From 22e86710e324b85b3349a080fa4e58a421c833ee Mon Sep 17 00:00:00 2001 From: Drullkus Date: Tue, 7 Apr 2015 22:35:59 -0700 Subject: [PATCH] Circuit variations for all of your Futurama needs! --- .../java/com/cricketcraft/chisel/Features.java | 14 +++++++++++--- .../resources/assets/chisel/lang/en_US.lang | 17 +++++++++++++++++ .../textures/blocks/futura/circuitPlate-v9.png | Bin 0 -> 5221 bytes 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index a9afef52..8dd4a8f0 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -775,7 +775,15 @@ public enum Features { futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controllerWIP"); futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP"); futura.carverHelper.registerAll(futura, "futura"); - Carving.chisel.registerOre("futura", "futura"); + + BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + for (int i = 0; i < 16; i++) { + circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate"); + } + + circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); + circuits.carverHelper.registerVariations("futura", circuits); + Carving.chisel.registerOre("futura", "futura"); } @Override @@ -1020,14 +1028,14 @@ public enum Features { @Override void addBlocks() { - BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("hexPlating/hexAnim").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/shroud").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); } hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); Carving.chisel.registerOre("hexPlating", "hexPlating"); - BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("hexPlating/hexAnim").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/shroud").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index e907c22e..67f0fc54 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -224,10 +224,27 @@ tile.bloodRune.5.desc=Blood Rune Tiles #Futura tile.chisel.futura.name=Futura Block +tile.chisel.futuraCircuit.name=Futura Circuit tile.futura.0.desc=Glowing Screen with Metallic Borders tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines tile.futura.3.desc=Poptart Rainbow +tile.futuraCircuit.black.desc=Black +tile.futuraCircuit.blue.desc=Blue +tile.futuraCircuit.brown.desc=Brown +tile.futuraCircuit.cyan.desc=Cyan +tile.futuraCircuit.green.desc=Green +tile.futuraCircuit.light_blue.desc=Light Blue +tile.futuraCircuit.silver.desc=Light Gray +tile.futuraCircuit.lime.desc=Lime +tile.futuraCircuit.magenta.desc=Magenta +tile.futuraCircuit.orange.desc=Orange +tile.futuraCircuit.pink.desc=Pink +tile.futuraCircuit.purple.desc=Purple +tile.futuraCircuit.red.desc=Red +tile.futuraCircuit.white.desc=White +tile.futuraCircuit.yellow.desc=Yellow +tile.futuraCircuit.gray.desc=Gray #Waterstone tile.chisel.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png b/src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png new file mode 100644 index 0000000000000000000000000000000000000000..72177cc9e644174440b7dd7662a5ff636039f057 GIT binary patch literal 5221 zcmV-r6q@UaP)KLZ*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} z000S)NklZKe#EPQSQ4kf= zhta*d_s)!Dr|Ef-bv1K;&OPTl-#N#UWm*36@-lKp5k)5lUDp8suInOa6rrR{0Koen z{t=h1I?}}pr~RM4^=(ASrK_8G|HDrZXP1-W|{t7baIjF1Hk6y zCi3~bMD}@hxs9@CqEfny_dZyYWMj@j&gdad%3iRrvr`4&!0Q~LW1>9iHpb3F#B~(_ zK+Y)AG4`PPL~y{4*9QO$_sP#AKlV?;?XLtc>9OlWRn^FGqA37qwOZJ#5KSv76MA2V z+kYqc!Q&6;bv6M2bf1IYz0Q%~09tYzmD1(V0=L{LG`H$_?5~D?TU`ytGMNmfr>7$~ zxVpNEN^*PTJOEHhZo}&|pe47t@$S=Lr&>}Qd~U=YbAw_(i^ZW%NJiM6bcd3mvp8(!xK{bZFOu4~LWaCVGX(@i82k;ju&RmIB6O2|9_;8#ECK}n?t zsL`M{JCq*U%_~E#yryAkX_0Zt28zxS{UoRY0LS$%STuX|>@@DT=R>|Fq7wN|=8?7J zHjXNF?&T=-AWo(C^++_?uZ%)709ZVH8(Pu}p%VE{ec+Zmg&#k?4%f}?2}xMgi9!`t z2*M~SGvorTRx5U{;P$*AF7$O?QO*!#06+$Sk3X%$*(r_O_}#mA(P%V~PN%W3un_r7 zwOU23R^yODRuV9^@i#)|C(_)iV|Vf{&Mvp<4cz$0WBl{pzXv`u@PQ#>I3edzQfZh7 zuCDUx7x-;qO}cpDw10M44MkKXWuj8Lfqb4vHQPSo18EwtNMJgycj@K;;L^Q+h0x2k zPx?bMHnHKZawrG@vTfUb6iSHE)9W-MZI|^8SxLaMrhFF7$UI_T66c9RFj>g}7_x*+ zCKG;UX^BUPQmI63RG+v)on~Fy007KN8(9C-2Br>bIA$D1&S=paFg4)JiD1D$to2bC zEM#is5H*;UHlR;57%tSpgKkbhuxWY#*L5*HJ&mQMCF*mgRt|h%l!#pD(p86=oNe1a zSyXg3qG^_}vE$B;fugg_aiP74h)!}`;2=IgxQA()P*v3@D5a_@GMP;5Lgcwtt2Kxr zxfkL{82BI=*CvV_I>`s0e*&-bjjS*lsq4PCA0BE*`#(tkxdbI|jDiMS;1=v#Is~ZQ7Bsf|XjW z7DBT)jwHVfjcG{_WzP~KZ6h)ln3=q>=Xov5@(D*0Ihm@e$mjEtJSrl7{AnGJ{Y{R0 zkO|oD&8<3|o!`Njb1-#K8=#CAi8h2L6U1w7IoO?S;pab$KEyA6_9FqdU7ibx85x1O zxBxevcJt52p$!|fEX(jm&CKQjA{^6 zuItp+zdZF#*#1eM4Vr;@M5m){4lsxi+&*QJ=|ttAr@wOwsfUYPfFt9*8H>|Uki7S3 zdMct7kyCGEaA1JpEOn0();fw#4hNrqLb(vh)MOIUqjJ#Rj0JrLoXwH(y#^hEPAqpK zYmH;R#5zo^485C+@M{2|-045Zz7JiWk3~M$bwhgy%-h7NH!^t8<$XdX9!`9qxm6F@ zpXeKlhY#WQz&FA{$B9KL+qV4!sreB}On_8(Do^%oqOzDW2DtA~_#;l}bylfeW?%mj zdNX`(8ih`A)ePd?AH^8q08KJO3I|1j0J_P)`m=wfLz;gy-PLS+;S-A(30ad za_-DLMWLuV(u)YGFNv8Q;Y+fpnF6hII+1})6@#s0fZaSUDyKfu5{F`59Inrfnd^!o0DY$2EK|T>-wpQgT|9kN;WDovBG>4CbX~_$<@KQxvwVX@X0M~62mOWWJb$^_ zh^53NaI!Z;l(!$b-=2p|H9bKhdy z6<5jl48NiAjgk?$++Yv;d4?u5s;Y7s6YW{;u?n3?BoNgkVS^$Y9HV+|nM@`$@3{48 zPR#NRwhj}Oyc7D&Qt*X^h1hC!&gczpw@0-%syxFYOu1Yh*<7SBDsrK5V$3lX(W>O?;BlMUADuQHjs6%K=n6n|e zHp=#@L@q>lcpU2NMTohI1*^C|LE*1DKKpzXi9{lD-OvGgz1~P}^6uM)pEGKq_Gc6; zCE6kxmNDmyq|EGps}T9@^Pn$g+qNHd>vB|3iQ`B4d|sl-z7U~DS=8?2o3Jdy-