From bb2ca79c4e21fdecb369b3d2f91b9ebe864e6ea5 Mon Sep 17 00:00:00 2001 From: Cricket Date: Sat, 20 Dec 2014 15:35:53 -0500 Subject: [PATCH] Fixes scaffold --- build.gradle | 2 +- .../com/cricketcraft/chisel/init/ModBlocks.java | 13 ++++++++----- .../technical/scaffoldsTransparent-ctm.png | Bin 4059 -> 0 bytes .../blocks/technical/scaffoldsTransparent.png | Bin 3396 -> 0 bytes 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png diff --git a/build.gradle b/build.gradle index f878cc3b..335a8080 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "2.1.3" +version = "2.2.0" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel 2" diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 786488bf..759c3111 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -82,7 +82,7 @@ public class ModBlocks { public static BlockSnakestoneObsidian obsidianSnakestone; public static BlockCarvable hexPlating; public static BlockCarvable technical; - //public static BlockCarvableGlass technical2; + public static BlockCarvableGlass technical2; public static BlockCarvable bone; public static BlockCarvable scorching; public static BlockCarvable brickCustom; @@ -1487,15 +1487,18 @@ public class ModBlocks { technical.carverHelper.register(technical, "technical"); Carving.chisel.registerOre("technical", "technical"); - //Crash :/ - - /*technical2 = (BlockCarvableGlass) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffoldTransparent"); technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 1, "technical/fanFastTransparent"); technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 2, "technical/fanStillTransparent"); technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.14.desc"), 3, "technical/fanStillTransparent"); technical2.carverHelper.register(technical2, "technical2"); - Carving.chisel.registerOre("technical2", "technical2");*/ + Carving.chisel.registerOre("technical2", "technical2"); + + Carving.chisel.addVariation("technical2", technical2, 0, 16); + Carving.chisel.addVariation("technical2", technical2, 1, 17); + Carving.chisel.addVariation("technical2", technical2, 2, 18); + Carving.chisel.addVariation("technical2", technical2, 3, 19); } if(Configurations.featureEnabled("bone")) { diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png deleted file mode 100644 index 47a635ea771aa574b712173612a6446bdeff3ea1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4059 zcmV<14KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000FBNklbk}`hjWhGAKthmj;QJefU+z%=Buj0 zT8j*K_Ni_!+1(y-e|hT8wI_lgz&S?{1o*y>wH9kFT5I+~>$bOs+!XhC?KHMG?O5 zqqSyJKFczUF?ewt6Gai~zHr&E02 zM+mVoueBzMB0Os?zVGAvK3`woi}_;7r~A9S_}Roc=g?a7;*%Zs(attyRrBp_CE_?H zj^l2dg%BI_LWqYRsH%#=V1V!Y0Q~*zTD%N=_h_2)()S#|aF{Y*-0}6S6k!-*tz|x+ zvs$gtT6eYHgsMAJ?VO#=6NkqgFTWo23%#nx|=s)_P+;O;fI}u8__-?(Xi` z35<)PfFExP-WIh8!?26eFbw(jwiX{(jT>hvkCk@I^nEjM_k?%Tx+jOxOJilArL}vx@?8gg$u%f#ra!jhLd+G*f30zjd&phtJMm5ckw;h zaKP2=f`jAF#9kaDr6dS~hcA?pwr#1Zin^{TibBl(^MlI<33v0WuA?{QjWGa7YbsSe(5@2tidP?jZ=$>cpB2!en- z&yk0RhX7<*#{K<0QcA)wL~Gs6Zvbm8Ns=I?q-h$AF$6(?Qi|nr`9VIAWf|i6^XINz z`@pK?`X|hDU&_u0q?GjGd;36NUdHdb_M1g522tof{%C^q7w(_eOJS|WIY-;J{Ptk% z27`pV`xP@I#nE`&rC%Suw-5B?d;5SfrWfDa2aGYjc=`W)z*_s0eZUygi|_3N>n;6I zzPAr(t$XpkeLzatkMHXPd7k&;#mUKuE6%=SnvYnPRTrh}rupCD)V3}Ak$dog`xRz5 zARyGsB7 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png deleted file mode 100644 index 7ec5627b603c580173785b7b45fda41c9c47a045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3396 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 a{tp0JM;6Y%+;pD+0000tB-q