diff --git a/millennium-legacy/.classpath b/millennium-legacy/.classpath old mode 100644 new mode 100755 index 6c614bc..91ee9a5 --- a/millennium-legacy/.classpath +++ b/millennium-legacy/.classpath @@ -1,10 +1,6 @@ - - - -<<<<<<< HEAD - -======= - ->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef - - + + + + + + diff --git a/millennium-legacy/.project b/millennium-legacy/.project old mode 100644 new mode 100755 index b29e032..9afda82 --- a/millennium-legacy/.project +++ b/millennium-legacy/.project @@ -1,21 +1,17 @@ - - -<<<<<<< HEAD - EYS -======= - Millenium Legacy ->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + millennium-legacy + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/millennium-legacy/.settings/org.eclipse.jdt.core.prefs b/millennium-legacy/.settings/org.eclipse.jdt.core.prefs old mode 100644 new mode 100755 index acfe6af..838bd9d --- a/millennium-legacy/.settings/org.eclipse.jdt.core.prefs +++ b/millennium-legacy/.settings/org.eclipse.jdt.core.prefs @@ -1,21 +1,11 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -<<<<<<< HEAD -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -======= -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 ->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -<<<<<<< HEAD -org.eclipse.jdt.core.compiler.source=1.8 -======= -org.eclipse.jdt.core.compiler.source=1.7 ->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/millennium-legacy/README.md b/millennium-legacy/README.md old mode 100644 new mode 100755 diff --git a/millennium-legacy/bin/map.txt b/millennium-legacy/bin/map.txt old mode 100644 new mode 100755 diff --git a/millennium-legacy/bin/milleniumlegacy/Algorithm.class b/millennium-legacy/bin/milleniumlegacy/Algorithm.class old mode 100644 new mode 100755 index 05cac0e..f1fde3d Binary files a/millennium-legacy/bin/milleniumlegacy/Algorithm.class and b/millennium-legacy/bin/milleniumlegacy/Algorithm.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/GUI$1.class b/millennium-legacy/bin/milleniumlegacy/GUI$1.class new file mode 100755 index 0000000..f10639b Binary files /dev/null and b/millennium-legacy/bin/milleniumlegacy/GUI$1.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/GUI.class b/millennium-legacy/bin/milleniumlegacy/GUI.class old mode 100644 new mode 100755 index c32f3d7..a1d1acb Binary files a/millennium-legacy/bin/milleniumlegacy/GUI.class and b/millennium-legacy/bin/milleniumlegacy/GUI.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/ImageLoader.class b/millennium-legacy/bin/milleniumlegacy/ImageLoader.class old mode 100644 new mode 100755 index f848d1d..ac69542 Binary files a/millennium-legacy/bin/milleniumlegacy/ImageLoader.class and b/millennium-legacy/bin/milleniumlegacy/ImageLoader.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/Item.class b/millennium-legacy/bin/milleniumlegacy/Item.class old mode 100644 new mode 100755 index d04d6d7..fc5ddb1 Binary files a/millennium-legacy/bin/milleniumlegacy/Item.class and b/millennium-legacy/bin/milleniumlegacy/Item.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/KeyManager.class b/millennium-legacy/bin/milleniumlegacy/KeyManager.class old mode 100644 new mode 100755 index 922a2b6..000f31b Binary files a/millennium-legacy/bin/milleniumlegacy/KeyManager.class and b/millennium-legacy/bin/milleniumlegacy/KeyManager.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/MainGame.class b/millennium-legacy/bin/milleniumlegacy/MainGame.class old mode 100644 new mode 100755 index 863932b..81693c5 Binary files a/millennium-legacy/bin/milleniumlegacy/MainGame.class and b/millennium-legacy/bin/milleniumlegacy/MainGame.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/Map.class b/millennium-legacy/bin/milleniumlegacy/Map.class old mode 100644 new mode 100755 index dccb8e2..0c677de Binary files a/millennium-legacy/bin/milleniumlegacy/Map.class and b/millennium-legacy/bin/milleniumlegacy/Map.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/MapLoader.class b/millennium-legacy/bin/milleniumlegacy/MapLoader.class old mode 100644 new mode 100755 index d326678..4f394d2 Binary files a/millennium-legacy/bin/milleniumlegacy/MapLoader.class and b/millennium-legacy/bin/milleniumlegacy/MapLoader.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/OptionsPane.class b/millennium-legacy/bin/milleniumlegacy/OptionsPane.class old mode 100644 new mode 100755 index cab53bc..a0532c6 Binary files a/millennium-legacy/bin/milleniumlegacy/OptionsPane.class and b/millennium-legacy/bin/milleniumlegacy/OptionsPane.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/Tile.class b/millennium-legacy/bin/milleniumlegacy/Tile.class old mode 100644 new mode 100755 index 5b97d86..cbaebc0 Binary files a/millennium-legacy/bin/milleniumlegacy/Tile.class and b/millennium-legacy/bin/milleniumlegacy/Tile.class differ diff --git a/millennium-legacy/bin/milleniumlegacy/player.class b/millennium-legacy/bin/milleniumlegacy/player.class old mode 100644 new mode 100755 index 6430540..db01fbb Binary files a/millennium-legacy/bin/milleniumlegacy/player.class and b/millennium-legacy/bin/milleniumlegacy/player.class differ diff --git a/millennium-legacy/resources/sprites/npc.png b/millennium-legacy/resources/sprites/npc.png new file mode 100644 index 0000000..87f4be3 Binary files /dev/null and b/millennium-legacy/resources/sprites/npc.png differ diff --git a/millennium-legacy/resources/sprites/player.png b/millennium-legacy/resources/sprites/player.png old mode 100644 new mode 100755 diff --git a/millennium-legacy/resources/textures/grass.png b/millennium-legacy/resources/textures/grass.png old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/map.txt b/millennium-legacy/src/map.txt old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/Algorithm.java b/millennium-legacy/src/milleniumlegacy/Algorithm.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/GUI.java b/millennium-legacy/src/milleniumlegacy/GUI.java old mode 100644 new mode 100755 index d99a58f..ab33b73 --- a/millennium-legacy/src/milleniumlegacy/GUI.java +++ b/millennium-legacy/src/milleniumlegacy/GUI.java @@ -1,19 +1,17 @@ package milleniumlegacy; -<<<<<<< HEAD + import java.awt.Component; import java.awt.Graphics; import java.util.HashMap; import javax.imageio.ImageIO; -======= ->>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f import javax.swing.*; public class GUI { public static void main(String[] args) { -<<<<<<< HEAD + JFrame f = new JFrame("Millenium Legacy"); f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); f.setContentPane(new JPanel() { @@ -26,7 +24,7 @@ public class GUI { f.setSize(825, 625); f.setVisible(true); Algorithm.research(); -======= + SwingUtilities.invokeLater(new Runnable() { public void run() { createAndShowGUI(); @@ -45,7 +43,6 @@ public class GUI { f.setSize(825, 625); f.setVisible(true); draw.start(); ->>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f } } diff --git a/millennium-legacy/src/milleniumlegacy/ImageLoader.java b/millennium-legacy/src/milleniumlegacy/ImageLoader.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/Item.java b/millennium-legacy/src/milleniumlegacy/Item.java old mode 100644 new mode 100755 index 89d827f..4b02596 --- a/millennium-legacy/src/milleniumlegacy/Item.java +++ b/millennium-legacy/src/milleniumlegacy/Item.java @@ -3,7 +3,7 @@ import java.util.*; public class Item { - public static final Map items; + public static final HashMap items; static { //Putting items diff --git a/millennium-legacy/src/milleniumlegacy/KeyManager.java b/millennium-legacy/src/milleniumlegacy/KeyManager.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/MainGame.java b/millennium-legacy/src/milleniumlegacy/MainGame.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/Map.java b/millennium-legacy/src/milleniumlegacy/Map.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/MapLoader.java b/millennium-legacy/src/milleniumlegacy/MapLoader.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/OptionsPane.java b/millennium-legacy/src/milleniumlegacy/OptionsPane.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/Tile.java b/millennium-legacy/src/milleniumlegacy/Tile.java old mode 100644 new mode 100755 diff --git a/millennium-legacy/src/milleniumlegacy/player.java b/millennium-legacy/src/milleniumlegacy/player.java old mode 100644 new mode 100755