From bc46a1f198e58819a74f4f819f10422fe73bc577 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Sun, 5 Apr 2020 18:29:44 +0200 Subject: [PATCH] Capacitors, Conduits, Stellar Armor --- .../config/AlloySmelterRecipes_Core.xml | 69 +++ .../enderio/config/SAGMillRecipes_Core.xml | 30 + .../config/SliceAndSpliceRecipes_Core.xml | 13 + resources/assets/enderio/lang/en_US.lang | 29 +- .../textures/blocks/powerConduitAluminum.png | Bin 0 -> 679 bytes .../textures/blocks/powerConduitCopper.png | Bin 0 -> 656 bytes .../blocks/powerConduitCoreAluminum.png | Bin 0 -> 1005 bytes .../blocks/powerConduitCoreCopper.png | Bin 0 -> 1005 bytes .../textures/blocks/powerConduitCoreCrude.png | Bin 0 -> 1088 bytes .../blocks/powerConduitCoreCrystalline.png | Bin 0 -> 936 bytes .../powerConduitCoreCrystallinePinkSlime.png | Bin 0 -> 1010 bytes .../blocks/powerConduitCoreElectrum.png | Bin 0 -> 1023 bytes .../powerConduitCoreEnergeticSilver.png | Bin 0 -> 1141 bytes .../textures/blocks/powerConduitCoreGold.png | Bin 0 -> 1056 bytes .../textures/blocks/powerConduitCoreIron.png | Bin 0 -> 1013 bytes .../blocks/powerConduitCoreMelodic.png | Bin 0 -> 1026 bytes .../blocks/powerConduitCoreSilver.png | Bin 0 -> 968 bytes .../blocks/powerConduitCoreStellar.png | Bin 0 -> 1019 bytes .../textures/blocks/powerConduitCrude.png | Bin 0 -> 702 bytes .../blocks/powerConduitCrystalline.png | Bin 0 -> 649 bytes .../powerConduitCrystallinePinkSlime.png | Bin 0 -> 676 bytes .../textures/blocks/powerConduitElectrum.png | Bin 0 -> 669 bytes .../blocks/powerConduitEnergeticSilver.png | Bin 0 -> 707 bytes .../textures/blocks/powerConduitGold.png | Bin 0 -> 689 bytes .../textures/blocks/powerConduitIron.png | Bin 0 -> 636 bytes .../textures/blocks/powerConduitMelodic.png | Bin 0 -> 651 bytes .../textures/blocks/powerConduitSilver.png | Bin 0 -> 663 bytes .../textures/blocks/powerConduitStellar.png | Bin 0 -> 577 bytes .../textures/items/crystallineCapacitor.png | Bin 0 -> 372 bytes ...ystallinePinkSlimeGrindingBall.png.mcmeta} | 0 .../textures/items/endergeticCapacitor.png | Bin 0 -> 392 bytes .../textures/items/endergisedCapacitor.png | Bin 0 -> 406 bytes .../items/itemPowerConduitAluminum.png | Bin 0 -> 1005 bytes .../textures/items/itemPowerConduitCopper.png | Bin 0 -> 1005 bytes .../textures/items/itemPowerConduitCrude.png | Bin 0 -> 1088 bytes .../items/itemPowerConduitCrystalline.png | Bin 0 -> 936 bytes .../itemPowerConduitCrystallinePinkSlime.png | Bin 0 -> 1010 bytes .../items/itemPowerConduitElectrum.png | Bin 0 -> 1023 bytes .../items/itemPowerConduitEnergeticSilver.png | Bin 0 -> 1141 bytes .../textures/items/itemPowerConduitGold.png | Bin 0 -> 1056 bytes .../textures/items/itemPowerConduitIron.png | Bin 0 -> 1013 bytes .../items/itemPowerConduitMelodic.png | Bin 0 -> 1026 bytes .../textures/items/itemPowerConduitSilver.png | Bin 0 -> 968 bytes .../items/itemPowerConduitStellar.png | Bin 0 -> 1019 bytes .../textures/items/silverCapacitor.png | Bin 0 -> 367 bytes .../textures/items/stellarCapacitor.png | Bin 0 -> 371 bytes .../enderio/textures/items/stellar_axe.png | Bin 0 -> 335 bytes .../enderio/textures/items/stellar_boots.png | Bin 0 -> 478 bytes .../textures/items/stellar_chestplate.png | Bin 0 -> 556 bytes .../enderio/textures/items/stellar_helmet.png | Bin 0 -> 433 bytes .../textures/items/stellar_leggings.png | Bin 0 -> 561 bytes .../textures/items/stellar_pickaxe.png | Bin 0 -> 373 bytes .../enderio/textures/items/stellar_sword.png | Bin 0 -> 623 bytes .../textures/items/totemicCapacitor.png | Bin 0 -> 418 bytes .../java/crazypants/enderio/ClientProxy.java | 3 + src/main/java/crazypants/enderio/EnderIO.java | 3 + .../java/crazypants/enderio/ModObject.java | 1 + .../enderio/conduit/ConduitRecipes.java | 95 ++- .../gui/ExternalConnectionContainer.java | 8 +- .../conduit/gui/item/BigItemFilterGui.java | 197 ++++++ .../conduit/gui/item/ItemSettings.java | 38 +- .../item/filter/ItemBigItemFilter.java | 4 +- .../conduit/item/filter/ItemFilterBig.java | 69 +++ .../conduit/power/ItemPowerConduit.java | 6 +- .../enderio/conduit/power/PowerConduit.java | 11 +- .../conduit/power/PowerConduitNetwork.java | 2 +- .../endergy/ItemPowerConduitEndergy.java | 75 +++ .../power/endergy/PowerConduitEndergy.java | 559 ++++++++++++++++++ .../crazypants/enderio/config/Config.java | 38 +- .../crazypants/enderio/item/ItemRecipes.java | 17 +- .../item/darksteel/DarkSteelItems.java | 33 +- .../darksteel/DarkSteelRecipeManager.java | 16 +- .../item/darksteel/IDarkSteelItem.java | 4 + .../item/darksteel/ItemStellarArmor.java | 74 +++ .../item/darksteel/ItemStellarAxe.java | 53 ++ .../item/darksteel/ItemStellarPickaxe.java | 53 ++ .../item/darksteel/ItemStellarSword.java | 57 ++ .../machine/AbstractPoweredMachineEntity.java | 32 +- .../enderio/machine/crafter/TileCrafter.java | 14 +- .../enderio/machine/farm/TileFarmStation.java | 9 +- .../stirling/GuiStirlingGenerator.java | 10 +- .../stirling/TileEntityStirlingGenerator.java | 49 +- .../generator/zombie/TileZombieGenerator.java | 7 +- .../slicensplice/TileSliceAndSplice.java | 11 +- .../enderio/machine/soul/TileSoulBinder.java | 56 +- .../machine/spawner/TilePoweredSpawner.java | 8 +- .../enderio/material/ItemCapacitor.java | 13 + .../enderio/material/MaterialRecipes.java | 127 ++-- .../enderio/power/BasicCapacitor.java | 33 +- .../crazypants/enderio/power/Capacitors.java | 59 +- .../crazypants/enderio/power/ICapacitor.java | 2 + 91 files changed, 1796 insertions(+), 191 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/powerConduitAluminum.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCopper.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreCrude.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreCrystalline.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreCrystallinePinkSlime.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreElectrum.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreGold.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreIron.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCoreStellar.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCrude.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCrystalline.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitElectrum.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitGold.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitIron.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitMelodic.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitSilver.png create mode 100644 resources/assets/enderio/textures/blocks/powerConduitStellar.png create mode 100644 resources/assets/enderio/textures/items/crystallineCapacitor.png rename resources/assets/enderio/textures/items/{crystallinePinkSlimeGrindingball.png.mcmeta => crystallinePinkSlimeGrindingBall.png.mcmeta} (100%) create mode 100644 resources/assets/enderio/textures/items/endergeticCapacitor.png create mode 100644 resources/assets/enderio/textures/items/endergisedCapacitor.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitAluminum.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitCopper.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitCrude.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitCrystalline.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitCrystallinePinkSlime.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitElectrum.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitEnergeticSilver.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitGold.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitIron.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitMelodic.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitSilver.png create mode 100644 resources/assets/enderio/textures/items/itemPowerConduitStellar.png create mode 100644 resources/assets/enderio/textures/items/silverCapacitor.png create mode 100644 resources/assets/enderio/textures/items/stellarCapacitor.png create mode 100644 resources/assets/enderio/textures/items/stellar_axe.png create mode 100644 resources/assets/enderio/textures/items/stellar_boots.png create mode 100644 resources/assets/enderio/textures/items/stellar_chestplate.png create mode 100644 resources/assets/enderio/textures/items/stellar_helmet.png create mode 100644 resources/assets/enderio/textures/items/stellar_leggings.png create mode 100644 resources/assets/enderio/textures/items/stellar_pickaxe.png create mode 100644 resources/assets/enderio/textures/items/stellar_sword.png create mode 100644 resources/assets/enderio/textures/items/totemicCapacitor.png create mode 100644 src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java create mode 100644 src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java create mode 100644 src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java create mode 100644 src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index 8ae3b592..07f79fb0 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -389,6 +389,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index a6870938..752d7c97 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -3035,6 +3035,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index 0f2bb4aa..dd6bf8d7 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -87,6 +87,19 @@ + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index a3bf4d63..2f88b928 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -33,6 +33,19 @@ enderio.itemPowerConduit.name=Energy Conduit enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit enderio.itemPowerConduitEnder.name=Ender Energy Conduit +enderio.itemPowerConduitEndergyCrude.name=Crude Energy Conduit +enderio.itemPowerConduitEndergyIron.name=Iron Energy Conduit +enderio.itemPowerConduitEndergyAluminum.name=Aluminum Energy Conduit +enderio.itemPowerConduitEndergyGold.name=Gold Energy Conduit +enderio.itemPowerConduitEndergyCopper.name=Copper Energy Conduit +enderio.itemPowerConduitEndergySilver.name=Silver Energy Conduit +enderio.itemPowerConduitEndergyElectrum.name=Electrum Energy Conduit +enderio.itemPowerConduitEndergyEnergeticSilver.name=Energetic Silver Energy Conduit +enderio.itemPowerConduitEndergyCrystalline.name=Crystalline Energy Conduit +enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Crystalline Pink Slime Energy Conduit +enderio.itemPowerConduitEndergyMelodic.name=Melodic Energy Conduit +enderio.itemPowerConduitEndergyStellar.name=Stellar Energy Conduit + enderio.itemRedstoneConduit.name=Redstone Conduit enderio.itemRedstoneConduitSwitch.name=Conduit Switch enderio.itemRedstoneConduitInsulated.name=Insulated Redstone Conduit @@ -61,7 +74,6 @@ enderio.filterUpgradeAdvanced.name=Advanced Item Filter enderio.filterUpgradeBig.name=Big Item Filter enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter enderio.itemConduitFilterUpgrade=Upgrade for item conduits - enderio.itemConduitFilterUpgrade.configured=Configured enderio.itemConduitFilterUpgrade.clearConfigMethod=Place in crafting grid to clear enderio.itemConduitFilterUpgrade.clearConfigWarning=This will clear all stored filter settings! @@ -324,7 +336,13 @@ enderio.itemBasicCapacitor.name=Capacitor enderio.basicCapacitor.name=Basic Capacitor enderio.activatedCapacitor.name=Double-Layer Capacitor enderio.enderCapacitor.name=Octadic Capacitor +enderio.crystallineCapacitor.name=Crystalline Capacitor enderio.melodicCapacitor.name=Melodic Capacitor +enderio.stellarCapacitor.name=Stellar Capacitor +enderio.silverCapacitor.name=Silver Capacitor +enderio.endergeticCapacitor.name=Endergetic Capacitor +enderio.endergisedCapacitor.name=Endergised Capacitor +enderio.totemicCapacitor.name=Totemic Capacitor enderio.machine.tooltip.upgrade=Machine Upgrade enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Increases energy storage and @@ -804,6 +822,15 @@ item.endSteel_sword.name=The Ender MKII item.endSteel_pickaxe.name=End Steel Pick item.endSteel_axe.name=End Steel Axe +//Stellar +item.stellar_helmet.name=Stellar Helm +item.stellar_chestplate.name=Stellar Plate +item.stellar_leggings.name=Stellar Leggings +item.stellar_boots.name=Stellar Boots +item.stellar_sword.name=The Ender MKIV +item.stellar_pickaxe.name=Stellar Pick +item.stellar_axe.name=Stellar Axe + enderio.item.darkSteel.tooltip.lvs=lvs enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efficiency when powered diff --git a/resources/assets/enderio/textures/blocks/powerConduitAluminum.png b/resources/assets/enderio/textures/blocks/powerConduitAluminum.png new file mode 100644 index 0000000000000000000000000000000000000000..20547e143140a4549bfb1c4ed9c53afc1103f911 GIT binary patch literal 679 zcmV;Y0$BZtP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TEM<$wX}gzrp-~c=K6obSqGP^+ZOaktCBz zsnu#n8IQ+fohuXy((m`>QZ_5&;ZT~*rm~}QgTX+5E1%Dcx3nY^x2965=p5DHHxh}2 z6pO_OSK#B;Q+e>_gU+43GjJ_;Mc!`Qljr4q`S$%l8IUau*nil<#45mkGRGJj9A}CE zTZe$qD{x{0WM`RzPNyU7c3Vn*QC6LlR(!SBoJLx$mUO#aWe-zg8RNUYR?>LCkXK(^{6ApNxEbkVvbGlu zeqJ?bFP+x)fs11dcm>&>TeYx#-`7`DI?`QmwqM1n&;J|#Cxo1U$ZuMHmQsF<%bNfI N002ovPDHLkV1i^pKcxTw literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCopper.png b/resources/assets/enderio/textures/blocks/powerConduitCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..fa648ea689fdef1108f3aaa48a073ed767fd9b4f GIT binary patch literal 656 zcmV;B0&o3^P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T zCXpm05Xjf{{zj(+QOKsvf%XrFnK?7(GXFVq?mgGb<#M4!$Ye4INzKjumZ_A={IdrZgL9HdB-94J?@JhlI?%`Cv3Q=RHj=r~Xrwv=zrp-~c=K7TyA^nMe@O;| zfyCo+saC5;84rg;ohuXy((QI72m_2Q_VijONnZrg0e=}tO zTgTwJZdPFF!g+ah%ai9nmgURWed%;M>RY{bRbo*EU@?vu1DL)4xTShFn^n8nY^ps? zyt}91<;{`2__-oGdk04q*mzjbedF9)=hy3Xd9Dlkp_%q#HU1ngTt=7vh8 zBDGpg-;502esr?|9hQb^;@$6oz5TMZS}pb6xW1w?q^qN0=i9oP?*ewa-Bx>=cy}xC z_THjA`E*fsza47U^a3o9lY4DFVhqiXZW13lZ%O>DwP(3ofj4&-e6Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMVkv$K=kptrZT5{t!TYimnDYip}iDisNW zz`osvQ!bZx_@cnSy1FV&O-;t#-rkm=udlE2{n~^yH#f`PoA+%ZM1W0$%mN@h=600- z^TrifUtgD@JChRgsBpyNaU(-=_+;Q*N0{q9KC~Q`A~TebNu_Li0AfQ!gNeFOI8DI) z;eKsxO^T(G1-r4aAwhqCe`RxX(GeU#q|3&tlK zRfYnR5p@#%oJK)gEEZ*YSVJ2Wi(y*K}ydMg!Sq>@Wb@R6bL?<-*iihiE>77&W*_Q`C~Q)2QGex z>+RY>Nh<(&aRy3CYm`a-pDctrN7u-uKUY{Mde>#&`Y~t-~JqS{!12)F)qk3_Ea59le z0NX(t0Ar6v_S+67#}3+p)VYtdfQyIqv{gmv!;2_OO0|jtPmT}Se}YmhYMGLv6VGOB zyi((^$Sys8yg|rjvsIGX35^iEzc?zHOva+VJo7`Ye)(m7@?X#$Q3xJLRL>3>K?uGz zz!Bl+47C1aZ1RI#c=y#f%PP9eg~lA650?_9MfL2EaRQ56Vc#_$IUapHZ8pM0tx?%G zoNWT~Z$(tk6mih}0<+6bCn9Ezh_xA4TUjT15E`NFnz=3dM>I}I&r$?@OL@IpILz+$ zcFAhqd-P0t^b*AG*4x(n>9lm|cecjq(w=C!Wutm_n{sb6ut&wHd7e$~6$n&}U&T}q zTmXkdN7%1(c7FKo3z^I1Opoy$Z*qHEn{AUp#DUvz>ID!Q4+B5{ladyIr>*`bg9Epp z+C+!|n+BN$KzPjUDBs`s!CMdizR5WL*P9IdUEc8~Gsr>!o17x*Lg6$4_lJAVi+R;I bc|-mHbD4`aybM)o00000NkvXXu0mjfs>RdO literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png b/resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..e64d907ef47a7ab52f758642ee3d12791b35d9fb GIT binary patch literal 1005 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 Hu0mjf)BO@O literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png b/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f98482c988ac2b6f8abf3958d48f8164d4b6dd GIT binary patch literal 1056 zcmV+*1mF9KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TdroB{#bbAcXmD3D)O6iuv$ zWj!d0GR4mKtwv>(9{T~KUCw;_advjOD{pUaFDn!Za(jC#K&4WVEX&06JU&|=oW)}C znQtBNPp4A}f`HsKO~u>a-_QQ|C6qAq<+}%C4g?WE9|kgB0OVuVU*~`La93utRPNvZ zOA3}19K~XhWRMIt7%;9O&$SjlXc<@{c9hU;);K)?MBn!*YC`!k0p`!QaU9ENG-a|$ zl8AS3aFEUCa}H>?H|4jBl)|XrthvQ(($vi&81$r8D@nClVH|?VW=lmAt-V{rr8NR{IM0)z%>D@?QTcFtQumwzyFTmR@%QT&{^_JPO z&z@r0uU1OZsF!KYMumQ$Uazvv>#b&Bi|K#;4OWDG9bYJtb{umbGfY0q5t5ygvS0urZEbw>V}UdA$M#nE{i@d=*3~>Y6dK zIX#`y;#harY%b5!_i91^a=?47tD)Nym@lPFCAkRi%fp__3kPOlnem~ z#v5(=@+jg5PGpHefNezpWdIO+@xsmE>@1P+=9>Hb=*KO_@d6Xi>!~?Ww9dKAKuJ-2 zyBhTBRjl8{Lict-ztp)rd9y2zf7)g|TXOJ{FZA$Z212XVa3t+l%bcLRI~_=4I%b*9 z&dPFe;kF~{Kb+`Cn#+D&kBbaJ5Nv7yKRNYd4Lr|hwl7}>%LJS-EKwMlEPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T%@Da6E%rGf`}-JOTi})QA80p;ybtzbms+J`2yljQ1J2wf-fMraG?wLCh;1h zMop%^N-A?aGt2p*(|xM{`n$Ti(jD~m^;KfAn0$SG3219;lS-u`K@ixtkKvTd%Npo|valgO6CFt+(uk7vZNlQzM%+Jr8BSgTM2AKswc+SUB{{H^He0+S!($bQ| zJSq&0jg3Zz3t_5j3&h6WRLp>Udj+r$0)`@6inyjZZM zQb~fr!NJPs=chTO(`h+7J2PSO_xk!OS65dyb|exBiO1t+LvUbVz(mPCn4FxHTrOwh zrluwdhK7bJY>5amnT(vDpUd3boDux+>6r(<1H_}}vb(!06B841cXwxevQcFyAUTmf zt5MJ%9v>zD@L(->e=qm?jqUO2N%H!g&FAG_dvJ4eV?A&^TY%L(%IoWE>w{W!Hnx$X zHjZm4ceJ-#OLlaa9klB=2o8Q&Z*>MOZHujv7!oK1nLrHqk6EFI%HxE-x=- zc6QeIFNK0}Y0uBkbuHJ6G4U_Bl~f!Z9oat}Cl*^@U#|y2%5=i!*nL#5o+1c10WU>B z8fIo@WNT~7>YB1$U0s#q<6~RgBc*rou%5Q6C_TdbaSTc-YC7C$Wo5<0scrtLEId6u zT@|Zw#>U3#LAsvZMc!DotE;O@(s8`C)ySl1czD>-w7tD8J3BjOC;!iSW)y-464kRq zMi7FN02{}CaByJd$DwX)Y#67Yq6MlAAN7apB^uSUL&gX!a)o`@Y+M_p10YP)8kK#+ z`PN9C3!-|ah=Ilh#^q+0ojM|Bjfk}wS6f*fJqV4^(t+>A#YL49(z6r+-_oPrGaP0n zm6B938{C#^lvj*N^{7Y^y!ZOXmPM30JXZf@Fv`n^)n z9r#szdwXklJm6^^9UZlC7~|vPlFepKkD~bTCULh6wWbq;5>00000NkvXXu0mjfLABt( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png b/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png new file mode 100644 index 0000000000000000000000000000000000000000..eada7b116f4f9657abbfd675c77b013f84b5de72 GIT binary patch literal 1026 zcmV+d1pWJoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TP<3q|s;y=IFEPuCKq8S)G9-gd2F5k`Tx*G;WzZ6-;|RG-PPYdj#^Z4nH6g!Dz~X+px3?$N zovJ2Vuh%7*nwkm^4i0oeel#yHFTYe_>Q`=*H5+_GE}4^DJf|@PK{c#OwOLjF;hTrD zS=v-TnM_K;&j4fP#ZQY$u*0Wi4A>5s6FrwJC$AjZ5!Pln5VT3O8!ij1R4q$ktE9GB zDN51xiIr;=DY*VdxgbT?g0%ZHboJ=yN}Vhzm#*H)PJQ(pI)1wUh-8ms)N<*p#=&TE zR9j!Ky8}B+Gp0bW$@~rv4yh<-w0v$^R?e^J7#z674W{?k4l2!x66|sYjx_AD92!XL zgnMW1$+UaX*wN_2|d+_;z@~hu#%Eb!% zg|3$A#TfV(EJ`UJoqeQFI+IxJ@%rO#5|qph=-5_cOJhC~{19X!lK?*Wwf{@z-p;8% z*f%KGXRhmmv^cXU8TZFMr%ZqaOx)LV))uAp7jZ0Uxc)$DK>B<8W#QC!K0e#{`8=sD3QIX~^P2CElVC7;S`nVzpdmlt1OXq@_Q{n*xvVA)6Y z^pFvRU|Rzm5pm9d>$mWJL6*NPE2ri}Yd?2%mx#lKgGKf9kO>0K+(G-D7&X56?xy+( zleNoA`*4~hWPOLIo+=W+>;*<9OhinLjGZahS<6kdBwU8NYvyKR?nc4!^t434w)Cy} zO%HQ?WK70#N9Fj~F*$y8T>WwPw$=FXsN`LLti#E>mTY;;M)iW}>FJR7HUr0;*!_$5 zB^%G`dj&$VUhKY#xj}FN9Ih(D_Bve_5eMeO z>0SVD+y`-{wCMuH$G*EeLOI;od5s;07*qoM6N<$f|=9m7XSbN literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png b/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..ce46f4baa21a351487ed5e447050add04b542540 GIT binary patch literal 968 zcmV;(12_DMP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TYqgq$#>U1P?|$w|Z*Q;6OkU7Hh=4W*nF)YDX6+#V%kFPEIXRJq z=_v_YRyZP&h>{^0EEpKq;B)PZ4=sb1NE?nYm`LdI0K~4YE)_K)zf8dV{`dI!SW3mB zCR?pmB{V)h-Z(uy)qqqwEjvGcsW9~`m&=+BZ9^;;lm7mG^&tolrS@QLVNP<{thT$m zyCvdhfH5;9V4KgEF<>hoCb%z)8=D;~!kP>RoEF44>$1T1_xB}VD5&M~c`3L)zJr4U z$-90wmy?3~0xK_Q>(SAfT3J#qoxPQvwzcKZYIBqa1_smy<8k!^`oPy~ufR6bj1UMG z%x~P)9})Iw{ry+j`0!1~;K0RiFuijtI668~f*sC~BgI{oY%BpQTW@4_`=hROb$&); zg7Edie%64KV}q0;<}xOmr6(`cI5C{8^_$m}Un-T9iya;wwzW(z%)q~3UP|%!?PvX` z6U1bj%Zu$KwC*iIRv*-h@Pm^;f&gs;WdMxbezv76xc72fC*+*lI1`w-uji~O%GaO7 zv83X}ENFT2wf-kKibeNNr9_Wz%<6cf#bJ_jdi*1guV0ntcW)_&gHYzQ5#!?F!oh-i zy2&_!X6~T^3oz-2SCE+sE zRTJCSDygrhB?7i2?in^S?e-#>OiCt`k<7@5w$tvmRsZm?q+CDQ;@G~~pV8L~O-xKQ zxVIS?ablc#yK5kDV(cpB1i=Mx*mQ*LI%nlem!~DWx2JlHcf84op&?x+gNOrb!)YG? zZ`=odeH+{Xu(Gw^WH5heQUf6Z+8AUe0REV@gM54A=cX?HeUowguQwUkyWH_6Gsr}M qHZ?`mg#0oA^ZQ@+i@4^ST$MjO#fF9ag7k0z0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TuH7?|(k*yn1#D$s|{{Txj zzCw&k9;GeiB@#+Yd!6shJ#{QD^-E4??m6H2=G-&G9juOy4%_8&(ca!30oB#jWZO1b zmc`F92d7jj{o$(w{5v~4{sTmC@t_+#;SRLL}lRuh+)`5Z!J!i;9rh zCP4h=xVxL9bb5n}&FAxEb#-;wg+hT7T3f^P?)^Cy=KiUq@0lY?w2tEdV({zu2E`&@ zoCwjkRGbFRUZ91AG(UU2Uhaw_-b#@JEjnR=R`04HoN z+0EnPQkpH5UZrFz%eJ(o(qA$LA&x0RX9Z3M@ z0hGRF!pHMEBqoIcr6!iY2aOk5G*QZ9rO+95=6r;I_V$s^hb~$Ne{4T!*K4fU) z;N>AY)BB3!w!^_9`}FW51_IH#CaJlcQ-nMF-KR)hnF-eN>GNQ4+0Dptl^WhIp;MW_n7 z9mo}!dfX!5_bch!ttA?wXrz(aS|ilf(!}$Y=CJlR1*us*M;%VH8ui<|^}>dp6_3Yl ze76y3Z;#N((Rg{X!Fpwyxf7xv8gTlIG`AtXEZ4r7s+;j;f>4 zfN~z-AjAQggCmQXaTD<4!pUa0%5CF28Fwh~ukK{I002ovPDHLkV1gx-+VTJZ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrude.png b/resources/assets/enderio/textures/blocks/powerConduitCrude.png new file mode 100644 index 0000000000000000000000000000000000000000..6ea83a873e3c21b6ef762ddd3b4d6bffa0d20383 GIT binary patch literal 702 zcmV;v0zv(WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TXC z6HydCnM@`VFz;7k2mx7pE&Lr;b~bieh=MF4Dp)93$rg*1poN7Z7XAqf_XjKp2?4`C zlsqBthxhv?XNeLqh3ibQA6(A4=bTCI_uV@uH=%Soy%2+VJPspK*Y#{PN_*O{mex0% zEnw{#h&ql$A`#93%d%v#Sa86f&*u^fg*b;rY&M(G$3R}8c>wj3$%MYv23LXY+c(Lo zc)l!-nRkvF5)Oyy!=_RxsaC5}C=^aut4asof6z{+QyC72V!lI4l?zlAvD`UVn$0Ht z;41L+(S3RI?jvLW@(gHBYlEpk%#7zx9?Gk?@8w&gK?YbY7}&N=wz}tt<4hoiIeg%E zrWk-ehXMGmz}f|1b&lmR20ERNwA*dT=W>!UCpw$S(B`sP##*hGbh}-$2UFByUdZP; zP@haBB$Z6^8RUAs9_xKqz+T#40Onw#3Mg(|yDAC81p7U;UG@TJK9=jZ?l7EAYoo`0T+wdHvy&933C? zR09{cwrE#-0Q_pL#yIvHF}yXvCiTHpV0Y(*?CidjgTq7bv@U-GU|08A&j@l_r)*bQ z!{>W%@_6>7o=^LTzbXJ=rK^kpWdK&n5YSrn5l0?lom#y9n0Z2)awduWHx&QzG07*qoM6N<$f*MCRxBvhE literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png b/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png new file mode 100644 index 0000000000000000000000000000000000000000..f42442ccb6ae8dbb84db7abcde4fab099e386d56 GIT binary patch literal 649 zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tf{ztDi@XR4 zF%R!=%v`RbkVfwX{ljGDoSAc&|C~8D_eLDY>5Gd@CWDexI{m0qDb;U{=s*XC&jeoV zfiEK?l1L|U=Ykw`?xXy&@zuG$EGgZTmR=Cj!FR$yg+U$gCWI;vx_ znB;OfjR7!*Q8Jm7Mx!C^cKb=yU}qKjklz>4TTnPVlbyvy`G0Yt z*@E3-@yQv(_M5AJ&ClzcyO(Mz0)~kXXAgis1J-tjf!%jlP2b;3-hKM{LC@ef3=<#T z9#}s-l;3M>a(jKPT@Aj^&8g-*?M#us=jS?~b)Wf+xiw&z`0!R>lxmtl7-_s{E-+wh$bZ~`I^1Big1-{7?B00000NkvXXu0mjfS=BQ( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png b/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png new file mode 100644 index 0000000000000000000000000000000000000000..99d6c972cf3a51b001fcb1f235ab4cd26bbc08d8 GIT binary patch literal 676 zcmV;V0$crwP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Te##2--5l^a*HnZ=+3Zd|+Z55&iI#EpZGB$$T0 z#Awp#o}7vmGNO=;c7q-$>fT#*n>yz{x;vImrvr46N~P#vjg0iXWr=@l#Gia<_$=VX zJ@9389En6i`b0b)M-T*JZ2P{CSS%)edX9BE9cj}TS7@AIzQ!~+x(b~9K0&+PhH088 zl}i1JJVNa&aWuLK`+_deWZWT_Y?KXe6Ny$Sa>_p$tQ8P~-d+113i*{^tLJs@c&<&^08{&RjNaoe_~&r?GT zlOJ6Lj(3i+u)cuHn=7fBdx0$I2iIEnh%(eT+v@dBk#paTb8bIhW`~GZ6*$^H!s5oF zjIq)|MuajTD`iM%uC_Tos1CtCjs55Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TPLBn%l$&P#?mL-~)&)RPzQ3>La-EA>8-|wTf=K6%~bw3)`J-+9n|h zv=3Hjx%-nl!ESJlL;^6x}Oj7CeAD&7n|JR5g^M&Ce zfHQj_>t7Pj^Hc}%cwE9TR6?FkrxJ_BREM)RnM_oMup7({@Hd{etb9H%-qMmx+@4CMqH9!xXCx8{ zDHIA3uE4hs>$3LvtFE2D9=LkNm-nyl%99uS@@sETGayW3faokz(CKuf-EPZDke9%9c3~w@84k5tE$McL1-Hc=PIxJbzh{{c>5O1wXb*+7ClF_tyE1MnmqEw$$#PrJRa@dHkc<1Hiro zL~f{7t5UDm_00(J_Om_#$Yg1l$3OZ#aCmg2T@7yEx~ZHAfo#5i?(FJ%)_oVynHn&U ze{?JG`R%Gae7Y^=g9DA4ULXtj>{(lnScYatHjWKh=ib@bd*ZLV7l^-B;M3*>RtKO%=+Ujf$Bp|MCI1JU8MhPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Trz>kBCw01AjffJ42`)w&&7touTVdLc=c&)b1QJ|{&Olh zL(g@{u(XUvZO;(bfeL1l6>~Nz>nzJDPWEYLEd_y3=leZ6ySfU>M}kMW5c%_w8+AfNa6Q7$a=KL@VHVp3Gqk8~Bqc z1kmdsxNq$hI5q)fmlpGN2d2|0O(qi>4u>>cTcZ&)%V;zb8IQ*l$FZ;nQ^aBn--Y#c zi60CGBDfB|BuON;_6nFv{{}Gc_rjwJC^m0ClD>eoLmx=_{99i8==N3d>pClziEri} z0J}ufR z#)fD-3viyXhL9+VWWL+&${42xSSG%?6}WQu8GZfmigtE)C2OoFSU@kXweAsRsD9Y0 zwfmt@z^|PYc5^Fm{oxDx{O+a9fyE*tKpBITG6XbMZOkuL2f(=b6}WWc0l)ij2g~@E zA8_2|$*ouz!{SxKPe+kl*pius;uZ4_IpR8&;>Y p(%=f5?6+dkr{9ME2{k7`^a}*!j|}riY61WN002ovPDHLkV1mtvLp1;Z literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitGold.png b/resources/assets/enderio/textures/blocks/powerConduitGold.png new file mode 100644 index 0000000000000000000000000000000000000000..ad721730a0ace17714b6ab50e0d6adfca0698803 GIT binary patch literal 689 zcmV;i0#5yjP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T7gHhK!P*;2i%~gJWv?c)HsV+turV%~~1z`%UcZY~a)9ufl-Yk^y^yY{^7dz_Ki{anCjJCsPWc&ryiA zSK!hFm>oM>XE_>;FdPoCeY+uYXS=!3lqiZ2$FZ;{Q^s;n-@UtS(H*}g!gKVE$76}l z?-cZU4RpI64i5X0E%E-{1I5r(b9}z&{J~(1$4>_0SHC5i6(LrM&u0%1e9;I!!$c57 z>cxwcj^%X>!&B8KbEg7(hAcH!iO+uz936j`t|lHmyf2!wOwsfG;p2hWUDuU8r-oQ1 zKED-s-L2qR&&T1HZ;~~8fh?$(?^^eWW~lvKYfT^5GWW{Qvx|5+y+-`C0*6z=m|ftN2zl4Y^zD4odHQ5a5O`)&2I@jiLC89JSs z#MyRP&Zp@Vvy&59_xq7zX{bAA`zV XfCi7~M{!=^00000NkvXXu0mjfU4KH; literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitIron.png b/resources/assets/enderio/textures/blocks/powerConduitIron.png new file mode 100644 index 0000000000000000000000000000000000000000..5d72f34986536215a4515b315f86e62e59dc564a GIT binary patch literal 636 zcmV-?0)zdDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TK~z{r?U&7J zVo?mo<99bo?X0v~htA4{bY4h&g!%&R-1rP4f-fU(ryHFzovu_=@Dl_-+h5wqZE3+x zdoQ$q2uV(IO8z-Hw?|(*9^cC&qR}WyA}1$LIucR+(eOWO*YI7yn==qUJ(W->q(1Qb z{j%ThRj_xvo%nn{_0g~6w*=$yl z$)qe63yH;IvRbWVG#W{#)6vc?mrMOyi9|xe;jr%McDuSpH}C_2fTU6>4|kx^Xh^wS z*0rxU13%8rq}gmrp-_;&x3|iGYGJ@kz!oOf0nU>(d~EQVDFSRC0$lIFn*~^Prl-@X zOePb_TwJL9%w!H48IQ*@o6VFxOv%M3_UrOeb?W?Fg?+^4^SS1`-htq=eu38=FqBFq zod@o{P5y8=lnky=T&2DK)c;mAMgsYGq-MGr_*VDHF^6MeC=1U>hIr%p9Gf+5P1Mw Whm$h|E}%RB0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TcAL(&)XQe;DS>oH=3UKj)l#5=bVKZRx;q9F)ZR`noz6Q~l8hK55VJoxq!WV6Zs5DW&T-EONeZnatx2n5td<7+mXI!2f`*gPQK<}B8~4D8JBNWET{a5yYyf6tyX zZZsO|n{+0nQmIHHk&s%gCYS#&wK|xqR;&73>4CIFqfuRRQa({1Y+#2%A;}D8e9XY^ z!mcdtEvoP9?SZ5-B&##4vVOQOS2x#M0ohUk{ij+gaWn9`GQ`aa0&E?^I?ow+GXd)r z8Wf8~DHIBl8Xi>{8%aHDgt=0w)UBu^*!g^3=O$9)sz-hdtFVsPa=EOmc+NohNxuM< za|aj$hPA0Rt&nq%rpLK|Ir(+|Tj#CMhF;?Rxd(uK3&`AXS~-=A>V@8n2)Cb`CB{@~ z=q28B2Hw31SEg5F<7h)}AMSKlgKRpZniGQ9`941H-t&AHusJoLmw5j&usydeOZ!Xm z=l({sW-m|$+TCm0BgEiG6Q}*{%(-p8fcRKzzvW*Bwr00v`CwUnRN<}=SWl_SDg+j5 zWBe9tY+?JKfz6+rnkD}a=ovR7=a{VRMZ-L=8gx7!*Y(6<171Pab7PBfb||Z_CV!uT lul*`k{r%tYli+azB9A8kl@v|HrO*HX002ovPDHLkV1jO@CZGTS literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitSilver.png b/resources/assets/enderio/textures/blocks/powerConduitSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..0cade692b883592447f828172f661032da989420 GIT binary patch literal 663 zcmV;I0%-k-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T_*REPs$Ux3JM9?W6L_)* z;&XEn2n5syUawci?XbR-swNw3$FTCJw+s9d+()!#}a5)upsbxpBY)H$kw?eqC0l}fp| z0tY8&vi0?g&b_@Jm|s|s^@E@CE4Ly4&(DI30_-Pq*o?trrU`nM%_fU?uH|6U3TDuy2TwYc^nqk(sUe#WNlPSJBe@w4_mUROJaXDhJ#`>*7`uj(9` zPBQ|=09M8jSgehipRNwTMzGymf&9^lX375p_Kcg6b4=FuqQTGoj*dhkx}G>}z$?i1 x+^WSmolfhk$=#>mZNG|DzyCLUB{-ab$PJ3vnk^d8Tp$1d002ovPDHLkV1nmWHx&Q? literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitStellar.png b/resources/assets/enderio/textures/blocks/powerConduitStellar.png new file mode 100644 index 0000000000000000000000000000000000000000..742b0514e620c396c1ed0538b0dc5f7c05f0462c GIT binary patch literal 577 zcmV-H0>1r;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T!;$Io&R5z(?`(YmO0^cO-RTJ$4yRc0R)MYK@IAX+%noMSg0 zgNd7RA`e{8yZ7BE_uO}9P%D*6dEz6HNPr~X*Vp8Doczz zwrz{&c{HqD*A>gM=z|e!G#XsPu&>a40QtJ7x#8_V{(PUlsRnp?og+gH02P3$Ob?XE z8uxXQpPU(T5aI5?dTx)g|2G38!-H~od@4H|t8!VoqXJY51<`1fYN5pJKu{UX>?zNl0Kdqpp*RYcHrdvK-O}*Qoep*)%vyr zn|G}SXIDc0fd000%HLO|~ns#GDMxw=MNbG2LW|3(J@*K_5$ zp5@wvDjrK-lWnW1MSuBd7tGE8>W}IiDkk^-8~zfyT!6?2aF#(#`WAU0 P00000NkvXXu0mjf#SZ~& literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineCapacitor.png b/resources/assets/enderio/textures/items/crystallineCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..ca0971af3ec246a43979aeef2d73968dadc4a625 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(ML}g z#}Etur4wxVnj8e&o(stx73SEu@r#IeW@V)j;hSaP;mFu^dl4RO`bS3XB3X8n3b5o+pOAib;-{MJAqs65jnqsyexG&X`fR%> zL}3DxA;!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3(J;P+JIo=EmjBK7R zjv*HQ$pU}RANcV9fBh!IHpX@9))mN1nfYJ7ZQ@bK84DN{eB1MF8H+izd&;8$@bW(>+TwJ^@^z<`>HF0*|?LA~-b^VwdX8qTXw-H`4G4X6yWdifX ztBnRgL5UoO0OiANrrna?-ri!F;uOk$D1w*aVeag(fA@Fh>K?u~R~jgD??}O~AC3zQ jmRZeV6KMZ$%)l_^UDUfbB5HZSP-F0P^>bP0l+XkKKeL|! literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endergisedCapacitor.png b/resources/assets/enderio/textures/items/endergisedCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..e1e539091664848ec3053463ab0346ca28317852 GIT binary patch literal 406 zcmV;H0crk;P)N2bZe?^J zG%hhNF=Hy6O8@`?6iGxuR5(wakY`Ixg?xZeP{to0Qpj@{km>VzC0azU774na7 z(kB9#H#NDL!>L|yUaCqk_=UuP>}3%b(@$B!9KYk*>Lvr6<;~3t{(d1gfE7Rj^L8Kh z9t61Edm6bGoKAz3QZ(o_>7m~O&%@qGfDWT?*EvW-r!By+j}-~f5`YfU)6k~Hi>Hrv zeXN53*2Hr$n~Z2ad#1&!N8eu`dc5z81jG~Q7mxB?*)|gPF#rGn07*qoM6N<$f?f8b A>i_@% literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png b/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png new file mode 100644 index 0000000000000000000000000000000000000000..fea5c7084323ff8180b166f1722d6e9b2f8f7fce GIT binary patch literal 1005 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMVkv$K=kptrZT5{t!TYimnDYip}iDisNW zz`osvQ!bZx_@cnSy1FV&O-;t#-rkm=udlE2{n~^yH#f`PoA+%ZM1W0$%mN@h=600- z^TrifUtgD@JChRgsBpyNaU(-=_+;Q*N0{q9KC~Q`A~TebNu_Li0AfQ!gNeFOI8DI) z;eKsxO^T(G1-r4aAwhqCe`RxX(GeU#q|3&tlK zRfYnR5p@#%oJK)gEEZ*YSVJ2Wi(y*K}ydMg!Sq>@Wb@R6bL?<-*iihiE>77&W*_Q`C~Q)2QGex z>+RY>Nh<(&aRy3CYm`a-pDctrN7u-uKUY{Mde>#&`Y~t-~JqS{!12)F)qk3_Ea59le z0NX(t0Ar6v_S+67#}3+p)VYtdfQyIqv{gmv!;2_OO0|jtPmT}Se}YmhYMGLv6VGOB zyi((^$Sys8yg|rjvsIGX35^iEzc?zHOva+VJo7`Ye)(m7@?X#$Q3xJLRL>3>K?uGz zz!Bl+47C1aZ1RI#c=y#f%PP9eg~lA650?_9MfL2EaRQ56Vc#_$IUapHZ8pM0tx?%G zoNWT~Z$(tk6mih}0<+6bCn9Ezh_xA4TUjT15E`NFnz=3dM>I}I&r$?@OL@IpILz+$ zcFAhqd-P0t^b*AG*4x(n>9lm|cecjq(w=C!Wutm_n{sb6ut&wHd7e$~6$n&}U&T}q zTmXkdN7%1(c7FKo3z^I1Opoy$Z*qHEn{AUp#DUvz>ID!Q4+B5{ladyIr>*`bg9Epp z+C+!|n+BN$KzPjUDBs`s!CMdizR5WL*P9IdUEc8~Gsr>!o17x*Lg6$4_lJAVi+R;I bc|-mHbD4`aybM)o00000NkvXXu0mjfs>RdO literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCopper.png b/resources/assets/enderio/textures/items/itemPowerConduitCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..e64d907ef47a7ab52f758642ee3d12791b35d9fb GIT binary patch literal 1005 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 Hu0mjf)BO@O literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitGold.png b/resources/assets/enderio/textures/items/itemPowerConduitGold.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f98482c988ac2b6f8abf3958d48f8164d4b6dd GIT binary patch literal 1056 zcmV+*1mF9KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TdroB{#bbAcXmD3D)O6iuv$ zWj!d0GR4mKtwv>(9{T~KUCw;_advjOD{pUaFDn!Za(jC#K&4WVEX&06JU&|=oW)}C znQtBNPp4A}f`HsKO~u>a-_QQ|C6qAq<+}%C4g?WE9|kgB0OVuVU*~`La93utRPNvZ zOA3}19K~XhWRMIt7%;9O&$SjlXc<@{c9hU;);K)?MBn!*YC`!k0p`!QaU9ENG-a|$ zl8AS3aFEUCa}H>?H|4jBl)|XrthvQ(($vi&81$r8D@nClVH|?VW=lmAt-V{rr8NR{IM0)z%>D@?QTcFtQumwzyFTmR@%QT&{^_JPO z&z@r0uU1OZsF!KYMumQ$Uazvv>#b&Bi|K#;4OWDG9bYJtb{umbGfY0q5t5ygvS0urZEbw>V}UdA$M#nE{i@d=*3~>Y6dK zIX#`y;#harY%b5!_i91^a=?47tD)Nym@lPFCAkRi%fp__3kPOlnem~ z#v5(=@+jg5PGpHefNezpWdIO+@xsmE>@1P+=9>Hb=*KO_@d6Xi>!~?Ww9dKAKuJ-2 zyBhTBRjl8{Lict-ztp)rd9y2zf7)g|TXOJ{FZA$Z212XVa3t+l%bcLRI~_=4I%b*9 z&dPFe;kF~{Kb+`Cn#+D&kBbaJ5Nv7yKRNYd4Lr|hwl7}>%LJS-EKwMlEPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T%@Da6E%rGf`}-JOTi})QA80p;ybtzbms+J`2yljQ1J2wf-fMraG?wLCh;1h zMop%^N-A?aGt2p*(|xM{`n$Ti(jD~m^;KfAn0$SG3219;lS-u`K@ixtkKvTd%Npo|valgO6CFt+(uk7vZNlQzM%+Jr8BSgTM2AKswc+SUB{{H^He0+S!($bQ| zJSq&0jg3Zz3t_5j3&h6WRLp>Udj+r$0)`@6inyjZZM zQb~fr!NJPs=chTO(`h+7J2PSO_xk!OS65dyb|exBiO1t+LvUbVz(mPCn4FxHTrOwh zrluwdhK7bJY>5amnT(vDpUd3boDux+>6r(<1H_}}vb(!06B841cXwxevQcFyAUTmf zt5MJ%9v>zD@L(->e=qm?jqUO2N%H!g&FAG_dvJ4eV?A&^TY%L(%IoWE>w{W!Hnx$X zHjZm4ceJ-#OLlaa9klB=2o8Q&Z*>MOZHujv7!oK1nLrHqk6EFI%HxE-x=- zc6QeIFNK0}Y0uBkbuHJ6G4U_Bl~f!Z9oat}Cl*^@U#|y2%5=i!*nL#5o+1c10WU>B z8fIo@WNT~7>YB1$U0s#q<6~RgBc*rou%5Q6C_TdbaSTc-YC7C$Wo5<0scrtLEId6u zT@|Zw#>U3#LAsvZMc!DotE;O@(s8`C)ySl1czD>-w7tD8J3BjOC;!iSW)y-464kRq zMi7FN02{}CaByJd$DwX)Y#67Yq6MlAAN7apB^uSUL&gX!a)o`@Y+M_p10YP)8kK#+ z`PN9C3!-|ah=Ilh#^q+0ojM|Bjfk}wS6f*fJqV4^(t+>A#YL49(z6r+-_oPrGaP0n zm6B938{C#^lvj*N^{7Y^y!ZOXmPM30JXZf@Fv`n^)n z9r#szdwXklJm6^^9UZlC7~|vPlFepKkD~bTCULh6wWbq;5>00000NkvXXu0mjfLABt( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png b/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png new file mode 100644 index 0000000000000000000000000000000000000000..eada7b116f4f9657abbfd675c77b013f84b5de72 GIT binary patch literal 1026 zcmV+d1pWJoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TP<3q|s;y=IFEPuCKq8S)G9-gd2F5k`Tx*G;WzZ6-;|RG-PPYdj#^Z4nH6g!Dz~X+px3?$N zovJ2Vuh%7*nwkm^4i0oeel#yHFTYe_>Q`=*H5+_GE}4^DJf|@PK{c#OwOLjF;hTrD zS=v-TnM_K;&j4fP#ZQY$u*0Wi4A>5s6FrwJC$AjZ5!Pln5VT3O8!ij1R4q$ktE9GB zDN51xiIr;=DY*VdxgbT?g0%ZHboJ=yN}Vhzm#*H)PJQ(pI)1wUh-8ms)N<*p#=&TE zR9j!Ky8}B+Gp0bW$@~rv4yh<-w0v$^R?e^J7#z674W{?k4l2!x66|sYjx_AD92!XL zgnMW1$+UaX*wN_2|d+_;z@~hu#%Eb!% zg|3$A#TfV(EJ`UJoqeQFI+IxJ@%rO#5|qph=-5_cOJhC~{19X!lK?*Wwf{@z-p;8% z*f%KGXRhmmv^cXU8TZFMr%ZqaOx)LV))uAp7jZ0Uxc)$DK>B<8W#QC!K0e#{`8=sD3QIX~^P2CElVC7;S`nVzpdmlt1OXq@_Q{n*xvVA)6Y z^pFvRU|Rzm5pm9d>$mWJL6*NPE2ri}Yd?2%mx#lKgGKf9kO>0K+(G-D7&X56?xy+( zleNoA`*4~hWPOLIo+=W+>;*<9OhinLjGZahS<6kdBwU8NYvyKR?nc4!^t434w)Cy} zO%HQ?WK70#N9Fj~F*$y8T>WwPw$=FXsN`LLti#E>mTY;;M)iW}>FJR7HUr0;*!_$5 zB^%G`dj&$VUhKY#xj}FN9Ih(D_Bve_5eMeO z>0SVD+y`-{wCMuH$G*EeLOI;od5s;07*qoM6N<$f|=9m7XSbN literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitSilver.png b/resources/assets/enderio/textures/items/itemPowerConduitSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..ce46f4baa21a351487ed5e447050add04b542540 GIT binary patch literal 968 zcmV;(12_DMP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TYqgq$#>U1P?|$w|Z*Q;6OkU7Hh=4W*nF)YDX6+#V%kFPEIXRJq z=_v_YRyZP&h>{^0EEpKq;B)PZ4=sb1NE?nYm`LdI0K~4YE)_K)zf8dV{`dI!SW3mB zCR?pmB{V)h-Z(uy)qqqwEjvGcsW9~`m&=+BZ9^;;lm7mG^&tolrS@QLVNP<{thT$m zyCvdhfH5;9V4KgEF<>hoCb%z)8=D;~!kP>RoEF44>$1T1_xB}VD5&M~c`3L)zJr4U z$-90wmy?3~0xK_Q>(SAfT3J#qoxPQvwzcKZYIBqa1_smy<8k!^`oPy~ufR6bj1UMG z%x~P)9})Iw{ry+j`0!1~;K0RiFuijtI668~f*sC~BgI{oY%BpQTW@4_`=hROb$&); zg7Edie%64KV}q0;<}xOmr6(`cI5C{8^_$m}Un-T9iya;wwzW(z%)q~3UP|%!?PvX` z6U1bj%Zu$KwC*iIRv*-h@Pm^;f&gs;WdMxbezv76xc72fC*+*lI1`w-uji~O%GaO7 zv83X}ENFT2wf-kKibeNNr9_Wz%<6cf#bJ_jdi*1guV0ntcW)_&gHYzQ5#!?F!oh-i zy2&_!X6~T^3oz-2SCE+sE zRTJCSDygrhB?7i2?in^S?e-#>OiCt`k<7@5w$tvmRsZm?q+CDQ;@G~~pV8L~O-xKQ zxVIS?ablc#yK5kDV(cpB1i=Mx*mQ*LI%nlem!~DWx2JlHcf84op&?x+gNOrb!)YG? zZ`=odeH+{Xu(Gw^WH5heQUf6Z+8AUe0REV@gM54A=cX?HeUowguQwUkyWH_6Gsr}M qHZ?`mg#0oA^ZQ@+i@4^ST$MjO#fF9ag7k0z0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TuH7?|(k*yn1#D$s|{{Txj zzCw&k9;GeiB@#+Yd!6shJ#{QD^-E4??m6H2=G-&G9juOy4%_8&(ca!30oB#jWZO1b zmc`F92d7jj{o$(w{5v~4{sTmC@t_+#;SRLL}lRuh+)`5Z!J!i;9rh zCP4h=xVxL9bb5n}&FAxEb#-;wg+hT7T3f^P?)^Cy=KiUq@0lY?w2tEdV({zu2E`&@ zoCwjkRGbFRUZ91AG(UU2Uhaw_-b#@JEjnR=R`04HoN z+0EnPQkpH5UZrFz%eJ(o(qA$LA&x0RX9Z3M@ z0hGRF!pHMEBqoIcr6!iY2aOk5G*QZ9rO+95=6r;I_V$s^hb~$Ne{4T!*K4fU) z;N>AY)BB3!w!^_9`}FW51_IH#CaJlcQ-nMF-KR)hnF-eN>GNQ4+0Dptl^WhIp;MW_n7 z9mo}!dfX!5_bch!ttA?wXrz(aS|ilf(!}$Y=CJlR1*us*M;%VH8ui<|^}>dp6_3Yl ze76y3Z;#N((Rg{X!Fpwyxf7xv8gTlIG`AtXEZ4r7s+;j;f>4 zfN~z-AjAQggCmQXaTD<4!pUa0%5CF28Fwh~ukK{I002ovPDHLkV1gx-+VTJZ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/silverCapacitor.png b/resources/assets/enderio/textures/items/silverCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..7fee71ed36456ecd1deaa00dcc9fc5dddfe21eee GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(Hl<} z#}Etuxf5);4mk+8Jr}yCv9qDKRs4dRW6%xGCZ&kTU$d2tsYp2nb7-+0Idn)mqH=Pf z`UdY!o<7$e8K!)y&7a=N#ia1){t}j5>$q2)H7j~ly(qw8>G9vn6IAV4Mdb8!3$3Of zRc&qhccq7`MvJ>*=S69b&PfL({99U!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(Fac# z#}Etur4#P*9drqG4WO6ul)=zyP*kikV+S+wWdi#9NznOW{ zSD4|SQ}(~6YayP?f}Fmjw_KYNaKnDCV7QQBMx@clXCJ0%ule5I?!Myp#De2`2Me_& z&f6?hd!2FV(WbffM{_RnPIcj8VBYcUf_%u&-SK=%__4!xhus^F8C7a)O_moCOsb)o|E@k?=Ldl&)zAWn#k><^3S9T P=ywKBS3j3^P6XMus01GN%F+ZSZt)46*P}Uck+9{`^1wLjii33X2q;|KDG) z{@=dtTSJMngVewO_Fw;Bz5V=u{GPhM_N({xR4`vKwXgm7$bR#bJN0aehL3m{B^%cK zd^lO1!?}Z1!P()4z3tEcPqVN8leaBo%Hi;gW6X@(QT)1o_JoH2v$y5_-CuZG>=Co@ zlAnK`X8!*hq;ya!L66B>h)Ln>{kpfU*=n2%ZuN2bZe?^J zG%heMGBNQWX_Wu~0b5B#K~y+TrIAfb0#Ou(=g0X299&e3h$0Bes8Q^jiil!}7J|#5 zZOE7~Ws4S(2yHUcM$1tLC!P8Ou3Wv%IdO-EF-u%Lvv}`&9`2bd0T_#c;V29YM}a@t zY*x~Bok^Uk5Dd#`#wQ@C@a{NxER}rag}rUOnkMcG1KWHqmOg z{}$NYE}qKefWWeCmc&nvhYK2(g^KYI5ICPE%7%gH;XX2%j9(yjB|+z-j$ZEq^E(@m zW!V$-`O=cc@FbC!ipiO7Z?@=SfT{ z%Pfe+Vp2MtX2IlY)P02mz5oCK07*qoM6N<$f~usz0{{R3 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/stellar_chestplate.png b/resources/assets/enderio/textures/items/stellar_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ffd2bbc45875909c49cbcfdce58a1fb375f272 GIT binary patch literal 556 zcmV+{0@MA8P)N2bZe?^J zG%heMGBNQWX_Wu~0jWtuK~y+TrIK4q0#Ou&{ePnWBM5tlFp8oqlIU*aLr)PzA($Xk zbd#B~vXQdUu{1Abib2p1@Ws_x8)izT9;$~moU_kf-`RW5@c{Ujz776H@<}F>j)F^b z7+RQx*Xwn~DWA{h#Cia>(X=cSOC?DT27?}o@kXnKX1gu%;pKS&Ie?MKA~MD)V(~a~ z`8@8+Wr5iMnkw}=o|{d)zP+JRyAzND;HJ~rg;}^%kPQJ)QialEttNn{hJ|{gAh|BU z*~NicQpd8c)=iYFRVm#z0-A^y^#C|928Y<>rkH33(n=aim0ML!PRxl! z;&TQZ2zw5#N5OgI%rx@Wl|X=fxses|ET!uL=o#YIUzO7LWXfY}E4a?4U_BTZk48in znG+1og~jam``v(n@RZu#z{u)2zdRBU#r^(aT%DO<4gqZ21qjT9q|8nyjczw9M(zAm zrQA7Y<`BSq7l60%Ef6xgx}=T_rJS_G8Ex(CNDF)$-vTJkVLKKR5R+{q#j`*lAVdEV uK*=pCxo>g|{nHZyVT^s->H+*+@O%J)?Zu|9V<_?f0000N2bZe?^J zG%heMGBNQWX_Wu~0WL{IK~y+TWBC97KSda;ASoEDASoDyvuV>NFfQ-!{*MjA}a6k&K-Msn#&i(uUA3nYV6gmvV2f%EY zA=%CKKruW9oIG>p|K)4f{@=cL4JdQ~jBnq)M!W&L_w55}zV|<+rsDsUmGl13TE7I$ ze)jU^|BF|y5H{f0$&+9WM)tP+zn--vSZvjrrT7hKpED6i9r!N2bZe?^J zG%heMGBNQWX_Wu~0j^0zK~y+TrIJlcLQxQg?~hYlh;G~lQA9*h7NwS$rDdU(-(+MW z6toamLSWIxK%%6S1VdAc$`6dzE?m6b8A$Gd5~Rh;%$&LNoHH|50`M>WdN_)NAe~N2 z7QYwPkPoYYJ=Tv;=gZz*7z_rXMhKSNF4+{&>b&CSHjAxT6!R_zijQ}Ad8?q`&vUG- z5dd^Uv;88wC0TX$2?jjLD&xIb9}bvx+R^NE@cGq3tx-m=cf%sT-TlCGqXGIxSt9_b z*Kx}-DzzF)uIc|5mn6_Jo187hrdgjEM32L=k(r7f&%%+Xc><1x+C~E|O zY2S_f!vhbG04kMA(rUHR+|~xnJ`dhoEq;}<<@l5@7ewru|boF2-ij>}6A91%B?$)rT`#6!qtgPgPa zoU;7`KwCIHi{s)d!^1KfjSQe4EEWrKj#^XJ2mtz#&NCSV!eQ=Juh(-6G~DZ44)?|4 z@EOpmXz#Rvv6V&Wbh^P1X%jy=WsLwBU68&3NaWfZv(}#A00000NkvXXu0mjf$Mf%r literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/stellar_pickaxe.png b/resources/assets/enderio/textures/items/stellar_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..46b17dc791c53697952ad16ae244ac49a53f0b82 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aistgPb%?u1b{{!il z3=E|P3=FRl7#OT(FffScPl`Y422{&g;1OBOz`!jC!i@DP@e_f9k|nMYCBgY=CFO}l zsSE{)nRz98d8s7|CVB>XMus01GN%F+UGsEt46*P}me`|UWB=RUs?AG~ZKG=C|M~l? zSdXv2XY=F#|Nkrhp9w1ZFWGYBU$*s)M`k=LgnAs?6mIhwv$RP5sN|4lICSEGz3tEc zSF@M@+h4U+^pQ{u!)!){v#znZ|8t#~{>fW!eE$FDX5$Wi;R(-Lt+zLsHvdrQy5XP>7p|NGs$vqhUN)285uK_aumto?s)buW@+age&cCcghZLypN2bZe?^J zG%heMGBNQWX_Wu~0qjXcK~y+Tm6G2}Q(+j#U+ALS-EOdRA#7uRMPdGeDGO>p+%Fe1 z<8T@xQ(Cmm1r-+UDi~9AYAC{jUC3nHjd+trh!94IB!x7J8g=c3d_B)IeDTZ%b@AbS zd7tz7KF@j25dbb>wOScfRYfwH6s1zhz|)0UOy!=#H?CclF9xJiDUr=)4RUUE89$rH zI5{a}cp~08!0B`vy1!gm!pzbq&&A?M)OZYFKyxTmyawLi$y^g#M<62o-NM7X0wTOIxS^-XW%`K8;2|p zjz*Es=lPPQtUaDadFQRZg$M;)qFSwrS8vwjh0*xuW0P1Y6pR5cR$gN=H-nL>1Rgz9 z`BSyVu3-D!Cd(wWBLn;sg}1$42>DEqT_C=n49{bN6s-)c-|X_udB4Uidd4&H&4QV00HKQQ-gp002ov JPDHLkV1fxM4^037 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/totemicCapacitor.png b/resources/assets/enderio/textures/items/totemicCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..400a3582e3ceb27dbf2b0ccf770504361a6a6167 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZrV4qwIEGmGC;#~W-`-VXwF1xozklET?=Sa0_~Y2TE&pfMz4~uH)oSqy z$A=3Z%jT>7+5h$Nvw8vB%~wV94qTj@RbZ+ib;0m(-uD0D_s{*}Uo?@oqQZFg!^^LI zI;2W`PgETIc;x?XKGpy17hmXE?77RfhRs=+r}@v{S7qE1&42h0Ih>Vv*szGR&9RaF zGS6X!vp0ASu9RFRFt;~{!^5_X@rBd{Q^nKGS00-(Sju#mF{m&edeO z``cSN^Q=4aGnKfOJ>0) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotCopper"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 4); + } + + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', conductiveIron); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + + if(OreDictionary.doesOreNameExist("ingotSilver")) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotSilver"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 5); + } + + if(OreDictionary.doesOreNameExist("ingotElectrum")) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotElectrum"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 6); + } + + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticGold); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 1); + + if(OreDictionary.doesOreNameExist("ingotSilver")) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticSilver); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 7); + } + + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', phasedGold); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 2); + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallineAlloy); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 8); + + if(OreDictionary.doesOreNameExist("slimeballPink")) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallinePinkSlime); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 9); + } + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', melodicAlloy); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 10); + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', stellarAlloy); + + } + + else { + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', conductiveIron); + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', energeticGold); + addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', phasedGold); + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', "ingotIron"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', "ingotAluminum"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "bbb", "###", "bbb", 'b', binder, '#', "ingotGold"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "bbb", "###", "bbb", 'b', binder, '#', "ingotCopper"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "bbb", "###", "bbb", 'b', binder, '#', "ingotSilver"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "bbb", "###", "bbb", 'b', binder, '#', "ingotElectrum"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "bbb", "###", "bbb", 'b', binder, '#', energeticSilver); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "bbb", "###", "bbb", 'b', binder, '#', crystallineAlloy); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "bbb", "###", "bbb", 'b', binder, '#', crystallinePinkSlime); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "bbb", "###", "bbb", 'b', binder, '#', melodicAlloy); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "bbb", "###", "bbb", 'b', binder, '#', stellarAlloy); + + } if (GasUtil.isGasConduitEnabled()) { addShaped(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', binder, '#', electricalSteel, 'g', fusedGlass); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index 31a70db4..f7556f12 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -66,8 +66,8 @@ public class ExternalConnectionContainer extends ContainerEnder fuzzyB; + + final boolean isAdvanced; + final boolean isStickyModeAvailable; + + private final IItemFilterContainer filterContainer; + private final ItemFilter filter; + + private int buttonIdOffset; + private int xOffset; + private int yOffset; + + public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable) { + this(gui, filterContainer, isStickyModeAvailable, 32, 48, 0); + } + + public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, + int xOffset, int yOffset, + int buttonIdOffset) { + this.gui = gui; + this.isStickyModeAvailable = isStickyModeAvailable; + this.filterContainer = filterContainer; + this.xOffset = xOffset; + this.yOffset = yOffset; + this.buttonIdOffset = buttonIdOffset; + + filter = filterContainer.getItemFilter(); + + isAdvanced = filter.isAdvanced(); + + int butLeft = xOffset + 92+ 54; + int x = butLeft; + int y = yOffset + 40; + whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + + y -= 20; + useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setPaintSelectedBorder(false); + + stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + y -= 20; + useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setPaintSelectedBorder(false); + + y -= 20; + useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setPaintSelectedBorder(false); + + y -= 20; + fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class); + } + + public void createFilterSlots() { + filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() { + @Override + public void run() { + sendFilterChange(); + } + }); + } + + @Override + public void mouseClicked(int x, int y, int par3) { + } + + @Override + public void updateButtons() { + ItemFilter activeFilter = filter; + + if(isAdvanced) { + useNbtB.onGuiInit(); + useNbtB.setSelected(activeFilter.isMatchNBT()); + + useOreDictB.onGuiInit(); + useOreDictB.setSelected(activeFilter.isUseOreDict()); + + if(isStickyModeAvailable) { + stickyB.onGuiInit(); + stickyB.setSelected(activeFilter.isSticky()); + } + + fuzzyB.onGuiInit(); + fuzzyB.setMode(activeFilter.getFuzzyMode()); + } + + useMetaB.onGuiInit(); + useMetaB.setSelected(activeFilter.isMatchMeta()); + + whiteListB.onGuiInit(); + if(activeFilter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + } + } + + + @Override + public void actionPerformed(GuiButton guiButton) { + + if(guiButton.id == ID_META + buttonIdOffset) { + filter.setMatchMeta(useMetaB.isSelected()); + sendFilterChange(); + } else if(guiButton.id == ID_NBT + buttonIdOffset) { + filter.setMatchNBT(useNbtB.isSelected()); + sendFilterChange(); + } else if(guiButton.id == ID_STICKY + buttonIdOffset) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) { + filter.setUseOreDict(useOreDictB.isSelected()); + sendFilterChange(); + } else if(guiButton.id == ID_FUZZY + buttonIdOffset) { + filter.setFuzzyMode(fuzzyB.getMode()); + sendFilterChange(); + } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) { + filter.setBlacklist(!filter.isBlacklist()); + sendFilterChange(); + } + } + + private void sendFilterChange() { + updateButtons(); + filterContainer.onFilterChanged(); + } + + @Override + public void deactivate() { + useNbtB.detach(); + useMetaB.detach(); + useOreDictB.detach(); + whiteListB.detach(); + stickyB.detach(); + fuzzyB.detach(); + } + + @Override + public void renderCustomOptions(int top, float par1, int par2, int par3) { + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(1); + + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18); + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 748401ff..a2a5e44f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -69,7 +69,7 @@ public class ItemSettings extends BaseSettingsPanel { private final RedstoneModeButton rsB; private final ColorButton colorB; - + private ColorButton channelB; boolean inOutShowIn = false; @@ -98,18 +98,18 @@ public class ItemSettings extends BaseSettingsPanel { nextFilterB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); - x = 66; + x = 66; channelB = new ColorButton(gui, ID_CHANNEL, x, y); channelB.setColorIndex(0); channelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - + filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { @Override public boolean shouldDraw() { return !gui.getContainer().hasFilterUpgrades(isInputVisible()) && super.shouldDraw(); } }; - speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) { + speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18*2, customTop + 3 + 16 + 36, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) { @Override public boolean shouldDraw() { return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw(); @@ -130,7 +130,7 @@ public class ItemSettings extends BaseSettingsPanel { x += channelB.getWidth() + 4; priLeft = x - 8; - + rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { @Override @@ -167,8 +167,8 @@ public class ItemSettings extends BaseSettingsPanel { loopB.setPaintSelectedBorder(false); priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), EnderIO.lang.localize("gui.conduit.item.priority")); - - x = priLeft + priWidth + 9; + + x = priLeft + priWidth + 9; priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y); priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y+8); @@ -212,7 +212,7 @@ public class ItemSettings extends BaseSettingsPanel { ConnectionMode mode = con.getConnectionMode(gui.getDir()); if(mode == ConnectionMode.INPUT) { - showInput = true; + showInput = true; } else if(mode == ConnectionMode.OUTPUT) { showOutput = true; } else if(mode == ConnectionMode.IN_OUT) { @@ -257,7 +257,7 @@ public class ItemSettings extends BaseSettingsPanel { return; } boolean outputActive = (mode == ConnectionMode.IN_OUT && !inOutShowIn) || (mode == ConnectionMode.OUTPUT); - + if(!outputActive) { rsB.onGuiInit(); @@ -286,12 +286,12 @@ public class ItemSettings extends BaseSettingsPanel { priDownB.onGuiInit(); gui.addToolTip(priorityTooltip); } - + int chanCol; if(!outputActive) { - chanCol = itemConduit.getInputColor(gui.getDir()).ordinal(); - } else { - chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal(); + chanCol = itemConduit.getInputColor(gui.getDir()).ordinal(); + } else { + chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal(); } channelB.onGuiInit(); channelB.setColorIndex(chanCol); @@ -324,12 +324,12 @@ public class ItemSettings extends BaseSettingsPanel { sendFilterChange(); } else if(guiButton.id == ID_CHANNEL) { - DyeColor col = DyeColor.values()[channelB.getColorIndex()]; + DyeColor col = DyeColor.values()[channelB.getColorIndex()]; if(isInputVisible()) { itemConduit.setInputColor(gui.getDir(), col); } else { itemConduit.setOutputColor(gui.getDir(), col); - } + } sendFilterChange(); } @@ -343,7 +343,7 @@ public class ItemSettings extends BaseSettingsPanel { } @Override - public void mouseClicked(int x, int y, int par3) { + public void mouseClicked(int x, int y, int par3) { super.mouseClicked(x, y, par3); if(filterGui != null) { filterGui.mouseClicked(x, y, par3); @@ -351,7 +351,7 @@ public class ItemSettings extends BaseSettingsPanel { } private boolean isInputVisible() { - ConnectionMode mode = con.getConnectionMode(gui.getDir()); + ConnectionMode mode = con.getConnectionMode(gui.getDir()); return (mode == ConnectionMode.IN_OUT && inOutShowIn) || (mode == ConnectionMode.INPUT); } @@ -388,9 +388,9 @@ public class ItemSettings extends BaseSettingsPanel { //draw speed upgrade slot GL11.glColor3f(1, 1, 1); gui.bindGuiTexture(1); - gui.drawTexturedModalRect(gui.getGuiLeft() + 9 + 18, gui.getGuiTop() + 46, 94, 238, 18, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + 9, gui.getGuiTop() + 46 +18 +18, 94, 238, 18, 18); } - + //filter upgrade slot GL11.glColor3f(1, 1, 1); gui.bindGuiTexture(1); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java index 02c9bd00..cbcacb7d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java @@ -38,9 +38,9 @@ public class ItemBigItemFilter extends ItemBasicItemFilter { int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); ItemFilter filter; if(damage == 0) { - filter = new ItemFilter(30,false); + filter = new ItemFilterBig(24, false); } else { - filter = new ItemFilter(30,true); + filter = new ItemFilterBig(24, true); } if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java new file mode 100644 index 00000000..9138f1ca --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java @@ -0,0 +1,69 @@ +package crazypants.enderio.conduit.item.filter; + +import java.util.List; + +import com.enderio.core.client.gui.widget.GhostSlot; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.conduit.gui.GuiExternalConnection; +import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; +import crazypants.enderio.conduit.gui.item.BigItemFilterGui; +import crazypants.enderio.conduit.gui.item.IItemFilterGui; +import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer; +import crazypants.enderio.conduit.item.IItemConduit; + +public class ItemFilterBig extends ItemFilter { + + public ItemFilterBig() { + this(24,false); + } + + public ItemFilterBig(int numItems, boolean isAdvanced) { + super(numItems, isAdvanced); + } + + @Override + public String getInventoryName() { + return "Big Item Filter"; + } + + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); + BigItemFilterGui bigItemFilterGui = new BigItemFilterGui(gui, cont, !isInput); + bigItemFilterGui.createFilterSlots(); + return bigItemFilterGui; + } + + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { + int topY = yOffset; + int leftX = xOffset; + int index = 0; + int numRows = (int) Math.ceil(items.length/8); + for (int row = 0; row < numRows; ++row) { + for (int col = 0; col < 8; ++col) { + int x = leftX + col * 18; + int y = topY + row * 20; + slots.add(new ItemFilterGhostSlot(index, x, y, cb)); + index++; + } + } + } + + @Override + public int getSlotCount() { + return getSizeInventory(); + } + + + @Override + public String toString() { +// return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky=" +// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]"; + return "Big"+super.toString(); + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 57684c4a..30245f4d 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -23,8 +23,6 @@ public class ItemPowerConduit extends AbstractItemConduit { new ItemConduitSubtype(ModObject.itemPowerConduit.name(), "enderio:itemPowerConduit"), new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Enhanced", "enderio:itemPowerConduitEnhanced"), new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder"), - // new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Stellar", "enderio:itemPowerConduitStellar") - }; public static ItemPowerConduit create() { @@ -37,6 +35,10 @@ public class ItemPowerConduit extends AbstractItemConduit { super(ModObject.itemPowerConduit, subtypes); } + protected ItemPowerConduit(ModObject modObject, ItemConduitSubtype[] subtypes) { + super(modObject, subtypes); + } + @Override public Class getBaseConduitType() { return IPowerConduit.class; diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 45d7f955..1729d5c3 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -50,7 +50,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { private static ICapacitor[] capacitors; - static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender", /*"Stellar"*/}; + static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender"}; static ICapacitor[] getCapacitors() { if(capacitors == null) { @@ -58,7 +58,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF), - // new BasicCapacitor(Config.powerConduitTierFourRF, Config.powerConduitTierFourRF) }; } return capacitors; @@ -76,8 +75,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { public void registerIcons(IIconRegister register) { for (String pf : POSTFIX) { ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); - ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT + pf)); - ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT + pf)); + ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); } ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); @@ -503,12 +502,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public IIcon getTextureForInputMode() { - return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]); + return ICONS.get(ICON_KEY_INPUT); } @Override public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]); + return ICONS.get(ICON_KEY_OUTPUT); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java index 9b592007..1c73ba98 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java @@ -21,7 +21,7 @@ public class PowerConduitNetwork extends AbstractConduitNetwork powerReceptors = new HashMap(); diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java new file mode 100644 index 00000000..c8e30d36 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java @@ -0,0 +1,75 @@ +package crazypants.enderio.conduit.power.endergy; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractItemConduit; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.ItemConduitSubtype; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.conduit.power.ItemPowerConduit; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.ICapacitor; + +public class ItemPowerConduitEndergy extends ItemPowerConduit { + + private static String PREFIX; + private static String POSTFIX; + + static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crude", "enderio:itemPowerConduitCrude"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Iron", "enderio:itemPowerConduitIron"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Aluminum", "enderio:itemPowerConduitAluminum"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Gold", "enderio:itemPowerConduitGold"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Copper", "enderio:itemPowerConduitCopper"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Silver", "enderio:itemPowerConduitSilver"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Electrum", "enderio:itemPowerConduitElectrum"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "EnergeticSilver", "enderio:itemPowerConduitEnergeticSilver"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crystalline", "enderio:itemPowerConduitCrystalline"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "CrystallinePinkSlime", "enderio:itemPowerConduitCrystallinePinkSlime"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Melodic", "enderio:itemPowerConduitMelodic"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Stellar", "enderio:itemPowerConduitStellar"), + + }; + + public static ItemPowerConduitEndergy create() { + ItemPowerConduitEndergy result = new ItemPowerConduitEndergy(); + result.init(); + return result; + } + + protected ItemPowerConduitEndergy() { + super(ModObject.itemPowerConduitEndergy, subtypes); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + return new PowerConduitEndergy(stack.getItemDamage()); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + if(PREFIX == null) { + POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; + } + ICapacitor cap = PowerConduitEndergy.getCapacitors()[itemStack.getItemDamage()]; + list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java new file mode 100644 index 00000000..c7c5a67a --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java @@ -0,0 +1,559 @@ +package crazypants.enderio.conduit.power.endergy; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.vecmath.Vector3d; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.conduit.power.PowerConduit; +import crazypants.enderio.conduit.power.PowerConduitNetwork; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.PacketConduitProbe; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.enderio.tool.ToolUtil; + +import static crazypants.enderio.config.Config.powerConduitEndergyTiers; + +public class PowerConduitEndergy extends PowerConduit { + + static final Map ICONS = new HashMap(); + + private static ICapacitor[] capacitors; + + static final String[] POSTFIX = new String[] { "Crude", "Iron", "Aluminum", "Gold", "Copper", "Silver", "Electrum", "EnergeticSilver", "Crystalline", "CrystallinePinkSlime", "Melodic", "Stellar"}; + + static ICapacitor[] getCapacitors() { + if(capacitors == null) { + capacitors = new BasicCapacitor[] { + + new BasicCapacitor(powerConduitEndergyTiers[0]), + new BasicCapacitor(powerConduitEndergyTiers[1]), + new BasicCapacitor(powerConduitEndergyTiers[2]), + new BasicCapacitor(powerConduitEndergyTiers[3]), + new BasicCapacitor(powerConduitEndergyTiers[4]), + new BasicCapacitor(powerConduitEndergyTiers[5]), + new BasicCapacitor(powerConduitEndergyTiers[6]), + new BasicCapacitor(powerConduitEndergyTiers[7]), + new BasicCapacitor(powerConduitEndergyTiers[8]), + new BasicCapacitor(powerConduitEndergyTiers[9]), + new BasicCapacitor(powerConduitEndergyTiers[10]), + new BasicCapacitor(powerConduitEndergyTiers[11]) + }; + } + return capacitors; + } + + static ItemStack createItemStackForSubtype(int subtype) { + ItemStack result = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, subtype); + return result; + } + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + for (String pf : POSTFIX) { + ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); + ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); + ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + } + ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + public static final float WIDTH = 0.075f; + public static final float HEIGHT = 0.075f; + + public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); + public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); + + public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); + + protected PowerConduitNetwork network; + + private int energyStoredRF; + + private int subtype; + + protected final EnumMap rsModes = new EnumMap(ForgeDirection.class); + protected final EnumMap rsColors = new EnumMap(ForgeDirection.class); + + protected EnumMap recievedTicks; + + private final Map externalRedstoneSignals = new HashMap(); + + private boolean redstoneStateDirty = true; + + public PowerConduitEndergy() { + } + + public PowerConduitEndergy(int meta) { + this.subtype = meta; + } + + @Override + public boolean getConnectionsDirty() { + return connectionsDirty; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if(ConduitUtil.isProbeEquipped(player)) { + if(!player.worldObj.isRemote) { + new PacketConduitProbe().sendInfoMessage(player, this); + } + return true; + } else if(col != null && res.component != null && isColorBandRendered(res.component.dir)) { + setExtractionSignalColor(res.component.dir, col); + return true; + } else if(ToolUtil.isToolEquipped(player)) { + if(!getBundle().getEntity().getWorldObj().isRemote) { + if(res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + // Attempt to join networks + return ConduitUtil.joinConduits(this, faceHit); + } else if(externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if(containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + return true; + } + } + } + } + return false; + } + + private boolean isColorBandRendered(ForgeDirection dir) { + return getConnectionMode(dir) != ConnectionMode.DISABLED && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE; + } + + @Override + public ICapacitor getCapacitor() { + return getCapacitors()[subtype]; + } + + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + rsModes.put(dir, mode); + setClientStateDirty(); + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = rsModes.get(dir); + if(res == null) { + res = RedstoneControlMode.IGNORE; + } + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + rsColors.put(dir, col); + setClientStateDirty(); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor res = rsColors.get(dir); + if(res == null) { + res = DyeColor.RED; + } + return res; + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("subtype", (short) subtype); + nbtRoot.setInteger("energyStoredRF", energyStoredRF); + + for (Entry entry : rsModes.entrySet()) { + if(entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord); + } + } + + for (Entry entry : rsColors.entrySet()) { + if(entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + subtype = nbtRoot.getShort("subtype"); + + if(nbtRoot.hasKey("energyStored")) { + nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); + + } + setEnergyStored(nbtRoot.getInteger("energyStoredRF")); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "pRsMode." + dir.name(); + if(nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if(ord >= 0 && ord < RedstoneControlMode.values().length) { + rsModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "pRsCol." + dir.name(); + if(nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if(ord >= 0 && ord < DyeColor.values().length) { + rsColors.put(dir, DyeColor.values()[ord]); + } + } + } + } + + @Override + public void onTick() { + } + + @Override + public int getEnergyStored() { + return energyStoredRF; + } + + @Override + public void setEnergyStored(int energyStored) { + energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); + } + + + private boolean isRedstoneEnabled(ForgeDirection dir) { + boolean result; + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if(mode == RedstoneControlMode.NEVER) { + return false; + } + if(mode == RedstoneControlMode.IGNORE) { + return true; + } + + DyeColor col = getExtractionSignalColor(dir); + int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); + int exSig = getExternalRedstoneSignalForDir(dir); + boolean res; + if(mode == RedstoneControlMode.OFF) { + //if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); + } else { + //if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); + } + return res; + } + + private int getExternalRedstoneSignalForDir(ForgeDirection dir) { + if(redstoneStateDirty) { + externalRedstoneSignals.clear(); + redstoneStateDirty = false; + } + Integer cached = externalRedstoneSignals.get(dir); + int result; + if(cached == null) { + TileEntity te = getBundle().getEntity(); + result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); + externalRedstoneSignals.put(dir, result); + } else { + result = cached; + } + return result; + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if(mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); + } + + @Override + public int getMaxEnergyExtracted(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if(mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + if(recievedRfThisTick(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyExtracted(); + } + + private boolean recievedRfThisTick(ForgeDirection dir) { + if(recievedTicks == null || dir == null || recievedTicks.get(dir) == null || getBundle() == null || getBundle().getWorld() == null) { + return false; + } + + long curTick = getBundle().getWorld().getTotalWorldTime(); + long recT = recievedTicks.get(dir); + if(curTick - recT <= 5) { + return true; + } + return false; + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + if(network != null && network.powerManager != null) { + network.powerManager.receptorsChanged(); + } + return super.onNeighborBlockChange(blockId); + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + recievedTicks = null; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { + return 0; + } + int freeSpace = getMaxEnergyStored() - getEnergyStored(); + int result = (int) Math.min(maxReceive, freeSpace); + if(!simulate && result > 0) { + setEnergyStored(getEnergyStored() + result); + + if(getBundle() != null) { + if(recievedTicks == null) { + recievedTicks = new EnumMap(ForgeDirection.class); + } + recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); + } + + } + return result; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (PowerConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IPowerInterface rec = getExternalPowerReceptor(direction); + + return rec != null && rec.canConduitConnect(direction); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + boolean res = super.canConnectToConduit(direction, conduit); + if(!res) { + return false; + } + if(Config.powerConduitCanDifferentTiersConnect) { + return res; + } + if( !(conduit instanceof IPowerConduit)) { + return false; + } + IPowerConduit pc = (IPowerConduit)conduit; + return pc.getMaxEnergyStored() == getMaxEnergyStored(); + } + + @Override + public void externalConnectionAdded(ForgeDirection direction) { + super.externalConnectionAdded(direction); + if(network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorAdded(this, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, + getExternalPowerReceptor(direction)); + } + } + + @Override + public void externalConnectionRemoved(ForgeDirection direction) { + super.externalConnectionRemoved(direction); + if(network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorRemoved(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + } + } + + @Override + public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) { + TileEntity te = bundle.getEntity(); + World world = te.getWorldObj(); + if(world == null) { + return null; + } + TileEntity test = world.getTileEntity(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + if(test == null) { + return null; + } + if(test instanceof IConduitBundle) { + return null; + } + return PowerHandlerUtil.create(test); + } + + @Override + public ItemStack createItem() { + return createItemStackForSubtype(subtype); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + // Rendering + @Override + public IIcon getTextureForState(CollidableComponent component) { + if(component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); + } + if(COLOR_CONTROLLER_ID.equals(component.data)) { + return IconUtil.whiteTexture; + } + return ICONS.get(ICON_KEY + POSTFIX[subtype]); + } + + @Override + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]); + } + + @Override + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if(key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; + } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; + } + + @Override + public int getMaxEnergyStored() { + return getCapacitors()[subtype].getMaxEnergyStored(); + } + + @Override + public boolean displayPower() { + return true; + } +} diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index cc0db767..e2da841d 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -283,6 +283,9 @@ public final class Config { public static int enderGeneratorRfPerTick = 360; public static int enderGeneratorTicksPerBucketFuel = 96000; + public static double[] zombieGeneratorsEnergyMultipliers = {1f,2f,3f,5f,8f,13f,21f}; + public static double[] zombieGeneratorsBurnTimeMultipliers = {0.5f,1f/1.5f}; + public static int stirlingGeneratorBaseRfPerTick = 20; public static float stirlingGeneratorEnergyMultiplierT1 = 1f; public static float stirlingGeneratorEnergyMultiplierT2 = 2f; @@ -291,6 +294,10 @@ public final class Config { public static float stirlingGeneratorBurnTimeMultiplierT2 = 1f / 1.5f; public static float stirlingGeneratorBurnTimeMultiplierT3 = 1f / 1.5f; + public static double[] stirlingGeneratorEnergyMultipliers = {1f,2f,3f,5f,8f,13f,21f}; + public static double[] stirlingGeneratorBurnTimeMultipliers = {0.5f,1f/1.5f}; + + public static boolean combustionGeneratorUseOpaqueModel = true; public static boolean addFuelTooltipsToAllFluidContainers = true; @@ -442,7 +449,7 @@ public final class Config { public static int powerConduitTierOneRF = 640; public static int powerConduitTierTwoRF = 5120; public static int powerConduitTierThreeRF = 20480; -//public static int powerConduitTierFourRF = 81920; + public static int[] powerConduitEndergyTiers = {20, 40, 80, 160, 320, 1280, 2560, 10240, 40960, 81920, 327680, 2000000000}; public static boolean powerConduitOutputMJ = true; public static int sliceAndSpliceLevelOnePowerPerTickRF = 80; @@ -614,6 +621,9 @@ public final class Config { .getInt(powerConduitTierTwoRF); powerConduitTierThreeRF = config.get(sectionPower.name, "powerConduitTierThreeRF", powerConduitTierThreeRF, "The maximum IO for the tier 3 power conduit") .getInt(powerConduitTierThreeRF); + powerConduitEndergyTiers = config.get(sectionPower.name, "powerConduitTiersEndergy", powerConduitEndergyTiers, "The maximum IO for the endergy power conduit") + .getIntList(); + powerConduitCanDifferentTiersConnect = config .getBoolean("powerConduitCanDifferentTiersConnect", sectionPower.name, powerConduitCanDifferentTiersConnect, "If set to false power conduits of different tiers cannot be connected. in this case a block such as a cap. bank is needed to bridge different tiered networks"); @@ -1061,22 +1071,36 @@ public final class Config { enderGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "enderGeneratorTicksPerMbFuel", enderGeneratorTicksPerBucketFuel, "The number of ticks one bucket of fuel lasts.").getInt(enderGeneratorTicksPerBucketFuel); + zombieGeneratorsEnergyMultipliers = config.get(sectionPower.name, "zombieGeneratorsEnergyMultipliers", + zombieGeneratorsEnergyMultipliers, "Energy multipliers for the Zombie-Type Generators").getDoubleList(); + + zombieGeneratorsBurnTimeMultipliers = config.get(sectionPower.name, "zombieGeneratorsBurnTimeMultipliers", + zombieGeneratorsBurnTimeMultipliers, "Burn time multipliers for the Zombie-Type Generators").getDoubleList(); + + stirlingGeneratorBaseRfPerTick = config.get(sectionPower.name, "stirlingGeneratorBaseRfPerTick", stirlingGeneratorBaseRfPerTick, "The amount of power generated per tick.").getInt(stirlingGeneratorBaseRfPerTick); stirlingGeneratorEnergyMultiplierT1 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT1", - stirlingGeneratorEnergyMultiplierT1, "Energy multiplier for the Stirling Generator, Tier 1 machine").getDouble(); + stirlingGeneratorEnergyMultiplierT1, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 1 machine").getDouble(); stirlingGeneratorEnergyMultiplierT2 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT2", - stirlingGeneratorEnergyMultiplierT2, "Energy multiplier for the Stirling Generator, Tier 2 machine").getDouble(); + stirlingGeneratorEnergyMultiplierT2, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 2 machine").getDouble(); stirlingGeneratorEnergyMultiplierT3 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT3", - stirlingGeneratorEnergyMultiplierT3, "Energy multiplier for the Stirling Generator, Tier 3 machine").getDouble(); + stirlingGeneratorEnergyMultiplierT3, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 3 machine").getDouble(); + + stirlingGeneratorEnergyMultipliers = config.get(sectionPower.name, "stirlingGeneratorEnergyMultipliers", + stirlingGeneratorEnergyMultipliers, "Energy multipliers for the Stirling Generator").getDoubleList(); stirlingGeneratorBurnTimeMultiplierT1 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT1", - stirlingGeneratorBurnTimeMultiplierT1, "Burn time multiplier for the Stirling Generator, Tier 1 machine").getDouble(); + stirlingGeneratorBurnTimeMultiplierT1, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 1 machine").getDouble(); stirlingGeneratorBurnTimeMultiplierT2 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT2", - stirlingGeneratorBurnTimeMultiplierT2, "Burn time multiplier for the Stirling Generator, Tier 2 machine").getDouble(); + stirlingGeneratorBurnTimeMultiplierT2, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 2 machine").getDouble(); stirlingGeneratorBurnTimeMultiplierT3 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT3", - stirlingGeneratorBurnTimeMultiplierT3, "Burn time multiplier for the Stirling Generator, Tier 3 machine").getDouble(); + stirlingGeneratorBurnTimeMultiplierT3, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 3 machine").getDouble(); + + stirlingGeneratorBurnTimeMultipliers = config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultipliers", + stirlingGeneratorBurnTimeMultipliers, "Burn time multipliers for the Stirling Generator").getDoubleList(); + addFuelTooltipsToAllFluidContainers = config.get(sectionPersonal.name, "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, "If true, the RF/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.").getBoolean( diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index ac94b4c3..3932078d 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -11,6 +11,7 @@ import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; import static crazypants.enderio.material.Material.VIBRANT_CYSTAL; import static crazypants.util.RecipeUtil.addShaped; @@ -19,6 +20,7 @@ public class ItemRecipes { public static void addRecipes() { ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); ItemStack diode = new ItemStack(EnderIO.itemFrankenSkull,1,FrankenSkull.GUARDIAN_DIODE.ordinal()); + ItemStack sentient = new ItemStack(EnderIO.itemFrankenSkull,1,FrankenSkull.SENTIENT_ENDER.ordinal()); String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); String vibCry = VIBRANT_CYSTAL.oreDict; @@ -26,7 +28,7 @@ public class ItemRecipes { String darkSteel = DARK_STEEL.getOreIngot(); String soularium = SOULARIUM.getOreIngot(); String endSteel = END_STEEL.getOreIngot(); - + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); // Wrench ItemStack wrench = new ItemStack(EnderIO.itemYetaWench, 1, 0); @@ -49,6 +51,12 @@ public class ItemRecipes { addShaped(DarkSteelItems.itemEndSteelLeggings.createItemStack(), "sss", "sds", "s s", 's', endSteel, 'd', diode); addShaped(DarkSteelItems.itemEndSteelBoots.createItemStack(), "s s", "sds", 's', endSteel, 'd', diode); + //Stellar + addShaped(DarkSteelItems.itemStellarHelmet.createItemStack(), "sss", "sds", 's', stellarAlloy, 'd', sentient); + addShaped(DarkSteelItems.itemStellarChestplate.createItemStack(), "sds", "sss", "sss", 's', stellarAlloy, 'd', sentient); + addShaped(DarkSteelItems.itemStellarLeggings.createItemStack(), "sss", "sds", "s s", 's', stellarAlloy, 'd', sentient); + addShaped(DarkSteelItems.itemStellarBoots.createItemStack(), "s s", "sds", 's', stellarAlloy, 'd', sentient); + ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing, 1, 0); addShaped(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather); addShaped(new ItemStack(DarkSteelItems.itemGliderWing, 1, 1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); @@ -85,5 +93,12 @@ public class ItemRecipes { addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "stickDarkSteel"); addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); + // Stellar Tools + addShaped(DarkSteelItems.itemStellarSword.createItemStack(), " s ", " s ", " e ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); + addShaped(DarkSteelItems.itemStellarPickaxe.createItemStack(), "sss", " e ", " w ", 's', stellarAlloy,'e', sentient, 'w', "stickDarkSteel"); + addShaped(DarkSteelItems.itemStellarPickaxe.createItemStack(), "sss", " e ", " w ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); + addShaped(DarkSteelItems.itemStellarAxe.createItemStack(), "ss ", "se ", " w ", 's', stellarAlloy,'e', sentient, 'w', "stickDarkSteel"); + addShaped(DarkSteelItems.itemStellarAxe.createItemStack(), "ss ", "se ", " w ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java index 8de62a02..e29b9e79 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java @@ -31,6 +31,14 @@ public class DarkSteelItems { public static ItemEndSteelPickaxe itemEndSteelPickaxe; public static ItemEndSteelAxe itemEndSteelAxe; + public static ItemStellarArmor itemStellarHelmet; + public static ItemStellarArmor itemStellarChestplate; + public static ItemStellarArmor itemStellarLeggings; + public static ItemStellarArmor itemStellarBoots; + public static ItemStellarSword itemStellarSword; + public static ItemStellarPickaxe itemStellarPickaxe; + public static ItemStellarAxe itemStellarAxe; + public static ItemMagnet itemMagnet; private DarkSteelItems() { @@ -58,16 +66,25 @@ public class DarkSteelItems { itemEndSteelPickaxe = ItemEndSteelPickaxe.create(); itemEndSteelAxe = ItemEndSteelAxe.create(); + itemStellarHelmet = ItemStellarArmor.create(0); + itemStellarChestplate = ItemStellarArmor.create(1); + itemStellarLeggings = ItemStellarArmor.create(2); + itemStellarBoots = ItemStellarArmor.create(3); + + itemStellarSword = ItemStellarSword.create(); + itemStellarPickaxe = ItemStellarPickaxe.create(); + itemStellarAxe = ItemStellarAxe.create(); + itemMagnet = ItemMagnet.create(); } public static boolean isArmorPart(Item item, int type){ switch(type){ - case 0:return item == itemDarkSteelHelmet||item == itemEndSteelHelmet; - case 1:return item == itemDarkSteelChestplate||item == itemEndSteelChestplate; - case 2:return item == itemDarkSteelLeggings||item == itemEndSteelLeggings; - case 3:return item == itemDarkSteelBoots||item == itemEndSteelBoots; + case 0:return item == itemDarkSteelHelmet||item == itemEndSteelHelmet||item == itemStellarHelmet; + case 1:return item == itemDarkSteelChestplate||item == itemEndSteelChestplate||item == itemStellarChestplate; + case 2:return item == itemDarkSteelLeggings||item == itemEndSteelLeggings||item == itemStellarLeggings; + case 3:return item == itemDarkSteelBoots||item == itemEndSteelBoots||item == itemStellarBoots; default: return false; } } @@ -107,5 +124,13 @@ public class DarkSteelItems { MinecraftForgeClient.registerItemRenderer(itemEndSteelSword, dsr); MinecraftForgeClient.registerItemRenderer(itemEndSteelPickaxe, dsr); MinecraftForgeClient.registerItemRenderer(itemEndSteelAxe, dsr); + + MinecraftForgeClient.registerItemRenderer(itemStellarBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarHelmet, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarSword, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarPickaxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarAxe, dsr); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index 0443695a..ace3363e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -21,6 +21,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.ApiaristArmorUpgrade; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; @@ -35,6 +36,7 @@ import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade; import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; import crazypants.enderio.material.Alloy; +import crazypants.enderio.material.endergy.AlloyEndergy; import crazypants.enderio.thaumcraft.ThaumcraftCompat; public class DarkSteelRecipeManager { @@ -82,11 +84,19 @@ public class DarkSteelRecipeManager { return; } - if(evt.left.getItem() instanceof IEndSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.END_STEEL.getOreIngot())) { + if(evt.left.getItem() instanceof IStellarItem && OreDictionaryHelper.hasName(evt.right, AlloyEndergy.STELLAR_ALLOY.getOreIngot())) { handleRepair(evt); - }else if(evt.left.getItem() instanceof IDarkSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.DARK_STEEL.getOreIngot())) { + } + + else if(evt.left.getItem() instanceof IEndSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.END_STEEL.getOreIngot())) { + handleRepair(evt); + } + + else if(evt.left.getItem() instanceof IDarkSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.DARK_STEEL.getOreIngot())) { handleRepair(evt); - } else { + } + + else { handleUpgrade(evt); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java index af00e740..3f4d3fcd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java +++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java @@ -8,4 +8,8 @@ public interface IDarkSteelItem { } + public interface IStellarItem extends IEndSteelItem { + + } + } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java new file mode 100644 index 00000000..e0eeb5ad --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java @@ -0,0 +1,74 @@ +package crazypants.enderio.item.darksteel; + +import java.util.Iterator; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.EnumHelper; + +public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem { + + public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("stellarAlloy", 75, new int[] {8, 14, 18, 7}, 25); + + public ItemStellarArmor(int armorType) { + super(MATERIAL, "stellar", armorType); + + } + + public static ItemStellarArmor create(int armorType) { + ItemStellarArmor res = new ItemStellarArmor(armorType); + res.init(); + return res; + } + + public static ItemStellarArmor forArmorType(int armorType) { + switch (armorType) { + case 0: return DarkSteelItems.itemStellarHelmet; + case 1: return DarkSteelItems.itemStellarChestplate; + case 2: return DarkSteelItems.itemStellarLeggings; + case 3: return DarkSteelItems.itemStellarBoots; + } + return null; + } + + public static int getPoweredProtectionIncrease(int armorType) { + switch (armorType) { + case 0: return 2; + case 1: return 1; + case 2: return 4; + case 3: return 3; + } + return 0; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); + while (iter.hasNext()) { + IDarkSteelUpgrade upgrade = iter.next(); + if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { + upgrade.writeToItem(is); + } + } + + par3List.add(is); + } + +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java new file mode 100644 index 00000000..0a2b33fe --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java @@ -0,0 +1,53 @@ +package crazypants.enderio.item.darksteel; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem { + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarAxe; + } + + public static ItemStellarAxe create() { + ItemStellarAxe res = new ItemStellarAxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemStellarAxe() { + super("stellar", ItemStellarSword.MATERIAL); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } + +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java new file mode 100644 index 00000000..635fbc8a --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java @@ -0,0 +1,53 @@ +package crazypants.enderio.item.darksteel; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + +public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellarItem { + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarPickaxe; + } + + public static ItemStellarPickaxe create() { + ItemStellarPickaxe res = new ItemStellarPickaxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemStellarPickaxe() { + super("stellar", ItemStellarSword.MATERIAL); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } + +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java new file mode 100644 index 00000000..1436fdce --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java @@ -0,0 +1,57 @@ +package crazypants.enderio.item.darksteel; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.EnumHelper; + +public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem { + + static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("stellarAlloy", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 5000, 16, 11, 25); + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarSword; + } + + + public static ItemStellarSword create() { + ItemStellarSword res = new ItemStellarSword(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemStellarSword() { + super("stellar",MATERIAL); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } +} diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 5a7dd8d3..07eccfa0 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -8,9 +8,11 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.vecmath.VecmathUtil; import crazypants.enderio.EnderIO; +import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.ICapacitorItem; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.PowerHandlerUtil; @@ -25,7 +27,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { super(slotDefinition); - capacitorType = Capacitors.BASIC_CAPACITOR; + setCapacitor(Capacitors.BASIC_CAPACITOR); } @Override @@ -95,7 +97,20 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity } public ICapacitor getCapacitor() { - return capacitor != null ? capacitor : capacitorType.capacitor; + + if(capacitor != null) { + return capacitor; + } + + else if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + return EnderIO.itemBasicCapacitor.getCapacitor(contents); + } + } + + return capacitorType.capacitor; + } public int getEnergyStoredScaled(int scale) { @@ -111,7 +126,18 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity public void setCapacitor(Capacitors capacitorType) { this.capacitorType = capacitorType; - this.capacitor = null; + + if(capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if(contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents)); + } + } + + else { + this.capacitor = capacitorType.capacitor; + } + onCapacitorTypeChange(); //Force a check that the new value is in bounds setEnergyStored(getEnergyStored()); diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index f7d467c2..7a6e81d9 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -38,12 +38,12 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf private boolean bufferStacks = true; private long ticksSinceLastCraft = 0; - + private FakePlayer playerInst; public TileCrafter() { super(new SlotDefinition(9, 1)); - containerItems = new ArrayList(); + containerItems = new ArrayList(); } @Override @@ -51,7 +51,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf ICapacitor refCap = getCapacitor(); int maxUse = getPowerUsePerTick(getCapacitorType()); int io = Math.max(maxUse, refCap.getMaxEnergyExtracted()); - setCapacitor(new BasicCapacitor(io * 4, refCap.getMaxEnergyStored(), io)); + setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io)); } @Override @@ -115,9 +115,9 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf public int getPowerUsePerTick() { return getPowerUsePerTick(getCapacitorType()); } - + public int getPowerUsePerTick(Capacitors type) { - int ticks = getTicksPerCraft(type); + int ticks = getTicksPerCraft(type); return (int)Math.ceil(Config.crafterRfPerCraft / (double)ticks); } @@ -128,7 +128,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf return 10; } else { return 2; - } + } } static boolean compareDamageable(ItemStack stack, ItemStack req) { @@ -156,7 +156,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf }, 3, 3); int[] usedItems = new int[9]; - + for (int j = 0; j < 9; j++) { ItemStack req = craftingGrid.getStackInSlot(j); if (req != null) { diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 6473cb1f..41e79bb3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -34,6 +34,7 @@ import crazypants.enderio.machine.farm.farmers.IHarvestResult; import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.Capacitors; import crazypants.enderio.tool.ArrayMappingTool; public class TileFarmStation extends AbstractPoweredTaskEntity { @@ -195,7 +196,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if(inventory[upg] == null) { return 0; } else { - return Config.farmBonusSize * inventory[upg].getItemDamage(); + return Config.farmBonusSize * EnderIO.itemBasicCapacitor.getCapacitor(inventory[upg]).getTier(); } } @@ -709,13 +710,13 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { int ppt = calcPowerUsePerTick(); switch (getCapacitorType()) { case BASIC_CAPACITOR: - setCapacitor(new BasicCapacitor(ppt * 40, 250000, ppt)); + setCapacitor(new BasicCapacitor(0, ppt * 40, 250000, ppt)); break; case ACTIVATED_CAPACITOR: - setCapacitor(new BasicCapacitor(ppt * 40, 500000, ppt)); + setCapacitor(new BasicCapacitor(0, ppt * 40, 500000, ppt)); break; case ENDER_CAPACITOR: - setCapacitor(new BasicCapacitor(ppt * 40, 1000000, ppt)); + setCapacitor(new BasicCapacitor(0, ppt * 40, 1000000, ppt)); break; default: break; diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index 73a832b7..e32f0563 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -45,12 +45,12 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase 0) { if(getEnergyStored() < getMaxEnergyStored()) { - setEnergyStored(getEnergyStored() + getPowerUsePerTick()); + setEnergyStored(getEnergyStored() + getPowerUsePerTick()); } burnTime--; - sendBurnTimePacket = shouldDoWorkThisTick(20,-1) || burnTime == 0; + sendBurnTimePacket = shouldDoWorkThisTick(20,-1) || burnTime == 0; } transmitEnergy(); @@ -183,32 +185,17 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme return doPush(dir, te, 0, 0); } - public static float getEnergyMultiplier(Capacitors capacitorType) { - if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) { - return Config.stirlingGeneratorEnergyMultiplierT2; - } else if(capacitorType == Capacitors.ENDER_CAPACITOR) { - return Config.stirlingGeneratorEnergyMultiplierT3; - } - return Config.stirlingGeneratorEnergyMultiplierT1; - } - - private float getEnergyMultiplier() { - return getEnergyMultiplier(getCapacitorType()); - } - - public static float getBurnTimeMultiplier(Capacitors capacitorType) { - if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) { - return Config.stirlingGeneratorBurnTimeMultiplierT2; - } else if(capacitorType == Capacitors.ENDER_CAPACITOR) { - return Config.stirlingGeneratorBurnTimeMultiplierT3; - } - return Config.stirlingGeneratorBurnTimeMultiplierT1; + public float getEnergyMultiplier() { + int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorEnergyMultipliers.length); + return (float)Config.stirlingGeneratorEnergyMultipliers[tier-1]; } public float getBurnTimeMultiplier() { - return getBurnTimeMultiplier(getCapacitorType()); + int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorBurnTimeMultipliers.length); + return (float)Config.stirlingGeneratorBurnTimeMultipliers[tier-1]; } + //private PowerDistributor powerDis; private boolean transmitEnergy() { if(powerDis == null) { @@ -219,7 +206,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme return false; } int transmitted = powerDis.transmitEnergy(worldObj, canTransmit); - setEnergyStored(getEnergyStored() - transmitted); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; } @@ -227,6 +214,6 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme public boolean hasCustomInventoryName() { return false; } - - + + } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index db00d756..a3c18c82 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.generator.zombie; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -328,9 +329,9 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu } public int getOutputPerTick(){ - if(inventory[slotDefinition.getMaxUpgradeSlot()] != null) - return baseOutputPerTick*(4+inventory[slotDefinition.getMaxUpgradeSlot()].getItemDamage())/4; - else return baseOutputPerTick; + int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.zombieGeneratorsEnergyMultipliers.length); + return (int)(baseOutputPerTick*Config.zombieGeneratorsEnergyMultipliers[tier-1]); + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index 19d03826..337851fc 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -22,17 +22,20 @@ import crazypants.enderio.power.Capacitors; public class TileSliceAndSplice extends AbstractPoweredTaskEntity { public static final int POWER_PER_TICK_ONE = Config.sliceAndSpliceLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2, + private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, + POWER_PER_TICK_ONE * 2, Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); public static final int POWER_PER_TICK_TWO = Config.sliceAndSpliceLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor(POWER_PER_TICK_TWO * 2, + private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0, + POWER_PER_TICK_TWO * 2, Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO); public static final int POWER_PER_TICK_THREE = Config.sliceAndSpliceLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2, + private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0, + POWER_PER_TICK_THREE * 2, Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); @@ -66,6 +69,8 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { case ENDER_CAPACITOR: setCapacitor(CAP_THREE); break; + default: + break; } } diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 495b0dbc..9299fcdf 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -32,7 +32,7 @@ import crazypants.enderio.xp.XpUtil; public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess { public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2, + private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2, Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; @@ -42,7 +42,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF; private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2, Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); - + private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); public TileSoulBinder() { @@ -50,20 +50,20 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } @Override - public ExperienceContainer getContainer() { + public ExperienceContainer getContainer() { return xpCont; } @Override - public String getMachineName() { + public String getMachineName() { return ModObject.blockSoulBinder.unlocalisedName; } - + @Override public int getInventoryStackLimit() { return 1; } - + @Override protected boolean processTasks(boolean redstoneChecksPassed) { if(xpCont.isDirty()) { @@ -115,7 +115,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } return ((ISoulBinderRecipe)nextRecipe).getExperienceLevelsRequired(); } - + @Override protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { @@ -136,17 +136,17 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx return false; } MachineRecipeInput newInput = new MachineRecipeInput(slot, item); - int otherSlot = slot == 0 ? 1 : 0; + int otherSlot = slot == 0 ? 1 : 0; if(inventory[otherSlot] == null) { List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), newInput); if(recipes.isEmpty()) { return false; - } + } for(IMachineRecipe rec : recipes) { if(rec != null && rec.isValidInput(newInput)) { return true; } - } + } } else { MachineRecipeInput[] inputs = new MachineRecipeInput[] { newInput, @@ -169,6 +169,22 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx case ENDER_CAPACITOR: setCapacitor(CAP_THREE); break; + case CRYSTALLINE_CAPACITOR: + break; + case ENDERGETIC_CAPACITOR: + break; + case ENDERGISED_CAPACITOR: + break; + case MELODIC_CAPACITOR: + break; + case SILVER_CAPACITOR: + break; + case STELLAR_CAPACITOR: + break; + case TOTEMIC_CAPACITOR: + break; + default: + break; } } @@ -181,7 +197,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } return res; } - + @Override protected boolean doPush(ForgeDirection dir) { boolean res = super.doPush(dir); @@ -195,7 +211,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx /** * Determines how much stored XP can/should be removed because it is not * needed for the next recipe. - * + * * @return A number between 0 and the amount of stored XP */ private int getExcessXP() { @@ -209,10 +225,10 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(ForgeDirection from, Fluid fluid) { return xpCont.canFill(from, fluid); } - + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { int max = XpUtil.experienceToLiquid(getXPRequired()); @@ -240,17 +256,17 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return xpCont.drain(from, Math.min(XpUtil.experienceToLiquid(getExcessXP()), maxDrain), doDrain); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(ForgeDirection from, Fluid fluid) { return xpCont.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(ForgeDirection from) { return xpCont.getTankInfo(from); } @@ -261,11 +277,11 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx } @Override - public void writeCommon(NBTTagCompound nbtRoot) { + public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); xpCont.writeToNBT(nbtRoot); } - + @Override public FluidTank getInputTank(FluidStack forFluidType) { return xpCont; @@ -280,5 +296,5 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx public void setTanksDirty() { xpCont.setDirty(true); } - + } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index ece33b17..5621ede9 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -25,14 +25,14 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks; public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); + private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, (int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 1.25), + private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,(int) (POWER_PER_TICK_TWO * 1.25), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); public static final int POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 1.25), + private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,(int) (POWER_PER_TICK_THREE * 1.25), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance; @@ -226,7 +226,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { && worldObj.getCollidingBoundingBoxes(entityliving, entityliving.boundingBox).isEmpty() && (!worldObj.isAnyLiquid(entityliving.boundingBox) || entityliving.isCreatureType(EnumCreatureType.waterCreature, false)); if(spaceClear && USE_VANILLA_SPAWN_CHECKS) { - //Full checks for lighting, dimension etc + //Full checks for lighting, dimension etc spaceClear = entityliving.getCanSpawnHere(); } return spaceClear; diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 28d64289..7a1d8146 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -4,6 +4,8 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -76,15 +78,26 @@ public class ItemCapacitor extends Item implements ICapacitorItem { public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < Capacitors.values().length; ++j) { par3List.add(new ItemStack(par1, 1, j)); + if(Capacitors.values()[j] == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack stack = new ItemStack(par1, 1, j); + stack.addEnchantment(Enchantment.efficiency, 5); + par3List.add(stack); + } } } @Override public ICapacitor getCapacitor(ItemStack stack) { int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, Capacitors.values().length - 1); + + if(Capacitors.values()[damage] == Capacitors.TOTEMIC_CAPACITOR) { + damage = MathHelper.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.efficiency.effectId, stack)+1, 1, Capacitors.TOTEMIC_CAPACITOR.ordinal()); + } + return Capacitors.values()[damage].capacitor; } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 88d1cff6..a379ced9 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -14,11 +14,14 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.ItemEnderFood.EnderFood; +import crazypants.enderio.material.endergy.AlloyEndergy; +import crazypants.enderio.power.Capacitors; +import static crazypants.enderio.power.Capacitors.*; import static com.enderio.core.common.util.OreDictionaryHelper.*; -import static crazypants.enderio.EnderIO.itemBasicCapacitor; import static crazypants.enderio.material.Alloy.*; import static crazypants.enderio.material.Material.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; import static crazypants.util.RecipeUtil.*; public class MaterialRecipes { @@ -42,6 +45,10 @@ public class MaterialRecipes { } } + for(Capacitors capacitor: Capacitors.values()){ + OreDictionary.registerOre(capacitor.getOreTag(), new ItemStack(EnderIO.itemBasicCapacitor,1,capacitor.ordinal())); + } + for (Alloy alloy : Alloy.values()) { boolean isPrimaryName = true; for (String oreDictName : alloy.getOreIngots()) { @@ -66,6 +73,30 @@ public class MaterialRecipes { } } + for (AlloyEndergy alloy : AlloyEndergy.values()) { + boolean isPrimaryName = true; + for (String oreDictName : alloy.getOreIngots()) { + OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + // Allow free conversion of additional/legacy oreDict name items into + // our item because we only register recipes for the primary oreDict + // name. Use a 2-to-2 recipe because the 1-to-n is already in use. + addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + } + } + isPrimaryName = true; + for (String oreDictName : alloy.getOreBlocks()) { + OreDictionary.registerOre(oreDictName, alloy.getStackBlock()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + } + } + } + OreDictionary.registerOre("nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal())); OreDictionary.registerOre("nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal())); @@ -109,7 +140,51 @@ public class MaterialRecipes { String soularium = SOULARIUM.getOreIngot(); String endSteel = END_STEEL.getOreIngot(); - ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); + String energeticSilver = ENERGETIC_SILVER.getOreIngot(); + String vividAlloy = VIVID_ALLOY.getOreIngot(); + String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); + String melodicAlloy = MELODIC_ALLOY.getOreIngot(); + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); + + String capacitor = Capacitors.BASIC_CAPACITOR.getOreTag(); + String capacitorAdv = Capacitors.ACTIVATED_CAPACITOR.getOreTag(); + String capacitorEnder = Capacitors.ENDER_CAPACITOR.getOreTag(); + String capacitorCrystal = Capacitors.CRYSTALLINE_CAPACITOR.getOreTag(); + String capacitorMelodic = Capacitors.MELODIC_CAPACITOR.getOreTag(); + + String ingotCopper = OreDictionary.doesOreNameExist("ingotCopper") && Config.useModMetals ? "ingotCopper": "ingotIron"; + + //Capacitors + if (Config.useHardRecipes) { + addShaped(BASIC_CAPACITOR.getItemStack(), " gr", "gig", "rg ", 'r', "dustRedstone", 'g', "ingotGold", 'i', ingotCopper); + addShaped(ACTIVATED_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', energeticAlloy, 'c', BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); + addShaped(ENDER_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', phasedGold, 'c', ACTIVATED_CAPACITOR.getItemStack(), 'C', "glowstone"); + + String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine": "itemPulsatingCrystal"; + addShaped(CRYSTALLINE_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', crystallineAlloy, 'c', capacitorEnder, 'C', prismarine); + addShaped(MELODIC_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', melodicAlloy, 'c', CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); + addShaped(STELLAR_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', stellarAlloy, 'c', MELODIC_CAPACITOR.getItemStack(), 'C', PRECIENT_CRYSTAL.oreDict); + + addShaped(SILVER_CAPACITOR.getItemStack(), " sr", "sis", "rs ", 'r', "dustRedstone", 's', "ingotSilver", 'i', "ingotLead"); + addShaped(ENDERGETIC_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', energeticSilver, 'c', SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); + addShaped(ENDERGISED_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', vividAlloy, 'c', ENDERGETIC_CAPACITOR.getItemStack(), 'C', "glowstone"); + + } + + else { + addShaped(BASIC_CAPACITOR.getItemStack(), " gr", "gig", "rg ", 'r', "dustRedstone", 'g', "ingotGold", 'i', ingotCopper); + addShaped(ACTIVATED_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', energeticAlloy, 'c', BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); + addShaped(ENDER_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', phasedGold, 'c', ACTIVATED_CAPACITOR.getItemStack(), 'C', "glowstone"); + + String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine": "itemPulsatingCrystal"; + addShaped(CRYSTALLINE_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', crystallineAlloy, 'c', capacitorEnder, 'C', prismarine); + addShaped(MELODIC_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', melodicAlloy, 'c', CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); + addShaped(STELLAR_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', stellarAlloy, 'c', MELODIC_CAPACITOR.getItemStack(), 'C', PRECIENT_CRYSTAL.oreDict); + + addShaped(SILVER_CAPACITOR.getItemStack(), " sr", "sis", "rs ", 'r', "dustRedstone", 's', "ingotSilver", 'i', "ingotLead"); + addShaped(ENDERGETIC_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', energeticSilver, 'c', SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); + addShaped(ENDERGISED_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', vividAlloy, 'c', ENDERGETIC_CAPACITOR.getItemStack(), 'C', "glowstone"); + } //Conduit Binder ItemStack cbc = BINDER_COMPOSITE.getStack(8); @@ -195,23 +270,6 @@ public class MaterialRecipes { addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone"); - //Ender Capacitor - ItemStack enderCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 2); - ItemStack activatedCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 1); - if (Config.useHardRecipes) { - addShaped(enderCapacitor, "eee", "cgc", "eee", 'e', phasedGold, 'c', activatedCapacitor, 'g', "glowstone"); - } else { - addShaped(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', "glowstone"); - } - - //Melodic Capacitor - ItemStack melodicCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, 3); - if (Config.useHardRecipes) { - addShaped(melodicCapacitor, "eee", "cgc", "eee", 'e', endSteel, 'c', enderCapacitor, 'g', new ItemStack(Items.ender_eye)); - } else { - addShaped(melodicCapacitor, " e ", "cgc", " e ", 'e', endSteel, 'c', enderCapacitor, 'g', new ItemStack(Items.ender_eye)); - } - // Weather Crystal ItemStack main = Config.useHardRecipes ? new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()) : new ItemStack(Items.diamond); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()), main /* TODO figure out new weather crystal recipe */)); @@ -235,6 +293,12 @@ public class MaterialRecipes { addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); } + for (AlloyEndergy alloy : AlloyEndergy.values()) { + addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); + addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); + } + //DS Rod ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal()); addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel,'n', endSteelNugget); @@ -250,32 +314,13 @@ public class MaterialRecipes { if (hasCopper()) { ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); - ItemStack ingotCopper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); - GameRegistry.addSmelting(dustCopper, ingotCopper, 0); + ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); + GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); } if (hasTin()) { ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); GameRegistry.addSmelting(dustTin, ingotTin, 0); } - - ArrayList copperIngots = OreDictionary.getOres("ingotCopper"); - String gold; - if (Config.useHardRecipes) { - gold = "ingotGold"; - } else { - gold = "nuggetGold"; - } - if (copperIngots != null && !copperIngots.isEmpty() && Config.useModMetals) { - addShaped(capacitor, " gr", "gcg", "rg ", 'r', "dustRedstone", 'g', gold, 'c', "ingotCopper"); - } else { - addShaped(capacitor, " gr", "gig", "rg ", 'r', "dustRedstone", 'g', gold, 'i', "ingotIron"); - } - - if (Config.useHardRecipes) { - addShaped(activatedCapacitor, "eee", "cCc", "eee", 'e', energeticAlloy, 'c', capacitor, 'C', "dustCoal"); - } else { - addShaped(activatedCapacitor, " e ", "cCc", " e ", 'e', energeticAlloy, 'c', capacitor, 'C', "dustCoal"); - } } -} + } diff --git a/src/main/java/crazypants/enderio/power/BasicCapacitor.java b/src/main/java/crazypants/enderio/power/BasicCapacitor.java index 32768815..d8a02699 100644 --- a/src/main/java/crazypants/enderio/power/BasicCapacitor.java +++ b/src/main/java/crazypants/enderio/power/BasicCapacitor.java @@ -1,24 +1,36 @@ package crazypants.enderio.power; public class BasicCapacitor implements ICapacitor { - + private int maxEnergyReceived = 40; - private int maxEnergyStored = 100000; + private int maxEnergyStored = 100000; private int maxEnergyExtracted = 20; + private int tier = 1; public BasicCapacitor() { } + public BasicCapacitor(int maxEnergyIO) { + this(0, maxEnergyIO, maxEnergyIO, maxEnergyIO); + } + public BasicCapacitor(int maxEnergyIO, int maxEnergyStored) { - this(maxEnergyIO, maxEnergyStored, maxEnergyIO); + this(0, maxEnergyIO, maxEnergyStored, maxEnergyIO); } - public BasicCapacitor(int maxEnergyIn, int maxEnergyStored, int maxEnergyOut) { - configure(maxEnergyIn, maxEnergyStored, maxEnergyOut); + public BasicCapacitor(int tier, int maxEnergyIO, int maxEnergyStored) { + this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO); } - - protected void configure(int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { + public BasicCapacitor(int tier, int maxEnergyIn, int maxEnergyStored, int maxEnergyOut) { + configure(tier, maxEnergyIn, maxEnergyStored, maxEnergyOut); + } + + + + +protected void configure(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { + this.tier = tier; this.maxEnergyReceived = maxEnergyReceived; this.maxEnergyStored = maxEnergyStored; this.maxEnergyExtracted = maxEnergyExtracted; @@ -42,10 +54,15 @@ public class BasicCapacitor implements ICapacitor { protected void setMaxEnergyStored(int maxEnergyStored) { this.maxEnergyStored = maxEnergyStored; } - + @Override public int getMaxEnergyExtracted() { return maxEnergyExtracted; } + @Override + public int getTier() { + return tier; + } + } diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index 9702f4ef..062048d5 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -6,28 +6,69 @@ import crazypants.enderio.EnderIO; public enum Capacitors { BASIC_CAPACITOR( - new BasicCapacitor(80, 100000, 20), - "basicCapacitor"), + new BasicCapacitor(1, 80, 100000, 20), + "basicCapacitor", + "Basic"), ACTIVATED_CAPACITOR( - new BasicCapacitor(240, 200000, 60), - "activatedCapacitor"), + new BasicCapacitor(2, 240, 200000, 60), + "activatedCapacitor", + "Advanced"), ENDER_CAPACITOR( - new BasicCapacitor(400, 500000, 100), - "enderCapacitor"), + new BasicCapacitor(3, 400, 500000, 100), + "enderCapacitor", + "Ender"), + + CRYSTALLINE_CAPACITOR( + new BasicCapacitor(4, 840, 1000000, 260), + "crystallineCapacitor", + "Crystalline"), + MELODIC_CAPACITOR( - new BasicCapacitor(640, 1000000, 180), - "melodicCapacitor"); + new BasicCapacitor(5, 1640, 2000000, 460), + "melodicCapacitor", + "Melodic"), + + STELLAR_CAPACITOR( + new BasicCapacitor(6, 3320, 5000000, 980), + "stellarCapacitor", + "Stellar"), + + TOTEMIC_CAPACITOR( + new BasicCapacitor(7, 6600, 10000000, 1900), + "totemicCapacitor", + "Totemic"), + + SILVER_CAPACITOR( + new BasicCapacitor(1, 80, 100000, 20), + "silverCapacitor", + "Basic"), + + ENDERGETIC_CAPACITOR( + new BasicCapacitor(2, 240, 200000, 60), + "endergeticCapacitor", + "Advanced"), + + ENDERGISED_CAPACITOR( + new BasicCapacitor(3, 400, 500000, 100), + "endergisedCapacitor", + "Ender"); public final ICapacitor capacitor; public final String unlocalisedName; public final String iconKey; + public final String oreDict; - private Capacitors(ICapacitor capacitor, String unlocalisedName) { + private Capacitors(ICapacitor capacitor, String unlocalisedName, String oreDict) { this.capacitor = capacitor; this.unlocalisedName = "enderio." + unlocalisedName; this.iconKey = "enderio:" + unlocalisedName; + this.oreDict = oreDict; + } + + public String getOreTag() { + return "capacitor"+oreDict; } public ItemStack getItemStack() { diff --git a/src/main/java/crazypants/enderio/power/ICapacitor.java b/src/main/java/crazypants/enderio/power/ICapacitor.java index 4b37ab23..fc8e297b 100644 --- a/src/main/java/crazypants/enderio/power/ICapacitor.java +++ b/src/main/java/crazypants/enderio/power/ICapacitor.java @@ -8,4 +8,6 @@ public interface ICapacitor { int getMaxEnergyExtracted(); + int getTier(); + }