From 0d00ff00cb4c9a6bf22787ed5625114cc0c88f34 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:43:51 +0200 Subject: [PATCH] Fixed Conduit Filter --- resources/assets/enderio/lang/en_US.lang | 27 +++++ .../textures/blocks/crudeSteelBlock.png | Bin 0 -> 657 bytes .../textures/blocks/crystallineAlloyBlock.png | Bin 0 -> 493 bytes .../blocks/crystallinePinkSlimeBlock.png | Bin 0 -> 592 bytes .../crystallinePinkSlimeBlock.png.mcmeta | 23 ++++ .../textures/blocks/energeticSilverBlock.png | Bin 0 -> 499 bytes .../textures/blocks/melodicAlloyBlock.png | Bin 0 -> 419 bytes .../textures/blocks/stellarAlloyBlock.png | Bin 0 -> 541 bytes .../textures/blocks/vividAlloyBlock.png | Bin 0 -> 481 bytes .../enderio/textures/items/crudeSteel.png | Bin 0 -> 550 bytes .../textures/items/crudeSteelGrindingBall.png | Bin 0 -> 607 bytes .../textures/items/crystallineAlloy.png | Bin 0 -> 470 bytes .../items/crystallineAlloyGrindingBall.png | Bin 0 -> 572 bytes .../textures/items/crystallinePinkSlime.png | Bin 0 -> 538 bytes .../items/crystallinePinkSlime.png.mcmeta | 23 ++++ .../crystallinePinkSlimeGrindingBall.png | Bin 0 -> 654 bytes ...rystallinePinkSlimeGrindingball.png.mcmeta | 23 ++++ .../textures/items/energeticSilver.png | Bin 0 -> 656 bytes .../items/energeticSilverGrindingBall.png | Bin 0 -> 584 bytes .../enderio/textures/items/melodicAlloy.png | Bin 0 -> 479 bytes .../items/melodicAlloyGrindingBall.png | Bin 0 -> 546 bytes .../enderio/textures/items/stellarAlloy.png | Bin 0 -> 474 bytes .../items/stellarAlloyGrindingBall.png | Bin 0 -> 1588 bytes .../enderio/textures/items/vividAlloy.png | Bin 0 -> 642 bytes .../textures/items/vividAlloyGrindingBall.png | Bin 0 -> 585 bytes src/main/java/crazypants/enderio/EnderIO.java | 11 +- .../java/crazypants/enderio/ModObject.java | 3 + .../conduit/item/filter/ItemFilter.java | 7 +- .../material/endergy/AlloyEndergy.java | 85 ++++++++++++++ .../endergy/BlockIngotStorageEndergy.java | 105 ++++++++++++++++++ .../endergy/BlockItemIngotStorageEndergy.java | 39 +++++++ .../material/endergy/ItemAlloyEndergy.java | 86 ++++++++++++++ .../endergy/ItemGrindingBallEndergy.java | 50 +++++++++ 33 files changed, 480 insertions(+), 2 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/crudeSteelBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/energeticSilverBlock.png create mode 100644 resources/assets/enderio/textures/blocks/melodicAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/stellarAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/vividAlloyBlock.png create mode 100644 resources/assets/enderio/textures/items/crudeSteel.png create mode 100644 resources/assets/enderio/textures/items/crudeSteelGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallineAlloy.png create mode 100644 resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlime.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingball.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/energeticSilver.png create mode 100644 resources/assets/enderio/textures/items/energeticSilverGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/melodicAlloy.png create mode 100644 resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/stellarAlloy.png create mode 100644 resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/vividAlloy.png create mode 100644 resources/assets/enderio/textures/items/vividAlloyGrindingBall.png create mode 100644 src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1ee49eba..08fcea6c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -207,6 +207,7 @@ enderio.vibrantCrystal.name=Vibrant Crystal enderio.enderCrystal.name=Ender Crystal enderio.attractorCrystal.name=Enticing Crystal enderio.weatherCrystal.name=Weather Crystal + enderio.darkGrindingBall.name=Dark Steel Ball enderio.electricalGrindingBall.name=Electrical Steel Ball enderio.energeticGrindingBall.name=Energetic Alloy Ball @@ -216,6 +217,7 @@ enderio.conductiveGrindingBall.name=Conductive Iron Ball enderio.pulsatingGrindingBall.name=Pulsating Iron Ball enderio.soulariumGrindingBall.name=Soularium Ball enderio.endSteelGrindingBall.name=End Steel Ball + enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output @@ -250,6 +252,23 @@ enderio.darkSteel.name=Dark Steel enderio.soularium.name=Soularium enderio.endSteel.name=End Steel enderio.endSteelNugget.name=End Steel Nugget + +enderio.crudeSteel.name=Crude Steel +enderio.crystallineAlloy.name=Crystalline Alloy +enderio.melodicAlloy.name=Melodic Alloy +enderio.stellarAlloy.name=Stellar Alloy +enderio.crystallinePinkSlime.name=Crystalline Pink Slime +enderio.energeticSilver.name=Energetic Silver +enderio.vividAlloy.name=Vivid Alloy + +enderio.crudeSteelGrindingBall.name=Crude Steel Grinding Ball +enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball +enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball +enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball +enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball +enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball +enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball + enderio.precientCrystal.name=Precient Crystal enderio.pulsatingPowder.name=Grains of Piezallity enderio.vibrantPowder.name=Grains of Vibrancy @@ -280,6 +299,14 @@ tile.enderio.darkSteel.name=Dark Steel Block tile.enderio.soularium.name=Soularium Block tile.enderio.endSteel.name=End Steel Block +tile.enderio.crudeSteel.name=Crude Steel Block +tile.enderio.crystallineAlloy.name=Crystalline Alloy Block +tile.enderio.melodicAlloy.name=Melodic Alloy Block +tile.enderio.stellarAlloy.name=Stellar Alloy Block +tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block +tile.enderio.energeticSilver.name=Energetic Silver Block +tile.enderio.vividAlloy.name=Vivid Alloy Block + //Powder / Ingot enderio.powderCoal.name=Coal Powder enderio.powderIron.name=Iron Powder diff --git a/resources/assets/enderio/textures/blocks/crudeSteelBlock.png b/resources/assets/enderio/textures/blocks/crudeSteelBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..ca38b79ec09ed22d27ea56a6727e78318826cefa GIT binary patch literal 657 zcmV;C0&e|@P)o? z?Qp)k-5rXJFEGVwXLml{nR!R<-@BvbV2zbXB8Uirpc(*3k`w^%J^#w$&mm?q8nd=G z;O31RhzJ+XpGQRa`t2J4MZe!U?0o-D(a$^m=iKH7cn7Ir zSue?ZIch8blgZ==rC?N*>zB6hZG&?y&IcqlSesE*9C3PJ$UEI15Gq;YjXU@d&EtibPBLIeF34paW z1~92%bGiuvi}`|$(;MB~UE6l|_4Rd{qjL85_o=E1V+;m?S8rb9T%_r>x~5t#0XY0~ zNZYhnYmb9^he^#bkrs;uy?+eeeRv;7Btq~3BoYSgOi&aNAq2$?iUHH<6pn1tG$E|m zC<*1T#H4BGoab>jwm)xE*9|5~gxj}nb+yfA^VqCm`5$Rk|115}$rC(!`~-RU;I4{7 rF)03rsfq}QB%KZr!tqKURuz8%H9ix) literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png b/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..c05650fc5ad5e2a38646540dfbdf0d2e1f04cdb4 GIT binary patch literal 493 zcmV5Tx&vP4^J8I4AKu$EPxGa8NXJP#4!V-&H*A13{~ zZx_7#2khgi=seG9nuh6Q!tHvE*19k3+E-Q&v?)k|ZZi zyI)HL5QZV|;+TglV>lcF5Cj2Q0blly%K3{eyjMG=RvTCGq@g|ku$6UQ-GmIY%JMGOW59v&V5 zaLxgcWf`;CZ0m#b`5e@}nYc0+>+O{Rnb0(8XxYSxR91bap z0)VDz5D`QK0BbGg?Cgwgw@bg@XR%n&?RL>xBO+X0Ub0v$I5{~12)jp;Bp85;i;IJ_ zcWnnlsOx%*Hb9=|fwo7}G~ro9P)bo%)w&A3UXSPJX8`*BKJ)pUIF12Af_Ld>S;lg? z#3-d$tyaM}olcL^-mHqLstV^ES(Y)GOwd|yQH6EG_z?0u=kD$fW6Zh=Ns=%cjd*-~ zGUx0C)@v`2b*`VdhkMepuHZ{bsbikrW8eibB^0zUvbXyWqgaZ7Hch4RfYYi9$a6& z1K|DWdXM39xkP(CaL$pYDbwkcwr#`m_*Q&BSe2uC@T2?*N-=tKg|+to_2A>%58?c( e2m5#tJ@^fb<2oJ#}Vrr*qQrVzoAXL$%X_KlxTuccKD|BjEX-n@M$d7h(`!di>97Ogc(DMW-yN-5UsHA<;Q%!FacXfy)A^E|ZH3{C@P z-*W(pq5xoUmN2_pa;WKaiYdzy=NtgeIeMopuIA0cV}~o5EXyd00_PmB`d!Ae`LCog z47(kspT0I|D#P`9jftX&BuVH$JK<)zB}o!I&qG9bk@(y!w^(Zd>a|i7MHqli>*Of* z@3EsT<$VS*r_-EOnr?-3DtNx7=Qjh>`EenS*=!VHk(HWs!J0QhTRSyu5as{ za}Lk**laeKIF3ov6z3cwg4Vj>(0lrXtND^BiXNHxzK;C>CYUXNwlR_g`r@O%r7g8061MOq!;YWr>I&B2-m{a}Hw+Kn!>; z-&)J*biyd581BGYOV@S(ls#_6JfBZO2=Pd?)^TxQS4u?-bzO5lpGlJB)52=CVzb$B zzu&2`myjoX)hg zY+>*_MqSsmZA+GAUnIsDjEF2M7?}TNPeeXH)8TN4gZaX|{}96D`xgK)#JISI{UrbZ N002ovPDHLkV1kqcxYPgu literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png b/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..ac48462e9b35bb25e8744e2c4e80178b35b00d6f GIT binary patch literal 541 zcmV+&0^D5d!Lq2$|lS>e>z<6{|(MgTaD zgVvfPo^m~Z13*<(01SsIv)LYxF`Z5^bzNhv1;AR%U~tMswg*(b<5R&MOrGadRfV;d z{rx|jp6&u=Ycz)OI3rC*Kto;Eh)7>B&vQ%=1VmB9_SP@vi}ys4;5ZHDPWZ9sX4Y0FwLz)hOrswLq?(ZUkQi{)q z4aWC<;yC91{=StJWZe9Hh3B=-9sj@l;V|Xo#Na5UD2jrrs_^}D=8HC2cb>xIt(fI< zNmW%O$$~74Fy=vamq2UXxA6MllF1~-b<1`OVHh$VmlVZY27|W04o&lrEC>SPc*<;c zz~*Ml`M!@)N^yA^0m~Psy|s0<_LxKjb9;MBS(a-7-OxmYBw28F7W74|wP>v=%M!D( zu|bj~SZfgxwAL#X0{@(=>s`WdU6to~7!e`Q^JisWT@RjZOGGeD(=eG#dScDN+@O@| fZQbvL_B;Or4omj8aI7bT00000NkvXXu0mjf-s%2G literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/vividAlloyBlock.png b/resources/assets/enderio/textures/blocks/vividAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..09e938adbff492ff6e15e38c51cadbb2bfbd53df GIT binary patch literal 481 zcmV<70UrK|P)FqWg(&`@(S_UD%^S~d9%FXCfuJZTqLC0p#GfQuvv3UNDtFGNyQ}+j zojO(O$FDz)X(2zsn_d|gHmX%>G%7rRx1Fq zECV120+!2VfxOvlFj!OrGL}<6$Y`0sCF^_Ej)+cP+#ymIc^}2A`YPE77zJp1U zgeZy%LErb^K75)953iI`42MHZxm?EcJnr{9B0{ZJ<8U}oE|&qg-|rvg2SLDiJjN)c zxL&V$=KX&EU)ir+G3WD{G)?h+pD2pZS{J0kV?LfGbh}+9lL^L{M;EHqDxFS;8^-x7*v$JY|Z=TmREEEu8-X X5N^{$4Uva?00000NkvXXu0mjf^Tgtk literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crudeSteel.png b/resources/assets/enderio/textures/items/crudeSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..99e4c2554570382606b3186f90202b078703e35e GIT binary patch literal 550 zcmV+>0@?kEP)N2bZe?^J zG%heMGBNQWX_Wu~0i#JoK~y+TrIYDO0#O)-y$i3S+bAk*v9igfl86wKlClu9wA@gd zw6x4g9d}za+n6LO4XL2$N58t4w>gLQA}n9{;2b#5bKV&^lIA9<3 z&IJg&8C;znA{z2z*=a*5pF+szq@stL8WN$EcL`bO#zw%4=Ev&_!hRo$+d1TU4kzNR zymDWbG}W0#Z}28^xt?g8fV!+wo15(lOM;79&~>2GtDxEWg(U zufv9!$#J;t)(?V%BI05#gMJKq$t`+V$@D^_>W61>9;KZu!mBJ;kAn)%%fe?tHWGv& zO57F`h6k0HH5xEw(1GV76wD=};3Ml`y&f>~4%)zCGQJD+S~cwEX%rG1hBO1TYV}M& zbYl(4tuVMy083Ugf~=Q9uS0(#36Z!Ktk}tx0}_}^dyB-s{Qv*}07*qoM6N<$g5zB7e*gdg literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png b/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..00a9ca043fabcf7434c7e8a0de7f9b412b8fdb4f GIT binary patch literal 607 zcmV-l0-*hgP)u)D^P)e5QBn3No-;lcGF+r!i2=QaOF?XKVo8HqKOMvkeHyU z_yLLRq^OB8lqNKxrDaNIrZdyI*M*_d7`OVa&f>h!d2`Nz|1EJ`BoYY#eBY;Duamo# zQA#OvT}KGPvDc@kd>8XR#x-EwrvJe$xzoBP1D3M493Ss`Lwx-5E@cS#>Yl641?WL zi8f%{HUQ1Cp}G?2y3W<<2^9*3SXx?Qr-GKo@(d_GUDR^#RJE75ATI-V}TNo8-| tP*MFf(MT96B~PBc=;~EU{muH1^%J2#_l*53_X7X`002ovPDHLkV1gPw9lrno literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineAlloy.png b/resources/assets/enderio/textures/items/crystallineAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..f0dbf54dfb9f432ea0e08aecbeb577952c39cb88 GIT binary patch literal 470 zcmV;{0V)28P)N2bZe?^J zG%heMGBNQWX_Wu~0aHmtK~y+TWAHK*XCN0)qL*}_5E}X)grQvGfO15{f2Hv7|B7K@ z|EJ!*{r}3>uY?T&DF$f*Xn~mUzx>Uc z|Cc_02GcOj^PfKbKmFCK|7|yK{?9vj5Mc<2;Z|J@wyE*T6|gPnnnCQ|2M_*R=H>l2 z&B}sf318p;U<1|z6?xRw!fjsq`ZZWHi0xTd_ur+m^1p3S5tu*e#*P04hY$bHJ#YYF z08Eotef|GgK$}2{9ZF08J6BYI<>o(m^1u4rx&Kpu&Ij@PuUgV2L>oAA-Fz z{mvb5Sd^VS2{sUB2uKr1Gt3aU0YOWb!VPh)sshuXXsbAV`hUaa%Wy+rnqU|lh#-J$ zh*Nnv*r}(1;n4~-AbQ<8?3&O4%n*_0DhWni38FM6#xJL M07*qoM6N<$f{FjhQUCw| literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png b/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..089b93e0a6747e8eb551818bcb85f53dda097a5f GIT binary patch literal 572 zcmV-C0>k}@P)ZgwYU*PcV;2@BZT}65!?uZzrb!>xibq_brd8v zMM?!tnM#CwIm5*0ytj*DYG}J{AGmNA_Z*%J|2yhsaa|XHIF4yHn`GD5MMSVH3xLb5 zEhQo-^%K!r1CV%a8yOiv78fO-$*{byJL8G z7_BukGc!~w6-?9Q@$s=geL-P!Qv3n0C8O6h-7FCirx7Ll6WwjzgtV z8Gyqu928vb?5NYzQ(CPSj^p5+pHr{baa|YB^XPOsL{Y@i(GfR$dkVmL|1LG~LKue3 z&CPLgazYeE%+Ai@c^*L!AR>feh}N1YiU0_{w?(}cjE;^HFDytZm11{ym$S1oL literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlime.png b/resources/assets/enderio/textures/items/crystallinePinkSlime.png new file mode 100644 index 0000000000000000000000000000000000000000..6950b5068b7d8d4bd55453f0c642dee19a6a99a3 GIT binary patch literal 538 zcmV+#0_FXQP)N2bZe?^J zG%heMGBNQWX_Wu~0hdWcK~zXf?Ud^)gHasE_y3Sm9{U?8MahtBLbk;Vmxv_f5@QTA zMq#pY&1JS?%q3BKABH074Sc3c22*|5w-+ekk4Nyy zm;)~x_rM|8%)<|6FCHz|I5WCnS8snwsL*A0GrN1@n9cq$)z|Z<=uB!vTSC1s6w&!$ z0*}Fo;jA9v%g@%k5BR;-XZJ#zu7WzH1s9_(*s51x%++HuOZO$XnsviDWXDL32DeM+ zY_le{9RspX2HBf!Sdvd+tH#9E*2=}70*Cg1N$75Lo!vSMR!gTbS2&LShIK(g5W&1e z5U7%y1j%4V7u&E?YsNyc0p_w9LBd1)U_X)aUDBV{!H(+II1vdo4?8>H;HMiDIF4QK^MWz(WPLeP|!l5icpj|D9$b-7D2SFQ^mo_!O6XY z6pE8Hn1F~SO=(&K5vnA&$-TX4(tD0WX>2GR)Iq_%aNrxx`|y3s1AjYWZ|Ljm1Hg4% zs?{pD&rT?%6oz2{aR2RNp_D?1-HMbF0PlWUS63IKJ(pB07GrpLm`Ef-wD&lrOxV1OG$6dYOOS-rTb{ zl*?tB%_gx}3|}G$$2>GvEdqf6Qc8MGB`6k)=(^7K_ICTV0h5FG)X>ln@xBw_6SUSG zG)>z*tyia3HW5OQPN%th?xs4hf$O@2!(oVNG}pG++1bJ4@u2nisjr(zDH#|TAeYM_ zgg^*Ey8d}27)_NTw1mQ%4LZN_^60g^b>$;sAG@DHp7Z)*2 z6UTAzcL&*Au3%Xf`pFP$pNmK-@%enXu8VEkoq)-OX_3ifFin$4B*JQLg^i63qR}XY zY@S-JhT}NQ&CT)j{j31!J)a78oM78F$z+mjHjCppB$G*&mX@$A3#AmcZ6l?`aU1}w zubWEj2ZTZ)F2^sbU@*wk)D-!A9;FmYDHawMs8lMqiJsEoRvvxR_4+Ydbv<5wKgfO(9|$nO{pwR zrTIETtf^Uvvr(;;E$|}!Q=We3Oi&@b^#>m~oO7P%`{i?vPPgMH`QV;JvNk7Gx9d=< zE?G@hA{mZi)M(GwnWT)}+Y9uH8@*DF-dRRtV2O{*YwUHLV_Sj2aTcQhjB+`F@CqXf zaUKT05{j+S`{6hB1B)2*PqRf}aGb#)ZmMwmc!YtupUg%7(m%gUNAL?Xu~mH2-w7

