From 15bea5fde0c9990a726316eb50eabd4f038d8d32 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 25 Feb 2020 00:07:30 +0100 Subject: [PATCH] Rename project & packages --- README.md | 5 +- .../ynerant/leveleditor}/api/editor/Case.java | 4 +- .../leveleditor}/api/editor/Collision.java | 2 +- .../leveleditor}/api/editor/EditorAPI.java | 4 +- .../leveleditor}/api/editor/RawCase.java | 2 +- .../leveleditor}/api/editor/RawMap.java | 4 +- .../leveleditor}/api/editor/RawSprite.java | 4 +- .../leveleditor/api/editor/package-info.java | 4 + .../api/editor/sprites/Category.java | 2 +- .../api/editor/sprites/Sprite.java | 2 +- .../api/editor/sprites/SpriteRegister.java | 4 +- .../leveleditor}/client/main/Main.java | 10 +- .../client/main/package-info.java | 2 +- .../leveleditor}/editor/CollidPanel.java | 6 +- .../leveleditor}/editor/EditorFrame.java | 28 +-- .../ynerant/leveleditor}/editor/Map.java | 10 +- .../ynerant/leveleditor}/editor/MapPanel.java | 4 +- .../leveleditor}/editor/SpriteComp.java | 4 +- .../leveleditor}/editor/WrapLayout.java | 2 +- .../ynerant/leveleditor}/frame/MainFrame.java | 17 +- .../frame/listeners/ChangeLAFListener.java | 4 +- .../listeners/CollidMapMouseListener.java | 12 +- .../frame/listeners/CreateMapListener.java | 6 +- .../frame/listeners/MapMouseListener.java | 10 +- .../frame/listeners/OpenMapListener.java | 6 +- .../frame/listeners/SpriteMouseListener.java | 6 +- .../gameengine/api/editor/package-info.java | 4 - src/main/resources/META-INF/MANIFEST.MF | 3 + .../textures/layer 1.png | Bin .../textures/layer 2.png | Bin .../textures/layer 3.png | Bin .../textures/sprites/blank.png | Bin .../textures/sprites/gazon.png | Bin .../textures/sprites/sprites.json | 168 +++++++++--------- .../ynerant/leveleditor}/AppTest.java | 2 +- 35 files changed, 173 insertions(+), 168 deletions(-) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/Case.java (89%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/Collision.java (50%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/EditorAPI.java (97%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/RawCase.java (96%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/RawMap.java (91%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/RawSprite.java (80%) create mode 100644 src/main/java/fr/ynerant/leveleditor/api/editor/package-info.java rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/sprites/Category.java (90%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/sprites/Sprite.java (96%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/api/editor/sprites/SpriteRegister.java (97%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/client/main/Main.java (96%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/client/main/package-info.java (70%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/CollidPanel.java (94%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/EditorFrame.java (91%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/Map.java (88%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/MapPanel.java (96%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/SpriteComp.java (93%) rename src/main/java/{galaxyoyo/alice/gameengine => fr/ynerant/leveleditor}/editor/WrapLayout.java (98%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/MainFrame.java (89%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/ChangeLAFListener.java (94%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/CollidMapMouseListener.java (79%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/CreateMapListener.java (76%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/MapMouseListener.java (91%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/OpenMapListener.java (73%) rename src/main/java/{galaxyoyo/gameengine => fr/ynerant/leveleditor}/frame/listeners/SpriteMouseListener.java (79%) delete mode 100644 src/main/java/galaxyoyo/alice/gameengine/api/editor/package-info.java create mode 100644 src/main/resources/META-INF/MANIFEST.MF rename src/main/resources/assets/{unknown => leveleditor}/textures/layer 1.png (100%) rename src/main/resources/assets/{unknown => leveleditor}/textures/layer 2.png (100%) rename src/main/resources/assets/{unknown => leveleditor}/textures/layer 3.png (100%) rename src/main/resources/assets/{unknown => leveleditor}/textures/sprites/blank.png (100%) rename src/main/resources/assets/{unknown => leveleditor}/textures/sprites/gazon.png (100%) rename src/main/resources/assets/{unknown => leveleditor}/textures/sprites/sprites.json (91%) rename src/test/java/{galaxyoyo/unknown => fr/ynerant/leveleditor}/AppTest.java (94%) diff --git a/README.md b/README.md index b6c8885..b29feed 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ -# Alice Game Engine -_by galaxyoyo_ \ No newline at end of file +# Level Editor + +_by ÿnérant_ \ No newline at end of file diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/Case.java b/src/main/java/fr/ynerant/leveleditor/api/editor/Case.java similarity index 89% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/Case.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/Case.java index 98b06ca..a87e678 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/Case.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/Case.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; -import galaxyoyo.alice.gameengine.api.editor.sprites.Sprite; +import fr.ynerant.leveleditor.api.editor.sprites.Sprite; public class Case { diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/Collision.java b/src/main/java/fr/ynerant/leveleditor/api/editor/Collision.java similarity index 50% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/Collision.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/Collision.java index 668ed09..d0965f8 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/Collision.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/Collision.java @@ -1,4 +1,4 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; public enum Collision { diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/EditorAPI.java b/src/main/java/fr/ynerant/leveleditor/api/editor/EditorAPI.java similarity index 97% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/EditorAPI.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/EditorAPI.java index f8050fc..9b7a190 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/EditorAPI.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/EditorAPI.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; -import galaxyoyo.alice.gameengine.editor.Map; +import fr.ynerant.leveleditor.editor.Map; import java.awt.Color; import java.awt.Graphics2D; diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawCase.java b/src/main/java/fr/ynerant/leveleditor/api/editor/RawCase.java similarity index 96% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/RawCase.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/RawCase.java index 3360ad4..444d2fc 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawCase.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/RawCase.java @@ -1,4 +1,4 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; public class RawCase { diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawMap.java b/src/main/java/fr/ynerant/leveleditor/api/editor/RawMap.java similarity index 91% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/RawMap.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/RawMap.java index 5340ca7..5d0627d 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawMap.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/RawMap.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; -import galaxyoyo.alice.gameengine.editor.Map; +import fr.ynerant.leveleditor.editor.Map; import java.awt.image.BufferedImage; import java.util.ArrayList; diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawSprite.java b/src/main/java/fr/ynerant/leveleditor/api/editor/RawSprite.java similarity index 80% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/RawSprite.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/RawSprite.java index 050615a..6ecf7e2 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/RawSprite.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/RawSprite.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.api.editor; +package fr.ynerant.leveleditor.api.editor; -import galaxyoyo.alice.gameengine.api.editor.sprites.Sprite; +import fr.ynerant.leveleditor.api.editor.sprites.Sprite; public class RawSprite { diff --git a/src/main/java/fr/ynerant/leveleditor/api/editor/package-info.java b/src/main/java/fr/ynerant/leveleditor/api/editor/package-info.java new file mode 100644 index 0000000..139b9a8 --- /dev/null +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/package-info.java @@ -0,0 +1,4 @@ +/** + * @author galaxyoyo + */ +package fr.ynerant.leveleditor.api.editor; \ No newline at end of file diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Category.java b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Category.java similarity index 90% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Category.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Category.java index 9c0168a..b5022aa 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Category.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Category.java @@ -1,4 +1,4 @@ -package galaxyoyo.alice.gameengine.api.editor.sprites; +package fr.ynerant.leveleditor.api.editor.sprites; import java.util.List; diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Sprite.java b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Sprite.java similarity index 96% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Sprite.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Sprite.java index 4da268a..d771755 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/Sprite.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/Sprite.java @@ -1,4 +1,4 @@ -package galaxyoyo.alice.gameengine.api.editor.sprites; +package fr.ynerant.leveleditor.api.editor.sprites; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/SpriteRegister.java b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/SpriteRegister.java similarity index 97% rename from src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/SpriteRegister.java rename to src/main/java/fr/ynerant/leveleditor/api/editor/sprites/SpriteRegister.java index 01a6e6c..4e0e711 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/sprites/SpriteRegister.java +++ b/src/main/java/fr/ynerant/leveleditor/api/editor/sprites/SpriteRegister.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.api.editor.sprites; +package fr.ynerant.leveleditor.api.editor.sprites; -import galaxyoyo.alice.gameengine.client.main.Main; +import fr.ynerant.leveleditor.client.main.Main; import java.awt.image.BufferedImage; import java.io.BufferedInputStream; diff --git a/src/main/java/galaxyoyo/alice/gameengine/client/main/Main.java b/src/main/java/fr/ynerant/leveleditor/client/main/Main.java similarity index 96% rename from src/main/java/galaxyoyo/alice/gameengine/client/main/Main.java rename to src/main/java/fr/ynerant/leveleditor/client/main/Main.java index 42340c0..8e571cf 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/client/main/Main.java +++ b/src/main/java/fr/ynerant/leveleditor/client/main/Main.java @@ -1,12 +1,12 @@ /** * @author galaxyoyo */ -package galaxyoyo.alice.gameengine.client.main; +package fr.ynerant.leveleditor.client.main; -import galaxyoyo.alice.gameengine.api.editor.EditorAPI; -import galaxyoyo.alice.gameengine.api.editor.RawMap; -import galaxyoyo.alice.gameengine.api.editor.sprites.SpriteRegister; -import galaxyoyo.gameengine.frame.MainFrame; +import fr.ynerant.leveleditor.frame.MainFrame; +import fr.ynerant.leveleditor.api.editor.EditorAPI; +import fr.ynerant.leveleditor.api.editor.RawMap; +import fr.ynerant.leveleditor.api.editor.sprites.SpriteRegister; import java.awt.Color; import java.awt.Desktop; diff --git a/src/main/java/galaxyoyo/alice/gameengine/client/main/package-info.java b/src/main/java/fr/ynerant/leveleditor/client/main/package-info.java similarity index 70% rename from src/main/java/galaxyoyo/alice/gameengine/client/main/package-info.java rename to src/main/java/fr/ynerant/leveleditor/client/main/package-info.java index aecadf8..a9d765f 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/client/main/package-info.java +++ b/src/main/java/fr/ynerant/leveleditor/client/main/package-info.java @@ -4,4 +4,4 @@ /** * @author galaxyoyo */ -package galaxyoyo.alice.gameengine.client.main; \ No newline at end of file +package fr.ynerant.leveleditor.client.main; \ No newline at end of file diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/CollidPanel.java b/src/main/java/fr/ynerant/leveleditor/editor/CollidPanel.java similarity index 94% rename from src/main/java/galaxyoyo/alice/gameengine/editor/CollidPanel.java rename to src/main/java/fr/ynerant/leveleditor/editor/CollidPanel.java index fce708b..ee1ec04 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/CollidPanel.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/CollidPanel.java @@ -1,7 +1,7 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; -import galaxyoyo.alice.gameengine.api.editor.Case; -import galaxyoyo.alice.gameengine.api.editor.Collision; +import fr.ynerant.leveleditor.api.editor.Case; +import fr.ynerant.leveleditor.api.editor.Collision; import java.awt.Color; import java.awt.Graphics; diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/EditorFrame.java b/src/main/java/fr/ynerant/leveleditor/editor/EditorFrame.java similarity index 91% rename from src/main/java/galaxyoyo/alice/gameengine/editor/EditorFrame.java rename to src/main/java/fr/ynerant/leveleditor/editor/EditorFrame.java index 4f908ff..a966c5c 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/EditorFrame.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/EditorFrame.java @@ -1,15 +1,15 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; -import galaxyoyo.alice.gameengine.api.editor.EditorAPI; -import galaxyoyo.alice.gameengine.api.editor.RawMap; -import galaxyoyo.alice.gameengine.api.editor.sprites.Category; -import galaxyoyo.alice.gameengine.api.editor.sprites.Sprite; -import galaxyoyo.alice.gameengine.api.editor.sprites.SpriteRegister; -import galaxyoyo.gameengine.frame.listeners.CollidMapMouseListener; -import galaxyoyo.gameengine.frame.listeners.CreateMapListener; -import galaxyoyo.gameengine.frame.listeners.MapMouseListener; -import galaxyoyo.gameengine.frame.listeners.OpenMapListener; -import galaxyoyo.gameengine.frame.listeners.SpriteMouseListener; +import fr.ynerant.leveleditor.api.editor.EditorAPI; +import fr.ynerant.leveleditor.api.editor.RawMap; +import fr.ynerant.leveleditor.api.editor.sprites.Category; +import fr.ynerant.leveleditor.api.editor.sprites.Sprite; +import fr.ynerant.leveleditor.api.editor.sprites.SpriteRegister; +import fr.ynerant.leveleditor.frame.listeners.CollidMapMouseListener; +import fr.ynerant.leveleditor.frame.listeners.CreateMapListener; +import fr.ynerant.leveleditor.frame.listeners.MapMouseListener; +import fr.ynerant.leveleditor.frame.listeners.OpenMapListener; +import fr.ynerant.leveleditor.frame.listeners.SpriteMouseListener; import java.awt.BorderLayout; import java.awt.Color; @@ -160,9 +160,9 @@ public class EditorFrame extends JFrame implements ChangeListener, ActionListene scroll2.getHorizontalScrollBar().setMaximum(0); scroll3.getHorizontalScrollBar().setMaximum(0); - resources.addTab("", new ImageIcon(new File("assets/unknown/textures/layer 1.png").getAbsolutePath()), scroll1); - resources.addTab("", new ImageIcon(new File("assets/unknown/textures/layer 2.png").getAbsolutePath()), scroll2); - resources.addTab("", new ImageIcon(new File("assets/unknown/textures/layer 3.png").getAbsolutePath()), scroll3); + resources.addTab("", new ImageIcon(new File("assets/leveleditor/textures/layer 1.png").getAbsolutePath()), scroll1); + resources.addTab("", new ImageIcon(new File("assets/leveleditor/textures/layer 2.png").getAbsolutePath()), scroll2); + resources.addTab("", new ImageIcon(new File("assets/leveleditor/textures/layer 3.png").getAbsolutePath()), scroll3); resources.addChangeListener(this); resources.setBackgroundAt(0, Color.white); resources.setBackgroundAt(1, Color.white); diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/Map.java b/src/main/java/fr/ynerant/leveleditor/editor/Map.java similarity index 88% rename from src/main/java/galaxyoyo/alice/gameengine/editor/Map.java rename to src/main/java/fr/ynerant/leveleditor/editor/Map.java index d8e4827..6059475 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/Map.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/Map.java @@ -1,9 +1,9 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; -import galaxyoyo.alice.gameengine.api.editor.Case; -import galaxyoyo.alice.gameengine.api.editor.RawCase; -import galaxyoyo.alice.gameengine.api.editor.RawMap; -import galaxyoyo.alice.gameengine.api.editor.sprites.SpriteRegister; +import fr.ynerant.leveleditor.api.editor.Case; +import fr.ynerant.leveleditor.api.editor.RawCase; +import fr.ynerant.leveleditor.api.editor.RawMap; +import fr.ynerant.leveleditor.api.editor.sprites.SpriteRegister; import java.awt.image.BufferedImage; import java.util.ArrayList; diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/MapPanel.java b/src/main/java/fr/ynerant/leveleditor/editor/MapPanel.java similarity index 96% rename from src/main/java/galaxyoyo/alice/gameengine/editor/MapPanel.java rename to src/main/java/fr/ynerant/leveleditor/editor/MapPanel.java index fd673f0..209ed70 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/MapPanel.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/MapPanel.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; -import galaxyoyo.alice.gameengine.api.editor.Case; +import fr.ynerant.leveleditor.api.editor.Case; import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/SpriteComp.java b/src/main/java/fr/ynerant/leveleditor/editor/SpriteComp.java similarity index 93% rename from src/main/java/galaxyoyo/alice/gameengine/editor/SpriteComp.java rename to src/main/java/fr/ynerant/leveleditor/editor/SpriteComp.java index 23858f5..608f57c 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/SpriteComp.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/SpriteComp.java @@ -1,6 +1,6 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; -import galaxyoyo.alice.gameengine.api.editor.sprites.Sprite; +import fr.ynerant.leveleditor.api.editor.sprites.Sprite; import java.awt.Color; import java.awt.Dimension; diff --git a/src/main/java/galaxyoyo/alice/gameengine/editor/WrapLayout.java b/src/main/java/fr/ynerant/leveleditor/editor/WrapLayout.java similarity index 98% rename from src/main/java/galaxyoyo/alice/gameengine/editor/WrapLayout.java rename to src/main/java/fr/ynerant/leveleditor/editor/WrapLayout.java index 4e546be..3fe9f7f 100644 --- a/src/main/java/galaxyoyo/alice/gameengine/editor/WrapLayout.java +++ b/src/main/java/fr/ynerant/leveleditor/editor/WrapLayout.java @@ -1,4 +1,4 @@ -package galaxyoyo.alice.gameengine.editor; +package fr.ynerant.leveleditor.editor; import java.awt.*; import javax.swing.JScrollPane; diff --git a/src/main/java/galaxyoyo/gameengine/frame/MainFrame.java b/src/main/java/fr/ynerant/leveleditor/frame/MainFrame.java similarity index 89% rename from src/main/java/galaxyoyo/gameengine/frame/MainFrame.java rename to src/main/java/fr/ynerant/leveleditor/frame/MainFrame.java index 5dd8925..187e881 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/MainFrame.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/MainFrame.java @@ -1,11 +1,12 @@ /** * @author galaxyoyo */ -package galaxyoyo.gameengine.frame; +package fr.ynerant.leveleditor.frame; -import galaxyoyo.gameengine.frame.listeners.ChangeLAFListener; -import galaxyoyo.gameengine.frame.listeners.CreateMapListener; -import galaxyoyo.gameengine.frame.listeners.OpenMapListener; +import fr.ynerant.leveleditor.client.main.Main; +import fr.ynerant.leveleditor.frame.listeners.ChangeLAFListener; +import fr.ynerant.leveleditor.frame.listeners.CreateMapListener; +import fr.ynerant.leveleditor.frame.listeners.OpenMapListener; import java.awt.Dimension; import java.awt.event.KeyEvent; @@ -25,7 +26,7 @@ import org.apache.logging.log4j.core.Logger; public class MainFrame extends JFrame { /** - * ID de sé + * ID de série * @see {@link JFrame} */ private static final long serialVersionUID = -3168760121879418534L; @@ -42,7 +43,7 @@ public class MainFrame extends JFrame * @see LogManager#getLogger(String) */ private static Logger LOGGER = (Logger) LogManager.getLogger("MainFrame"); - + private JMenuBar menuBar = new JMenuBar(); private JMenu fichier = new JMenu("Fichier"); private JMenu display = new JMenu("Affichage"); @@ -56,7 +57,7 @@ public class MainFrame extends JFrame /** * Constructeur - * @see galaxyoyo.alice.gameengine.client.main.Main#launchFrame() + * @see Main#launchFrame() */ private MainFrame() { @@ -87,7 +88,7 @@ public class MainFrame extends JFrame changeLAF.add(darkLAF); display.add(changeLAF); - + menuBar.add(fichier); menuBar.add(display); diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/ChangeLAFListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/ChangeLAFListener.java similarity index 94% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/ChangeLAFListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/ChangeLAFListener.java index f128dae..f028ab6 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/ChangeLAFListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/ChangeLAFListener.java @@ -1,6 +1,6 @@ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.gameengine.frame.MainFrame; +import fr.ynerant.leveleditor.frame.MainFrame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/CollidMapMouseListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/CollidMapMouseListener.java similarity index 79% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/CollidMapMouseListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/CollidMapMouseListener.java index bddd777..d60e18e 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/CollidMapMouseListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/CollidMapMouseListener.java @@ -1,10 +1,10 @@ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.alice.gameengine.api.editor.Case; -import galaxyoyo.alice.gameengine.api.editor.Collision; -import galaxyoyo.alice.gameengine.editor.CollidPanel; -import galaxyoyo.alice.gameengine.editor.EditorFrame; -import galaxyoyo.alice.gameengine.editor.Map; +import fr.ynerant.leveleditor.api.editor.Case; +import fr.ynerant.leveleditor.api.editor.Collision; +import fr.ynerant.leveleditor.editor.CollidPanel; +import fr.ynerant.leveleditor.editor.EditorFrame; +import fr.ynerant.leveleditor.editor.Map; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/CreateMapListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/CreateMapListener.java similarity index 76% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/CreateMapListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/CreateMapListener.java index 6c2436d..7e47ecc 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/CreateMapListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/CreateMapListener.java @@ -1,10 +1,10 @@ /** * @author galaxyoyo */ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.alice.gameengine.client.main.Main; -import galaxyoyo.gameengine.frame.MainFrame; +import fr.ynerant.leveleditor.client.main.Main; +import fr.ynerant.leveleditor.frame.MainFrame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/MapMouseListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/MapMouseListener.java similarity index 91% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/MapMouseListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/MapMouseListener.java index 1614e2c..c7cae4d 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/MapMouseListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/MapMouseListener.java @@ -1,9 +1,9 @@ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.alice.gameengine.api.editor.Case; -import galaxyoyo.alice.gameengine.editor.EditorFrame; -import galaxyoyo.alice.gameengine.editor.Map; -import galaxyoyo.alice.gameengine.editor.MapPanel; +import fr.ynerant.leveleditor.api.editor.Case; +import fr.ynerant.leveleditor.editor.EditorFrame; +import fr.ynerant.leveleditor.editor.Map; +import fr.ynerant.leveleditor.editor.MapPanel; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/OpenMapListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/OpenMapListener.java similarity index 73% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/OpenMapListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/OpenMapListener.java index f8c1ac1..dd6ed80 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/OpenMapListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/OpenMapListener.java @@ -1,7 +1,7 @@ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.alice.gameengine.api.editor.EditorAPI; -import galaxyoyo.gameengine.frame.MainFrame; +import fr.ynerant.leveleditor.api.editor.EditorAPI; +import fr.ynerant.leveleditor.frame.MainFrame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/main/java/galaxyoyo/gameengine/frame/listeners/SpriteMouseListener.java b/src/main/java/fr/ynerant/leveleditor/frame/listeners/SpriteMouseListener.java similarity index 79% rename from src/main/java/galaxyoyo/gameengine/frame/listeners/SpriteMouseListener.java rename to src/main/java/fr/ynerant/leveleditor/frame/listeners/SpriteMouseListener.java index 25f04ce..5ef0f85 100644 --- a/src/main/java/galaxyoyo/gameengine/frame/listeners/SpriteMouseListener.java +++ b/src/main/java/fr/ynerant/leveleditor/frame/listeners/SpriteMouseListener.java @@ -1,7 +1,7 @@ -package galaxyoyo.gameengine.frame.listeners; +package fr.ynerant.leveleditor.frame.listeners; -import galaxyoyo.alice.gameengine.editor.EditorFrame; -import galaxyoyo.alice.gameengine.editor.SpriteComp; +import fr.ynerant.leveleditor.editor.EditorFrame; +import fr.ynerant.leveleditor.editor.SpriteComp; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/src/main/java/galaxyoyo/alice/gameengine/api/editor/package-info.java b/src/main/java/galaxyoyo/alice/gameengine/api/editor/package-info.java deleted file mode 100644 index 73336eb..0000000 --- a/src/main/java/galaxyoyo/alice/gameengine/api/editor/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * @author galaxyoyo - */ -package galaxyoyo.alice.gameengine.api.editor; \ No newline at end of file diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..09456ce --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: fr.ynerant.leveleditor.client.main.Main + diff --git a/src/main/resources/assets/unknown/textures/layer 1.png b/src/main/resources/assets/leveleditor/textures/layer 1.png similarity index 100% rename from src/main/resources/assets/unknown/textures/layer 1.png rename to src/main/resources/assets/leveleditor/textures/layer 1.png diff --git a/src/main/resources/assets/unknown/textures/layer 2.png b/src/main/resources/assets/leveleditor/textures/layer 2.png similarity index 100% rename from src/main/resources/assets/unknown/textures/layer 2.png rename to src/main/resources/assets/leveleditor/textures/layer 2.png diff --git a/src/main/resources/assets/unknown/textures/layer 3.png b/src/main/resources/assets/leveleditor/textures/layer 3.png similarity index 100% rename from src/main/resources/assets/unknown/textures/layer 3.png rename to src/main/resources/assets/leveleditor/textures/layer 3.png diff --git a/src/main/resources/assets/unknown/textures/sprites/blank.png b/src/main/resources/assets/leveleditor/textures/sprites/blank.png similarity index 100% rename from src/main/resources/assets/unknown/textures/sprites/blank.png rename to src/main/resources/assets/leveleditor/textures/sprites/blank.png diff --git a/src/main/resources/assets/unknown/textures/sprites/gazon.png b/src/main/resources/assets/leveleditor/textures/sprites/gazon.png similarity index 100% rename from src/main/resources/assets/unknown/textures/sprites/gazon.png rename to src/main/resources/assets/leveleditor/textures/sprites/gazon.png diff --git a/src/main/resources/assets/unknown/textures/sprites/sprites.json b/src/main/resources/assets/leveleditor/textures/sprites/sprites.json similarity index 91% rename from src/main/resources/assets/unknown/textures/sprites/sprites.json rename to src/main/resources/assets/leveleditor/textures/sprites/sprites.json index 141d572..6c2d4dc 100644 --- a/src/main/resources/assets/unknown/textures/sprites/sprites.json +++ b/src/main/resources/assets/leveleditor/textures/sprites/sprites.json @@ -1,85 +1,85 @@ -{ - "blank": [ - [0,0] - ], - "gazon": [ - [0,0], - [0,16], - [0,32], - [0,48], - [0,64], - [0,144], - [0,160], - [0,176], - [16,144], - [32,144], - [16,160], - [32,160], - [32,224], - [48,224], - [64,224], - [80,224], - [96,224], - [112,224], - [112,208], - [159,48], - [160,166], - [176,166], - [128,144], - [128,160], - [144,80], - [48,36], - [64,36], - [54,53], - [70,53], - [48,70], - [16,28], - [16,16], - [16,32], - [16,48], - [16,64], - [16,80], - [32,16], - [32,32], - [32,48], - [32,64], - [32,80], - [48,64], - [48,80], - [64,64], - [64,80], - [80,64], - [80,80], - [96,64], - [96,80], - [112,64], - [112,80], - [128,80], - [128,64], - [112,48], - [128,48], - [112,32], - [128,32], - [112,16], - [128,16], - [64,128], - [80,128], - [96,128], - [48,144], - [64,144], - [80,144], - [96,144], - [48,160], - [96,160], - [48,176], - [96,176], - [32,176], - [112,176], - [64,160], - [80,160], - [64,176], - [80,176], - [64,192], - [80,192] - ] +{ + "blank": [ + [0,0] + ], + "gazon": [ + [0,0], + [0,16], + [0,32], + [0,48], + [0,64], + [0,144], + [0,160], + [0,176], + [16,144], + [32,144], + [16,160], + [32,160], + [32,224], + [48,224], + [64,224], + [80,224], + [96,224], + [112,224], + [112,208], + [159,48], + [160,166], + [176,166], + [128,144], + [128,160], + [144,80], + [48,36], + [64,36], + [54,53], + [70,53], + [48,70], + [16,28], + [16,16], + [16,32], + [16,48], + [16,64], + [16,80], + [32,16], + [32,32], + [32,48], + [32,64], + [32,80], + [48,64], + [48,80], + [64,64], + [64,80], + [80,64], + [80,80], + [96,64], + [96,80], + [112,64], + [112,80], + [128,80], + [128,64], + [112,48], + [128,48], + [112,32], + [128,32], + [112,16], + [128,16], + [64,128], + [80,128], + [96,128], + [48,144], + [64,144], + [80,144], + [96,144], + [48,160], + [96,160], + [48,176], + [96,176], + [32,176], + [112,176], + [64,160], + [80,160], + [64,176], + [80,176], + [64,192], + [80,192] + ] } \ No newline at end of file diff --git a/src/test/java/galaxyoyo/unknown/AppTest.java b/src/test/java/fr/ynerant/leveleditor/AppTest.java similarity index 94% rename from src/test/java/galaxyoyo/unknown/AppTest.java rename to src/test/java/fr/ynerant/leveleditor/AppTest.java index 5709616..6de43b9 100644 --- a/src/test/java/galaxyoyo/unknown/AppTest.java +++ b/src/test/java/fr/ynerant/leveleditor/AppTest.java @@ -1,4 +1,4 @@ -package galaxyoyo.unknown; +package fr.ynerant.leveleditor; import junit.framework.Test; import junit.framework.TestCase;