From fbd690f4275af2f3a42548769c53d9bcda2eb75e Mon Sep 17 00:00:00 2001
From: Indy <Indy@DESKTOP-BR2LBJO>
Date: Mon, 31 May 2021 12:25:39 +0200
Subject: [PATCH] update pom + reso json

---
 pom.xml                       | 73 ++++++++++++++++++++---------------
 src/configuration/config.json | 11 ++++++
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c4995f..12d77b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,30 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<groupId>jeu-de-combat</groupId>
 	<artifactId>jeu-de-combat</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Boulevard Combattant</name>
 	<description>Jeu de combat inspiré de Street Fighter 3: Third Strike. Projet de fin d'année de L3.</description>
 	<url>https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat</url>
-  
+
 	<build>
-		
+
 		<sourceDirectory>src</sourceDirectory>
-		
+
 		<resources>
-		
+
 			<resource>
 				<directory>src/launcher/ui</directory>
 			</resource>
-			
+
 		</resources>
-		
+
 		<plugins>
-		
+
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
@@ -30,21 +32,21 @@
 					<release>11</release>
 				</configuration>
 			</plugin>
-			
+
 		</plugins>
-		
+
 	</build>
-	
+
 	<properties>
-	
+
 		<lwjgl.version>3.2.3</lwjgl.version>
 		<lwjgl.natives>natives-windows</lwjgl.natives>
 		<javafx.version>11</javafx.version>
-		
+
 	</properties>
 
 	<dependencyManagement>
-	
+
 		<dependencies>
 			<dependency>
 				<groupId>org.lwjgl</groupId>
@@ -54,92 +56,99 @@
 				<type>pom</type>
 			</dependency>
 		</dependencies>
-		
+
 	</dependencyManagement>
 
 	<dependencies>
-	
+
 		<!-- LWJGL dependencies -->
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-assimp</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-glfw</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-openal</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-opengl</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-stb</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-assimp</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-glfw</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-openal</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-opengl</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.lwjgl</groupId>
 			<artifactId>lwjgl-stb</artifactId>
 			<classifier>${lwjgl.natives}</classifier>
 		</dependency>
-		
-		
+
+
 		<!-- JavaFX toolkit for launcher GUI -->
 		<dependency>
 			<groupId>org.openjfx</groupId>
 			<artifactId>javafx-controls</artifactId>
 			<version>${javafx.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openjfx</groupId>
 			<artifactId>javafx-fxml</artifactId>
 			<version>${javafx.version}</version>
 		</dependency>
 		
+		<!-- https://mvnrepository.com/artifact/org.json/json -->
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20210307</version>
+		</dependency>
+
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/configuration/config.json b/src/configuration/config.json
index 028c17f..4c4b7fd 100644
--- a/src/configuration/config.json
+++ b/src/configuration/config.json
@@ -1,4 +1,5 @@
 {
+	"test": "test valide",
 	"arena": [
 		"arena1.png",
 		"arena2.png",
@@ -25,5 +26,15 @@
 		"1680 x 1050",
 		"1920 x 1080",
 		"800 x 600"
+		],
+	"button": [
+		"up",
+		"down",
+		"rigth",
+		"left",
+		"a",
+		"b",
+		"c",
+		"d"
 	]
 }