Reorganized project to fit Maven's directory structure.

.classpath

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

pom.xml

@@ -15,8 +15,6 @@
 
 	<build>
 
-		<sourceDirectory>src</sourceDirectory>
-
 		<plugins>
 
 			<plugin>
@@ -26,6 +24,22 @@
 					<release>11</release>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+		    	<!-- Build an executable JAR -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<mainClass>Main</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 
 		</plugins>
 
@@ -36,6 +50,7 @@
 		<lwjgl.version>3.2.3</lwjgl.version>
 		<lwjgl.natives>natives-windows</lwjgl.natives>
 		<javafx.version>11</javafx.version>
+		<java.version>11</java.version>
 
 	</properties>
 

src/engine/loader/ControllerPromptTextureLoader.java

@@ -1,26 +0,0 @@
-package engine.loader;
-
-import engine.graphics.Texture;
-
-public class ControllerPromptTextureLoader {
-
-    public Texture up;
-    public Texture down;
-    public Texture left;
-    public Texture right;
-    public Texture X;
-    public Texture A;
-    public Texture Y;
-    public Texture B;
-
-    public ControllerPromptTextureLoader(){
-        up = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png", 0);
-        down = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png", 0);
-        left = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png", 0);
-        right = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png", 0);
-        A = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_A.png", 0);
-        B = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_B.png", 0);
-        X = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_X.png", 0);
-        Y = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png", 0);
-    }
-}

src/main/java/engine/graphics/Texture.java

