From 162d9d4e951afd7c9481da2fa32c86a24a4a9d96 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sat, 14 Feb 2015 18:12:38 -0500 Subject: [PATCH] fixing git --- millennium-legacy/.classpath | 16 +++----- millennium-legacy/.project | 38 ++++++++---------- .../.settings/org.eclipse.jdt.core.prefs | 32 +++++---------- millennium-legacy/README.md | 0 millennium-legacy/bin/map.txt | 0 .../bin/milleniumlegacy/Algorithm.class | Bin 1487 -> 1485 bytes .../bin/milleniumlegacy/GUI$1.class | Bin 0 -> 551 bytes .../bin/milleniumlegacy/GUI.class | Bin 922 -> 1466 bytes .../bin/milleniumlegacy/ImageLoader.class | Bin 1033 -> 1033 bytes .../bin/milleniumlegacy/Item.class | Bin 877 -> 860 bytes .../bin/milleniumlegacy/KeyManager.class | Bin 997 -> 997 bytes .../bin/milleniumlegacy/MainGame.class | Bin 3145 -> 3145 bytes .../bin/milleniumlegacy/Map.class | Bin 1373 -> 1373 bytes .../bin/milleniumlegacy/MapLoader.class | Bin 2649 -> 2649 bytes .../bin/milleniumlegacy/OptionsPane.class | Bin 290 -> 290 bytes .../bin/milleniumlegacy/Tile.class | Bin 936 -> 936 bytes .../bin/milleniumlegacy/player.class | Bin 897 -> 897 bytes millennium-legacy/resources/sprites/npc.png | Bin 0 -> 266 bytes .../resources/sprites/player.png | Bin .../resources/textures/grass.png | Bin millennium-legacy/src/map.txt | 0 .../src/milleniumlegacy/Algorithm.java | 0 .../src/milleniumlegacy/GUI.java | 9 ++--- .../src/milleniumlegacy/ImageLoader.java | 0 .../src/milleniumlegacy/Item.java | 2 +- .../src/milleniumlegacy/KeyManager.java | 0 .../src/milleniumlegacy/MainGame.java | 0 .../src/milleniumlegacy/Map.java | 0 .../src/milleniumlegacy/MapLoader.java | 0 .../src/milleniumlegacy/OptionsPane.java | 0 .../src/milleniumlegacy/Tile.java | 0 .../src/milleniumlegacy/player.java | 0 32 files changed, 38 insertions(+), 59 deletions(-) mode change 100644 => 100755 millennium-legacy/.classpath mode change 100644 => 100755 millennium-legacy/.project mode change 100644 => 100755 millennium-legacy/.settings/org.eclipse.jdt.core.prefs mode change 100644 => 100755 millennium-legacy/README.md mode change 100644 => 100755 millennium-legacy/bin/map.txt mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/Algorithm.class create mode 100755 millennium-legacy/bin/milleniumlegacy/GUI$1.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/GUI.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/ImageLoader.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/Item.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/KeyManager.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/MainGame.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/Map.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/MapLoader.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/OptionsPane.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/Tile.class mode change 100644 => 100755 millennium-legacy/bin/milleniumlegacy/player.class create mode 100644 millennium-legacy/resources/sprites/npc.png mode change 100644 => 100755 millennium-legacy/resources/sprites/player.png mode change 100644 => 100755 millennium-legacy/resources/textures/grass.png mode change 100644 => 100755 millennium-legacy/src/map.txt mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/Algorithm.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/GUI.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/ImageLoader.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/Item.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/KeyManager.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/MainGame.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/Map.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/MapLoader.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/OptionsPane.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/Tile.java mode change 100644 => 100755 millennium-legacy/src/milleniumlegacy/player.java 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 05cac0e424d9aec7090aaa750df0214ede7d7b15..f1fde3d7df18fe9141ec53305a5bca6ada0d7946 GIT binary patch delta 468 zcmZ9Hu}d3q9K}Bu?~Hes#Kf53VT_Olj1YRbh*-6z)i%~BcGW2$Xp5VsgMwLHTx{tr z>JS$l3Y{7n#i95Qh<}WW&>?+9kRlvk-ur#u_q}&_?ydXnZ#-G~T>Vn@YdfE|{Bm`B zGYA`H&tZt+Fj<4dv+cUEVmQs;MkG`;9x#ak*T0CHSEO5HZpbZ)Sx>AY)*>I=cNHS5 z!YTW46^xpBf5daW?iMdkiFy&w5;`IIpGa<#(F5B^*~LHS?TcXF%++J`kin*aLlKuT zB8(H|m8#6r%RF%wNw7vARg!Gb&mJkhlIBdi9}Loz!zEc=!?A8+{A7w3Vi_7t3mNkN z&J3>!DdkAcCAyS#Sm%wPsmKG~3Rw!SGbhw7(XQf4gf(lt6Y8O?67Mx_6`Er~){b6g z_@J$;auX_B(l0c1Rq5z16|^Meu&hGkSZzt1FuBebG^_#7??6pI`9N<-ZC4}>@$nxK CXHm5P delta 470 zcmY+9%PT}-7{-6+ILDYdGmOiboLn0gluRtB$!**(L*pM%(_}%)2Bl;cENqmVa?3`| z#ukaih_aQxMkx!PrWEykU(fTs&-=X3`{ukmM_=Kp^lEl1o7mh~SxfkiG3`1u(GsB9 zAo8cOW@HTKwrGUSUem;)5_r8KYCRBpq|xM=_?)=?ho{9KX*cjc$~r2S#N6O-+3&R4 zdpbSGE5E1vf`}LPY@u`9e=@lyBl|(a4R$>hzOVcpE1r*1K`TMJ3DJu~KVb%lkW#2g zs+c3nBGu%mVTD@Osbde9Q(|1Jc1r_A8hN2v-EgL!D0lK`6KkcwppYT|6NVVZ)RbdJ z@u5?NFqCxXQA@xEZ_P6#41&Ei9e`(iyJtde3kf{Bn+Em(%q$Z0$NDogE diff --git a/millennium-legacy/bin/milleniumlegacy/GUI$1.class b/millennium-legacy/bin/milleniumlegacy/GUI$1.class new file mode 100755 index 0000000000000000000000000000000000000000..f10639b83f915fb2c38a1f86b8796f6d95ac6450 GIT binary patch literal 551 zcmZvY%}T>S6ot>&*lLVct!@1U7cQ!TLAq4j6qQO9LG8xX7>9ObGAT*w&ttg~T=)P! zlz66fB@JZm+_{JEo_oK4KED7ou~ov9KsDCJD65CDQ9T*Gh39weox>75f#oOpEMLRy zMcZC@aV@Pf0>xu(b$%jHXzX?cyjJq4d=xMnU>Ze%az|TrHH;rrdMh7{BBql>(sX62 zUHQHW#QhI?hihU-Ixgm4m*HvZLLu>%A0U0c8Qv z6R1p33HUe3Fpboic7|p+;(=q)?Wv7Sl5xOGmG_g!5>|d5HaKofSI*1*xQ&rq z%}t&XKraG8+gg>jjLb5XVH;c%cMVMO=X#izcxy5W_pmxH;U$bPn0ZT8fr3^oqo< z(0HLA!MoiQGZH_5_kJ9WPhpy9VlSR2=l_3Rem(6c^)eLs_Ve;9fP1K_;0zOPflXY@ zPIE=Yvb)I=XGEz!lYu%ic!mmClF&~`;5fzE(BQa5*?)4Q^b5_{ Bl_LNE delta 167 zcmXAhOA3Ne6o$Wh6-1>MmOa6N&>#pRLCb8=UV;|W@Xp$WQwJ@eRkV`mr_O=@{4Y)y zKZ4=w(>;NLbAUA@?qZTQUs>1M+P%G5cc1_lP>jU0?D064w{TmS$7 delta 17 YcmeC==;Yuy^>5cc1_lO`jU0?D064=1T>t<8 diff --git a/millennium-legacy/bin/milleniumlegacy/Item.class b/millennium-legacy/bin/milleniumlegacy/Item.class old mode 100644 new mode 100755 index d04d6d78be096cd14975db05872e77c7f43ed045..fc5ddb1a119a42c2d5c0a2a18ea0fc0f95f8acfb GIT binary patch delta 312 zcmaFMc887Y)W2Q(7#J9g87wApSs4lYWF?j*>X(*e=IDDQ7H9Y-7FaVfa0X|l=Ovbu z7Ns&WSfic`i-CthiHAX%L1l6+qqC73BLkxm2ZIJ918aC{0XK{0$2gCOe; z24S|n43d$|LaM=$EJEtRk*q@U!BAN?pe#E?Rud$v4U*Ljj${+k2P@eKG>(bE5J-wK zumVXgAmnDy06N!=ftMkZfsesxvI4Wbo-slp8v`RyAq#^MkmLcgSs6?iOo2Q`1~VYZ H#9$5pdkZ|c delta 346 zcmY+9%}T>i5QWb)xwp4zS~Y^;Lj0?LQ5#LwYF&0Gc9liR@`6E9f|ig5T)FTGN?yQM z(3J}M06v3zS8jX&@ivM-3=G5h&KYK2_!~E#KOUX{G|(CvEqm;^CsXMRk}z^QvVTY@ zdEx1qOa^g4X#SzY^nIp`1=NaIBvk&zOe|qJi>d9d637*>39KuVAQsqAN<*Md(A$x` z5ZEG!PH++isf+~N?3J?8HMqJ7=x0}j+T}gwHFR$=!R|20A2ID~){5ur)|%%tYu5YW zT=C);Umx+!5qCVFTif5J8@05co&~1BR5w(WVZ+1`DmX_KJGlcOj4MWpW^-D#zWbZx UN(J=XY34J-9-2xc?C0r&PsK?;Pyhe` diff --git a/millennium-legacy/bin/milleniumlegacy/KeyManager.class b/millennium-legacy/bin/milleniumlegacy/KeyManager.class old mode 100644 new mode 100755 index 922a2b67cb820ef24eb4a1e250a652f0c9eea918..000f31bfd374fac7affada364ba0885576447ea2 GIT binary patch delta 17 ZcmaFL{*;~L)W2Q(7#J9gH*(x%1^`9Z2JHX< delta 17 ZcmaFL{*;~L)W2Q(7#J8#Hgeo$1^`9e2JQd= diff --git a/millennium-legacy/bin/milleniumlegacy/MainGame.class b/millennium-legacy/bin/milleniumlegacy/MainGame.class old mode 100644 new mode 100755 index 863932bc2ce3a4618b2357f99803d5ec84681de7..81693c578bc9f1f66c5a61e575c0e197d6ac61e5 GIT binary patch delta 17 ZcmX>paZ-Zg)W2Q(7#J9gH*z@g002WK21Eb= delta 17 ZcmX>paZ-Zg)W2Q(7#J8#HgY)f002WP21Nh> diff --git a/millennium-legacy/bin/milleniumlegacy/Map.class b/millennium-legacy/bin/milleniumlegacy/Map.class old mode 100644 new mode 100755 index dccb8e2a3323b62362a9030e4dd8305758e6195f..0c677de92614a6088eced5291c5c15941ef3f3c1 GIT binary patch delta 17 Zcmcc1b(f3d)W2Q(7#J9gH*$os0surK23-IE delta 17 Zcmcc1b(f3d)W2Q(7#J8#Hgbfr0surP23`OF diff --git a/millennium-legacy/bin/milleniumlegacy/MapLoader.class b/millennium-legacy/bin/milleniumlegacy/MapLoader.class old mode 100644 new mode 100755 index d3266780de7afcd0fa80d4a866450fb447207475..4f394d24e2a53d71c14d1d09933c330ca06304a7 GIT binary patch delta 28 kcmca9a#KX$)W2Q(7#J9g8K$u_FflSnPMj#YQPY460Fkf=W&i*H delta 28 kcmca9a#KX$)W2Q(7#J8#7^bl^FflSnPMj#YQPY460Fl55X8-^I diff --git a/millennium-legacy/bin/milleniumlegacy/OptionsPane.class b/millennium-legacy/bin/milleniumlegacy/OptionsPane.class old mode 100644 new mode 100755 index cab53bcdd1c5bcb04cdca8ff4a712ae5f36fc980..a0532c67bccc065238388f699d385d145dc7664c GIT binary patch delta 17 ZcmZ3)w1|o0)W2Q(7#J9gH*!cZ0suQ%1(*N; delta 17 ZcmZ3)w1|o0)W2Q(7#J8#HgZTY0suQ+1(^T< diff --git a/millennium-legacy/bin/milleniumlegacy/Tile.class b/millennium-legacy/bin/milleniumlegacy/Tile.class old mode 100644 new mode 100755 index 5b97d8674a1f59ef860b1208c497b1d797c6f481..cbaebc09616780d7aac5d1d2788201e62c85ba6c GIT binary patch delta 17 ZcmZ3%zJi_O)W2Q(7#J9gH*zds1^_+11~vcy delta 17 ZcmZ3%zJi_O)W2Q(7#J8#HgYUr1^_+61~&iz diff --git a/millennium-legacy/bin/milleniumlegacy/player.class b/millennium-legacy/bin/milleniumlegacy/player.class old mode 100644 new mode 100755 index 6430540150b4b4940b63aebbfa747c00759b0d75..db01fbbd37058a0021f59274b7ed74ee5b24d915 GIT binary patch delta 17 YcmZo5cc1_lP>jU1KC0632Y!2kdN delta 17 YcmZo5cc1_lO`jU1KC063Hd!T<>&kwgiBHT-c)=?D1fY;)iEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJjcI8afMr;B4q#Np%wiI)u%h0glb|Nq~<@w=h1(WN_#C&Yx9j#za} z6q`2r5r>>>>>> 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