From 2899c79bf24987dd155adcbc2062ffbbc82dcc6d Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 8 Dec 2016 19:38:41 +0100 Subject: [PATCH] cleanup --- .../deadlocker8/roadgame/main/_de.properties | 6 +++--- .../roadgame/tilepacks/TilePack.class | Bin 2629 -> 2629 bytes .../ui/SelectTilePackController$1.class | Bin 3323 -> 3323 bytes .../ui/SelectTilePackController$2.class | Bin 1892 -> 1892 bytes .../ui/SelectTilePackController.class | Bin 4825 -> 4911 bytes .../deadlocker8/roadgame/main/_de.properties | 6 +++--- .../roadgame/tilepacks/TilePack.java | 4 ++-- .../roadgame/ui/SelectTilePackController.java | 4 +++- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/de/deadlocker8/roadgame/main/_de.properties b/bin/de/deadlocker8/roadgame/main/_de.properties index 44a9724..960ff1d 100644 --- a/bin/de/deadlocker8/roadgame/main/_de.properties +++ b/bin/de/deadlocker8/roadgame/main/_de.properties @@ -1,4 +1,4 @@ app.name=RoadGame -version.code=0 -version.name=0.0.0 -version.date=05.12.16 \ No newline at end of file +version.code=1 +version.name=1.0.0 +version.date=08.12.16 \ No newline at end of file diff --git a/bin/de/deadlocker8/roadgame/tilepacks/TilePack.class b/bin/de/deadlocker8/roadgame/tilepacks/TilePack.class index b6062949311ba9b6e03b21dc6006417329ed37e3..ccb706a73e67c83a4e4a2384bb8459190698ab0d 100644 GIT binary patch delta 19 acmX>qa#Uo)e>O&jN$e_&ESpu?6_^1+s0A$m delta 19 acmX>qa#Uo)e>O&zN$e_&jGI;26_^1+!UZk> diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class index c1af4747b200597f3f0485cb0d6f4c16ee33ed4e..3875f98da1827314065a224d11592b4e83ab5572 100644 GIT binary patch delta 79 zcmew@`CD>>88@TjWOMH0wjK<E44w><3|<UM4Biad3_c9T489Cj41Nsm4E_vZ3;_%= j41o-(3_%Pf48aVQ4517)3}Fnl3=s_N4AGOVc@6*osDBWC delta 79 zcmew@`CD>>88@T-WOMH0wr&i94DJk)3?2+h44w?y3|<Vz4BiY@3_c9*489Cu41NqT j4E_wM3;_%!41o-l48aUF3?U4)3}FoI43U$qc@6*oqmd9? diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class index be74b4de64a6fdebf063304046ebd578eb8bd2c3..6ab0b99aa84d336328a46f2d150e066c0b5cf408 100644 GIT binary patch delta 31 mcmaFD_k?dlIU8f<<O;TM-aH0gh5`l&hC&8;hT_S0*g6249SHOQ delta 31 mcmaFD_k?dlIU8g8<O;TM-W&#AhCBudhI|HjhQi5r*g623mk8<r diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class index 3cdb96bb020372702b45494abf8dafcb6f5488b9..0f5b49df7ea5b10af5da539b981464cf6078a558 100644 GIT binary patch delta 1433 zcmcbqx?YXz)W2Q(7#J8#7`|-evSnpsXNX{Au$sJqMN8f>Cnq4kxHvN@Cp9E9C$*T1 zA)G;&i@}Q_nuj5VA$D>gs~TH8Ln1pv!sJ?3apok3<jK=n6<AUk8MHw9+1MG<85txd zALJC7ynvU5n~NchL71H(i;+QU@<w)1exJmo)Eq8`6owoghFpfc$wq9-+?fmoJPiB{ zg^UcMlLOgBSi(3MiYHgF>4{}Bl=3i?fh0JJQ%izNDsxiV87e04VUrQ5Vq{>{;9@9e zC;%B&%fnE|P(S$%n>0r`Ln9AE6GQW4es(R<Rz?PP1+X_XL2BDUG98os*p2kc8M=5F zx*75q88}MvgG-7s^U^sOdKnpnbkizy)AI95bc-{qQmqsW&8*oO`X{erR}h=X$iNkx zkzWomkc**@p@4&7%H#?*EiNN#5Vw?_Vfy5S+~)j-Tny6~W`g`Qi;-cc#^i$>GL!dn zOH7``(Z<ooFo%a>F2lUZ3Y>-<X$%W^7#1=tnjFb#!MTJXkey*EBZK1PTuw!1c82AX z_i@VeEn^VoWLU+phMi$GBZCY$T>o=&F|TD<H<^b^ha-()0}sPShE0<lxLjDaFfxcu zZr~Q1JdcZ8W;4SMkPCJ)GO%m7xVX4zhJoT@HxI)ehP{)Ia@jNPpUlb~B%a1l%Ehpm z;SflzDoDi<9)_a~$0p}->$5CiXE-@|A-5IJ35L@k`7?|R^AWz0=E>nmV>rjdaGqh_ z<bED8j(CQPJPel@E^l7TbB$5v1tWt{R$^IVT7`abNn(1celUn+XLtol9v2xU*w`7~ zFfyo46p)^LmxGI+k%1*CF*%!y;W@*59)=H-Kk^;WRAdlkU|`^3U}RumU}X?v5NBXu zU}TVBkYr$F5M*Fr+Qh)kz{9}6SULF?e`x(~hVaPk43XOy0>UL(wlPFmu`Oq0mt@<? z5XZ=HfFZ?-bvHv=<aUM(EB4(CnURvL+ZeL9Gvr%wNOA}jZDS|_3GQYnj})rh&QJ}K zt=Y!VAk?yrp=}#OCrBZuB&SdhSYcnJ(1h&_ldQNTxr8QfW0)$*wVPpDeWaGQj;<u@ zc7_?-7-mbdZ)2D*$+44RF%v`hZiZ!%+Zk3^aYID8A)=Dpn;2H^U|0_k<b(=>^>INt zT)P=INAmIUi7;&4&aiz4!!Aj7p?%vJ4oI?tBt#gDwlf^u#&B3`3xmwIdWPeY>`;B| zyBSVIYUxU{YHw#awT<B{C=@O*GR*q-bt3}<0}F!)0|P@9gB$|`gEj*zgDwL<gC2t# zgFb@+gCT<@gAs!pgE2!eg9$?dgBe2^g9Sr9gC#>RgB8OR1{;QL47Ln=8SEKOFgP%r zXK-YA$PmZyjv=0*{yRegBMU<!BM(Coqa;HzqZ&gBqXk1Mqdh|!qaQ;$V=O}^V;+MU zV+BJQI9>}FxIu9TjaLT7N(NpAK2TgURx(^+xXQo;mc7Psoq?IblF@<T2E$DT7KSp0 z9}Kq`ZZohl)HA$ixWjOlft{h3;UUAldWQQ991PnSb}&3(xX-}JaDrhO!$Srh1}=v0 z4CM@u7#=flGdzJNCx~%R8CV#eF)%R5Gcf&U$YNk;XJBM!c+Sr7lAYl-JA)SkJ3~AJ z!*51r21bUr3<8ie$6&_52y!C>ht?Jbscj7JKmp1G3Qz|IE|8NMsu<WAs=*$FBwP-t e2bmZ?GB7YOF??e9%)r1P#K6QbjR68qKqvqN=~rd| delta 1362 zcmZ3lc2kw>)W2Q(7#J8#7(Q;~vSsDsV(?;!;9-blh?+c&RZSs=A	PmXSdyE3qt5 zzqBMXN8hs~wJ5P9zlet+o*`lK9aaU#q{)9-^;uFF86+lO<dxvyVn}8XW@kvB9Ka^e zk;stA!;r<0J-M7sSvid%mxqC$A&-$kRKo{sVoqXSx_)p;QD$DcwPqLxL&4;|Y<gm8 z3`IN)#UOPY#i=F1C6zg;><p!o8QEn-${86LHMkf`7;?E75*ey^7^)d+CL6L#bCfXD z@i5dgG)xX**Ai`FWMEea$;?SD)&!|-0m-yZp3H7!Si;cG!_dKy&B(w}k`J+%gQ1I& zK}a{PLN_fxuSB;vvntg}!O+Z_ouP-3L3-i`X$cO7K1K$v;Eeooh@o5z-3+-L3==2s zWz*s^vIcRB*cqlwj^(i8n9MK@<j3ig=X31i=w_J7!!V0s_T*GfLylyIxjYQ>80Jr& z$7#W~kRgzrVbSC}oN6pf7#XA{U*r{;9KgpWz{RkbL70<aIm1eJh82tqGGK{4TpX-C z467JcPY&eL;Yem!%fqmaVg2M*E*F-Kj0|Fv^|-~<*&Hkxz<`Tk1H)F36Sgrjuxq%u zxVUJBfudvw55rD|U6Z-E?HTt>_Tml_Pi80rsof7!s|r$akcZ(A!{N!Bx%FA*vNIf; z9Lr(OZ^XrLl;H$O$w@|r`5KcGd1NN<=a8D*$s;jYp3`db79I(;WQNl`3}+Z-GcpJk zr<VBV`R11vr#k0kCTFLna5Ka(oa13Q&v0S$C!TAJl24&&DXl`kxFj(>RX-R+vNJrN z{E$zU@#W<Ie1>dK7~b$Oyq#>ue}GY8@^^lD&V>xz3_J`Bj5(9#1w!k$F@#&OEoWqx zWZTIQ&B$<oA<>F;H$!sdc7{|d_T3C=k&>+27&5jq<XCY?atP&bV<-d(?q(>76e`=! zPyv#y+{REV)VPhIc^g9;NFk>rr%)$YVRxiZ?{<cMD=tYcp$Xd<CP{MbW|$nQrLChY z$-13k>NbWM^^)w{80JWF>||KL#1OulVR7VkhNV{A5K(T3s3i9$hGjb#)<6U~p@Lw2 zTu=_zZiWq!e0+Q&44bwyY}vuEU6NgB_cn&TlI$P}5eB2}4Ewe*9MIarAhV6(h$K5y z8~g5hhNF>Mx{|Eg+Zm2;V>ks0g|mzdv;KYE$iTqB!XU!Hz);2@%fP^(#lXs-!@$p= z%b>=f$6&x<z+lN>$l%6c#1PD2!jQ>e#!$py&d|VM!O+fN#jujWnqdQjEyHdGJBC9H z_6%1TVi+DW#4@~Mh-3K95YO<RA%T&HA(2tCo*{`*n<1Ieh#`g1ks*~afFYeRk->y9 zo1uh3l!1YvfPotnRSaSb;-K`%n8U!!z{kJ{7Q4uBiGc~sy3BBeftkUQ(U{>X!!-sL zhD?SZ4A&WMFt9QdF}!EE$#9E-ouPr@A;WEkI}98QD;ah$+-11Kz{#+i!Dku6Jq8{I zE{0bO<qY>39x!k-JY-;C;9+2d8uy5Sh2b#+1A{yR(|?9o26lD^Ms|iL><rJ?8D6k6 zcrmau#4s@YW@KhyWOz0CtdNA)Yf#8BfkTc9<UEE726l!@uxCJ~GB9vJJ;TKCj)8%J ZiQzrN2L=WPAqFOf$sjK>Ffbg2&;UXWQk(z) diff --git a/src/de/deadlocker8/roadgame/main/_de.properties b/src/de/deadlocker8/roadgame/main/_de.properties index 44a9724..960ff1d 100644 --- a/src/de/deadlocker8/roadgame/main/_de.properties +++ b/src/de/deadlocker8/roadgame/main/_de.properties @@ -1,4 +1,4 @@ app.name=RoadGame -version.code=0 -version.name=0.0.0 -version.date=05.12.16 \ No newline at end of file +version.code=1 +version.name=1.0.0 +version.date=08.12.16 \ No newline at end of file diff --git a/src/de/deadlocker8/roadgame/tilepacks/TilePack.java b/src/de/deadlocker8/roadgame/tilepacks/TilePack.java index 6ca06dd..359e6a1 100644 --- a/src/de/deadlocker8/roadgame/tilepacks/TilePack.java +++ b/src/de/deadlocker8/roadgame/tilepacks/TilePack.java @@ -8,12 +8,12 @@ import java.util.Random; import de.deadlocker8.roadgame.logic.Tile; import de.deadlocker8.roadgame.logic.TileType; -public abstract class TilePack +public class TilePack { protected String name; protected HashMap<TileType, Integer> tiles; - public TilePack(String name) + protected TilePack(String name) { this.name = name; } diff --git a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java index d74acae..761c40b 100644 --- a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java +++ b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import de.deadlocker8.roadgame.tilepacks.TilePack; +import de.deadlocker8.roadgame.tilepacks.TilePackAllPossibleTiles; import de.deadlocker8.roadgame.tilepacks.TilePackDefault; import de.deadlocker8.roadgame.tilepacks.TilePackTest; import javafx.event.ActionEvent; @@ -47,7 +48,8 @@ public class SelectTilePackController ArrayList<TilePack> possibleTilePacks = new ArrayList<>(); possibleTilePacks.add(new TilePackDefault()); - possibleTilePacks.add(new TilePackTest()); + possibleTilePacks.add(new TilePackTest()); + possibleTilePacks.add(new TilePackAllPossibleTiles()); for(TilePack currentPack : possibleTilePacks) { -- GitLab