@@ -26,7 +26,7 @@ public class Texture {
     private int load(String path) {
         int[] pixels = null;
         try {
-            BufferedImage image = ImageIO.read(new FileInputStream(path));
+            BufferedImage image = ImageIO.read(getClass().getResourceAsStream(path));
             width = image.getWidth();
             height = image.getHeight();
             pixels = new int[width * height];

src/main/java/engine/loader/ControllerPromptTextureLoader.java

@@ -0,0 +1,26 @@
+package engine.loader;
+
+import engine.graphics.Texture;
+
+public class ControllerPromptTextureLoader {
+
+    public Texture up;
+    public Texture down;
+    public Texture left;
+    public Texture right;
+    public Texture X;
+    public Texture A;
+    public Texture Y;
+    public Texture B;
+
+    public ControllerPromptTextureLoader(){
+        up = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png", 0);
+        down = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png", 0);
+        left = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png", 0);
+        right = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png", 0);
+        A = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_A.png", 0);
+        B = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_B.png", 0);
+        X = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_X.png", 0);
+        Y = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png", 0);
+    }
+}

src/main/java/engine/object/Hitbox.java

@@ -8,7 +8,7 @@ public class Hitbox extends ObjectGl{
 
     public Hitbox(float z, float w, float h, float size, Vector3f color) {
         super(z, w, h, size, null, color);
-        this.setShader("shaders/ObjectGlColor/vert.glsl", "shaders/StylishShaders/HitboxFrag.glsl");
+        this.setShader("/shaders/ObjectGlColor/vert.glsl", "/shaders/StylishShaders/HitboxFrag.glsl");
     }
 
 

src/main/java/engine/object/HorizontalProgressBar.java

@@ -17,7 +17,7 @@ public class HorizontalProgressBar extends ObjectGl {
         this.current = current;
         this.leftToRight = leftToRight ? 1 : 0;
         this.useHeight = false;
-        this.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarFrag.glsl");
+        this.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarFrag.glsl");
     }
 
     public void setCurrent(float newCurrent) {

src/main/java/engine/object/ObjectGl.java

@@ -79,13 +79,13 @@ public class ObjectGl {
 
         // use different shader for each set of option
         if (tex == null && color == null){
-            this.shader = new Shader("shaders/ObjectGl/vert.glsl","shaders/ObjectGl/frag.glsl");
+            this.shader = new Shader("/shaders/ObjectGl/vert.glsl","/shaders/ObjectGl/frag.glsl");
         } else if (tex == null){
-            this.shader = new Shader("shaders/ObjectGlColor/vert.glsl","shaders/ObjectGlColor/frag.glsl");
+            this.shader = new Shader("/shaders/ObjectGlColor/vert.glsl","/shaders/ObjectGlColor/frag.glsl");
         } else if (color == null){
-            this.shader = new Shader("shaders/ObjectGlTex/vert.glsl","shaders/ObjectGlTex/frag.glsl");
+            this.shader = new Shader("/shaders/ObjectGlTex/vert.glsl","/shaders/ObjectGlTex/frag.glsl");
         } else {
-            this.shader = new Shader("shaders/ObjectGlTexColor/vert.glsl","shaders/ObjectGlTexColor/frag.glsl");
+            this.shader = new Shader("/shaders/ObjectGlTexColor/vert.glsl","/shaders/ObjectGlTexColor/frag.glsl");
         }
     }
 

src/main/java/engine/object/Sprite.java

@@ -31,7 +31,7 @@ public class Sprite extends ObjectGl {
      * Ajoute une ombre sous le personnage
      */
     public void setShadow(){
-        this.shadow = new ObjectGl(this.zPos, this.width, this.height * 0.3f, this.scalingFactor, "textures/shadow.png", null);
+        this.shadow = new ObjectGl(this.zPos, this.width, this.height * 0.3f, this.scalingFactor, "/textures/shadow.png", null);
         this.shadow.translate(new Vector3f(this.xPos, this.yPos - this.height * 4.3f, -8f)); // 8 ça fait bcp mais y du z-fighting sinon jsp pk
     }
 

src/main/java/engine/object_wrapper/Text.java

@@ -103,8 +103,8 @@ public class Text {
     }
 
     private Letter charToObjectGl(char a, int index){
-        Letter objectGl = new Letter(this.zPos, 1.0f, 1.0f, this.size, "textures/dejavu10x10_gs_tc.png", null, index);
-        objectGl.setShader("shaders/StylishShaders/BasicVert.glsl","shaders/StylishShaders/TextFrag.glsl");
+        Letter objectGl = new Letter(this.zPos, 1.0f, 1.0f, this.size, "/textures/dejavu10x10_gs_tc.png", null, index);
+        objectGl.setShader("/shaders/StylishShaders/BasicVert.glsl","/shaders/StylishShaders/TextFrag.glsl");
         ObjectGlSetCharWrap(a, objectGl);
         return objectGl;
     }

src/main/java/engine/utils/FileUtils.java

@@ -2,6 +2,8 @@ package engine.utils;
 
 import org.lwjgl.BufferUtils;
 
+import engine.Engine;
+
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
@@ -18,7 +20,7 @@ public class FileUtils {
     public static String loadAsString(String file){
         StringBuilder result = new StringBuilder();
         try {
-            BufferedReader reader = new BufferedReader(new FileReader(file));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(Engine.class.getResourceAsStream(file)));
             String buffer = "";
             while ((buffer = reader.readLine()) != null) {
                 result.append(buffer).append("\n");

src/main/java/gameplay/match/match.java

@@ -204,10 +204,10 @@ public class match {
 		String pathToBG = "";
 		switch (stage) {
 			case "arena1":
-				pathToBG = "textures/arena1.png";
+				pathToBG = "/textures/arena1.png";
 				break;
 			default:
-				pathToBG = "textures/arena1.png";
+				pathToBG = "/textures/arena1.png";
 		}
 
 		ObjectGl background = new ObjectGl(0f,1f,1f,2.5f, pathToBG, null);
@@ -221,22 +221,22 @@ public class match {
 		switch (character1) {
 			case "blue":
 				p1 = CharacterBlue.generateCharBlue();
-				pathp1 = "textures/Sprite_sans_grille_9comp.png";
+				pathp1 = "/textures/Sprite_sans_grille_9comp.png";
 				break;
 			default:
 				p1 = CharacterBlue.generateCharBlue();
-				pathp1 = "textures/Sprite_sans_grille_9comp.png";
+				pathp1 = "/textures/Sprite_sans_grille_9comp.png";
 				break;
 		}
 		
 		switch (character2) {
 		case "blue":
 			p2 = CharacterBlue.generateCharBlue();
-			pathp2 = "textures/Sprite_sans_grille_9comp.png";
+			pathp2 = "/textures/Sprite_sans_grille_9comp.png";
 			break;
 		default:
 			p2 = CharacterBlue.generateCharBlue();
-			pathp2 = "textures/Sprite_sans_grille_9comp.png";
+			pathp2 = "/textures/Sprite_sans_grille_9comp.png";
 			break;
 	}
 		
@@ -280,23 +280,23 @@ public class match {
 		engine.add_uiElement(coordP2);
 		// Barre de vie
 		healthBarP1Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p1.getCurrentHP(), p1.getMaxHP(), false);
-		healthBarP1Obj.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl");
+		healthBarP1Obj.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl");
 		healthBarP1Obj.setUseHeight(true);
 		healthBarP1Obj.useTime = true;
 		healthBarP1 = new UIElement(healthBarP1Obj, 0.0138f, 0.980f, engine);
 		healthBarP2Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p2.getCurrentHP(), p2.getMaxHP(), true);
-		healthBarP2Obj.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl");
+		healthBarP2Obj.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl");
 		healthBarP2Obj.setUseHeight(true);
 		healthBarP2Obj.useTime = true;
 		healthBarP2 = new UIElement(healthBarP2Obj, 0.563f, 0.980f, engine);
 		engine.add_uiElement(healthBarP1);
 		engine.add_uiElement(healthBarP2);
 		// Habillage barre de vie
-        ObjectGl healthBarP1Hab = new ObjectGl(81f, 1f, 1f, 1f, "textures/health_bar.png", null);
+        ObjectGl healthBarP1Hab = new ObjectGl(81f, 1f, 1f, 1f, "/textures/health_bar.png", null);
         healthBarP1Hab.setTextureWrap(0,0, 883, 158);
         UIElement healthBarP1HabUI = new UIElement(healthBarP1Hab, 0.005f, 0.995f, engine);
         engine.add_uiElement(healthBarP1HabUI);
-		ObjectGl healthBarP2Hab = new ObjectGl(81f, 1f, 1f, 1f, "textures/health_bar.png", null);
+		ObjectGl healthBarP2Hab = new ObjectGl(81f, 1f, 1f, 1f, "/textures/health_bar.png", null);
 		healthBarP2Hab.setTextureWrap(0,0, 883, 158);
 		healthBarP2Hab.flipTextureWrapH();
 		UIElement healthBarP2HabUI = new UIElement(healthBarP2Hab, 0.555f, 0.995f, engine);

src/main/resources/launcher/launcher.fxml

@@ -78,7 +78,7 @@
                <children>
                   <ImageView styleClass="char_img" fitHeight="400" fitWidth="400">
                      <image>
-                        <Image url="/launcher/default.png"/>
+                        <Image url="/launcher/charfaces/default.png"/>
                      </image>
                   </ImageView>
                   <ChoiceBox styleClass="char_box" onAction="#chp1"/>
@@ -88,7 +88,7 @@
                <children>
                   <ImageView styleClass="char_img" fx:id="char_p2" fitHeight="400" fitWidth="400">
                      <image>
-                        <Image url="/launcher/default.png"/>
+                        <Image url="/launcher/charfaces/default.png"/>
                      </image>
                   </ImageView>
                   <ChoiceBox styleClass="char_box" onAction="#chp2"/>