FxPN0u;E-oa9J7we@~&Oe@}r2Q>&^Dsv}eaJWbIBUC*MD%6_ z-2wYay2h3m7F#q8E^y>>8!qnv1@}jBc=~a*OiK?9J&nXhgsqkWQdq}gmFqkC_7Flb4BPkpIfhs8w9oR24X^=W0&2~&HDk)REoVgkN qk3f^yi!oSbjAm);r0oPde*OW7=2_-wrGAtE00006y{6o#MgHf@r7)7#wShCtH}rgU%-97G%imkcd&tYZ)a|AUiA90gYqI*H&9C`BZW zQlUdBwGtZBgrwHgo20oWO?$uNP#PPGtG;mH4Cj4#4=?<0sf%TPejb1z2=F|Q8_SPG zM6hier4;X9JyjxtQs)+}H2|T@v}iO+`gUGi*JWvG3CD3rCX-aFRV>SrdcDrK(i;Vk zN~Nv>uHAhg`Fx(m#YK{~$&>;6KRTq-X;xNNFin%<)RcT(UmYbkE|x~4!EiXlbzRc& zb91fLB^(Z;wPtQ^j#{mTWm%k@oQ!4!xcBgh zP$+Qo{$sh4Kx>WTI5-hS!}B>iJHs#x64Ox*T0apH78VxR-rhzjg;I*+?X_{oSS<2<|=q2Cx(OT2*_W|fNJEATFY}+PvYgxkK zFvVh#N~MB`ptYt{D&ct^pWnSygTY|r83SC_^;|(_W@fM~3lZVN>t|!PBJwxuKh|#? Wp5{F&YP#?M0000N2bZe?^J zG%heMGBNQWX_Wu~0bEH$K~y+TrIXuA0#Ou(eG6Zro9N(05M@OWM1)X~j-(`w$DEtY z#EZnkphOZ5il+-j6u|?E*WQbG;{*68f2>6_mIZ14uvu#}>-+Yefzh39>UICkI_&B( zZ<|5ubGuxu1}lVJ0hS#LO8ydNh1uT{8YYO~fjmGr*+u=i&TuEvfozw5O4REStUM^_ z$NQMRO}VOYGu%Wg(L(XDh^RF>mrxTp5AaD@Da)rU!qiv8RoDzR2wQ@-OdBS!VE8^n z@FJ+4+>7-Xrd~Rg;4ymO*mLkccb`M-CWgp$WG+yl&}E2UfriC>5$;1bKWhXUNITNV zJM)+%Cs6K`?}GMAn+I!8HTaHwD0|DuI5SAyrcjY8nuH*NNAVF?O&}UYP2xTBaxJ(E zc(uPmaVeTah1A6#k@8jII&kq-$MP77s|5Tf{@#fPw=O8sd4Sbr3;ssKniG#O=yLnZIH{5 z`M%SIaVjz0w(sgJ&hwm;bKrkRy%x1v4FIh*Pft%Yx0)g%WHK25PC6$_L{RDlF~$I} z@z&;f9=q&H@FAdHujBhZl}d&C`+FS6k;lhJuAZ+HK&e!EFW9&DrO{|msZ_{hGI*ZH zXfz_1%W-gUK)GCI$*%P6D-R@MA+QiWIP@N&}y|f{CFtu1jZPA-zS^RGMP*; z#-Nm2al?U(B-#dJFTBLLXm-ex!)qO~TKN|Dd!6S!0=aeI4HHNo37x0>R49N2bZe?^J zG%heMGBNQWX_Wu~0ar;xK~y+TrIX1{!cY{3`xZQhui@UM!=9ZC3lrlMl?4kD!W1Az zRz$Wgh=fXNWRRgnv_S+lidJ!FqH$w>IY)0%G!g8doZQ>=eBWtrQ)zO-CjB>7*zq&% zaDeLba*yj{w<+qf(X8UY{BUDaMms}e0_U@eMR{x5syc3MOAV4 z(8L>(yb8E|Swq(_(9m^cWO*Q=%~~YFlWO%kPZ@@3-|BSW_Ifez@t8Gbw}S;w&t0rX zqvqtUp)*YTjaUpTp%4~)K9(I-Wn^}9h9fq*vSahx^_+`Q=bV>uY)d*>Gw6w75) z)sKTLlrrB1S2xGp*ld;fb+m@UXK|3vvrtF~B3MXF!B!$+N>;;RUTgi&c33Q;s%fUA zP)ai-iVusdEG`jvx8(R^*b~iAtAxY&~QjHHe@;0erKEX4qo1nU)YuS QzW@LL07*qoM6N<$f;KA1z5oCK literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png b/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d7682d4670a63bb88209eebef0a033baae8140 GIT binary patch literal 1588 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z81_llpi<;HsXMd|v6mX?-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{ zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+ILD!*GCez(Z{OV z2AC48eDhN>(<)sOOH%EO3=A!F4GnY+OhXJUtPBmTj7@Cx(bOQh03_pFl$uzQUlfv` zpJNC1MJ|Y|V5|oWD0F$KRvUd#E<(yxkSq%p1?E{hE}%|W{<1)W=%Wz{=2gPi%9p;`eOb$Yr{_S zv^t%5S`;9{y6RWoM~kky{rxXXx}w%TONyE9w>E7Pg zIP&ua@3Ed-l$le!&9g6Wdv=V8Dcdn+jzOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E-_;&oJ#-z0rN>jK~y+T)sfFj({UKb_g5seHODq}rTJqS z)}bGVm}!jW_WdS?&Gns1laN~UgQy*pwz)+ewxF zsHl_h>ht|(U>>BaZ+PJI9A2;I`S9pAPpobqYOS{a7mK7|YB`C%rIRCLvyA*)LGSW! zEUEBxU~(%MrEUV#O9bY=(L6rKqaQ2C6Q60!&SG#W|4J%lg>u=C(cOvb`8(S4MbZLj z%P-*=FYr*j-MM*uuagDj50r|i9vp+0;UyAY^w z_0@zB$mq69KH72xx@NxO8GDWO!cBHv&#*7~g!<@x4kjOSbXBrbKq^=x1ht_A<|ZMi zlDyPLQ?ySma^}M?Ea&3vPmHizzzy+X4hVtTJJZiJSnrT9iq*|cV*S4%NEfpiX;d(K?|1=BnB;_twb)Y zFfj=#2#JEgAcI7sghr&P$@k{XdsDpcwip_mq-~wmS={rx=U({VQol`WYbyXj5Kt%- z@JVxYGd(=_Qx)$?#U&txnn#ZQYg zKDea-(&_X@z|z2=9PjUE=e9Q5>!7U;rq?u?RElgi%YjUi^O1T<-5semuL5$p9Knw= zmSwSLGcbdd-<)J@{v)9VlXAIST^g#op;75Ra+KXxf~GJ$EkY!u5TLt3 z@#I@2G(30?=gbw^01y#O(`0`Xo;lzL8bd*693B^bA|jmF+s6IpFF+}jQaFyYt^sgt z$5tj*OZY)RI258I1~cCSlu{gSj4=6rx$=D@Ob`UM4RqOO?ByG5+s5-e4#r?AU&eJ^ zx{?MHA6C&?V;BbL0M~W@_`&r{YHn^0+qUUU#~EK-A)n84D3f4(;WLio;QKzWW~PYV zysQ9PI@%*OC%CRl&%RyUdHoLG_vzc-!oB$=ip3%#La9^&9pHH$0L7IxQR@MTL;|}j zE7Zps8NI>u+XX}ftu?c=vv^;>5V<|9eBZBTY5+Alc~-EtK+*yoz_p7tvm)}hp&vf00000NkvXXu0mjfQ-=v1 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index c6c198b8..51b833be 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -152,6 +152,9 @@ import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; import crazypants.enderio.material.OreDictionaryPreferences; +import crazypants.enderio.material.endergy.BlockIngotStorageEndergy; +import crazypants.enderio.material.endergy.ItemAlloyEndergy; +import crazypants.enderio.material.endergy.ItemGrindingBallEndergy; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.rail.BlockEnderRail; import crazypants.enderio.teleport.ItemTravelStaff; @@ -195,13 +198,16 @@ public class EnderIO { // Materials public static ItemCapacitor itemBasicCapacitor; public static ItemAlloy itemAlloy; - public static ItemAlloy itemGrindingBall; + public static ItemGrindingBall itemGrindingBall; + public static ItemAlloyEndergy itemAlloyEndergy; + public static ItemGrindingBallEndergy itemGrindingBallEndergy; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; public static BlockIngotStorage blockIngotStorage; + public static BlockIngotStorageEndergy blockIngotStorageEndergy; public static BlockDarkSteelBars blockDarkIronBars; public static BlockSoulariumBars blockSoulariumBars; public static BlockEndSteelBars blockEndSteelBars; @@ -456,6 +462,8 @@ public class EnderIO { itemMaterial = ItemMaterial.create(); itemAlloy = ItemAlloy.create(); itemGrindingBall = ItemGrindingBall.create(); + itemAlloyEndergy = ItemAlloyEndergy.create(); + itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); itemPowderIngot = ItemPowderIngot.create(); registerFluids(); @@ -470,6 +478,7 @@ public class EnderIO { itemSoulVessel = ItemSoulVessel.create(); blockIngotStorage = BlockIngotStorage.create(); + blockIngotStorageEndergy = BlockIngotStorageEndergy.create(); blockDarkIronBars = BlockDarkSteelBars.create(); blockSoulariumBars = BlockSoulariumBars.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 626c4b58..af6636db 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -31,7 +31,9 @@ public enum ModObject { // Materials itemBasicCapacitor, itemAlloy, + itemAlloyEndergy, itemGrindingBall, + itemGrindingBallEndergy, itemMaterial, itemMachinePart, itemPowderIngot, @@ -88,6 +90,7 @@ public enum ModObject { blockDarkSteelLadder, blockReinforcedObsidian, blockIngotStorage, + blockIngotStorageEndergy, // Painter blockPainter, diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index bc82d090..e35c7974 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -45,6 +45,7 @@ public class ItemFilter implements IInventory, IItemFilter { boolean sticky = false; FuzzyMode fuzzyMode = FuzzyMode.DISABLED; + int numItems; ItemStack[] items; final List oreIds; @@ -74,6 +75,7 @@ public class ItemFilter implements IInventory, IItemFilter { public ItemFilter(int numItems, boolean isAdvanced) { this.isAdvanced = isAdvanced; + this.numItems = numItems; items = new ItemStack[numItems]; oreIds = new ArrayList(numItems); for(int i=0;i oreIngots = new ArrayList(); + private final List oreBlocks = new ArrayList(); + private final float hardness; + + private AlloyEndergy(String baseName, float hardness, String oreDictName) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + if(oreDictName != null) { + this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); + this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + } + this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); + this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); + this.hardness = hardness; + } + + private AlloyEndergy(String baseName, float hardness) { + this(baseName, hardness, null); + } + + public float getHardness() { + return hardness; + } + + public ItemStack getStackIngot() { + return getStackIngot(1); + } + + public ItemStack getStackIngot(int size) { + return new ItemStack(EnderIO.itemAlloyEndergy, size, ordinal()); + } + + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBallEndergy, size, ordinal()); + } + + public ItemStack getStackBlock() { + return getStackBlock(1); + } + + public ItemStack getStackBlock(int size) { + return new ItemStack(EnderIO.blockIngotStorageEndergy, size, ordinal()); + } + + public String getOreIngot() { + return oreIngots.get(0); + } + + public String getOreBlock() { + return oreBlocks.get(0); + } + + public List getOreIngots() { + return oreIngots; + } + + public List getOreBlocks() { + return oreBlocks; + } + +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java new file mode 100644 index 00000000..c55b5e87 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java @@ -0,0 +1,105 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; + +public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedTooltipProvider { + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public static BlockIngotStorageEndergy create() { + BlockIngotStorageEndergy res = new BlockIngotStorageEndergy(); + res.init(); + return res; + } + + private BlockIngotStorageEndergy() { + super(ModObject.blockIngotStorageEndergy.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } + + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemIngotStorageEndergy.class, ModObject.blockIngotStorageEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[AlloyEndergy.values().length]; + for (AlloyEndergy alloy : AlloyEndergy.values()) { + icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.values().length - 1); + return icons[meta]; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + return AlloyEndergy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java new file mode 100644 index 00000000..b976917f --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java @@ -0,0 +1,39 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockItemIngotStorageEndergy extends ItemBlock { + + public BlockItemIngotStorageEndergy(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + AlloyEndergy.values()[stack.getItemDamage()].unlocalisedName; + } + + @Override + public int getMetadata(int damage) { + return damage; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (AlloyEndergy alloy : AlloyEndergy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java new file mode 100644 index 00000000..77f84ea7 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java @@ -0,0 +1,86 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemAlloyEndergy extends Item { + + static final boolean useNuggets = false; + + protected final IIcon[] icons; + protected final int numItems; + + public static ItemAlloyEndergy create() { + ItemAlloyEndergy alloy = new ItemAlloyEndergy(); + alloy.init(); + return alloy; + } + + protected ItemAlloyEndergy() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); + + numItems = AlloyEndergy.values().length; + if(useNuggets) { + numItems = numItems * 2; + } + icons = new IIcon[numItems]; + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemAlloyEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) { + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + } + if(useNuggets) { + for (int i = 0; i < numAlloys; i++) { + icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); + } + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + if(i < AlloyEndergy.values().length) { + return AlloyEndergy.values()[i].unlocalisedName; + } else { + return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < numItems; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java new file mode 100644 index 00000000..46cb0766 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java @@ -0,0 +1,50 @@ +package crazypants.enderio.material.endergy; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemGrindingBallEndergy extends ItemAlloyEndergy { + + public static ItemGrindingBallEndergy create() { + ItemGrindingBallEndergy ball = new ItemGrindingBallEndergy(); + ball.init(); + return ball; + } + + private ItemGrindingBallEndergy() { + setUnlocalizedName(ModObject.itemGrindingBallEndergy.unlocalisedName); + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBallEndergy.unlocalisedName); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey+"GrindingBall"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return AlloyEndergy.values()[i].unlocalisedName+"GrindingBall"; + } +}