From 15d7f7405bfe4313a8fdde2fe9b9e54960bbb0cf Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Sun, 10 May 2020 12:36:33 +0200 Subject: [PATCH] Added 1.12 content --- .gitignore | 12 +- README.md | 6 +- build.gradle | 3 +- gradle.properties | 14 +- gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 55627 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- .../config/AlloySmelterRecipes_Core.xml | 79 +++ .../enderio/config/SAGMillRecipes_Core.xml | 102 +++- .../config/SliceAndSpliceRecipes_Core.xml | 39 ++ .../assets/enderio/config/VatRecipes_Core.xml | 20 + resources/assets/enderio/lang/en_US.lang | 160 ++++- resources/assets/enderio/models/EnderJar.png | Bin 0 -> 1218 bytes .../enderio/models/FrankenzombieJar.png | Bin 0 -> 2234 bytes .../textures/blocks/blockEndSteelBars.png | Bin 0 -> 478 bytes .../textures/blocks/blockSoulariumBars.png | Bin 0 -> 3079 bytes .../textures/blocks/crudeSteelBlock.png | Bin 0 -> 657 bytes .../textures/blocks/crystallineAlloyBlock.png | Bin 0 -> 493 bytes .../blocks/crystallinePinkSlimeBlock.png | Bin 0 -> 592 bytes .../crystallinePinkSlimeBlock.png.mcmeta | 23 + .../enderio/textures/blocks/endSteelBlock.png | Bin 0 -> 3931 bytes .../textures/blocks/endSteelBlock.png.mcmeta | 33 ++ .../blocks/ender_distillation_flow.png | Bin 0 -> 10028 bytes .../blocks/ender_distillation_flow.png.mcmeta | 3 + .../blocks/ender_distillation_still.png | Bin 0 -> 8988 bytes .../ender_distillation_still.png.mcmeta | 5 + .../textures/blocks/energeticSilverBlock.png | Bin 0 -> 499 bytes .../enderio/textures/blocks/itemConduit.png | Bin 1311 -> 479 bytes .../textures/blocks/itemConduitCore.png | Bin 16638 -> 15103 bytes .../enderio/textures/blocks/liquidConduit.png | Bin 401 -> 213 bytes .../textures/blocks/liquidConduitAdvanced.png | Bin 1242 -> 537 bytes .../blocks/liquidConduitAdvancedLocked.png | Bin 1254 -> 524 bytes .../textures/blocks/liquidConduitCore.png | Bin 1918 -> 673 bytes .../blocks/liquidConduitCoreAdvanced.png | Bin 2149 -> 798 bytes .../blocks/liquidConduitCoreEnder.png | Bin 2062 -> 822 bytes .../textures/blocks/liquidConduitEnder.png | Bin 2410 -> 4489 bytes .../enderio/textures/blocks/meConduit.png | Bin 1308 -> 343 bytes .../enderio/textures/blocks/meConduitCore.png | Bin 2339 -> 895 bytes .../textures/blocks/meConduitCoreDense.png | Bin 2007 -> 924 bytes .../textures/blocks/meConduitDense.png | Bin 1272 -> 330 bytes .../textures/blocks/melodicAlloyBlock.png | Bin 0 -> 419 bytes .../enderio/textures/blocks/ocConduitCore.png | Bin 284 -> 383 bytes .../textures/blocks/ocConduitCoreAnim.png | Bin 721 -> 774 bytes .../enderio/textures/blocks/powerConduit.png | Bin 1246 -> 472 bytes .../textures/blocks/powerConduitAluminum.png | Bin 0 -> 679 bytes .../textures/blocks/powerConduitCopper.png | Bin 0 -> 656 bytes .../textures/blocks/powerConduitCore.png | Bin 1911 -> 931 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 .../textures/blocks/powerConduitCoreEnder.png | Bin 1931 -> 899 bytes .../powerConduitCoreEnergeticSilver.png | Bin 0 -> 1141 bytes .../blocks/powerConduitCoreEnhanced.png | Bin 1957 -> 908 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 .../textures/blocks/powerConduitEnder.png | Bin 1255 -> 463 bytes .../blocks/powerConduitEnergeticSilver.png | Bin 0 -> 707 bytes .../textures/blocks/powerConduitEnhanced.png | Bin 1248 -> 467 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 .../blocks/redstoneConduitCoreOff.png | Bin 1962 -> 773 bytes .../textures/blocks/redstoneConduitCoreOn.png | Bin 2215 -> 869 bytes .../blocks/redstoneConduitSwitchOff.png | Bin 2086 -> 913 bytes .../blocks/redstoneConduitSwitchOn.png | Bin 2106 -> 930 bytes .../blocks/redstoneInsulatedConduit.png | Bin 1199 -> 516 bytes .../redstoneInsulatedConduitCoreOff.png | Bin 1916 -> 917 bytes .../blocks/redstoneInsulatedConduitCoreOn.png | Bin 2084 -> 913 bytes .../blocks/solarPanelAdvancedBorder.png | Bin 1098 -> 194 bytes .../blocks/solarPanelAdvancedSide.png | Bin 17921 -> 138 bytes .../textures/blocks/solarPanelAdvancedTop.png | Bin 2722 -> 1872 bytes .../textures/blocks/solarPanelBorder.png | Bin 1098 -> 216 bytes .../textures/blocks/solarPanelSide.png | Bin 18039 -> 187 bytes .../enderio/textures/blocks/solarPanelTop.png | Bin 2846 -> 1996 bytes .../blocks/solarPanelVibrantBorder.png | Bin 0 -> 281 bytes .../textures/blocks/solarPanelVibrantSide.png | Bin 0 -> 424 bytes .../textures/blocks/solarPanelVibrantTop.png | Bin 0 -> 2033 bytes .../textures/blocks/stellarAlloyBlock.png | Bin 0 -> 541 bytes .../textures/blocks/vapor_of_levity_flow.png | Bin 0 -> 10024 bytes .../blocks/vapor_of_levity_flow.png.mcmeta | 4 + .../textures/blocks/vapor_of_levity_still.png | Bin 0 -> 8621 bytes .../blocks/vapor_of_levity_still.png.mcmeta | 5 + .../textures/blocks/vividAlloyBlock.png | Bin 0 -> 481 bytes .../textures/gui/23/zombieGenerator.png | Bin 2112 -> 1844 bytes .../items/bucketEnder_distillation.png | Bin 0 -> 440 bytes .../textures/items/bucketVapor_of_levity.png | Bin 0 -> 427 bytes .../items/conductiveIronGrindingBall.png | Bin 0 -> 687 bytes .../enderio/textures/items/crudeSteel.png | Bin 0 -> 550 bytes .../textures/items/crudeSteelGrindingBall.png | Bin 0 -> 607 bytes .../textures/items/crystallineAlloy.png | Bin 0 -> 470 bytes .../items/crystallineAlloyGrindingBall.png | Bin 0 -> 572 bytes .../textures/items/crystallineCapacitor.png | Bin 0 -> 372 bytes .../textures/items/crystallinePinkSlime.png | Bin 0 -> 538 bytes .../items/crystallinePinkSlime.png.mcmeta | 23 + .../crystallinePinkSlimeGrindingBall.png | Bin 0 -> 654 bytes ...rystallinePinkSlimeGrindingBall.png.mcmeta | 23 + .../textures/items/darkSteelGrindingBall.png | Bin 0 -> 1240 bytes .../enderio/textures/items/darkSteelRod.png | Bin 0 -> 355 bytes .../items/electricalSteelGrindingBall.png | Bin 0 -> 1147 bytes .../electricalSteelGrindingBall.png.mcmeta | 27 + .../enderio/textures/items/endSteel.png | Bin 0 -> 4996 bytes .../textures/items/endSteel.png.mcmeta | 33 ++ .../textures/items/endSteelGrindingBall.png | Bin 0 -> 4578 bytes .../items/endSteelGrindingBall.png.mcmeta | 33 ++ .../textures/items/endSteelMachineChassi.png | Bin 0 -> 596 bytes .../enderio/textures/items/endSteelNugget.png | Bin 0 -> 3606 bytes .../textures/items/endSteelNugget.png.mcmeta | 33 ++ .../enderio/textures/items/endSteel_axe.png | Bin 0 -> 3651 bytes .../textures/items/endSteel_axe.png.mcmeta | 33 ++ .../enderio/textures/items/endSteel_boots.png | Bin 0 -> 1394 bytes .../textures/items/endSteel_chestplate.png | Bin 0 -> 1565 bytes .../textures/items/endSteel_helmet.png | Bin 0 -> 1301 bytes .../textures/items/endSteel_leggings.png | Bin 0 -> 1441 bytes .../textures/items/endSteel_pickaxe.png | Bin 0 -> 3413 bytes .../items/endSteel_pickaxe.png.mcmeta | 33 ++ .../enderio/textures/items/endSteel_sword.png | Bin 0 -> 4063 bytes .../textures/items/endSteel_sword.png.mcmeta | 33 ++ .../textures/items/enderCrystalPowder.png | Bin 0 -> 592 bytes .../textures/items/endergeticCapacitor.png | Bin 0 -> 392 bytes .../textures/items/endergisedCapacitor.png | Bin 0 -> 406 bytes .../items/energeticAlloyGrindingBall.png | Bin 0 -> 655 bytes .../textures/items/energeticSilver.png | Bin 0 -> 656 bytes .../items/energeticSilverGrindingBall.png | Bin 0 -> 584 bytes .../textures/items/filterUpgradeBig.png | Bin 0 -> 1322 bytes .../items/filterUpgradeBigAdvanced.png | Bin 0 -> 1681 bytes .../items/filterUpgradeBigAdvanced.png.mcmeta | 10 + .../textures/items/itemLiquidConduit.png | Bin 1918 -> 673 bytes .../items/itemLiquidConduitAdvanced.png | Bin 2149 -> 798 bytes .../textures/items/itemLiquidConduitEnder.png | Bin 2059 -> 822 bytes .../textures/items/itemPowerConduit.png | Bin 1911 -> 931 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 .../textures/items/itemPowerConduitEnder.png | Bin 1931 -> 899 bytes .../items/itemPowerConduitEnergeticSilver.png | Bin 0 -> 1141 bytes .../items/itemPowerConduitEnhanced.png | Bin 1957 -> 908 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/itemRedstoneConduit.png | Bin 2213 -> 869 bytes .../items/itemRedstoneInsulatedConduit.png | Bin 2084 -> 913 bytes .../textures/items/itemRedstoneSwitch.png | Bin 2134 -> 920 bytes .../enderio/textures/items/melodicAlloy.png | Bin 0 -> 479 bytes .../items/melodicAlloyGrindingBall.png | Bin 0 -> 546 bytes .../textures/items/melodicCapacitor.png | Bin 0 -> 393 bytes .../textures/items/phasedGoldGrindingBall.png | Bin 0 -> 681 bytes .../textures/items/phasedIronGrindingBall.png | Bin 0 -> 705 bytes .../textures/items/precientCrystal.png | Bin 0 -> 395 bytes .../enderio/textures/items/precientPowder.png | Bin 0 -> 460 bytes .../textures/items/pulsatingPowder.png | Bin 0 -> 460 bytes .../items/redstoneAlloyGrindingBall.png | Bin 0 -> 656 bytes .../textures/items/silverCapacitor.png | Bin 0 -> 367 bytes .../textures/items/skullGuardianDiode.png | Bin 0 -> 584 bytes .../items/skullGuardianDiode.png.mcmeta | 10 + .../items/skullSkeletalContractor.png | Bin 0 -> 555 bytes .../textures/items/soulMachineChassi.png | Bin 0 -> 650 bytes .../textures/items/soulariumGrindingBall.png | Bin 0 -> 643 bytes .../enderio/textures/items/stellarAlloy.png | Bin 0 -> 474 bytes .../items/stellarAlloyGrindingBall.png | Bin 0 -> 1588 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 .../enderio/textures/items/vibrantPowder.png | Bin 0 -> 451 bytes .../enderio/textures/items/vividAlloy.png | Bin 0 -> 642 bytes .../textures/items/vividAlloyGrindingBall.png | Bin 0 -> 585 bytes .../models/armor/endSteel_layer_1.png | Bin 0 -> 2404 bytes .../models/armor/endSteel_layer_2.png | Bin 0 -> 2282 bytes .../textures/models/armor/stellar_layer_1.png | Bin 0 -> 1313 bytes .../textures/models/armor/stellar_layer_2.png | Bin 0 -> 1199 bytes .../java/crazypants/enderio/ClientProxy.java | 19 +- src/main/java/crazypants/enderio/EnderIO.java | 127 ++-- .../java/crazypants/enderio/ModObject.java | 22 +- .../enderio/conduit/ConduitRecipes.java | 102 +++- .../gui/ExternalConnectionContainer.java | 8 +- .../conduit/gui/item/BigItemFilterGui.java | 197 ++++++ .../conduit/gui/item/ItemSettings.java | 38 +- .../item/filter/ItemBigItemFilter.java | 71 +++ .../conduit/item/filter/ItemFilter.java | 36 +- .../conduit/item/filter/ItemFilterBig.java | 69 +++ .../conduit/power/ItemPowerConduit.java | 8 +- .../enderio/conduit/power/PowerConduit.java | 44 +- .../conduit/power/PowerConduitNetwork.java | 2 +- .../endergy/ItemPowerConduitEndergy.java | 75 +++ .../power/endergy/PowerConduitEndergy.java | 559 ++++++++++++++++++ .../crazypants/enderio/config/Config.java | 91 ++- .../enchantment/EnchantmentSoulBound.java | 4 +- .../enderio/fluid/BlockFluidEio.java | 225 +++++-- .../java/crazypants/enderio/fluid/Fluids.java | 41 +- .../crazypants/enderio/item/ItemRecipes.java | 35 ++ .../crazypants/enderio/item/KeyTracker.java | 4 +- .../item/darksteel/DarkSteelController.java | 91 ++- .../item/darksteel/DarkSteelItems.java | 62 ++ .../darksteel/DarkSteelRecipeManager.java | 29 +- .../item/darksteel/IDarkSteelItem.java | 10 +- .../item/darksteel/ItemDarkSteelArmor.java | 48 +- .../item/darksteel/ItemDarkSteelAxe.java | 53 +- .../item/darksteel/ItemDarkSteelPickaxe.java | 24 +- .../item/darksteel/ItemDarkSteelShears.java | 20 +- .../item/darksteel/ItemDarkSteelSword.java | 26 +- .../item/darksteel/ItemEndSteelArmor.java | 73 +++ .../item/darksteel/ItemEndSteelAxe.java | 53 ++ .../item/darksteel/ItemEndSteelPickaxe.java | 53 ++ .../item/darksteel/ItemEndSteelSword.java | 57 ++ .../item/darksteel/ItemStellarArmor.java | 74 +++ .../item/darksteel/ItemStellarAxe.java | 53 ++ .../item/darksteel/ItemStellarPickaxe.java | 53 ++ .../item/darksteel/ItemStellarSword.java | 57 ++ .../upgrade/ApiaristArmorUpgrade.java | 12 +- .../item/darksteel/upgrade/EnergyUpgrade.java | 31 +- .../item/darksteel/upgrade/GliderUpgrade.java | 18 +- .../item/darksteel/upgrade/JumpUpgrade.java | 6 +- .../upgrade/NaturalistEyeUpgrade.java | 8 +- .../darksteel/upgrade/NightVisionUpgrade.java | 24 +- .../item/darksteel/upgrade/SolarUpgrade.java | 55 +- .../upgrade/SoundDetectorUpgrade.java | 22 +- .../item/darksteel/upgrade/SpeedUpgrade.java | 8 +- .../item/darksteel/upgrade/SpoonUpgrade.java | 22 +- .../item/darksteel/upgrade/SwimUpgrade.java | 22 +- .../item/darksteel/upgrade/TravelUpgrade.java | 22 +- .../machine/AbstractPoweredMachineEntity.java | 38 +- .../enderio/machine/MachineRecipes.java | 25 +- .../enderio/machine/crafter/TileCrafter.java | 14 +- .../enderio/machine/farm/TileFarmStation.java | 23 +- .../farm/farmers/RubberTreeFarmerIC2.java | 21 +- .../stirling/GuiStirlingGenerator.java | 10 +- .../stirling/TileEntityStirlingGenerator.java | 49 +- .../zombie/BlockZombieGenerator.java | 49 +- .../generator/zombie/GeneratorType.java | 19 + .../generator/zombie/GuiZombieGenerator.java | 22 +- .../generator/zombie/TileZombieGenerator.java | 94 ++- .../zombie/ZombieGeneratorRenderer.java | 44 +- .../slicensplice/TileSliceAndSplice.java | 11 +- .../machine/solar/BlockItemSolarPanel.java | 14 +- .../machine/solar/BlockSolarPanel.java | 29 +- .../machine/solar/TileEntitySolarPanel.java | 33 +- .../soul/SoulBinderPrecientCystalRecipe.java | 26 + .../machine/soul/SoulBinderRecipeManager.java | 11 +- .../enderio/machine/soul/TileSoulBinder.java | 60 +- .../machine/spawner/TilePoweredSpawner.java | 8 +- .../machine/transceiver/TileTransceiver.java | 10 +- .../crazypants/enderio/material/Alloy.java | 9 +- .../enderio/material/BlockDarkSteelBars.java | 69 +++ .../enderio/material/FrankenSkull.java | 15 +- .../enderio/material/ItemAlloy.java | 6 +- .../enderio/material/ItemCapacitor.java | 13 + .../enderio/material/ItemGrindingBall.java | 50 ++ .../enderio/material/MachinePart.java | 7 +- .../enderio/material/MachinePartRenderer.java | 2 +- .../crazypants/enderio/material/Material.java | 14 +- .../enderio/material/MaterialRecipes.java | 156 +++-- .../material/endergy/AlloyEndergy.java | 85 +++ .../endergy/BlockIngotStorageEndergy.java | 105 ++++ .../endergy/BlockItemIngotStorageEndergy.java | 39 ++ .../material/endergy/ItemAlloyEndergy.java | 86 +++ .../endergy/ItemGrindingBallEndergy.java | 50 ++ .../enderio/power/BasicCapacitor.java | 33 +- .../crazypants/enderio/power/Capacitors.java | 58 +- .../crazypants/enderio/power/ICapacitor.java | 2 + .../thaumcraft/GogglesOfRevealingUpgrade.java | 8 +- 281 files changed, 4376 insertions(+), 706 deletions(-) create mode 100644 resources/assets/enderio/models/EnderJar.png create mode 100644 resources/assets/enderio/models/FrankenzombieJar.png create mode 100644 resources/assets/enderio/textures/blocks/blockEndSteelBars.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulariumBars.png create mode 100644 resources/assets/enderio/textures/blocks/crudeSteelBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png create mode 100644 resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/endSteelBlock.png create mode 100644 resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_flow.png create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_still.png create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/energeticSilverBlock.png create mode 100644 resources/assets/enderio/textures/blocks/melodicAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/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/blocks/solarPanelVibrantBorder.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png create mode 100644 resources/assets/enderio/textures/blocks/stellarAlloyBlock.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_still.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/vividAlloyBlock.png create mode 100644 resources/assets/enderio/textures/items/bucketEnder_distillation.png create mode 100644 resources/assets/enderio/textures/items/bucketVapor_of_levity.png create mode 100644 resources/assets/enderio/textures/items/conductiveIronGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crudeSteel.png create mode 100644 resources/assets/enderio/textures/items/crudeSteelGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallineAlloy.png create mode 100644 resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallineCapacitor.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlime.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/darkSteelGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/darkSteelRod.png create mode 100644 resources/assets/enderio/textures/items/electricalSteelGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteel.png create mode 100644 resources/assets/enderio/textures/items/endSteel.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteelGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteelMachineChassi.png create mode 100644 resources/assets/enderio/textures/items/endSteelNugget.png create mode 100644 resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteel_axe.png create mode 100644 resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteel_boots.png create mode 100644 resources/assets/enderio/textures/items/endSteel_chestplate.png create mode 100644 resources/assets/enderio/textures/items/endSteel_helmet.png create mode 100644 resources/assets/enderio/textures/items/endSteel_leggings.png create mode 100644 resources/assets/enderio/textures/items/endSteel_pickaxe.png create mode 100644 resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/endSteel_sword.png create mode 100644 resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/enderCrystalPowder.png 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/energeticAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/energeticSilver.png create mode 100644 resources/assets/enderio/textures/items/energeticSilverGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/filterUpgradeBig.png create mode 100644 resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png create mode 100644 resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta 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/melodicAlloy.png create mode 100644 resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/melodicCapacitor.png create mode 100644 resources/assets/enderio/textures/items/phasedGoldGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/phasedIronGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/precientCrystal.png create mode 100644 resources/assets/enderio/textures/items/precientPowder.png create mode 100644 resources/assets/enderio/textures/items/pulsatingPowder.png create mode 100644 resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/silverCapacitor.png create mode 100644 resources/assets/enderio/textures/items/skullGuardianDiode.png create mode 100644 resources/assets/enderio/textures/items/skullGuardianDiode.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/skullSkeletalContractor.png create mode 100644 resources/assets/enderio/textures/items/soulMachineChassi.png create mode 100644 resources/assets/enderio/textures/items/soulariumGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/stellarAlloy.png create mode 100644 resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/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 resources/assets/enderio/textures/items/vibrantPowder.png create mode 100644 resources/assets/enderio/textures/items/vividAlloy.png create mode 100644 resources/assets/enderio/textures/items/vividAlloyGrindingBall.png create mode 100644 resources/assets/enderio/textures/models/armor/endSteel_layer_1.png create mode 100644 resources/assets/enderio/textures/models/armor/endSteel_layer_2.png create mode 100644 resources/assets/enderio/textures/models/armor/stellar_layer_1.png create mode 100644 resources/assets/enderio/textures/models/armor/stellar_layer_2.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/ItemBigItemFilter.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/ItemEndSteelArmor.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.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 create mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java create mode 100644 src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java create mode 100644 src/main/java/crazypants/enderio/material/ItemGrindingBall.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java create mode 100644 src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java diff --git a/.gitignore b/.gitignore index 4f76b3a2..9bddf5d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,15 @@ ## gedit *~ +## minecraft files +/asm +/config +/saves +/logs +/crash-reports + ## translation reports -resources/assets/enderio/lang/*.lang.txt \ No newline at end of file +resources/assets/enderio/lang/*.lang.txt +*.bat +libs/ +options.txt diff --git a/README.md b/README.md index 550f59f7..3834a361 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ -EnderIO [![Build Status](http://ci.tterrag.com/buildStatus/icon?job=EnderIO)](http://ci.tterrag.com/job/EnderIO/) +EnderIO-Unofficial ======= +This is a unofficial version of EndeIO for 1.7.10, in case of any bugs or problems please do not contact the original developers of EnderIO! + All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) are released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ). -Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**. +Do what you want with it, as long as you smile while doing so. diff --git a/build.gradle b/build.gradle index eaacd14a..0926ace8 100644 --- a/build.gradle +++ b/build.gradle @@ -49,11 +49,10 @@ repositories { mavenCentral() maven { url = "http://mobiusstrip.eu/maven" } maven { url = "http://chickenbones.net/maven/" } - maven { url = "http://dl.tsr.me/artifactory/libs-release-local" } maven { url = "http://maven.tterrag.com" } maven { url = "http://maven.ic2.player.to" } maven { url = "http://maven.cil.li/" } - mavenLocal() + maven { url = "https://gregtech.overminddl1.com/" } } dependencies { diff --git a/gradle.properties b/gradle.properties index 49815293..f0a93eee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,22 @@ minecraft_version=1.7.10 -forge_version=10.13.4.1448-1.7.10 -forgeDep_version=10.13.4.1448 +forge_version=10.13.4.1614-1.7.10 +forgeDep_version=10.13.4.1614 -mod_version=2.3.0 +mod_version=2.3.1.10_beta #Comment out this line to get rid of the appendix -mod_appendix=beta +#mod_appendix=beta buildcraft_version=6.1.5 waila_version=1.5.10 ccc_version=1.0.7.46 ccl_version=1.1.3.138 -ae2_version=rv1-stable-1 +ae2_version=rv3-stable-24 endercore_version=1.7.10-0.2.0.35_beta ee3_version=1.7.10-0.3.507 forestry_version=forestry_1.7.10:3.6.2.19 opencomputers_version=MC1.7.10-1.5.+ -toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,) +toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,) -curse_projectId=64578 +curse_projectId=379275 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b7612167031001b7b84baf2a959e8ea8ad03c011..a1347e58afd717f8b5ec6f158a91325210d46ccb 100644 GIT binary patch literal 55627 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 VEYIJJ9ELZ#02_W5@V{@~{689O)ye<> literal 51017 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

N(DARnfPMFG|;(rIGZH1uB1rN;y7UlJ8 znb!RwO#5WS_%cPPlwSw94PTKP64}}J!~E1}ch9``2jvUrB*#@up8L&*`tqgq ztTAS@^33w-5hFZAH&{j)?l0<)9X(d`N|yLk!E=iT%PD-FTJ!|hqyj%RFFP`SaL;|_ z$(+VYhKm)K@Oe~+eZK(6ElQNdfimBrdKjeVl57_7p^|)jrzt|wyRonj$j9Bji!


f)EE4q$t9yObmyG04W0z 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 t|KH7qPwVTc?c*oWQQiM74F8)Y + + + + + + + + + + @@ -379,6 +389,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index aa09ecee..752d7c97 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -236,6 +236,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2959,12 +2991,80 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index 75101bac..dd6bf8d7 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -61,6 +61,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 284f80ad..302e91f0 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -127,6 +127,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index df530d53..efc41631 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=Clay Compound 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 @@ -58,8 +71,9 @@ enderio.itemItemConduit.name=Item Conduit enderio.filterUpgradeBasic.name=Basic Item Filter 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! @@ -127,6 +141,8 @@ enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget tile.blockDarkIronBars.name=Dark Iron Bars +tile.blockSoulariumBars.name=Soularium Bars +tile.blockEndSteelBars.name=End Steel Bars tile.blockEndermanSkull.name=Enderman Skull tile.blockEndermanSkull.base.name=Enderman Head tile.blockEndermanSkull.reanimated.name=Reanimated Enderman Head @@ -173,6 +189,14 @@ fluid.cloud_seed_concentrated=Concentrated Cloud Seed tile.fluid.cloud_seed_concentrated.name=Concentrated Cloud Seed item.bucketCloud_seed_concentrated.name=Concentrated Cloud Seed Bucket +fluid.ender_distillation=Dew of the Void +tile.fluid.ender_distillation.name=Dew of the Void +item.bucketEnder_distillation.name=Dew of the Void Bucket + +fluid.vapor_of_levity=Vapor of Levity +tile.fluid.vapor_of_levity.name=Vapor of Levity +item.bucketVapor_of_levity.name=Vapor of Levity Bucket + fluid.eio.xpjuice=Liquid XP tile.fluid.eio.xpjuice.name=Liquid XP item.bucketXpjuice.name=XP Bucket @@ -190,16 +214,29 @@ enderio.gas.gasTick=Gas/t enderio.itemMachinePart.name=Machine Parts enderio.machineChassi.name=Machine Chassis enderio.basicGear.name=Basic Gear +enderio.soulMachineChassi.name=Soul Machine Chassis +enderio.endSteelMachineChassi.name=End Steel Chassis enderio.pulsatingCrystal.name=Pulsating Crystal enderio.vibrantCrystal.name=Vibrant Crystal enderio.enderCrystal.name=Ender Crystal enderio.attractorCrystal.name=Enticing Crystal enderio.weatherCrystal.name=Weather Crystal + enderio.darkGrindingBall.name=Dark Steel Ball +enderio.electricalGrindingBall.name=Electrical Steel Ball +enderio.energeticGrindingBall.name=Energetic Alloy Ball +enderio.vibrantGrindingBall.name=Vibrant Alloy Ball +enderio.redstoneGrindingBall.name=Redstone Alloy Ball +enderio.conductiveGrindingBall.name=Conductive Iron Ball +enderio.pulsatingGrindingBall.name=Pulsating Iron Ball +enderio.soulariumGrindingBall.name=Soularium Ball +enderio.endSteelGrindingBall.name=End Steel Ball + enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output enderio.darkGrindingBall.tooltip.detailed.line4=Power Reduction +enderio.darkSteelRod.name=Dark Steel Rod tile.blockReinforcedObsidian.name=Reinforced Obsidian tile.blockReinforcedObsidian.tooltip.common.line1=Wither Proof @@ -227,6 +264,42 @@ enderio.phasedIron.name=Pulsating Iron enderio.vibrantNugget.name=Vibrant Alloy Nugget enderio.darkSteel.name=Dark Steel enderio.soularium.name=Soularium +enderio.endSteel.name=End Steel +enderio.endSteelNugget.name=End Steel Nugget + +enderio.crudeSteel.name=Clay Compound +enderio.crystallineAlloy.name=Crystalline Alloy +enderio.melodicAlloy.name=Melodic Alloy +enderio.stellarAlloy.name=Stellar Alloy +enderio.crystallinePinkSlime.name=Crystalline Pink Slime +enderio.energeticSilver.name=Energetic Silver +enderio.vividAlloy.name=Vivid Alloy + +enderio.crudeSteelGrindingBall.name=Clay Compound Grinding Ball +enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball +enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball +enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball +enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball +enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball +enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball + +enderio.precientCrystal.name=Precient Crystal +enderio.pulsatingPowder.name=Grains of Piezallity +enderio.vibrantPowder.name=Grains of Vibrancy +enderio.enderCrystalPowder.name=Grains of the End +enderio.precientPowder.name=Grains of Prescience + +//Balls +enderio.electricalSteel_ball.name=Electrical Steel Ball +enderio.energeticAlloy_ball.name=Energetic Alloy Ball +enderio.phasedGold_ball.name=Vibrant Alloy Ball +enderio.redstoneAlloy_ball.name=Redstone Alloy Ball +enderio.conductiveIron_ball.name=Conductive Iron Ball +enderio.phasedIron_ball.name=Pulsating Iron Ball +enderio.vibrantNugget_ball.name=Vibrant Alloy Nugget Ball +enderio.darkSteel_ball.name=Dark Steel Ball +enderio.soularium_ball.name=Soularium Ball +enderio.endSteel_ball.name=End Steel Ball tile.blockIngotStorage.name=Ingot Storage tile.enderio.electricalSteel.name=Electrical Steel Block @@ -238,6 +311,15 @@ tile.enderio.phasedIron.name=Pulsating Iron Block tile.enderio.vibrantNugget.name=Vibrant Nugget Block tile.enderio.darkSteel.name=Dark Steel Block tile.enderio.soularium.name=Soularium Block +tile.enderio.endSteel.name=End Steel Block + +tile.enderio.crudeSteel.name=Clay Compound Block +tile.enderio.crystallineAlloy.name=Crystalline Alloy Block +tile.enderio.melodicAlloy.name=Melodic Alloy Block +tile.enderio.stellarAlloy.name=Stellar Alloy Block +tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block +tile.enderio.energeticSilver.name=Energetic Silver Block +tile.enderio.vividAlloy.name=Vivid Alloy Block //Powder / Ingot enderio.powderCoal.name=Coal Powder @@ -254,6 +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 @@ -283,6 +372,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=speed and energy storage tile.blockSolarPanel.name=Photovoltaic Cell tile.blockSolarPanel.advanced.name=Advanced Photovoltaic Cell +tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell tile.blockSolarPanel.tooltip.common.line1=Solar Power! tile.blockSolarPanel.tooltip.detailed.line1=Produces power during daylight hours tile.blockSolarPanel.tooltip.detailed.line2=Must have a clear line of sight to @@ -412,6 +502,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=to generate power enderio.zombieGenerator.fuelTank=Nutrient Tank enderio.gui.fluid.minReq=%s Required for activation +tile.blockFrankenzombieGenerator.name=Frank'N'Zombie Generator +tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Consumes Nutrient Distillation +tile.blockFrankenzombieGenerator.tooltip.detailed.line2=to generate even more power +enderio.frankenzombieGenerator.fuelTank=Nutrient Tank + +tile.blockEnderGenerator.name=Ender Generator +tile.blockEnderGenerator.tooltip.detailed.line1=Consumes Dew of the Void +tile.blockEnderGenerator.tooltip.detailed.line2=to generate power +enderio.enderGenerator.fuelTank=Void Tank + tile.blockKillerJoe.name=Killer Joe tile.blockKillerJoe.tooltip.detailed.line1=Attacks nearby creatures when tile.blockKillerJoe.tooltip.detailed.line2=supplied with a sword and @@ -698,6 +798,8 @@ skullZombieController.name=Z-Logic Controller skullZombieFrankenstien.name=Frank'N'Zombie skullEnderResonator.name=Ender Resonator skullSentientEnder.name=Sentient Ender +skullSkeletalContractor.name=Skeletal Contractor +skullGuardianDiode.name=Guardian Diode item.itemSpawnEggEnderIO.name=Spawn @@ -711,13 +813,41 @@ item.darkSteel_pickaxe.name=Dark Pick item.darkSteel_axe.name=Dark Axe item.darkSteel_shears.name=Dark Shears +//End Steel +item.endSteel_helmet.name=End Steel Helm +item.endSteel_chestplate.name=End Steel Plate +item.endSteel_leggings.name=End Steel Leggings +item.endSteel_boots.name=End Steel Boots +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 enderio.item.darkSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian enderio.item.darkSteel_pickaxe.tooltip.cost=cost +enderio.item.endSteel_pickaxe.tooltip.effPowered=Efficiency when powered +enderio.item.endSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian +enderio.item.endSteel_pickaxe.tooltip.cost=cost + +enderio.item.stellar_pickaxe.tooltip.effPowered=Efficiency when powered +enderio.item.stellar_pickaxe.tooltip.effObs=Efficiency breaking obsidian +enderio.item.stellar_pickaxe.tooltip.cost=cost + enderio.item.darkSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs +enderio.item.endSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs +enderio.item.stellar_axe.tooltip.multiHarvest=Sneak to harvest multiple logs enderio.item.darkSteel_shears.tooltip.multiHarvest=Shears multiple blocks/sheep when empowered @@ -725,12 +855,32 @@ enderio.item.darkSteel_sword.tooltip.line1=Increased skull and ender pearl drops enderio.item.darkSteel_sword.tooltip.line2=Endermen can't teleport once hit enderio.item.darkSteel_sword.tooltip.line3=+2 Damage when Powered +enderio.item.endSteel_sword.tooltip.line1=Increased skull and ender pearl drops +enderio.item.endSteel_sword.tooltip.line2=Endermen can't teleport once hit +enderio.item.endSteel_sword.tooltip.line3=+2 Damage when Powered + +enderio.item.stellar_sword.tooltip.line1=Increased skull and ender pearl drops +enderio.item.stellar_sword.tooltip.line2=Endermen can't teleport once hit +enderio.item.stellar_sword.tooltip.line3=+2 Damage when Powered + enderio.item.darkSteel_armor.tooltip.line1=Diamond level protection enderio.item.darkSteel_armor.tooltip.line2=when powered +enderio.item.endSteel_armor.tooltip.line1=Diamond+ level protection +enderio.item.endSteel_armor.tooltip.line2=when powered + +enderio.item.stellar_armor.tooltip.line1=Diamond+ level protection +enderio.item.stellar_armor.tooltip.line2=when powered + enderio.item.darkSteel_boots.tooltip.line1=Fall damage negated enderio.item.darkSteel_boots.tooltip.line2=when powered +enderio.item.endSteel_boots.tooltip.line1=Fall damage negated +enderio.item.endSteel_boots.tooltip.line2=when powered + +enderio.item.stellar_boots.tooltip.line1=Fall damage negated +enderio.item.stellar_boots.tooltip.line2=when powered + enderio.darksteel.upgrade.empowered_one.name=Empowered enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Power: $P enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=$D% damage absorbed @@ -751,6 +901,11 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=Power: $P enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=$D% damage absorbed enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=by power +enderio.darksteel.upgrade.empowered_five.name=Empowered V +enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line1=Power: $P +enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line2=$D% damage absorbed +enderio.darksteel.upgrade.empowered_five.tooltip.detailed.line3=by power + enderio.darksteel.upgrade.travel.name=Travel enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Hold shift and R-Click to teleport or enderio.darksteel.upgrade.travel.tooltip.detailed.line2=activate a travel anchor or Ender IO @@ -834,6 +989,9 @@ enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Generates power from enderio.darksteel.upgrade.solar_two.name=Solar II enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from the sun. +enderio.darksteel.upgrade.solar_three.name=Solar III +enderio.darksteel.upgrade.solar_three.tooltip.detailed.line1=Generates power from the sun. + //------GUI enderio.gui.simple.in=Max In: diff --git a/resources/assets/enderio/models/EnderJar.png b/resources/assets/enderio/models/EnderJar.png new file mode 100644 index 0000000000000000000000000000000000000000..b7e377e1b801fb5492bf6d686eae7ad441d9d5e9 GIT binary patch literal 1218 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 IM6N<$f*2TCtpET3 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockEndSteelBars.png b/resources/assets/enderio/textures/blocks/blockEndSteelBars.png new file mode 100644 index 0000000000000000000000000000000000000000..ff79bdfd20375b9599b71a58c4405c4177f9fa9f GIT binary patch literal 478 zcmV<40U`d0P)N2bZe?^J zG%heMGBNQWX_Wu~0b5B#K~y+Tby8bPLO~cjKRmkk(mg7=(mjfvBGWWYyJ%Xb$GoL! zMiE30Vi5H@HD4>XXSadF;hX(-_S@NU+PF>6Ark0^Dh2MHBJDy$fjnr z1t4p1`I~u!{e3op9G+@Bs1{biQ@9zZ;PQ0T5b#bV_-uudh>gg1ax@?t+nj0Ej;Fi{`6O zNL31KL1G{MQe_7uy@oX^TZRB%>iDqN6tKN7!^A06DKJcI!!F?B;cgR^{E8U&o6fqC z4FLtbqtRG4(=-~!|JQrO2%Nx{uzGpJIE{(*##>Nwmka?0E3n_Cao6$5KW015H&Ekt Unl)Lnxc~qF07*qoM6N<$f?!_8xc~qF literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockSoulariumBars.png b/resources/assets/enderio/textures/blocks/blockSoulariumBars.png new file mode 100644 index 0000000000000000000000000000000000000000..a5d4d5f54e85b8c2396facacd9f0603bc6314f12 GIT binary patch literal 3079 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 Vre2?h2K literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/crudeSteelBlock.png b/resources/assets/enderio/textures/blocks/crudeSteelBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..ca38b79ec09ed22d27ea56a6727e78318826cefa GIT binary patch literal 657 zcmV;C0&e|@P)o? z?Qp)k-5rXJFEGVwXLml{nR!R<-@BvbV2zbXB8Uirpc(*3k`w^%J^#w$&mm?q8nd=G z;O31RhzJ+XpGQRa`t2J4MZe!U?0o-D(a$^m=iKH7cn7Ir zSue?ZIch8blgZ==rC?N*>zB6hZG&?y&IcqlSesE*9C3PJ$UEI15Gq;YjXU@d&EtibPBLIeF34paW z1~92%bGiuvi}`|$(;MB~UE6l|_4Rd{qjL85_o=E1V+;m?S8rb9T%_r>x~5t#0XY0~ zNZYhnYmb9^he^#bkrs;uy?+eeeRv;7Btq~3BoYSgOi&aNAq2$?iUHH<6pn1tG$E|m zC<*1T#H4BGoab>jwm)xE*9|5~gxj}nb+yfA^VqCm`5$Rk|115}$rC(!`~-RU;I4{7 rF)03rsfq}QB%KZr!tqKURuz8%H9ix) literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png b/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..c05650fc5ad5e2a38646540dfbdf0d2e1f04cdb4 GIT binary patch literal 493 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta b/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta new file mode 100644 index 00000000..6d482b8d --- /dev/null +++ b/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..53d33aac293149d99a1e46359476820e59c9c466 GIT binary patch literal 10028 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 o004R= z004l4008;_004mK002@5009+P0026d000+n*IFNt00009a7bBm000XS000XS0e@s) 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 literal 1311 zcmbVMd2HKM82891(P-&F0&UR%<4sza=J<$n*lV^WaoR;9rOhH*F{IY9Us9`$?bQD?WR}y}i(x5hGfI<`lb}d~W^sz*7!OCe(b9uKYr2%+ zqI_-17CiZ|Hq+ENf=H*+jPdoPS(YGaf~IkZz>Tb83K?86)|WN#zz}s=Gi6ml ziyDQv+GYAM=;>kzDJ>FNQmh!IM8T9189^f`2T7z-#kdyGh8YF_y0I+Uh-EcEM1i4p z=_0I0Vtttmb9a41MIiKsyI+@KQG^a&6}wVEF~htMgEtOImN+pk#N(33jSDR4#aW7x z@OVOya5wFhNRc7k9;dUcXF0y#=?(BMI^cJDNQw$Ef!ZL$@=zG?dTIjGscGZhVucn1=7BCh45V6J zO`!`Z=Hz9}$33D;VB9RuCKwM+3yg>hUY8peos!#|U|o!drmzxU`oF0opi@M#PyW+4 zWf5$~;&y2Y;9+TwfC7g{hf~u1=YtZ0tl-1EKbHCS*9Ug>JV92zS&SyvzQJ9JL*It5IRge#T9hznu zl@sn)KivFm{@7Q$4<*02v*4e2H~&Mv>EpBGWBSal+dJO7W(~ivdTrsIa|iZ*LT>OC zEC}zUqa5Gyx{9~?zi;cG+yQU^g07(nT+k!~1p7#gIzQ$R{aKt#HS28WRDZt0Tl?ru55 zG08OL*NiqMTxkyG%os+Cv>{v=fgs?-nG{*5RHZbfjKr;BBJ$UE)m+Nopc3T zCx+a4%k*p_n+AX0mZrwv`aJWja$kHUaw((ALT+6SjSq(+KgfL3N>{eK>;D6ZJN58h z*Znhi+iqyE>M$7?w)`7k*7P{=3d{2 zx6E6MET>tj-M49?laWF{=z7Imtb+RrYjW%ouT>+jKT%zksOD8YJE>fE2iY;0X)Eym zyq?y~lOA9yF`$4hu8Z8cKLJO2Hl2GH+|}L%wf8oCn1QeP(Zi!PBBmiln#j4_Nsp(~ z{GVBMi+;piY`6!eHQ|@%yVqy4-fiE_RjiVg#yM~7>o*j4TiHB3i9N6@srvb*#S)kC z8qCZ?MUEUNmtP~VONH_#X-oTG$(XIaGl`0l*M&Mz*W@|MRFEg>4wYs?E6n>U$4zs_ z`Gv}^h8mE}C1ZqB5N{`|xd=~k*B8;JS$Vq3#NUa%dA}?e)b~876g}ttmQ&7wQ7afDP3)9X>SW%>{*)s#p?d~X~P#5bEE#e8sU~3n@)1hF5y5b zL@L=DAKQL--XM|OD6yffM-EQmDXq_8JefdlmY5NpmUss9P|dQc)otQu9oWq8$;m98 z1~=>FUa^EOR(C~%nshZnLocDGaGY`et*K+S)aj^HFY|V6hToHZn2Q?l(9b$JbUP~g z$3wqBY=t{p)0*UuhGXhj2lAw)VzNTsl_3g6E{EPui%gY%n9d zK`6K%(%$Zmd}4tyHkT8oekKRmy`*YR459UMAm^^#N@=m)yMv!~gXTSyuX3XuT%Xa^?6_l8-Tkmu?3!tW-jRsc_^9 z^mC4mhQBQjDkMAFNm{Lt6{m1jXouj&r_| z-i6fj|2>UYV_XQ2=-Y2d0|Z%>L)ClfthIhBX%@fiCfZxJleb*Ri!=`)NZAz;sOZn|&VNn7{K_^K4keIl13wHH zSzyp#v>+^OlCT&v>GEg=KUb`uKomzHFUc(G}0p+K7h05@?e!IJDP5JBPn5g}h z3EP?qfLmZynOW`6>Hh8o6zy#7Mu%Ox>ZYj0*=&4|it}6H$jcji<#yEWC~$ccPu3m1 z3>4#Tp^H1=PiY26Din2`oo(}|`#;nUH=pHmuZ0EBK+_usXw}?s6fDa&6%Y4;S0EQg zFN>k?##}@T2sUjyVw#r4uJOhiHh@8~N4`Lil%DdC$}{ovWVjrnxIgP=k0unnzOrGxe= zSwm$G1tx*|{!FicZ*~`*mbh?9K&l{%7}O!TTi;(t(0`%J5q@=s`K_y}t0;d=)@8?s z=oRm60h1=OD64@;=2;(PJ6OdbZn`G>cIG0kA+q~A@C#`Yc;$3v5qG(6j~xkWLlK=_M5GdgHT z1)_!=AET%?O#R=|AH<7b8r(ilpRL=Qo}T~HJlC*4-EJ~(bG3vRCI{4)j_H5->VMfu zpv^N3oQ>&>pBvS{%CH}jtpx|>ur`4mtEAhC6WFLh+;jofRk;?(xfEwC92{#N*{`vc zz2M{+`o{^&h)q_2O77=(Ppf?vP&eVP*KLm@ZL>>)?jyj4Iug0xs6Z{oZX4dtF4lNy z+Ch=uARS<>U--Lz7Sx>DE;x5<^WI4U~ih%9lsf0O)p@CTbaHA-Ri_ zXro$w5xtAQL3;J2=){t(*LK7@nPfWY1CM8>=S#12;VJa_V%Em7gt9}}SkRlf6q=9D zJ5#cQ&!(!ojrgBkm(E>9>X%-%R)aSU$DK5es}k)kaLH~?Qop}jhTzXpU>UA z+kPXvU*@C!r&4BSKL(lZ+P4u9ft}`etVwbJP`=jT*Et57mUR45GNM?m^v%u|PEX316AIWy+x;6wX zHu38|JFu#UOrOa}#$z-B0Ay&BE`yGXw2m0ndCZ)j&Wo=F#^}uQs}Rr*ow_UTZsBbcZ(D{<%UX z-~O?@zGb`XnQN@6fFCyyTp0o0KlsAJ#^_`}wEA^Ma?N!!KvTGEOPc3BQK~gR6NZ_9+j2HF?pr8;a}D`1V_AnAv9>mZPimnbRS=o@ z11_Z|cQA&!H%|KTeC;roA>b3Gk+%ExD9M_jCb8Cx7DZKsE>6U)L6P@rQ?=?suP=k1 z)Jhfci?M9GmpKup$erK4vTGNKt=UcPTx+hIh?uceRbD_~TY||?p7w}pc7OrvnrDAb z<7boRMg7hf5HcSzIV2(5>bpamk;{riZ;K(J>@=&oIG`hBsy#7Yjhm& zeT0fM4zZe_>Y%7$ zWFKq3kjV1*R7?%Rb1%I6;~+jua$9@Vfzukp{HB7xgDoW=MH z(NVE6)WJ4eNhhzk1s~+vbYwc%sQs}N;V=2LOees{kMZ(}CD-AQ26PMEB3ED7PLj*H z{w%^K%lqp((2gTrPiM8Q7i*`kBP8@Q&60eN@cD$C_Pd2gXJ&yOWjCFcoL0@Y;c#}@ z=3UN-iaG_tpDia77nnEJ`j$KqYm26VaOm^LOTL`CW#2Wh8pbKADGd@XzI=!8ap;o1 z)atsLQcM*t2U)lu-Ne(-3Za{9X&;-xWPFJgGt6}Te7J}$HI(kF+1*Kn2H?JieOdRR z7oXNI&xKjE$v(1!`P(-QOoy*7)sh4cNCo>S)=+h!q9BbyHO34s@ZT=iji43Imb7lE zT?G~yY6QH?{pl+!)FaRQ4nLs#-vht|K<-}M4%#$$o9_D@%6XpeQq{VB^bycq(f%|O z-TE2HMqWY5LJcVAZ;0M_wz6uUz51g7|6N$OJ#iqn)WoJ6u|H#zQ(Xvl+xsuLO5&7# z*l05)7L}%WTfM#4xBzq7z8nVD!}f<0AYjvd zmvoxiaPBKG0v5AjI@D;s7>AB}Up)w{&)=Seed5!M^_KF54_Rg0$^R=^2EP?hjH%bM z%D4JC^E-*+N}C-&--ro#pmX~sS?sA0`%fZodEW)H-1z$uG9H8d%gzTxY}6hg3x&+EL`1u5LNJ1&}85CGFeyG z2qWuTcVr%7<-ULo8p42!ewQ;=jgFCIXeq4f`Y>3?9;4)3EwpU|0 zeIC6j=nK^-{%N9^W!VZovN~$VRUI(JvmgD_`SI))Mv9Xz*KQank{SG-WnwlnfQXLx zm=&-%(+>XB1c`dO=4E)h`dfi&t(KDzh20w z>I#NaeoYDDt|kDqL-Jn}o99wLvf>6bc3c>!eBxj9gGq>!S=i8(SL62kT>Y!;*IuJDb*z74FJthB& z5X~ZQO{G6Fs+83>7`~AkRi#1bvof4Xr~jPi74(JIP=RC*y3vDFEenh09$CqE(zBudA|wqsq@6dxQE;_3 za>L~XQH^10tk8{aN6xcfkc7~QGzF{gQI#r@hUyjhq)FO8_^Gw+_=*=Nigs%n?H=-tw?-CB zhr|6j0(D%d1<=i*o|5@w<$Uf*=6u`v{zH$Xd%z`$q{%qXLs3NKJvz<&Q?@67=x*~o zv<7t=gOye90QjI$2RNw|i#@B7KIHk(*BlQnN1zi7lVq{f`*BLg;#|A@zCEUcmq!O)Jp+akSJm zOvkRi!#9)!?Nt7&>rA}`+~KOxOioYOE+FV(q%#i0@{;SBTd|u%EVEPOwunREjJnQk7kmNtVedT3e!DdN zZ>HKe`a2ijZQ-%J@(}4lvNA9c0n*Vp=l=ddW5^ytYPoJGN$YH z#$u@|S0ex06YfA?ygd%5ROIU$!nOwsl=M>X&UEH&p2MH+DF+s`7cc=7 zevoQd@dcmc7M?D9D?1M0-CNUpAVX2VEg8s87QtOJ_$?}K>Sy-ht{rh8i*fUHO(dW` z7G+9X!4BRYqH+i>1l9J7;-OE)Bwe1ZU`M1`Yf$>n@{S|74`PN#M=n*k_S_Q!=1V|9 z8x=hzP16i2ySFy-$JwsXDy@N z0FtA;w*|MLr)eKr^$l7%>xiin%Dd zf;}E<6{)}#_QiNR$yQABlPTkWdP~|;Fl`lMZ=Qd>m%VxG`2@FcV==|2id^@KoI{{J zaTx2+;It&{`&E>+y8vtyVIu79lm;Frw}?Dfwf(XrN)5m|yPB@oG_4m4_t&^2)yGZ_NVsZ$ZHvP?7`c`=d=zw^+ zWtji2Q_n{P&{yV$CsKUiF788aT1c4IEbNi&=HYDQxJ!Tmh~_*3g2dY&q%g&dps*|( zD<9$PsQaI*ss6izxuv3cXuxfJ@@!lYy(rH08VwB;?-;3oUiP&qOh>xPBR1@Jcq+}j z?Dg{j@PgqIx=ySFzmwyMVyHxt%zm+gZHhy))3qD7^<7!Vl!YvF)35Nf$E?QIO^Vwl z(DxO8J3r3@qIU2`wS*?bR?qywljkk@kEO($%|QyiH17)XsFd={%eWJTPwT79_+y`y zKJZAGqs{y1uylhYA5+=@6ye;29V{+|nhL7!z3|#ZnZQaCXIF=>o3c5CJi3_DpW&}p z(o{Pat9&=8L&tBLU&8on%q;!G6UOK{`fNsec1Oc(?vDz3ERI5}Wb`|J$>o}E=6ctd zCNT5y=8p+xjVEepSKLVO;siRI5Q<^`ZTrY4{He7X&zsE*G;ObK=2S`2@{7Hbc>D=%pWkPBrPPx+=MduX914 zh2)Yt6M6YuS2jOR=4tiXeFzY(T%rCw{DvetxF@?9D&ds*7(jpgKi zvFm&G;(whpdKzDao2a_svOBq%lI-K6AJOPxb-38`t$*sKV)SbRk8phWZhMiBk!GV$ zrHTRrO8Xd6S0|zIq6|>D*9>+H zL!jwWhHQ;((4`qoIBf2c<_guXzk&$uO(7&AvP0C^3?sU%MKN*h{VP{@9f)ty3H0_J z=$If|s0nwMwj&AV6|9^%O5Uud>tLVJR&Lfh&$y|y7}0;tmZw9xq(wx(?nsJ%@Kh-y zh7-wdrdT+B+{#nP$+V`ewS!Q};_9Hn!(*o&u%tRuP61cte*reUfZL14tIo2O-*X>t zDNFsHQ3NspxY((V>|o_`GlmVt#-jUCzlt6VVu`%TuAIDV{4YLX|o~J zI>8%y$9S#rr$xcs^-sm$zh!2X{mm56s`}ujT=!Xjubf=C1dnsWZR^C@(nMp)wr!#H zQNunYc*A*7wbCRj>OrUYDsaz1rMZePtm>v!u`J{NV|zF9`z0TfH>pa;7!67w83aaI;qMYsa zgB!(1E(a^W&r+zhRx{08F^5CeDni5`tEu%cpU+eX=CIEWGC8wc8}WEC8E!x<-c?5U zP!Q!Vn47&CP(u35RJcF%)5vGb7T>ayqa#lF%UrL;KB-Wq!sqlR+wU$tYj1W1JkPg= z5g(?PY^GDZPXnXRpoASS7yrNlcHPC9L1Mq0EUNSz3Z8I&5y`ka+lAZC{H*GA)m&k5 zC?bk21{1+n!dY-8OKASxY>C)KhI?HoCBcQSbM814y{(HHd?KF3O+nrKwMXTWO{kU2 zLmQiLHnM&gH)K1CXX-1eLu>jpYCoP1G^WD8`xDO&4R#)M57hX5eS`g&Y=}5jH+&|M z>|JN^cf8bg?l^*6R?Z(ub!98OPHOA5nwn=bAB~25_gH>1f{yJn=&inX6!xyZ z>jAHDvPg0lmyjiJ30&OJZo@fsb(qAT81sCIsfeJPK>MEWmt7mmtQu!eoKLZ66~IDJ z)wTCFBHKD#;;P4{PTCW5I9iWbD-px2ORx2Yk~DIjHjna1n_xPFxVWXh172A2^(2~z zA37N7DQL#r*gsz2^21JWilRFVfR0U2PdYJng}5%P&9>7%<$klE2zo%tiX zwIor>Qn02|5UOICyNa!%^7U!cYgV$NY?JLU*%&^_xKd*lauN8c1o%-5B-kNpnPlxXeO zenE`l3x^g-<^sR}s~U2;inx2gYFJzv3y2HLLh{K?;Xh?~0vJ1Rdm+rXFbZO%rHLj0 z4B7AeIVwVxH)n5I(vmT!ynO4Y{y_A0Z>;K&+79(;jsq^OMd~} zxVOdM;iD$As|XAT51Vb&ryuNGCQm@?1X97$3PfJWgU=KzySqOCZ!4CP=`O<{4oQqR^-!+vdacM-5CGJsrYL35gf~*}jfO zI;bQ#AZyQ{1na+NEjasX5P34}j_?mt#TK9EEw6=+&-s-vygT63fOJdb7SJDGybTxmEIvp>F6 zFc)!0ecLNz-ta0}-rI+PPHd%@O9%`mwkB`_F9ODC6N_7yR*PrFxtMTo0qC~QzDQcG z6ZB<})zVDgVW?kP4NxlaR|t!m!QV|w5{yMp(-?~BA?~JKxo^+B{+e4>P9-JJ-@h`@ z^^IpUoTGCMk~0dO&!!<+Zys^%)A6%Bw3y%*%la<$x3ryL0m<*pF=OBSc0D%3$}!q4 z$R^Y$>O!LH^oomCY2|Ixz1xY+(6^GGHjy~t3*|!EIoCVvk#S#D(CFqspe2p9blQM`p zU+4BZ9fvFdcdl8!$#mHhfAn;6HEOYZA~D@U4%HBF^YCEa{UiwRgX7(9<+H`-<~<0m zlC8=OH1BsLPLbZvu&%;Q=Hb+BD|P>8&4hPboh96CVUx^HWX}savaQA~H)GT*+N^dj zvj){5!%#_uTE42b#ra2z2&r5wsAVQ>Mn(!r4Qs?(R#P3FW@Rj{j6)R=LOvmP@Rh5%8&K@4SB1;NWHZmR zdu{!C#I7YU@Fv-TxX&jMUgqtGolzX)5Iw~%Dz}sk&oj#ShZ>owJ=s0uL83S6{E`ZX z<6m30wjA#8S$*?R}W~JM^Iy28dtNA3@ zZb<&v>_Tslz9ng8l`n8JNU;;_@#!IG*aKk`_Ig8O=rEKJ=g~@HIbp5M+x++PudpoR znY5uq_jkuHL$+=Zxxz*O?2mt;kh>w zq9Qu;f*>z!xp^^m^<>lR$Lfi>TR1#a*gFMi5X{}ebi3ddId?Z`%5$P2(Z|gPf-XO_ zi+@A#0{MR4?1o)8AlW~b8Zc{G$2hxxH7tw%hwQ<5E3C{P&JYeiQ$nq6GIy$#HW*H# z7NbOh;P{pKlQEUuVvx9>AyWgcvGB)=Sc4xbnClDfR6tkC==VG@PEX8fBAup8$)-9) z8aJ2C;>3gNn7^T2q151z4z`lDSs(RDUX$P14F<&=S9!^kz#eThp?vq~=io;*GYLnb zaJaH5a$2T3*W(#TH5Cw>N7_YX22y}!?t)A&f|;;%^J0-Bv!CFMc1;B{Dw3zy4k`p7 zajuHuC%9~i1mz7I9{Rnm>oG}WNY0mmt$1O0&O>pMi@VU~{Bw6D5vGi9Z!na@bU&-- zFX6vLzu^Y~gDJ;Z5c{W4fe*w%`L8=ga`Yna<)N{_>#r7n#$94R&jn);pUw^&qO1R^ z3Q_aT&U%&Lmyp)Mhf24gKG!rtDoX;mv{SJyGK@fxpyZK4F2d~!;g>v8#hX!umz}}n zk!j!ISKOW=_xY1^Vi3?Izn`Ljj|jy0Tlqm@!276DXzkuF`)XL_pT6?2VkstopWw=C zwgD!29;dlQAk?Nnc1%v6cJ$lcmy{~=S=IUvjx`_AyKviQ93tg)^Y5(PpDh9v?TG`{ z!x+d-U?)C?1qLe(sb0c0;$b{CE@u&Iz*PRZ=}&XT2mu%;?6>Em#e_ZNheu33IH0S8 z;{UE$p?8a^wR5Xl1&+mXuGP7c>FIAyYE@GejHXTk#!vc2kDn^!jNi83k8+@Vo8iwg zKBAXy+fDjlO2Zm$dplM~) z-uK>(iSOH~JnB@TR|6%qfJw9)ANAFK-k|z|4ESXKEDefX0a80UpWMG91T1#rZwMFK z*b~3$8D%6Z#5OLEPd9&qH&0_>_xja-ZFR^y(u_Myr-_=mFYuGCmjq4k<&dUB3%itL z7PI!n^vw7BM2|-KF^5^il>J$aHq1%+?cGUNf|648dEjY^P&qJ=8ARCxRz+PH%3H;5 zym=mtNAUT(Iamp0<+r9j?RY2L_WI24LfJsW2T;)}8uu#+9;esSQ-@NHS4(O27W}%I zeJiKvaX<#~R!e)15_E{8j7?-ezzRvSjdniOsptky%9b|5l(_m9cj9`>AgUf^WQ`Kx?Nq6aMJ>FT~HeDckK zcpUO62qo^tG$j}L+=*aic>izUsju;FoieW^z9Ax8#BK!@e)^SPOi z(YR9waWk}|?T4PEvX3gh>OB#<9Y=?KZ;;8Pi~4s%-d#6#@L-z@MvBD*xWv_zuA8O- zE$tI6gWUw5pup*Ud(=3o%T7Xl`P6C3R<#WNE>*d>fW^bAD{Zpp_hF{Xr;2}eFF*id z73(5{YqxU46u4cUZZlmhCEHc8+lPM}B=0^X&yTRol<+kEu51rlM6_+$wvf+y_~t2q z%w9A)+>84K94hRgiCU`UJ_4xFoW=m@m&C}IfV&(Gi21r<@{B%c4_KoL_tydR;A;{= zG3w&}L1wC;*R|F$N zSben_Hh?vVL<(=~`@UUdOrlxHi)BQ25B390I6Qo>q-Yr*dwAmQcuJDuNh=JqMtVIQ zZoK9AH+ni%I87-#Xepc=vu3Oc8pfH#4~L_nDX{I?si2Qk5?4mvS7jv+xtF&!P8RKJ zjd}(&p@BWI=@b!>pL?cCKdzkS*E%s4twF#i4&P!?L+o`HOj3byDeJ_W$9^b5JY}&O zm~=-y##O*&>1HXY^`!E6!*DWT-ge z5&-j7S?WLVYR}V-n8{Yc3Ad}t?8L(i(CBV`+juqgfo;GV6+{qfw7$GqcNGX~NE)<8 z?eLm6w(zkBR$_F`CD<`%RuN>d(dP8DC*?;305Pxc9$k&cN5U;&;ZvMo0ym_2wPn3q zNQ#j4m8kVm`L{>s@%E7~)Ki7V*_A~xj*f(Tz*lI$>u9wJLjT;rjS56;w5uoB^{yqG z!S$v%XJd^wB-3}LY`+9Hr~G?LMZ*eKk%O%6^UdH;8G|qve{*@2ZBipG+z)o#{(C*K#XoLx9OuE?nt9dd2Ep%qm4x7J)qPm1Aw zHzD3w1FbfjmAWPetfU)G7wuQu#uj!LR++IA2BzfKj;+>fE#x#Sxe-`K zU;>^-y|w05a+ocZ6ZPdUiHt@)91$M=2gv+*GU77IXv(ddQYv_S#&WXzFrAf|l;NB+ za!X`O>)L!k@lODy^RVORrz177`$aGfkoWO8UjNE02U$-{4B$z9?-{jYTK(q}GLJ=M zg<s(3RC?Zfg~KPRGqQ$Di_nfOW$CUiQu= z%ZZ=CrMOgqvY(qoZ|YE$iZL(-eYl+0H?K22wm;{y08|yJttpB9=w@=$vK4%7r?RjUmQ7Pxog1-x$i+{kCf8C;HlDAu1eC95fH)q}R+*9fZ@`)i|8q0n z_9&{}^})mu38mI4F)Y9wWC=>0VZc@6^bnG$rRa44N0o$`h0N;R4!RLzTfTw%gMQO_ zgtapvY^oW9;3qooS@p-vq?yta;VyJ71XtcpNtW$5$$z7CSXxqwMY5R5gCB5Cni=L> z!MAw?b9zhYM6>5@rT-%fkSZ1RIl<)DRdQCpe30i4P!NvuCb&wPG%o5NO`x!AbCGN5 zr&p|K8Zn4!98OR6?S?2p;$f4KsNxm7E1I9aygT+3V3|1JRbysRCW8FDcA8JQlS|b; zSNdo*CgN^&yiQ={z4!o7zKE#MecQYGd?Z?th6~QGXj)^yn8c`MfIL+1 zZ~79${?HR?WTBFBK98RZfPl`#VKsw=sAwpiITJ)KF(|rVvu67X-0htyWAge6YJw7d zi}?=sEpk>X^{0d`zsOHtMx3$&3<#zDJzesKq=6`Nyoy*Kn2BxQn$71r(>~ic6ec1m zc}K?d>@L&bI`!G~aq35N=L_jsBo?)RP;DAobBgVpKyy5*)bLFxiwRZ?iS^&GKWvYC zCwb18Uf9W5HfC(IyiMhKyz5z8SM`(WgKojE2X0J%O%^{WA<$;u_00wAT%~C6DUb%ln z2Ph<~T{eL^lW0KV)-$d!P70uJ(Emh1ue1go^yh?E?WM(N9uMg&YKE#8_3(iZ$Fq7Z zV9h-Zg8K1fn)rXo)7J9qh!mkW4^$vnM75ZJ^5<1=&=X-OEqmez?;#lJTt5CsQ8?}! z&rd0xS!=LqyB0}3uaXu90H96HAHTy-vLiJJB79IRt1fIr)9UqYui={DXNwf8pZZre#z={?2~a9;YghK7+{|JD}SS6q9krgGi^vl!#dv(+~}!3{RQru zhj~Ynjj`W_x(3=OfOgt2?C%rYSb;$d!MP4j?p_2Xs0WtJpvLl}f>hJ0wRevX!|T+| zpr+1>gV*`GLi#lh2N6`gH2Dc=}ul=!@tA5`o^<8 z9c=!#>Tq~5m@<*!(>S=unO#L9X;03OlaXx4i?gC~Uo^I~Au+`jwo)`BJn4>F9$?Z7 zfG9h--9;*RJ|6e)ymK@gWl<$KYN;nSxAU^a29@xhS(7!wNeRtdOa5q3cq*qJ@G56@7Ts)1)tqLaE1Aq VnhfoTqaIpClL0GA7K-cp{~x0i^osxh literal 16638 zcmaL9c|26_|36GqjuOWbia0{ZzHjANvS-VdWZ#$Ugp93;WY3n}*p&!LWr@kYuSE)D zUqZu3GuC_F@89S1{oQ}u-`gKEXU^lgu5&G~>w3Lj&*$@aZlI?@eSzfy85tS1mZqv9 z>6?R$>`VmZ8Pb(+&Xxn|>x#dcnZJ>jlYgMCuOpeVgO{Bnhn9z}v!kJ-twXR+uj4H; zGQ>4kV>5pe-PFp-;p(8k zc~44LRM-2qql>HNV_!$3$9l&0kKOI%95@wWj$1+Uqy{`3{cSmdJRW-b$pH44BBAgum7Vπ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 z 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 k$Z63jNW`9=7bP=eexzMQ5gGo^ePx# delta 353 zcmcc0IFWgR%0xqn`rQl+e7hNs|F~ktz`!6?;u=vBoS#-wo>-L15RjOeSEA?V8lq5U ztY@lcXz2dg$((_Kk=N73F(ktM==IZnEe-;$iTD0@nkawwHdpYu*rP4C`1|D`p9`IG z`ir0K_~GH%k93QInFLtt#WoJU(D?}T_SU2uj&k*zjJx+rcDd9GkM!rRJ3W0 z|NXVh(_Z_!DE`rxn3<5$G?CLyjYNi0_}%j*zO&Rn?lPNOQoHL}*(ddR&oXDu{jqQJ z^s7GR_m*jGS2S65Tz~8OU$T4gu8Ux|O2Un$j|e#A)6tLe!8 RcwhiBc)I$ztaD0e0s!nTo2>u< diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png index 5f5dbbe16e74a38c991762c6a38e89b4cd8daff2..8472ee8941f0274e68df5809b78bc13d2120e66d 100644 GIT binary patch delta 511 zcmVpGu1Q2eR9HvlmrY8=Fc8O+v|V-WQc!q)Ac(k7sET`UAc!Xryo=xo z6uf~xLC>My<+X|PpH5y=d8Ktx8hF1_GWqDx`Dc=*`lL8>ihs!S90ikQnfjQ&X{nBi zk#aItDqzx7ZSEbg?VMB2TDHd^UIjL`XHpxNcojH2EtI9X$NX0n^xjj`H>8xh2U^g*;c+HxAG2&UT{C0nX#P z5M+L(*3a$TeI{m$&`-n)1Oi~qF3OVM`akpCHP-uq--s2clfQ+rj=IP&+Fo)yWueBC4Ybvp+l$8IG`y5~m#G1mM;ndYp(*MK^qT zAMq-%-lt-hq-tw_o&Std%7M@Kd6U8;GO+?m{Q_Lt#}A3e-Vp!*002ovPDHLkV1kb5 B?*{+? literal 1242 zcmbVMTWB0r7#_@}5)zGXNw9RBJlLvp-MQ=x+19;e?ZR#nw@bTV9y~L1HajFUXEQT# zH*3Mr7{Ns>zDSz~p(>%Z#a9tyyQv@uVyguaA2ij6Jk%iCrdBOk&un(151|hZ%$(c* zecyln%e+1@_FP}jP!B;6eW{~~EFQ_=eYhKcy=wIi9tQocnjl7wR7${@hCZpoDa(mazkYIsA}upQ zoscqIrWA)o>uA-5$EssFqdIMS zP&-cLGZSPSxsa3?i8eTaCl!_9B~j)1XGnqLLoCm+f=cteCMp^)ldXrsYOYz(vWa9% z3$G$n(f3Ol%a+S!rW|6BJH_&CP4GQYN!Y?0Bs};gGQvP-1z8V{JRQSJT?_v+!Rx_O$kL^Cie;p@-&N1LvbK z+y>*=Jy<9(#NKG*u7#5VW)jGlv!Uas5)lfYFs5Z{h7NSyRAd^cT$omQ(WLbPFlku` zo17tXvJwildG^9f2~Lz_vK$S`NuD1SW6>y=OeUjZoQtcx6mDZvj^_i%fNgCHYqzk{ z1F>4%g}_H{4xyQL6-*S7kGvu(k?}Zr@Py@Hd$lmwp?3BDHk(>>#!M2YaUQYVEyS@r_59`v>Og=R1=77oLCQ z{-3w^QEOLENsS+_yu2^XE(>qHuMIO#9+tB7|z0znjPJiRv+xlCn9X>OX zJ}LHeqoIXV{ik=jzP-EnJAmq?%)OsC#xL2i!lWHLf4RxGeq-a>@Y9_Gvs-U&Zf@SJ gE$E*qoy0@E#JF6%v2}6nLh!dqjgBQgjJRPjV@2HIZ1DQ>ymZwX!aSWTuyq}{ zIGgfbFyOtQpfX^tf|*cT|9M=UyD`s280YsB#H5@beQS8Da|O14fF)KL!882}-->?h zbbO0Ym9^k@tC)N23@uJXD^{WV!xNFT3|B01%7G^U+ZwRPi3pGAMlPQtZUy#%I2AA| op~F$1|BMp$K*ApA!QU~_52v8MQ4BXWEC2ui07*qoM6N<$f=ONKo&W#< literal 1254 zcmbVMTWB0r7@m+uYR$!>qE;~DL{gQ`{kAh?6SKE=X*OLpD_yYQ&gIPRn9QX!lkQ|i zQcP=YsR%wQQlYdDDg_@@#FVBI1Ru18YC#c`dZ~&+`(SM`x1LFMQy)Sf9GE$`|NFlG z{FgbJAKuxqW!n}6K{~R#QUy4o(YyH``1R}czv1v`kS+xyjuF%p4YHs)CAX$FXalox@O5k7IlJ z9F=pEpla@_dtjtKT-55Lnxta`{b*k(Ljnr~3L08twl9ZqY?W7r^JtsI&{dOQG>)w~ zRm$bjq~igUCwN?=7#bBNg627irgxwWMYAMLk&J}Xw9JVzEuf7DgKC~`$c0p))ji|AN<5fsnk|dI1NQS|o1@2GSffC}j-_vAB0blb>H!vL=jTjZx84uzZ z^mOeCmYd716We|xP%va;0r<|ir@?#}Jxwr- z-Q9&EL+FjX$1`D4l(Cefja$GDvZ*)*PYB)AWldF7RTl+Zk*F9h(VUK}hN9yF6VoY; zqXdy-ugxr~^m1c@JHg$zxnxj{A|#yCof36jVQe5Q%b+J2ze8fa>pP`iPJn7d%* zqz9D1@rsT!)~tej)d?KG>bPh!i9WU0v~{QEKOJRg?ZPSGnFoNL@f-_X4Y6!)Ag_uV zuW*8dO9m(6jKXQS65|D2V|5{BNIWMpG}gfD|2K3bbc&4X zvTt7GzAl6Kr-;$Xa=F(t=jV5~{(gh6FA?v*yZQ9ny}5-qe&{S$wAM>2D=Rxqaq-`! z$I{(HkN5U(YnvMAnEB~=+vR_zzQ8}&apa?WCl?ow@?TLuzxY7n#v0X${>jXh$%W;Y u!y`z~nIAtqdp5prYkut3tH`qlTab@0zwqat@A7K&=gFprQ)d$8S8f9{@T<%K diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCore.png b/resources/assets/enderio/textures/blocks/liquidConduitCore.png index ef8c4fc669cc34e603513181542b9a1cd36cb257..5d7a308eeaf54df5b8b1883a45d8890352e00bb9 100644 GIT binary patch literal 673 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 literal 2149 zcmbVNYgiL!77h@opg=%G6lljN8n)yzxeyYG7?PlYjTdAA@lqz42?WT6WFjFemQt!* zw<@*@h!R;)E@kxj;RF*0MSi~|$HRso>~E@nW9pb%hCrm1vX1CRK|E*G2I zwy8wm4FpZ)5#Kr$FWCSH)LH~!QCMUdjSd2A4h3W}IUpDW&}krp3eu=_4jBZwOg0w` z24)^2rly7E+-PCMj25=y5tC6=!=+L)GBPL`42oKtL6Xq~5F$F6R-r)^Y87C!2uam?lt;uoeH(&OBayr_tkTUS3QHN)0BNWog+^5>ZE?Lp z>(FTAzizx2t&7RjAk=6?r`Bs_*m=m8&XTd*{l1V5h>@C+6qj2hRgX~E?1yMAXKf5QLEEtt6)R2 z8dd9()fzw`07!8P6|BzC1=>#NZNNfAtJs0S5n8npc#~qT;yv2kpEU}BNXa0Q0`n>+zFq2v_@cn!|-^=t; zzN4Zoq;%i#`J<{~R2B+WZQr`}Kt+ZBm9eR*pcN}toK2|7bvOI^`aXFzJw158&wOZT z*jis-zk95qp`kulQZiaj64& z_lN7<-Q9QKJ~cUg^V!R%PgS>amYWVPZ(%>(w6`s-VnHHw$!iyv%iV7_uPINQ8mhEf z3(i!%Y$=J_N54F_-v2?+$CV3LBuo|ch_@ZCIn(?tgRC#R{OR=M=;UNd&+Vb1gI*_F z<44Ue6R$irwH*!FG@n9fsfL->k0`@Ny75r2KHlxNL$-x23fo8^bYym4P&|GG9LcKG z#Wke*pNnglGY}rPJY}6F(7COx4j5cB{T0P~* zowcZVoGrg%j}|vZomn|*KG50^QSzKyg9tx6)o2qBy{`6(tZshBa6G-bwUp-8#b0vj zq*!>Zo#kHo`Pf63l&y|A0TN58&hsvRH{twF&k`4JUrX6-zyEBg4v*PWWwCZMd!54P zOPpJo+5S_W*K(Qzg}m+Vyuv)k7t3%#oUspGxkoEiSEAw^#yjmtH+L2-+I33N{)wmL zpBG}Tar??hS8j^DkA+;0D zp|AvI^W3&v@4S&s@jC1GMVAZjMb9(Bv#1Q3T}yXbQPb)3LR0q~yVz;_4>+(Ou0|B@ z@^HnkOJ4SAi}A;zRp~jqjx!D98}=_!gvktaw6E8aQv84qSbzgX1@Kv8Q21M1|EHvf*#LG@Ty{O6O*Q>FP$wmIT z1s9iiPfSewB1a7dQb%mo=Che%DC6R#qMd=G|4zVeucV_x{r%@&@5BM>bg+-i5#Y+_)<%Yhc3aOv9}*oV_UgQ|b}h#V;1E K6V`?&=KKcH6>JCq diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png index dfa54c473b39306daa4ff13306fd0309843ab2d3..c9e8c82dec8c006f60617c61bcd80e6751cdc16f 100644 GIT binary patch literal 822 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 NaPWY$Eydb5{-0s%xhwzx literal 2410 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 Ph5uD35aGrfJM#YkOH$3G diff --git a/resources/assets/enderio/textures/blocks/meConduitCore.png b/resources/assets/enderio/textures/blocks/meConduitCore.png index 96c77ce36dabc1abc10df9bb038f8fdedcfbe3eb..788ec80eaba48184c7e471e5d4e4a42b07adbcf6 100644 GIT binary patch literal 895 zcmV-_1AzRAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0~AR_K~zXfeOAkA zQ&AM%_a^C0nkKbG8)_yQI7ymGf*?{v@G)>Mi1-*P#cy!pH;5umI_S))13^@LK@_hsif;)ZMp@_j!{ z$`KgX**3ubMuEr$fXpcr3PCg)RVRCkNDMGwJTdJyuti8rKc`$S2fbcTC$U&euB|-K z?M8QiKvq?$<^GNq~jCaTjvFbUGdN!P$oNWcA`HiN@w7<|QSaJS+2FS`u?99h31zL%5`K zh!;)DV)C3g5l_!5HkUlL6H&V=h<%`$%AEiSpKabAY1A*YKfU)RsJD*f;Pa=EM#Suh zu7o5m{!9Z&r(u!}I&LS3lz@(t0%jF3$;NybA%Jr8kjZ%=xImc0G(PGcbX<(i=Nz{m5v;X8n{_HHwxxAeLVmE%TLPMU{;tJv`y zI%3{vA4{`SlUDac4r}|Nzu#+W5iAhUmuxq?>*pV;5l(1!@kCmxKR>7)Ft+d@O|uJ{ zjU!pVbU$nT7R(*Tk$<5d VL`Qq>X>b4l002ovPDHLkV1kb-h$8?1 literal 2339 zcmbVOYg7|w8cw+jQi6B^bRh&3R6;U=K#~SyNVo*K2`E{PRVK*s zDyY$d7F`vH2SKWfKo##m1axhMEfrR0ul%YF=~les-&s|vF~-M$b5DikHx%) zz@k9x2d6lZF&L&y0bxi!Bpi=G1TX;;6qYLI0)>POuLk9Kz=wdBNM_IV9<799 zp+DXDBw87tE{E{3kW#i?!9(&PaGxh5vHNR7vp~cfYP3R#Bn1?+WW4PXND8xAfmq~? z4`0Zq^0*+E%Mb9!ffNE6M*;l!IIaNX)@DK3yo!9vkpG*!3^7khLi~v6X z0D}D(L?#gAM%_xa>zWFEmgvxln2e*79zIixP-stQke<}gk_3&nM^!i1u-cy zSf)&o$uUeO#w$T6<;zsc)w3D;a9|ds5Pk*mLliOz=6#5%!cUkNa0O&O!~=0;KH!T3 zNqzv1OC$j}5?=sPd`SWUK;dHN`27Djba=!m{A`{4Pu&@0D`!k9z9xh}Fyk%3p z&Yhio#d|yRt`!fQ9jY^)^Rm7XU2|9XE%(Juuh>f3s~OI%fCH1t8vm<*Jj$r*CvQ%x z$Sb>QcR017FT;SBpd6M4-6~mMbe}#rV2ZsGV!S|UAE>PA)|!XLy9>{4t__`zx}~Zj z7*LsVul5oct#mv>vB^rml61Q*aE(Fxw8A7i=S|MT;F@v2$kbCVWn~>#4=p*_^XRoD z$0i5;ye6=sb)&BKh@(d6KZWXhl+nL8;KktgiHUAwkBygqSZ0z(fAf;JKT7AkwEkr7 zgD;03jGJ2*{B(X-#G zdbj2-9encqP;HpwI#$6lQS{et#qRcT(ovnIG2fPcI4Z<$?Gmf$-#cq>aMPn~+AFFv z%OZrki!NzK;|xhBd<;3P6oR7}`e)EJKV)Jju_-t*KIoe zUBP4fbw73gQ=TWvMDM8PUr%z$YNeEy2QMlXTuT`$tP{tcRJU&-K2uqEM67*QlyqFM z&51_~7rV6eMKl1XW~9ESC@ed(``5}U&=v)r4!Ly>U)T;Fw$I&duSL1#klNUBW3&^G z-7%{|ODAjxhKP1aC(4eaqq-kjF8?8wyrOGls}cJmeYB<2)nAsb^8~M%yNMVc_EFXnK=EOGxaxXw#WK?%rwdQ^~ai4dTeUaoBX3V zs+MBl-IaEUd$RLa(~d9bo2aQ0H)V&sJo>OFHw!>_tW1@2hBqAKCtnD1Goi=r-4Jql zYH%Cfd`oZol;+Ut7sj!73GTv@GFh*cq1pJ>ld(7ueir^jk8M4jdOpD0t7XlE9fXsw zd^FtlylL2aQ0t{;?9B7Pc&S#QebB-aQ%{$qJL1 z&~HhWRcE+9iQ~t;#N(xBCVZtyx&En)qk8tauSC(mCdNDeC;g8uQi5khX&v(Q;^4iY z3%gBSTwNP(@+hmQ+oq>T`Nx{b+y%S579n9h_vmwb3g*ZZBL; ziimMqZO_<|dcd3ZOfhscf*)q2QycPcZak}7+2kF+qr?onQ!g0oSRqQj-z+?KPoK4O zqpG>CS$8a^^vij*_uU)&vphs7bU$tVMEqimr`CDs7>>?t7YH51na{^Xj7yC( zEup#;kH3}nG}|hToqYpm*7W5$pY=)Ol#piHJ-6D1PnI_C9JFyg;qnXao=FO23Js@? zT-2%PXIz0(yq>2=))+2Z-$j>X4n$&>AB?k+WJ|NUbLmqk?}eEitwlf+_)f1 zTL|SaH|ZZ%^wlrC{el9-7Rgc`jSM^JYbq@ciK4R`+*U2RU#_+1##z^$wR-ukuu{9_ zx4Lb;%RBA5aIM(-h-G?9gYk6-b|m%RHq)$ diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png index 8965c6af8de0c2769ae6c74705ba96d957b79b26..e5a1bb9991821c6120236ba1b6d9d9d47787b95a 100644 GIT binary patch literal 924 zcmV;N17rM&P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D12IWNK~zXfb(YC$ zR8bIy>-LbFPG?Y~2^t7Nl#H7M#f1wY4iMZ5BB)Ej*ARRLw=VJsf{KcW3-Jk(pn_sB zXcIDar>ErFU#0){cu9V!oO7!F8qRR56HQG`CE0A&!2bTe6$%AAI5@Bf@iO)3( ztU)G|`Hx?%R$a%Mc+t$vOmaTH<%;i(x2_Zv7{N(N!hmT|>}Yo0?cb`e@jJ|hQ?uFZ z1l0)Ay3hu~IRz36kSv;m=ZZE^JY!Kd_Pfe=6+5S(9pu8Q5H6Gv!reprKQ6PTO!-U#6;WU5F|SChy*=5a1;++__~1RdNiKkxFnGIket{` z6b1rnjPhrMgQ#72tKd68f&5%Q*&!~B-L&4q34cx633^q%wzg)CgFSok?Unl=V?*0U z>wy!;@!@v>*?V_uq_;HcWtXjT$#yCm{uFD?vX89G)h(;kwr#JzV;kGQJN#y&;zg)H z;9qjs?5>}C=tf91yY522m43W)JK!>f&HAWS%A5B1%Kc7Dq1o{z18;WP8Uhp?!AVCW zU{`e<0}!7=H3#s#n}*QsE0KbvAwOLv!W_NC7XZQ}7kd`GfUkS6ETe7lisT#y*BVif@Yuq@f?gyA yMbp#M2@^SSL_+8sCW0#)zCdgJ+rm1EBKr$isa9gLT@x?>0000~sd+G26b}fje8K>V;1FO%^#(KFDkML(%O~dU zZ5kPP3c-tnYMSu~02cDrPFAfjl0MMrY6%3<`mun9B?}WThC) zo0cs|5wqH)GvYeT0JtqeDy#$-k_k_rT>&-9<X3>1q}|mcwK&+j$XR%;rfrAe}4bus{%$ zu_T;WsZ15w*VZu=0X^8o{7szW=8ZL~eAqp1;nG}f40x2p6 z8>Fyd4a8%zH5!noA}{gb|2K3r!YP`&PX4EEmbZvvbWfjm0kL@AM~H!F9uv_esK9SG z(R{8HsaR%1dBuVP9JS4KI^65dM&6e;nfDlI#x(B;JdG`Iy%#~K-y0VkN2=e zCrDToq#&TR)fTVQUhB!I78eIyMQ=XXbClNUpIiIj#z!E8#g2}x;=zH&)=$4d ztL_gC+w-VNRr#pM7Tg-R{SKcxDXHJ0Zf_W0Z=wAg+&ufXsW)suH6GaJ6Tc%>f`*^f zejl;e(^I>s%#L3S>Q&C7*9LqiF05`YIXWk|=j7&2&Ohc#ysokUeu;)gz8 zjp_TMD{yT@C2QUIdb0J)bIMk$q(HGM541-oe&71Gc%xDf78odUO27=;X1%vFgs|k>TN>zh1F7p1$mGgua_e zZT$UUDhFM0OEG+@eXng##qsyUe!3HR*j%^&h9GzJXE9%v$DbW)A9H3M;BT@857k`n z{#!)ts)E2De&q#4>Zd9Dyz+%+?{CUDD>`=W+*uO@U^j{V9*zCudW7?yc51pi9J|>xyTzF{q)B(3 z-+1V8lITKd+~dp0*!k+p_lMsJv%gg%X$!m__gh6kBfXiwYJAL8yCzLM*s z_LoQI7xsuwjLz?BhORJIzWyG6X#X^6WW-(qEsXrYoZ)VG)mv$*ss0=8wO=raF*R{HFxX+5R<9#de1=b6oWHfapnf(*kz!-Q@17iN(b-|M-^3 z3*R|dh|F}XNmR;O)$W)JIAUBg()%*}nOO1D_X>$U=98<_t~<`TVpF-$_J4R9Hvtmpu-HFbstg7$Rk0fUNWcNV!S(_9Q(~dmbb%(hM0Q zeu_l<=wC2t-k8h>Cl15bBCZY{DP-VEe< zj!cqiM$S3XYZ#`-{QWhxZHrv$13k!s!v|Q+Kv5L4Uwz**Yb~zpx_$uDG`(VBRM&NP z;IB2U^#v%UBnu+WfKqDC0MHnN>!xY2_^;+?qS%4*nZKVJJ002ovPDHLkV1g}9 BeFgvk literal 1272 zcmbVMZEVzJ94|1&oNg{;L?jAL7m%6t+UKs~H|Fi)E-@zSwa<2S>&x2C z>n<_!GM2euBoaQL9~>{?!-ORY5y>(j!9)l~2ofQ_Kp>KUfj}}Muo?8}b~pX7@WCeS z^Y;J!e*fqH(hpl(nyM;SRALxb6>pBF(1?3)MLGJ~g~EL_JnzIZPMgu`q-n!Xv>yrI;x@L z9;1{s`W%r!p3YuDGn2_VV%;tV3WbbvC6fX^n$k4yUNhFVlY;-cF|W0q?l&Qog0|6T z$tWM4btN#0-IIkpL*$LH(Na-Tq@JiD_i0df;!%-6Cq6}01UV~Zvr331C7$L;9xw`- z?UWRf^>Yd>Gc+3t1WG*f;kg(GVstPX4l#ZJVhk6ixflc1v#~JC202i|#&z3~bQzYk zRis_SMxKZjA{LY!!%7=QPpJx8bB1HsIm5&w5qxdCsw+m`uJ<1f{51vkBN56mhN640aRJLi) znHxKIjWq3F5lCJbt(_3@f!Bt&<3qKJzuG!J^7!PA?XN7u1`oW`@%Hdo{881j_gA|| zrdAE@t*FPEkG}Amen49?dFmq6YtI?ao&WTLEl{~bw;qT7{QELb?_PN6mv^tNN`%p5FDq`xnJyEzz;{9b5hZul>7i diff --git a/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png b/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbbbfd66f6bbd73539011ab0671e3526fc8305d GIT binary patch literal 419 zcmV;U0bKrxP)C>CYUXNwlR_g`r@O%r7g8061MOq!;YWr>I&B2-m{a}Hw+Kn!>; z-&)J*biyd581BGYOV@S(ls#_6JfBZO2=Pd?)^TxQS4u?-bzO5lpGlJB)52=CVzb$B zzu&2`myjoX)hg zY+>*_MqSsmZA+GAUnIsDjEF2M7?}TNPeeXH)8TN4gZaX|{}96D`xgK)#JISI{UrbZ N002ovPDHLkV1kqcxYPgu literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/ocConduitCore.png b/resources/assets/enderio/textures/blocks/ocConduitCore.png index ddd159dc14840c2d7b77699246f10b853a5b63b6..55d02f941c84c46ef5c8a6bbf9ba0a50d72d0720 100644 GIT binary patch literal 383 zcmV-_0f7FAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Tf9@K~zXfy_8Xo z!Y~X(leE3Y{~f*j}MUvrR`WqEtlrs53L|NZ`Wto1dI%k}2b z`fV`P22*X|T)2bwiXgpH-0%O+QU)ilMZpZf_hz7~$%&}y^;%~~UHlA8$yq%)y@bOs zILY}P0Mv0(Pmr?DGINquSm&bo{E5<~j;$-U%09hbJ?T^E zF+clx-K#@9*YxV98XwxCou{|LG+Oe^f;b`dtwOugf?v)RzR`P&_siYa-*-7IKP&&& XiShi8ihnbP0l+XkKxm{o@ diff --git a/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png b/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png index 74c1443356450da1f1fa93cb14c02c19bc21a4ce..860bade06931c6c1cdf26fa52b82eabd9d0f7a77 100644 GIT binary patch literal 774 zcmeAS@N?(olHy`uVBq!ia0vp^5anM1_q|to-U3d8P0EKI0n5o5OB#=-^rLgDR%RZ~yK~oqb=lIZ z5+x4JIQ&y)TDb4!7D2ul{>eXHcN`Omm{G)SeY2_3A|WnOa>I*VdM@|BEB=vP5HR(X z4c9}9ixKOuD_;8b!=%~zb2Cfam+(E_%F zol+~ZERCbrr}FSrs(bT~S6|YN`ILUSzk=xFi1eX9dUNr`JFH_+s8u5S(jpmF?Tv zq6^!OzpAitGvl57d(k@U*hjAyeVJ9A*WD!55Xo1z`>yJ?iN4M+yC1D9e0O=*iMtbQ z9Ymkz^`a2nJ7conMm&#a z4lY_P=cmV6ck)3EAH!#bwcU4kZ!(7jzPpyeR&Z+Vm-2?7&^4#L;-9o#5?5UiBm2wR zVWHO5N|8f_ivoWwx+x*Mpo?R{)`rJ2`(`wsti5>pbF4)B!(Y6=zWuZBnU)WXk{Mad zztb!?Y}dX0R&P@#Fbrbvi_cAZH}}_~ZMo_DKWfzm-Z4E_8zsI|dK3GKMR(R-!lvNA9*X?VIghE&{o8|m$L*g&M@ zQH%73b<;z?%W!XdtEdreA?D7Zy)8#Eulu&R>*Re>f;!Qzv$k(g((X&Ycl`X~kkd~u z9a+2XwZXfx-3C$Fhj-k6e>^aauiaT<^(w3C;Ah#BZ%W;a6zF{TuS3N0WvJ2RZEtsM z6Jd5#{C!$O?RU50B}VZN4r~&fm3pGgF6|Pf{}hamyxVJjIb-Tsr6WyhHYqM?CrW<= zT#mV;V9$J{FRt%w$IF;W84rC{N+>MqeE;g#8_CKC9aCHGYlgD#uwQiSm1y-XJ->Z+ z&wf{Z&RZth9XN58gpq-DvqaWh%i8~yF&FOi+_?DRtmoY)X#s1)RvYh`!5Oh}hUJUG zyP_Yse^^?I3HpdyVPoWiT>rSL966n_$~3hcX0Ok51qkfocy)R zrtS?@xHSKL`HVmb`&Z5T4Hnofu=7Z7xUrIdU99{boBO@{_SILIT7Gf7zL$0O@dw|3 z9r%6kw|@5R4Nt!RdQen){r-d@(5Ue zJ-GEX^FR9&DFoCspZ)dCr2fm-$KMV=xxjvI=g~uFlMO!qcg)X?NGkqo|64qH5S=81h&0jMS`VIk=r8c1 z{tD?I_E>r-^jce@Ad2}oC)<6~j4VZPJ+xWS2kYD2dCI)m*?$ndG))z0#BmIwsMq`9 zC}RF=_$_yaTLLG0pznDUh9R#3-}gx=#lzDvtn0ewIY!eot&%7Rf}_?(?`{QNr&C@l zow*5d_08rjPkiz9O%bFj>9^+N7f06?}FfSe_=2h12)Zh@`d z?Fs;wz7dI2!8yIV6}axVV&>a_!+%1@2@rh)wm?X!&o$^l00000NkvXXu0mjfD4x=d literal 1246 zcmbVMZD`zN98Xu;x!SJc2Y1SSh#8x!ESHx{a+i2#S1+kOx4YKc$!;G6pG%%=Lodl) z^4u<06-En6$DE`3L5D+_`emSFL$GeB9ipA68|s)a$52F2=O)8K#ZBgu_OAM&?1O>i zdHenTzyI@p$@EC}(VnjRx(I^kNe`(xJd(kC#~S>-8M^ug9_~e20qt~3s19663>Z!k zl4%Q!!W;xfqxu<45JY>`%ok80vqRAxD*^&c#J4J#O%REGzXJ4eh{z%wHSHwz`>Bs8 z(lnCPE-}MqDk(T-4o$dl=R`KIPmJrbLG?dOCVT}Oupk1YZEEjv}njF2hEg`^k}X`SUcGA2hjQII)qE6KB5l;K#0muZeugqXrfWb>i0nroDl zoI2Rl!mA`ThEPRen0mb)sYfG@JIZjfEHf<6@H~wXwAZi^@M+uI*s`EPPj}4+4R_<$CZqms&|Bvy-RE8Mj0Az<=$d<=G3YuLxfEi> zTt&VZ(?uXiGA);c7|jDgr$JnlXgz93@scbGF`lEEeB=Lyj=@ebL7n`kZdzNo7=!6b z7vRN8A3+;8kBhrx`0OjVL)+TZ>OkJV_}dewdZyUBJ~@44YI5I!eQkxkRX(%%4C>yd z&G(;M4By%D*7VStnc)lH{8FC1b@;*0c|RAPpF4VV^6#JTe&*G)$F@0IdWM*FYyOnlch`D$sZ&2Phb47*T`P~4ume9 zSMuvmd~r{2SLgHH*0+BRJv(P+jfFoFYcIcQ647c&Tskp~mascdaX_h3y@^ZJor{7o3wjt_*Jv{y1qZtG@HdQCU 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!vFvd!vV){sAK>D12{=UK~zXf-B!y^ z8$l54U1PApMghd*!b4mLkwAhACz3zdp$Kp5buA>3V4p@ZHy}cv_s99J_wMAxVvmZLn3xcmB!@31LM{<FY{9zkMUC|C+n7mAPt#}1zl+fJurjecLj_If>wc6N5sJ|>98O2xkJ?=uy{ zp&06t8EQEKHq{*c5EQ%x-k+V>-Se~h#bVK--QC@^+wCfXrE1mc2M6}~`dS1(e75ux z;X#j|%a^q^`*3<{-y03_S&fVVkR&3@g7zL!(0(E12iy$W&sNJGG3HzYK|Nr6-)!0= zS|PuQgzISo?ly`t&xZAO-{{EmehKXi%1EoC44ij=*8I^MWx&*xLB2Do+RzulD#(ta z1+=yGbvuS-&g^>Xd~&$n-x=g2Keh;@3Zg8-&jq!O4XZ6L8?K8bI4i9gL#P*Xk(+=U z<4%@h8WA%ZMtcl#I8dXKCAYVtH&J(TwNV~*s29ue5BO|tb2Ag>Rpt$XeMICQ1WN|B zOb|A%H!2Ycez4&eo1C9pa&={&7%@IXd_7iMUA3d7C7pvusx}vQJq7{GMA_;q&Br8n z)MSf}R#vhsP##`KmWY}3DVB4TL7>M#^%l8#6xtMhND0S?SU~j2#f2p|HyX13J-(O} z&NpF@p`H$zf+UCphlnuF>&BqY6s3{Vf@q68uEBb8d3F6G4fS-$iX8CtG=}xiXDO1) zOU+Z5Q6nmi$r*4X9|NHtHudU|st2dAFT+W$Ct8>E#Ij*PIl%LqGz~im&O9rzh!6;ab1?O`d~52}Y-~0lXjn*o6KNoaYZt z6Fe{5fA*V9C+kMA&)Y;%7h)FSCO#jw{M*8H*>7^segjW+UA~{;yn6ru002ovPDHLk FV1oQFt=a$p literal 1911 zcmbVNYg7|w8jc|ctHw$ZQB-hS?r7VjcZS5{ysZ?97C`h9Mt1b2jV#NyrR#{59tfh)0Infwt#(`KX zl7<^`1k258!Xr2wk1WEJ!lWd`D^b!aLfjaU!%DGi4kseYK_TdRoB_;u8evlj`fKV0 z0D-9l$JTXx@5MfeE4_fe43^HDJXV1aMe0ZFZ$YC3tOD$r3s25NE_g`h?vQ2MkQc9eRBmXm5}h(u+2UeC^lqb2SSM<5h%7=-S>KpwlhZj zzizw}Z8zmoxY&r>$!r>B^I@4kPG)2G`$BFY>y2_LO|VHpGPNX{ZN+U&tX3spPed4j zDN!?GHe+&`5K(~PLIo6t3C$J+6UyLl3`D~~nOq_nxAQK(G+ZK)f>KGeTmnImE=-|Q zNYqlDUJoj?dJPDVb7O6G2C<>|xHiFRk8$DOPTWm49r*FG}UA*lh+{QK!&34JmjL|x_`O0Ip z(I&^8%oXif?Vwk;$1!bljObF;rFk}>XTHi})W2Ng+_HLGM6q^oYbaUY`azgp4H?_Am-%#se`B44hGyWI?*a~X?B2^i={odll3&|r`ik6XRkCw)I;JpAZdT+GA~OD{JeB%zjfk$id&8%@ z#M|o&V5#H}hjVwf_ja5={B7L2*liPd+~O-Ih=QkaQ;P+|i{_q^v==nNQH5tK^NKd& z6oroSHOmcGnLD=>5?jUL^p-Lr9feiHh^v%fgw%p_!X z+WP#>o0yv|WSP@&RDH)QKPsvVJFu!Wd>iTa{;f$f);0`A@GqXe7JMP_;(c!(1yL2P zdLo?5&F%f=b5phNPtFCyzB6{oR!+PzQx_m0BXc*mPU-iypXw@_nCc(gQnILE|K(+E zPYS+Esg4QVKYN9L``2gA52$ZX2x(e5wBXam%7x6@gt(sl%S}ENsmsbVmz(%^19ucX zD_)a)xV7}Kjy@o3YvoNk(!KpEx4Z`UBFpb9;Uk{+4_LEiYery@JnG!q z(2(WQ)AvEO=dqtY(oNIX6qy>}Eww2h6JKY*59cr6c`{KS#7W~<&el$ufk#~MESZ?S z`7aAOW~BV@)X#a1clM&-YS+ua>%M11Hv(=?==r`g+DO*^qccvC7#P&X-@4>!TI$Q( zyoD*j1D8aRm6H=()Q6>4s$AS?gRz4=kh*Tq;qXdOn~6e0Yt!2Me}~KY8BhYx*-6o<;k6YJ29zYl}jkZ1?)W zqhz{oHIEO@%b=!x`LN^t4FQG0tJFl$C@5%J>3yP*KNuHs&sY88o8;EQfGwMzXYKfL z;8|s7f6C>@g7ekA=NlRt`o4cO=Z35E;F7Gz?LHpxgw6(SW?)9})@3p8U!kx*a%W1uB2)ghT4ly2|Yv~yj`@Gupc;n2Q cuef|pQbm8?Z#&92yMKkTI)k=K{c*v60NtJUumAu6 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png b/resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.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/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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 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..33d7e9c6bcbb153cfd57c5a2009503204f33a27e GIT binary patch literal 1141 zcmV-*1d98KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ941PVz+K~zXftya%( z6Gs&OcD?Jho$^gJ_fzWL_Oo7ov#Weu&uBJ#ULdayZx;%o! zSS+SQBNR;&Vf@juR;$4;l{DB!qXBDjax!Q(n>rw0DB$en`)JC3)EiBt22;q&q(Q)Z z24ExxA6Dx zPn2LbpC$VVvjRrjzb_wtd=@X)SFri!O&Ew|BV-6jqK)K+wJb^$wB6lZZ13!-ZEbI3 zN80r5?d@S(+QqFc>_|x*I`Dy(gwfLpIGc$wEootCb)(a|)&$);kMiK)pjsxKRzH!E zHWAh9tsuIYT8fW#Gnl{WR7yp;`A5H)#j%-L?IVZWTB{wl1xD{bD`<<8Fo)BUc3Pqw z7#Pq2$G^OcQ|ITA&t~vy;|CpM(CLni>e(D*jA+VfF`Z0BN+M=7A5DLQlNWCyo5>(Q zl*OMdOMZGD;5G-7ocyBJs~3KWWLn>ABl*Vm8h%e22Q^yVh*sx78ckuMv0tO_9+P3-_5N zov-B#D}+>)uhK+xdUg?U`MB6@i_k9*7VzTxZ?!+@a!Qq&>JUaRyoyMv?`*S@u-c|2XZs($9bR4(g5;6!_Vxu<3HbdxDa0?iX4f{Ug9#JL4ImNwRx z7gU&>vWS)|6q`AFZrQpL{B$a^Vby&Wck|e`uN1y-3LZ06`91s&o?ijxVfo%p67)R4rgc7*`XmMW>V2N{Y}PQMBR00000NkvXX Hu0mjf)BO@O literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png index 52cefdec03669ee092fa80429adaf0d17e7619b9..9090dfa73db1e047c240a47e35e4e92a42c931ec 100644 GIT binary patch literal 908 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 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 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 GJO2S>y|t16 diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png b/resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..e905b442b4cb71c6527a8b072c232d51d350e334 GIT binary patch literal 707 zcmV;!0zCbRP)Px#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/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png index b9d3794f668742e3a2aac322348600fa4c053b07..5fbec9fa9bf0228f59125c6d1b074dbb2e6ac134 100644 GIT binary patch delta 452 zcmV;#0XzQS3DX0R8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0004KNkl^>M?lD?LClYdERy);b~)rjL5MA2;4 za1=5BHAKskVVA&Q59|p^VHolp5JHeriUZ@Ss>t&^o@)j$HnmoI9!-eR3fy1*@LWmB z+=uC+AXAg`Jb$Mw%joc6pW`TJ9-6PNd+NrJH{R#lc7CiwceW$+f^STDs0b9M>6#zE* uA~K!zF{XF70^9vn%)I+I{3lGD0MRd>J76P%)xG8b0000vFJDqii8|stxuKJ?J{$28Q2husb&`9 z2_5voGz98kaTZ1}?Ea#b>2Z6KdnCowDd5{so^ByDhDCOJ7Et=3i)UedYuZ{fej(yPw7*o`eW==mOl+3x*?kQDTW#LUVtcCh#Q_ zw?9fOJJpj+;c?T3xIhV{!f-4e5-C>TMV8%(a||1xS%&6Bl4T`6B(Xuf@(@VPR&!EX zZmVdaRg}oPt|ifQxm>2o0m`)dXjT+On&D`UBasE^3>q%*NWiANK zC2bY?Y)BCR9~4P3$A?G`@CpgSLXcDfYA~D=1wO>FLDcY}-|I|%&3l*b3 zUFia}Sm`5ZpyshrmyG>!>u(IZZ*4-3WxR_wx_50HVd}nXK6YsAt*6#qsTsfg#hkY_ z`s$grg%4_O6^{s8#y>2kz!T4ZGJ7L;lD-2=FC3bPe6``t<$ZO!>=Wl%a)4P|kqr>m? zj<=ut-J>=fuDd#Q@a~nVv)^7H-8Dt#I|lyRJ3Z16d2sTT@cA!)y*jYiw6J$F@!CSi z_anuIGZ*%EJ>+dWP_wc9Qup|_g#*c#n&&28fBVJm&DY-B3^u9HJ$if1{L7&JQgYMc zvC)ry{H-Ci=7+%8iJ6;sCZ_iM`SFp7+1NKFRzB@okM&}w)cpLD+Qk|FpOa|ql;3aZ G9r*_$eX;cb 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/blocks/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png index b87124989e13c1642597419b8d667ea319a83f26..d6a8735be89b2666ad8737f2fd759ec1a76a4c70 100644 GIT binary patch literal 773 zcmV+g1N!`lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0-8xgK~zXfWtK~l z;y?^UUA6-Vh=4QnlFy3!AEj4)1r~gbM=z~(RCqE%EtNhg$@WlFPN&n@bzK97VQALt zwd_*LtiRvyd>+S9wza_-JfF{|ZCl0QE0@b<-0gO9-0ydhk-Q`TCPpA}PCWp_ZZ;d8 zZ?_wHQ#X=6pO1=w{fLPiTl(r4Q^N&lR*uKx*!R5>2yVCAc_K88tnmR8)Wm@Ek!=E(?2_L=tuz_9rxD$Tw|3+aZL!-=8172b#ebb<x)yD~BpiU9yaR0!J_^x5gy}a4DER@f5ju$#|L+ko@hgM|K4ZCw$qhZG z{HpL0qXBwuP#1XBE+(K%1R1aMf<>G9lLovWCdWsvHc=$tl{9$-KGjq`vCv+h_(VC? z(TKAfi8%Sx0Ed1zLVHHEZJK4G&Ynt5D}k^UHR6vu3K`T3i=*R^ks+cG@(?{j`(2w{ zvh75KEYQD$6rh~cLgYb29G~)X7{3?d+Mq_3D?yW2geKv~of#DiVGC^>Ha^!O+QkmE zCUSAc7(pcIC*sdlUt4H5uR-m+f#14LBq!VmWWnSMAu{CGMhx40{#5l2IM^X%5@#1c z2=XL9w(Ix`XMc!)vekg;9f&{EbokSj0Q{3R4Mh$w5(&b2yNrvII~jvZhZ~LS&PfJm zH4mWc`10&K8F|0oQ-j0dpdfc>O$M-;#-I?GbeRwK`@L#(C+psf1fF4CRFeX7Aa_oU zWxjtE$S>#fdBkvn|J&lp5MpRxy=>%s?qm;AN@@N9QVw-qVD^Ip00000NkvXXu0mjf Dc6m@3 literal 1962 zcmbVNYg7|w8cwOY6rm7o6g43ijfcv5(y+=a%5d6nTd&zOqdKLWI5|9 zvbCjxKq-f^c&WRr0s<8kDy<7Gf(oK`4^XWFT~{Pfz=9M6Y8bXB`2s@0U6bXXqP(W^m z_n`48jAW!-Yc z-P;Tr@C-sEi)qiD(kPTbB!;5^m(B(COcn(2g>;C^5kk=00E-E+84#1f5`qvU;_yWf z514;wq#BMGMDbGDycW3<(~JaR6)_lgyPa-l(=mJx0}={_3?_@gVu2(Av}ITb*a2E> zAqy6ys7;TXtb_@(0B(!04of4%G}6=OS1?-@iWi10w)sGjA!9gTD+8i48D_KlUeC}r zA|Cz4jhCWr>I^H&h(~Q$8m=evVF+0uld=1CAvcipMih&i$fUq2QcRy_MlFO~DyESq zbi{;+^g39lL-;%p7BU5(5aJ-9&Hy7Ik0n5udJdDvXR{aVyo@j9M?x|olP%%1Aqa}% z2n1}2M8IM5_)G~;z~?M*^hFntix+)_TFBf1v(duDFSJZ|li4)`K86@Yr~M(UXx8 z^S2j1j87hMxlAAAPaBWex*Mmep#kV-c=Si{Ndx$2{mb-&RRQ9Ni2L`4hnFtBQ{|JD z7gi9e*vk#dz2PF9nVBtfZEaifH(VK+&E5YFwXpPR=G|1jjqf_)>Ak*%;v5=DpPid) z2`cxCmdbj+JM##QnXt5m`*8CO zS!F#0-2C~cD8E{-s){Y5{0)Eqa&1b$|H*S=r;bw$WF z!&ziheXFFYx&C3|c=nOyIVlI4tK zsQY;TP$h~#RM%ge0GHXjixV%8A;BqWpzk`ZGx)AHu>b5Ei!Gl0AaODJ3roVAwFRFW zUQ_G4Vq$zgExXLs^j`PsElJcY&f2;5sdm}*n}6_gMV|TUbh)Hs=$tgJrVMVekKXrn z${dNor?#!D93QnFvE9BG$3p#SNx_CqU4P3Bulh1?<<@moeV)U$xT;`Ys=|NC4$rCRhN7<2@x`s}V>8Djn{RonE(lF*Es%t9`!#i6 zJv=qgG<$Ldxct-e!NIOJZNs5WeNT^EJ>e`X>)n)NnEdXoux^#O7y0q5_FB0|#}n7P ztH0;&q88-ilW&hwUcc&JTJ_uX^z6%lLre0C_O3gyyXJ@L<1<4BgRQVzSts9ioLYHb z>b=8bs-b+hb=9C|pu~G#lzX6B>Egp@jDkv+uie>a0fBIaL@v z$k*4`-cx_YxPSOzTWnz4)7ja^N6m+m2l^)`-^A{Q)btG3)Zc0RqkjGA$Zy0qryo3s z>bd1{p`ui@H^05QhrgwG(zUJ9zw2Dr(OWsS-hH75OM7cVL&i294`+{RKfg45Dd)yM a4{yp$5*6>$tCqU|p7N;e((28-5BwJ@OCak2 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png index 106d48a3ffa6b893eb903001eeaa90ebe72b8e12..b45cb2b44ea7babc69db83876810015067442271 100644 GIT binary patch literal 869 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 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png index a91432d46d07865a9db0f539d294225378ed4efe..d3c7987a652a26047abaf61f9247de26b19baa33 100644 GIT binary patch literal 930 zcmV;T16}-yP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TTEa_MPWg}?T8ck+OaKPqiVPS$--nZsama; zIk4F8_fth^61m0(oFFF#%r~2j5xYHHUtd?d-Odc{c3aM#K9liyEF>ks1vqgI;tNXuO}_FH&h^GA4MFOkd{a(tKC-K{e3I9H#hR>+gD2f;A@b{ zTVR!0U}@Pq>d@7l3{)PebamcW-D8aIcBHL>FJ}aZcY#ms^>y<_dT+hcIU(#oJ*83! z95_?_bl%cAV!mj6qByVZAV*q^V~A-7e(009Uhi3bR44>rfS<+17)yZUFq>*xh3pZv zS>Mq*XWURC$eNJH1SI#vw_?qz@GSwf5vfC=f~Gx*M76huM~1l-72}OK@>v25_HL-& z@Ao#g1p;Cq*E2!=Ag|Na1p(qc5n_q>u>lokPPBysr4`upr%s4(B=EU$sIL<{myO+s zxY3g6m^Rhc8ng)_5}Tc*^gH&P-V^JZM7Dz*p1?`$7Da8OB!x_+(6%MNm>?Ax{n8ou z0#57IO6WLkDx%nJQo^13?RBkCjU*pk<2lIzU)n)_ix_Y8eOjyVP9bZ3CHY=#RM0E5 z+VR`!(_l}tayehx4R2BY*u6e`A?N4k($c2@bo3bje#;0V_(cEW*%fq6o_kGldw2KW zTVyZt)zwwy9~u%ofBZyFPfyc!(d-CPbe;%}4KQ9T7V_iIZ@cRF^ZB)JGK*v*5f7KQ z%Hd?d$sNaYx(3}h~rW%J=?4-y3U^pCFjD3^+aM*etl#>E{Aa|b} z$Nt_%{KLh?Ma94!{NEO@3}FooTpuTLf4<3HNC-jx0i?*SgC2qNivR!s07*qoM6N<$ Eg47tXp8x;= literal 2106 zcmbVNX;f2Z8jc{i0S*YV$Z`z@5y*10kfnsMge4$h6*#Q9NiGs0xiN_(U=ggSMS)J? zpcM<&L1eH3MF%1nup)y?t;LlQP_$5$g9;2w0TJd#!I>YP{+N5t{kHo&&-;Gwa&AF5 zFVJ|c%~}iwW6TZWM4~gGdspkBO&pXhhoiE2(ZcL>Awz^^djXzmCMqC-l@OqoWJncEH4FP*mx-=*#{?|! z9->TVVLvz(7a9)uA#xa?;;A?xkpu!X1|FnR7$E2lkcc3e01^o#1`Y(76dDus0G1vs zYE3RmWkzxWmTaLr7B)?(lraeel}d$Ik@1Lp2LWU-7z84TKqBE#1Wu79RYGc}{;c7JY22SmMLhRMZfQlJbDBHS&3rAjV`g+;&M zMPdf>cO^^B~bhL?MOfK_iowbw0%>(S7Jte=6uhBa=YT zpW;KL_;P4e1{EEs9J22+mn&5$A*m2vwk<|&FL8-~%4Pb=VMvL{qY)%yxeCJ55GA5W zLu7!TAK(%zmWmLSVyiAgA1=&+<>E|O6d*?=!21w0#h)-w6c8Z>8G>+(R2l_GqEHxU z5MTz5C=!7r4+;o@L^^hfFZzE&M?jq-=<4Ku>Sp-}Ek@n)V;7*Ck9`D7(dLn(U6K&@ z*_Rm1$`mfgCtBT`5%Y6NzlYI~eo1Cm)1}$`@BY|Oa>R}H;@DtF@$8BFyrMv}6zPw! zdsWcn|*x=g?AXS!7YjSI%dgYcTE0XXywI#WBc2k=X2kU{P4iwf@w!%AUkb#?q?^jL$Wo=wtL&m#*Q={?RCwV z&+QC}bl5J9w4XZNyp!MUUI5rXS)83hjyna(+Bf``^b55!eEM%A8wAvRw}chN+M$6F z2T9%Yo|)CnWnLb9n*{d&Fmg)a~`%% zn){hk-PG7>lEJyHwcb{)2rduQyVg~1k#fVJ;Hq%{%RL7}1J85JH9Pl*1*?YaW;~&q z5y$=CV1Hoa&i6;G`o-{eurH+yQ{-*@w7}~Yl>2Je!MQ6z9x=rj$IScm1HKh`iT@g| zOlSzMj!Un-@{^JI3Y*i_eghdHeI|TYL6p!^FgIi7Ups7Rc@z`xZR#A6B{jJt){NcB zGJVN@!x3^ftyq;|cPq7z1_aFI)h22NFKAQgs`ye~%J7rHH4!bNMtk0l+rH($N_XZi z9IYjGi{q;`c43RWGvAWKEleKe2H+U;-TX;>gtQT-?fL%4-sCt>8$=kJLMnYTd;hft*}pHkc*aCnX`0qp#DTnZiCGSRgjV+wVEj)2ud}UGfw)K6jj&(T$&+Kq~ z&-lM*ejixcUh_1(qQ5$xT0K6ANyc9V1>BbbTy6#bYK>>+-pXuJvT1SYs(RY%T9;FX zz8eo)+^x*6_io$AzNnx1SlVj&*CR1D6}{r@aAm98P~GX=31mv4T{)STb#grO^6Lr8 zrprL*!B!0|MG9=+SK{sG9#fG?(VLlW|5Y69HS(sS7~5X8qbX1%Sm%k6h(9%UmR?@RM}#YY`M9o zS<=wZu!Y-o*yGh;&PaZS_JnIu-x(XNR_pRl&8C~PHJaXgZR7X<2wR=TX0s=lXJ6Qs zvXU-$QNm~!8=DHXkF0Mf4m3|w`7f~jle}d2Lb1AJhxSxqkLrmEoX7u!IS~`(KN{<_ Qp!=J1{dt^vU;dZ>0h5?e#Q*>R diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png index bc15f4b3b8a6da5cb94575087e1fbdd0092f964e..36006b9a38f202fac6d0a0db4cd8db83ad95a66b 100644 GIT binary patch delta 490 zcmVpGnMp)JR9Hvlmu+r?FbswhT3QK8wRRuBL8{aZnwR4T?D;e41bdhL{Vfmn@xXpUHHpD zmStjBRV8|irjf^twN~_MwGyrI>JNgh#<}XN*uIt|W9%BZyQjJ%?>bdv$&j5a^ zqhbV`YN(8BG(LKajkwjS4hMXGPv@}B`R zoq}62aAyIie;oJWIr&@=pE3aE&VX?xZhyhwXW)PTGXkuD0d2o5Q*MLy*IoyD*)Z|V g^eXu-7G}VhS6~v>W;8uSNB{r;07*qoM6N<$f^TB!NdN!< literal 1199 zcmbVLTWB0r7@jB%O={Y_i5lza6k|g(_t}}9F`KZN$+la&Y1poI6-sk<=4^II=8~Bc zcd|jK*V6W(mV)%5MNkl=5U656^U#1Ov}!F9vFmo>R zegF4gkB1cnpoua6Y{9dz2R*<}#Tgf+SG#-%U89Y?R2mLCp!w^wf+pi#yci|W+ zB4|%fUPgTs_2i^eD&ultzi#<13lj_*y8&TSRNp`xKx-UfP(fpkm!a>?U!s9yXXrzz z0$&IWRCD$=LUgb(T(TPDmS)of{h%+_i2)a32x51_i}W}{uh`YeKDp*-umZv38G6;J za$y7*euzMdO)(ZP3P9CZAth^q&8L0c#IU)Iz(e7tP$77CB|; z8peUnarJtgtxK#Qj&XvfX&f(dqR0>g6HR*<#*7#3Y+5i;WQ9(E9p3|qMOg8taE2zH zu7=4rbKNAa6?BA)=#d*6qNCDufVd)x{Hf3)^{DP_l1c6! zFO&d@H~N9lAw_``rf*HT$isOvLz6$O?by0ift8A_Dh$;4G@}W!%~Yz;W)v}P^Onpj zsw6e-Y{XZMK}9lTIV&kSK^T&?T*^$#YIacOwJa$}lbiP<3_S}qwH>0p#+4q+)r}BA z?1v@apJ;Z$NX^H7RPzI17+}{S$Fu!<)RR?@>4B zI?hI0yR09tp1)zYw1Jj~i*H|8K6Uo9wzzB0KUa*a+Ai?ct+9I_ZhCloLAo~g-MNJ~ zmf4Tc<;LdMM~-YAy_D;pnfMMzZ1T64w%q-x<-zamMPez{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D11d>GK~zXfU6xC3 z6G0G$yKN_aiP(k}NbG`wouI@vSK%yh1h@{DKrDGgN+Kb#gTTUzNPgQxedYc~&6HHG z>gwwMukN0yaU6|CMZI1R$Zod_&1Td67-MPo`+Yesio$(a31einT7_Dz=5yf1i;Ih* z+wFQ_u~;}5$yESEz$hTf$qS&^R;%UXhldC94s0ZCw_9I?D2@t9bJbWrN7Y~68^=A(ADA2p|VW7%!Jg2Ua{zCX-^lUVGs9_&A(CeHQxtet?t(QbfSH zunuKzHk*YXzkm5Xum-$1olXk^2!YqbQLu{-_3W~#NLB5*IEzsqpkArz&WgOdy9=Mb zehDhr??O93Aeg=!hF4ct;p4lvq1|qWhQ({90J4v5^7nu;Hj;%E_~!kGaC3bfK7aq_ z1PFLFm~;eQ84GO@>`hB(*-pCVKQhJdn6^!s$MRSc=Z+B8OTn}F;c?R>XYXfcW0o`$ zx$nSyZXuFqmO0dOv!^ZrJD%?#mvS=sIu7!%M``{*YdNO11d5R7>(Ux0Ky&e!CGE_j z8`R=d&ln^5Fi7b`~1;`Xfzi35cFD7P0uq-gtHeT%C4rBsaIW|Mep8$m8+2(1!+s z=Z~L+!C+8s7t4+S#pXm#^8!Z+ r`rD$)Q0B0RY?Vm)JY^~*#u)wq$9$=TL6o~~00000NkvXXu0mjf&o`+~ literal 1916 zcmbVNYg80v7+yrp01;25SjZWN^guGZGkck3R+a^K7hL5gq9A56J2MLl%+9hqw2OtA zT38}!UMNGw(7ce`Ov6Pkc|jBd3~>=9Q-na0jJzdk%_>+wJpE|Snfbo&{hsH&zh^#< zi3%U@@|p{e#~ZJiql)EL!10b7#eE-n-74aiDXcnyUBKvA3vQx#p(LZF01b^NQ?V3I zW@VhAf_OaV41HVzn-CcxBN&>GJ1~4JZRFTIUXa3S#ECSD1+-MM-XI5mtEvS7Jt+s{ zC6REXQAwrf=PWl-3zkR45zEsEj06?IK#*0&DWEA92ds3u!7Q`N!KZp<+}nOG`AP+<50Icp|T zCyP~u4cp>QaxjHujWU72VzKZoB0ghE79bdg31Fc>D1|MxD_&(eMdB?C^KQw z8(BSL02~@|EtAR0LC(`>A<)Li$mfa;=HWzfDHB+6qX6N<0-AQj^%QMpW2t}Kcp=&x zmt~{`v6Pv~G!a}qbiN~GE_eTJ$N}WMkwu&ITv70J6+>jwl!4W#CWZ!{rdXzbfq6`Xh$$ja1fg0Ig|t$!779cWF(iSdC@REZAu82@ z!+i4prcS^)C2;h~zxrlG#5JR1`+N$x!}B?!4BYUTxGCvNDw1-;w@af6jk9*7Z@oOf zE5t*6*NZ50X;@v_36EPnVHG&JqCKL}FPGN5+ZJx_JU6g8HC3E?_m6u;LBYX!UG15j z;z+4f+E~Gs2j0nU4sI4DclOuq@Xx{FAFdf&ikq%4W^L8gZH;z&e(-IPBB1=-IL%vw z64$1*?=CN0wygh2R~Heoxwq+;L+;1U&REw+EY4V`=hH4t9?GdF_ZCF$ZElXvZru`b zW=H6(Tc3Xl4?y)>DOdOM2Z`i5vUm51p`lqf=Z*PBUqB3?8{&kY@$Y^V{Gm|Iw0y+JIH*X$Ds5uoRm-m_dKQvzRZfJ?`m{#v&FIo0&ZFTjO$q5T$ zPP_j2cmewB{)7@XW^Sye=pY+b}zTY_S zUfJXM1#@)}e)a0r>5ssJ8<5c(SIo-U?SBue?A7JA|6H6~zAywm-9FhZ>0q*_SE~EY z**CnaVnFnzEG#hduK;p$fiPfHS)t_Eoh@J1DEb0^S+m%-@z>VqvZJGcqT7bjrEA}u zlpptg&(Hhv_tY1}J{hv(Tv3oIXM-f;@9Km^4-R7ol-&8^?dbfWx-dyey74KX51NrW{+v}&MB{G{30Xce9wBn zsR_QhC4at}=acGnarA}e0jFKooo7QXX74YaaQNX{_J{*+i3eJxd561_Jko8cmXh4O z?nz`(s_Q&|6<9GD!6#G4r+r6Yn+D`x}GdJ(X!vRW!1K8?0$8WBJspMK=}BIt9C{(i&C zyDmqv7TJ#v1Y>lgGug8yVF?Q@yf9XMuvk$VGYz{wu{+M}mmg(&`;71G63gh2&+hNK zd*g^2y|A(wfF3%nZ)jOr^Jv!0wNay1$Q8aHckI2<;=~^H|8tAM+2ZT5e%;}wgY(_@ zEVfz4Ri$n6`%pJ?ZnZ%^GYJ~7eGu48p1L`-C|eT#({}mfDHDWabBptxmiMJ(9oG-G zD41?pn|Hyb-hNNf<>QrWU-I$s*|vdHEx8}WNVauf@|2b!m9@3@5^T^K^u%(2?y3KJ zK>C`ormBkYUYav8m#!~O*NMKDv?@2*D(#2x^T~bg8#lBX%e_vQy&SzGX7EANv0{7e aC^uf|q{req;`{^0|4^fjQkBe3TJ<;Xum{%w diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png index 415bb10ad07e859b7fc6f7048fcfcbab2d47ebd0..0e8dc861572b81af46d695e823925d7efe0941d0 100644 GIT binary patch literal 913 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 diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png b/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png index f73cba2c87d3a1a2c9890d1a99b8e84c054b05f0..03f9a93702341a6c89ae62bed35f50fbdba6f53e 100644 GIT binary patch delta 166 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 D>`h|C diff --git a/resources/assets/enderio/textures/blocks/solarPanelSide.png b/resources/assets/enderio/textures/blocks/solarPanelSide.png index e5c00c349103031ef37eb4f714d98ddd85c7d126..16c894f10b7b0781cadfd1888b020955f0e12111 100644 GIT binary patch delta 11 Scmey~!?>Gqg5~6|u1x?SyaibR literal 18039 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 Ied@XY0%|8Lv;Y7A diff --git a/resources/assets/enderio/textures/blocks/solarPanelTop.png b/resources/assets/enderio/textures/blocks/solarPanelTop.png index a60c8f937916d4e401d2196903649db17a411395..24e14b6319963f49704e9aa729b18ed06a53161a 100644 GIT binary patch delta 11 ScmbOyc7}g~^5#+4zGqD;*ZPJQL1dTcs)2*AhZPam`aa@vCLb(Db zm+Z8IP-^~$#1d;k6a->>KQFTOO(#!EGvscW%NIhCx@kHnmTF{ev5 zVKmy_{bapH^KfGEo50O4QXZDMA4#^WX)Q_XIUuYRK+3zl_Z^ujdG#3dgy_tM_q)H z>^LYrGE~qMVZ*F?s)0dJK}+r71eWs$c%~+-c6j!&#zgZuFPid6ZjLlc!(`Kxi`|-a{kamNr-Tt%d`b#IMx*oHusD3=8pCvl-QfK?wXY>Bs+1ICk E00D;(6951J diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..4d57072dca713c51896852bcbc367f75a0f710f8 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXaGj@%V~B;S(H3f;v zd9QCpZgkGE$<`jBcL5VmKNq~RMoqE%y3K+=K}{c4)G-P#nJjAZyH4cv zeusAj3>RfAb}#;aQf$)Gts6zH<{91ZP1_K>z@;j|==^1poj6N=ZaPRCwA|Qdx4vFbFe?^Ul=&-v2sn zW0ndh&fz@;j|==^1pojClSxEDRCwA=R$FgfM-^VPW@hhwE;hw6 zc2$r{5k&|P50$D05YQlSQZ;U(nlum;)FPxv`~)8O2?!)aT0t*vsUW2ZZkrTvqE>2) zh(H2fpaK*cnM8`QL*n>c_GK=7Yxc3jk$t>9duGj=^;E_K9CU{WPUde{OCnx9jUy<)6UhgFGn8=lAqFoz3^wC=G<*NJTuD+4-Kan`>*B zL(^Rox3{dZITmUL^`dn=a_sl}gJvXE zsME>XqEqN;yEUq@R!3DKC!DnjzEa&R8!E{^#L6`5>jVrG=d-g}FDn7E4s(O0!E>sFa1WaeaBRL9-HM- z6Ggob&UZ4~xw(G-;lQl+KPFqnfm{ zA!tBhf}lGC?T}*R~Q3lb~4hG<4 zB_)-j0GJpcDbyDUe)Qf?{rZJd@(LNKNqu9bxE*ORs43R!tH&Q-dG!n%3CNWQNG&cu z)9p`lrRs5w6s!?0V^vd&thLsk+xy@9vB-lVubKucYBRbuSU9k7 z{>}6C;0E}uN5MyxPfwZQ*x@~(0%wb?7&WzWf^gFyJ=*usmsZcc-tQE{*l^Q;Cpxp3 zjIuG9ZS1XKI#BSR{^Dm=R?h;1ruMzUj6#WG)_!b;8yjI`6M&fcIpcWq(j^_BL6sE+ z7M^=l=;G+wf5?E! zg%Qpw_!lcw$if(KVAQ6?F~TZDZgp}V1#bwRgZ8W|&n3hF{AllyrPr396;1fW3h^ty ztBf5T04J7b375W^(z_4^a?#U{Qj91WB?@4H){DoF|L*i@`acyVHmch?5Q%m)h-7B^ zwy@b?Mx?LUhL*WtQ-%Gitqn+@V{82p?rHLw$Z=))XXLzR78gvWEMAL)=#*frdB?m` zx?pXqgS5xwWMZ5l8a>G_Dj!ta8^n_!5;pB}$)+uUkCPFm)DJ-0hQ&#evy1=eWFC6w zbGQK**$nNk4e_=PyikdQ|dwYnw#ZUS(qJOc^%T zidEp)MCXD+n=&4+VB~-lJVv;Nowg>3?hsyRGDKiu@Kg-Yus7Rd_z*muMtklIyt- zu*tUn@lP={3sj|Qvg8Z*fA((|-Vr*BK_?=&wN5QI@?<2G;n1<;GN&!HPvFTkp0tD} zp}x~&COUZJ=&`r|@JBIX>0&W`RO|T3-(%~V_&l(5W0dt+YR%hPdt9{^qDqjR6F{MiKfV9H?!0;R)4$7tyZG!pj-E0vHo-s3DRBK zn@-p{!I@`&qHT`YQb$DeJLQ8Ms^k(L+Dw{guS3`rQH)>^INdWa2l;xQC=}k-Qvz*J z4;@%k5B}%}IapMwa*PfTvgxiYX71ZNKpT*ir@P9=x~^3z1d8=ICSJI*gnF8)fnk7k zcnBVRz&{?BC0y?g9(?TV%V*FJywj}?%3f|qp%&vrTK%$BzoD$-^mq(xnskY%CC!HX zxb9}fu&i1PaII=98C}!Y-TS_L;MA!Xr9{K4S8FIaQtzI7I$d+)%GI`fH~zbYbUwdy z=r3=)fg0Xg`*(XKofuxEY|k7#$6eoSuS2-FwdQGO_TWzSo1Z?De9ZC0i%2LO$7-U3 zG_rK$8*l&OSE6T?E=YnxJRnh++equgECLBzh P00000NkvXXu0mjfHf-OW literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png b/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..ac48462e9b35bb25e8744e2c4e80178b35b00d6f GIT binary patch literal 541 zcmV+&0^D5d!Lq2$|lS>e>z<6{|(MgTaD zgVvfPo^m~Z13*<(01SsIv)LYxF`Z5^bzNhv1;AR%U~tMswg*(b<5R&MOrGadRfV;d z{rx|jp6&u=Ycz)OI3rC*Kto;Eh)7>B&vQ%=1VmB9_SP@vi}ys4;5ZHDPWZ9sX4Y0FwLz)hOrswLq?(ZUkQi{)q z4aWC<;yC91{=StJWZe9Hh3B=-9sj@l;V|Xo#Na5UD2jrrs_^}D=8HC2cb>xIt(fI< zNmW%O$$~74Fy=vamq2UXxA6MllF1~-b<1`OVHh$VmlVZY27|W04o&lrEC>SPc*<;c zz~*Ml`M!@)N^yA^0m~Psy|s0<_LxKjb9;MBS(a-7-OxmYBw28F7W74|wP>v=%M!D( zu|bj~SZfgxwAL#X0{@(=>s`WdU6to~7!e`Q^JisWT@RjZOGGeD(=eG#dScDN+@O@| fZQbvL_B;Or4omj8aI7bT00000NkvXXu0mjf-s%2G literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..291badfbd99b7a25f117713e9015d6dbce1e8809 GIT binary patch literal 10024 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/blocks/vividAlloyBlock.png b/resources/assets/enderio/textures/blocks/vividAlloyBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..09e938adbff492ff6e15e38c51cadbb2bfbd53df GIT binary patch literal 481 zcmV<70UrK|P)FqWg(&`@(S_UD%^S~d9%FXCfuJZTqLC0p#GfQuvv3UNDtFGNyQ}+j zojO(O$FDz)X(2zsn_d|gHmX%>G%7rRx1Fq zECV120+!2VfxOvlFj!OrGL}<6$Y`0sCF^_Ej)+cP+#ymIc^}2A`YPE77zJp1U zgeZy%LErb^K75)953iI`42MHZxm?EcJnr{9B0{ZJ<8U}oE|&qg-|rvg2SLDiJjN)c zxL&V$=KX&EU)ir+G3WD{G)?h+pD2pZS{J0kV?LfGbh}+9lL^L{M;EHqDxFS;8^-x7*v$JY|Z=TmREEEu8-X X5N^{$4Uva?00000NkvXXu0mjf^Tgtk literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/gui/23/zombieGenerator.png b/resources/assets/enderio/textures/gui/23/zombieGenerator.png index d6518d7a2fd6b9d252b6f8bdcbeffff554cbdd12..47e196be8e475bca2b9150b611e31b24be98e9f8 100644 GIT binary patch literal 1844 zcmcIlc~H_>9Dl!`h()mn&s?lvL({<1Jy3l(m&*hIXd1P&7uBM^{q$^scxY(p^v;EtfdGp@)nD6oVe%`!aws^bgYAw_P z0O)$SyKDmhQe7c{LaL74QP=m+NYUHeNT8$%GpG^}2b?xL0dO--dooB}C2K~y?~Dcj z&7av2Ce2S}MAmt@IPFOAm%bFyOsE)*Ku+?XMr|3J%79vQezh@|xL5oXy~_02Dawka z+S+@ALh>z7M(FHWkXh`!l)K zO`aPH-5TnNWei6@xhL_DB?u#Ev{J^gCF+%82gToH<{3vtYokZLLqe$NU}tQpAlJX< zYMX8*ip6HLM|6H}6&@Zx_2Psc)+lHTLqM2_jU1P8*u}-gJ>`v!&BzlSU4+4r^>P#V zjE^%bxtff%AxO`&+1LYPS_ctew533PMu|yn_H4&g4sw~Jlj7KZV6F-1(%@V2;ovk! zT}|@~%>f_!3VJTCfrzE46$&?Ym7HKkSZ$3yK5TI$pYAC1x9YwC@?O>dq!eEvdz*ur z%Wosr4Eh?Am77ywnAK&HHpM4&E{`Ca8eZP=d@`Dnv(*BK?^cCU7nhRXwmbF}`a3Bo zLSGih8}Jsv8_TuQ!)Q$3oTa@35@&S;aENcYTUrWlR0=oR+DQ#BG>bOwIEfdow0MQc z8aPel(_UFN@2@yAC1}fE+em|-9#9n0*GX<>XJ^;NR^{D-aW-#mKkMom!#mrx>abkH zBO;oLI1*(>kTW28F4E@#-2K``I1sqx5DEpBx#~a=uz5nNTtQ4pyhtjz>0&49Ur}kj zFx)4gBgv2mg1G|@-0JTJCzWZyy=D55H4YIYd0IRYCLDx_(#B; zK9aa@xsCGDdYaKd3fPVUP^72GJQNB#%&*he$*3dL*S?; zKzRXTAPiswz}u}&%++Lhm8j=6BLKo2;8xFi1V`aPk~y$0H)1&&0DUfCRnB^(*WCr9 zJW%_37nqm}_0hvf8I&#*3VYn}O^5a{7rgfAe{WZYMe=g7$ib#RAXWg<&I-=6SD`Qy zuip&zG8xZt9kQf_hi8mWH0yUW7QitFE(6M)mQp|Jd@$e)Vk|;Ykqido+P-X`4)~rK z%dtL3En#9bL~>L1TPU$s(cOC5fJ4veL$6Ei#Q8=#_V<-Sl9=Rpyi-mrog-;V|x zXsWW!p+$4>d;(CPBC!q>j9B>!q9Wtt`ShUdkZpW z()g&V4spwqJ^SVv?nI#A!rBzv%Qc8u%9ZghCHHT-MEXk+XV-Vfv+tQ|6~+~Y7i7il$!IO&#Hq`?B`LVFQ(>qUQ|C`l zh2?)kFdcJcAtArckY*{|i^c`CtKD0TK{srtBrRmF&!pv14JSyw8md3&o2)>o4ssfr WUsCe8$(}5kN#Wt@?NUMtO#T<{C(uU# literal 2112 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kEG#S|BV(Sb^fEQ+9ollo^%bufDc|sM{lAUj|9|=J?(Sp9j{X1t zAEbpHv#SClmb1VkvY3H^ZwCl7W;uS11`0}* zxJHx&=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_mvsmUy~2hE&A8z15vJ+d;%N za8`Ma-2eYuzw}u;IEkK|AvyKr&1kRu7SZnAO_OJBlRUm`-m$_r`hR0;#Mt?+^_&gx zSG*8E`M}%9x1KVr$o#)B|Jc6$$39(lH*2WaW>r;{^~?MA*IMc64!Yv%;z&v15Mi^@ZKj8`KZHeYHQ9Eq9LuSpSRmh<&oRDp-%G12u{M z6Y$y3aOu;>nNROC@2dEzU!T#o7%rch?Z>iUeO%R> z%(@ru4F_c(9OZcMH2U*DH-`JOzi(&r_&uNf!OzI}^{1Hcd^6w2wCry!cZFz4MpWeMY5Va0q#JdhI7`@#trZG zt`ps}fA!9?>k}_A{L0-N@M N^K|udS?83{1OVbQ!xR7j diff --git a/resources/assets/enderio/textures/items/bucketEnder_distillation.png b/resources/assets/enderio/textures/items/bucketEnder_distillation.png new file mode 100644 index 0000000000000000000000000000000000000000..b195c778a9c7f7bfff806c83b4d228c6ec37d29b GIT binary patch literal 440 zcmV;p0Z0CcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZmCnK~y+TrIWo% z#6T2S zGCOxN88R^_xZe=w-pSlEXD*Dv7{fM<JQk{WVXm+? zE38Hp*8E#q3+|#8#a*-}Mo|QC5!y7a?M6&8o__HIN(4b5R~jriD})H=?Bxpf^b@wo zIQ)77-M~))!gXETmJ^f*rCb4SiU(ZooFM0;i}FaF4Z~1oz~tjjMh$jlAPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YFJaK~y+TrIWEv zgg_96XSsUp9pX5iZO`h!#`$r;nTb_^reEFOK-YC@P1_&`Hb#M| zed7A!lCwQKkPrmHY#U3C27TYd-NQY6J-u)R;OJ}(&E^e!Fu&wXpePCz{bUWRo z|H)!LI+!xv1KPqc3~Cb9c35+SK;!HdYYtA|KEJA^z7OLWP%};a##~_I5`Xk?flUtD zSO{##8V#6Y+(dmiUUEVz*t++xT+n+TTeYt1dOV0<{|lbyab`AZtOEbx&o|Kyzz;!V VbJif1yN>_>002ovPDHLkV1latwKD(! literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png b/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..ee9549401c7f0960b3431d402b13de0d8fe511d9 GIT binary patch literal 687 zcmV;g0#N;lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00JLLL_t(IPoCYh))O`F)KZ3wYGXsJjg+FI=^HBmy+bS43d7P~0c zJ~Xuyap8QP8O)HuEPQ*RGi9p)j%MCZ&O_SVP}<*LTENci47Mq(03O_f7zra6=|QNiRfVVk zzvnDI(X3KYz-J1U=3gr7*7IlBn0$=Y=m?74AuI<2=xS|-#bQw&RR!?W!P>+acBh|W zGw}plQwe-bOk#av9INpd3ca_Hzi}NIKM$_49ww7X3+QZdBRABC_oH#F-5?8nNj0J0QL`@CSA8tD7|QW+qNbvYpp4IodCRfrCwa5s+P-~fbB5Lw=bG}{56 zvkvlqBCE0Hs7V93(tHYYp)RCpRw3L2k-QSPiHw(107<`3bNi9Qhm0D4{4gAK(NTLG z8ERDyz9y$Q7D0CtI9CG<27_`|RVAQO?1^LG>uM2jo}^&?ZwJ&|x%gLC-TZTd`3ZKF VWMyqgUgrP+002ovPDHLkV1nCgCLsU- literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crudeSteel.png b/resources/assets/enderio/textures/items/crudeSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..99e4c2554570382606b3186f90202b078703e35e GIT binary patch literal 550 zcmV+>0@?kEP)N2bZe?^J zG%heMGBNQWX_Wu~0i#JoK~y+TrIYDO0#O)-y$i3S+bAk*v9igfl86wKlClu9wA@gd zw6x4g9d}za+n6LO4XL2$N58t4w>gLQA}n9{;2b#5bKV&^lIA9<3 z&IJg&8C;znA{z2z*=a*5pF+szq@stL8WN$EcL`bO#zw%4=Ev&_!hRo$+d1TU4kzNR zymDWbG}W0#Z}28^xt?g8fV!+wo15(lOM;79&~>2GtDxEWg(U zufv9!$#J;t)(?V%BI05#gMJKq$t`+V$@D^_>W61>9;KZu!mBJ;kAn)%%fe?tHWGv& zO57F`h6k0HH5xEw(1GV76wD=};3Ml`y&f>~4%)zCGQJD+S~cwEX%rG1hBO1TYV}M& zbYl(4tuVMy083Ugf~=Q9uS0(#36Z!Ktk}tx0}_}^dyB-s{Qv*}07*qoM6N<$g5zB7e*gdg literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png b/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..00a9ca043fabcf7434c7e8a0de7f9b412b8fdb4f GIT binary patch literal 607 zcmV-l0-*hgP)u)D^P)e5QBn3No-;lcGF+r!i2=QaOF?XKVo8HqKOMvkeHyU z_yLLRq^OB8lqNKxrDaNIrZdyI*M*_d7`OVa&f>h!d2`Nz|1EJ`BoYY#eBY;Duamo# zQA#OvT}KGPvDc@kd>8XR#x-EwrvJe$xzoBP1D3M493Ss`Lwx-5E@cS#>Yl641?WL zi8f%{HUQ1Cp}G?2y3W<<2^9*3SXx?Qr-GKo@(d_GUDR^#RJE75ATI-V}TNo8-| tP*MFf(MT96B~PBc=;~EU{muH1^%J2#_l*53_X7X`002ovPDHLkV1gPw9lrno literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineAlloy.png b/resources/assets/enderio/textures/items/crystallineAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..f0dbf54dfb9f432ea0e08aecbeb577952c39cb88 GIT binary patch literal 470 zcmV;{0V)28P)N2bZe?^J zG%heMGBNQWX_Wu~0aHmtK~y+TWAHK*XCN0)qL*}_5E}X)grQvGfO15{f2Hv7|B7K@ z|EJ!*{r}3>uY?T&DF$f*Xn~mUzx>Uc z|Cc_02GcOj^PfKbKmFCK|7|yK{?9vj5Mc<2;Z|J@wyE*T6|gPnnnCQ|2M_*R=H>l2 z&B}sf318p;U<1|z6?xRw!fjsq`ZZWHi0xTd_ur+m^1p3S5tu*e#*P04hY$bHJ#YYF z08Eotef|GgK$}2{9ZF08J6BYI<>o(m^1u4rx&Kpu&Ij@PuUgV2L>oAA-Fz z{mvb5Sd^VS2{sUB2uKr1Gt3aU0YOWb!VPh)sshuXXsbAV`hUaa%Wy+rnqU|lh#-J$ zh*Nnv*r}(1;n4~-AbQ<8?3&O4%n*_0DhWni38FM6#xJL M07*qoM6N<$f{FjhQUCw| literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png b/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..089b93e0a6747e8eb551818bcb85f53dda097a5f GIT binary patch literal 572 zcmV-C0>k}@P)ZgwYU*PcV;2@BZT}65!?uZzrb!>xibq_brd8v zMM?!tnM#CwIm5*0ytj*DYG}J{AGmNA_Z*%J|2yhsaa|XHIF4yHn`GD5MMSVH3xLb5 zEhQo-^%K!r1CV%a8yOiv78fO-$*{byJL8G z7_BukGc!~w6-?9Q@$s=geL-P!Qv3n0C8O6h-7FCirx7Ll6WwjzgtV z8Gyqu928vb?5NYzQ(CPSj^p5+pHr{baa|YB^XPOsL{Y@i(GfR$dkVmL|1LG~LKue3 z&CPLgazYeE%+Ai@c^*L!AR>feh}N1YiU0_{w?(}cjE;^HFDytZm11{ym$S1oL literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/crystallineCapacitor.png b/resources/assets/enderio/textures/items/crystallineCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..ca0971af3ec246a43979aeef2d73968dadc4a625 GIT binary patch literal 372 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 F2>^CEu=M}{ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/darkSteelRod.png b/resources/assets/enderio/textures/items/darkSteelRod.png new file mode 100644 index 0000000000000000000000000000000000000000..e97f1cc35c7fdbab780a22448c79d79790a2a2de GIT binary patch literal 355 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-ZiY|M)IEGmGFP-Sfb;v-#b#sWz3Waw$u^m-BM_YqpMf84GsOCiZjn-^Y1G3WD`5o z~el!XQ%JM<0ng5 v&(t;UEz@8Y`!R*<$9(6BCSrfuc8JG(d3j>nnT)SM?=g6~`njxgN@xNAy*-L0 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..676f9ea55c760514f1d4a3b63deabe03ee6bbd33 GIT binary patch literal 1147 zcmV->1cdvEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00ZkuL_t(oN9|b8Pg7YGeuNDS!ip6MTmFby zl1SqC10vJ3XKwwv@pR~)_Za}b2$oJ2$U$LYA)}z6z{t+dHYzJC zQBzZc`uciCMn;A~M!y70f})}#qp`6OPNx%#i;LLV*}?YqHrCeG(AwI{MEUvoMk103 zDk>_lwY7!4y*=Rqc6WCPQj+y*LywG&CeZnY~^w zubtix5hSyhl$3mzL_iP5;c##kx7#frnwgnqn3a{q_ex77NHm+x#sQR(W_I9~CgaS3 zE-alYuym@x(y0PD_(t@gp`lD)4|;l-79)}aOFxB!r?)YH7NAp zUv)ijI8KT+b~DNRykAcb&YwRfbl@)$;1z-W>UwbL(kTx1`Fa^zdeGEVgLCIfaP#JG zxOMBAz8+k-@B?T`hkEdN$iY|BgR581prz$UJw347kK@_1c`m58Z(r;62WD_AHm=tn zym|8i&!7K?r%z|Tq(7L(lP42+{P>^r^&quBh(>)(L?l}MK_oK52!#gH*8{qc*dGJ} ze{y+0c;M0N4@eV8rEcH;BYizc?GL)Uf5G+ZKkN4g4#x?QQXROZ$vAVM3rnX8ES)N_ zbgDoOQuW~C#pC?&l=Z;u52zYnzFgwMN?Q+7`-4}nmPK$_O%D?L11f3S^5gNz^z|UQ zKM0Ca9u;~p#hb3?c_EBPkNg-P|6BjOFg<+_4r7C*xp+BJ3mulkd z*`s>j54_$MF@q*iP$%`jAGqB=aZ$aG7G@HVeM%1wzaM-Ymd^A6;~kc&ps4Nw38 N002ovPDHLkV1g}iAK?H1 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta new file mode 100644 index 00000000..2f26ac9b --- /dev/null +++ b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta @@ -0,0 +1,27 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteel.png b/resources/assets/enderio/textures/items/endSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..51741eeea28cc7ff9ef33234dbecadb1532a1591 GIT binary patch literal 4996 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 M07*qoM6N<$f-)nO%m4rY literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta new file mode 100644 index 00000000..6d482b8d --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteelMachineChassi.png b/resources/assets/enderio/textures/items/endSteelMachineChassi.png new file mode 100644 index 0000000000000000000000000000000000000000..9b8061d591705f08d0070916b610eb8cfd8fe65f GIT binary patch literal 596 zcmV-a0;~OrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00G2FL_t(IPfe2tOG7~rgx}v63s$UHv0}%H zsIm9NUK2GMW1`X66;W2dkqrih+?%&IH?w;$SYIqPu(4DoY^_z=_Ij1=Y*g#t0l&6T zB2d3NUu;V=g%<2@*4ce($R2J+?D=loUb7RzQ)W!uO`_j!uLcCxj?_i3M1s9Ytpp$u z`~3xgHJdWYK|9%N%JIj$jdmUH(Yx?+xdoAx3Kb!Q122vpwB$}ZKW-Cuw9_D0)Fw{5 zY%x^u=ivQuQU%!hexK6`$@6Y|yd9M&#h0;8MMIccT+=fNpb81jj#`zUf6vbP<7rAl zUI&l+0G0G*pSp}XcCm_s_({8-IsI_EUZ4j|C>H^hYfXz6R05%}772R)EUM7J9>;sCi&wH>Nu94`%bpD?MYSH;?I|mdg676F3%QOK=ZH<>9#4v0Rp^(#~E>ajJTEn*O6i@(nP;VZk_Dd zhGRN3n?n&)1o9Ap(_9@O7#o>tuauK}4o*DQwaN(T?&LN<$kpU0j iKaXuTGQGLUJo^C{`BbzSKy|_Z0000N- literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteelNugget.png b/resources/assets/enderio/textures/items/endSteelNugget.png new file mode 100644 index 0000000000000000000000000000000000000000..adae68f46463ae0d7e833854d3bddc20cb82e114 GIT binary patch literal 3606 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 VT>`q~5rqH%002ovPDHLkV1lKJ;e`MI literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta b/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta new file mode 100644 index 00000000..6d482b8d --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteel_boots.png b/resources/assets/enderio/textures/items/endSteel_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..639036b1208ff3b8029ac2a1a262dc5733d0579e GIT binary patch literal 1394 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvr6!i-7lq{K=fF}xKt_H^ zesM;Afr4|esh*)icxGNoet9t{dLX`aNiE7OOHFYr%Fk5*hp$y87Wp!LK><2g;SQOJjv%Mv0}coQhm=d*8sKb=`&&zzWJ?v%kSR1*73{?o=J@lQo*J|dx#-u2C1Q<6N=hs)@g$bOk^oGJxI{;5mX%)rb~0YK>`t21Z~A(Lk_19f2{O9)l5J`~hV( zk#=Er(lV|kuS}p@k^~Hb{C>aMpP}Z(G6*pmjS#GXG@5i7k?vd0NmL-6^Qj^hNXF+B zSwUiX4hUPMmhu&n36wn@3&AVcZ1)XwzVSrKDT4x(03m7^@_NH@jiP;$o%zR&2cmt& z%LN9qGd{jTbjtN`sUl=KcMlf|17&ZpXGB&m3RO<>&I&KXNmkMX$|q`?rLkO6kLYn+ zLl7u#HXw5NxmsL@8Z}z21~KS!BQ_qy#c?y9p*5RPoFEXyY%pYG;3TRgv_?y=1;>#H z*UI@MigPj%T~^i|=aLWQVuZ+05-%3>e0ih;3f;WK``o+$5JfsQ0xV`Zn)my{6Xmp@dSVqbLLU30d7A8yW5G)I&&2kPwcQOJ%0;1rmuUaHb#@rK4!x z$n+;C{jf>zzVsuQCU9Bojhhwt^a(wO5@Mg2pxyBL{9OxGJ%@GWEqC7OyNTw6s)2*(nv*nab zZrJ<%`n8GEI(AMju2x!sQq`L_V4z9WPR^i8M;N&ISr#UZQj8EH&wIoT$m$gzW#8q(v zLy0GT+1rds!{92iiIf%Y_WJOLZP(Rf5Y+g&@ z?d$O1`qjNhEu{0S{8A4~qk%h7oyS#tFy+yngv8Z(7w3gcpLOio`v>~;q>Hh`!Fxls zDfM&r-=0tBgS^Q~RHH|Ib^$#z8^$`W)7zvrGTVD+Su&w3-vN^YO F_1`hoL+Stk literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_helmet.png b/resources/assets/enderio/textures/items/endSteel_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..c1919c83d2bbf3c56b0078383662e15aa4bf3689 GIT binary patch literal 1301 zcmbVM?N1wZ96vyro09b1T3*0;=w4`h5AF5opzE%^b~ITTDNWk=z_|8)Z7*%_ZgEnOwohw*k$0leoSEK4n)s- zuwAF(;eOOFs{pm*q$No@DAYmY6ivEmw;8pP6iHB4f^=FalCe7(l0x?$463O@iivQ+ zJuSHNU>RLk7=kDi3V6YW%W9gS+-^5PS_!Mw0udH%MAG@9Mbf$&7C4|KRZ-DJSwia; z`Gh>IdobwfZU}iL9Nsr9X?ux+DIw00spvhAXUC^oBXDim)hrj+2wac_8T_&V#`(xF8CQk8@H^mbLo*4mRMTVE8_o zwL9Eanzm9dr>|k-ATG-WSQ{N+9jxC^Q303BW@9-A?Wf&AUyx;~1~(*WIxi(bLsx{l zdtCQDxr|>0ye_LzS&pg$w)vX+q*)IVUyDKsWZf?Uw*<=Ksv1FCoq2tifOqdWO! z!~^twf&Yqomn;0AoDt9&qTU?;YL>#?VDuC9r5Yah-_$SGU@!=$dc)$wjtl=Kd)vhzy5Ob$yWY&_M*33wr$_teC5v8p^ljcjqjh|-0qZ( zaD4gB_Zv4JDw||#du!v6`Hxqtj-|u`k2H6BpGg=DmxUR7+FrW!R!>WJx2^J7cEkAF z+9#%4bMKyBK{_OS_PclFa`W7uhFtY};Tz+zzN^c(zZH8|kodyg^(~?@o$fTPtjvrL zj!%3&R~uKDsTiG@x-!jAUA|p1{{9nDdfrHsW@pLDjn|$#+&+ITQ+@2>QQ{26z0gf9 z^;S#wpPAcSm|t96R964$YVGJ448Dg?Odf7}+;HX7A+!0T#C@iZZ$0rralPGzP_JJ& f`$PKJ7}A1xo*g~$_IX#l{-X*7`nWfILl^!Ay=KUl literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_leggings.png b/resources/assets/enderio/textures/items/endSteel_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..0933d703273df5f92d61d1ad78ed048ef0d5cbc9 GIT binary patch literal 1441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvr6!i-7lq{K=fF}xKt_H^ zesM;Afr4|esh*)icxGNoet9t{dLX`aNiE7OOHFYr%Fk5*hp$y87WY2rMb@$8937oT(vJ~N+=kWCL@mKCOSH&!o zMeck&$)S4huHcessRy^^E;{>vjqZd$Yd&85-aH|Nb>{xvH||;=kJRgbxKPd}tG6?a zncF)veC8FA1yhtXT3r`*EP|VW$}&sEVAX?HM%;%rez`Jo zdM)9d7FniyM?PtbYM09+;dSfJB}7~8%XmFwu6Ogs1p*T%&hZQtoN&s}ujlAq_mv?o z3j<0%axV5UF_z`!4`TzH3d$FLT9IX}r?=@xeervtj)|^M z?4B5Ja^P=>-`_azy=W58&g96N>bDcGs{Yuvr|H}}zW4j~7Va+8kKcRX*7uTH?zYTF zmFqk0cixYSV1KUZ@v6^VS<}5jI(+q-yOAn~FKpad%5i$z9);AK$FG*kzJ6INxF~We gW9FCgf9eMqp55MeN9hLJG*F@G>FVdQ&MBb@0Ov#r7XSbN literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_pickaxe.png b/resources/assets/enderio/textures/items/endSteel_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..1ec7688ccbefe4c3fca31ee8e28d07cc13c1fdfb GIT binary patch literal 3413 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta b/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta new file mode 100644 index 00000000..6d482b8d --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteel_sword.png b/resources/assets/enderio/textures/items/endSteel_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..cde1f9dd05e6d8e7cab369bc29867103da5c6e27 GIT binary patch literal 4063 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 RydVGo002ovPDHLkV1frCrf~oO literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta b/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta new file mode 100644 index 00000000..6d482b8d --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/enderCrystalPowder.png b/resources/assets/enderio/textures/items/enderCrystalPowder.png new file mode 100644 index 0000000000000000000000000000000000000000..40643c8f86379f82d789fa454549ff112f79003f GIT binary patch literal 592 zcmV-W0pG@<~KNR5(wilHW^{VHC%o{m{FnMVjUc z(hUV6(7?SS)D(ng>o9h8;tGq95{{eEXDItHr1OvsFoO`##f$UwBXSZld#&AE-*c$AREq?%N!a@A`c|55&U9V?2Tv(96>nJa7 z(0SRh^l@s z4sV+oV6odpO(aPDyhc;{3e8W(Xt*DyVOnGN)CF9#8tz9URP-vwB255eyE3+)@1|2F8aY=*Biz$W$UFE|1U6@CSWuMJ19M;c`4HR;oTtqJh2 eDw+IyA$|ZB)J6%TwG&bR0000? literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/endergeticCapacitor.png b/resources/assets/enderio/textures/items/endergeticCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..172d0e68b4fa967b80952586c4efa3ebe9fd27e1 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!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/energeticAlloyGrindingBall.png b/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..addeb91b77cd735ba40486d7240cc7e28127a5f1 GIT binary patch literal 655 zcmV;A0&x9_P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00I9=L_t(IPo#p;ah|kNW6ByHIf<-DnbvVn{Vnw6)+1tqT=gx)c8um###M z_WV3Enjyg~e0=aRhs*tb=iGb80RGDj7yrg?5s$|mTb5<`{eI)-kj3K>lQ##WEDf7@ zJRZZA{k7c?kW40xg^?J`*%nyZ56=$4!+oq?OY=4zqtp>091a_`t^?#V7N76!g%?@m z{W(MdQXWDI8DwTVUyg6(ZdbGp;sU&0ukreDEAo7d)ekesqXV#@u*DIisDR5mk+Z#2 zQYOJ*(5Tu4JQ;09?(at4opwS__`x2~3An9*+zw>AhffpjaUh8Bf zn{dW=Hmlm!u4$?R*cX#q7on`6ujB2`xT0M@jwZ-!=kj_JpU>y)byW+fRWV^Q-)gdy pin5rpe%s*Ys>Q#$;o_eg;|HF1F9=e^o^t>I002ovPDHLkV1n8v9?<{* literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/energeticSilver.png b/resources/assets/enderio/textures/items/energeticSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..0f53e6200186f14ddf4f7f577932447e29cdaf25 GIT binary patch literal 656 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 Hu0mjf)BO@O literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png b/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png index 1557249d308d75f9fcb01fabe0b655fb63e2e2ba..7d2459da3ed382d44f2f091a246fa88e5ccbd858 100644 GIT binary patch literal 908 zcmV;719SX|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T zJ29~lCrlC@61BI;&9ksYw4X%TPRJOrz^%2q-2ZXG#?*hmuQ5UPBpK@2AtML@W5S4P z_{p4`g(wE6siIAOQ^aUITsYXIo*gny;M=qD$VVw|e_6IZ!ep&k*%;1%gnX{f8QQLodM5138&NUdk_J=j`D$5arxID1smj8!DeKQq zS2BO4By&2R9dYKgwQNTv3ia$Y<=tlD`^oir6h+sftId_E;^VmBn%>Rs>W8x`?cJ+ghbkj_j)JM8Vx3p8nW5XXg99ndf<* z_j;xxF@EhL`s;KGg|bMwPLV{e4A<>GpL{;{yVpc6%ZZp&VgsH{*boawk)gN-V<-*C zW-JLqP=~n-lTauN%zAYyk*az}ti=s1#D!tm4JMLJp-3X_CPbTq5eyBsS#OjA_gl{Z z3_U6ZQur!RWs+k${W_-w+u)2>Yn?e-7zH9D7!tdfG+@98gkd-28m(fx6nJJ=OzvH; z*#P4igvgNs&z(wDB{Jl=1!M48e5MxUKnx+wg7`cbf>tv)AjD-uAe#d-AxO*EZ;q2~cBFpEAPL)Tbv1LIkW#rl`XlkxGnASauNpfJY7ARZY%tkE!G zP@}>4s4$x&pM^#4sAn{XZNJo4HqHGrG1frhq)Wm?O+c4v&SL61e!UuaU#| zqf#ML+lO+Kl^-vKmP{tMHSBWCTk)Ca=2hO3`4z(UJ>kB;O6E;aSm$-ktt~$akh1Xb z;jNbsOx4ASxP4O-6TJm^RRt7S-C2KZ|DOYLm}kO*r=V)@GtRH9@l)w6U$5S>^F*P; z1@n80>p@k2cem#ikeb5deB+(@T>@6`%OBe{HJap~vY@cod-9^g>1><^i${pja>86A zKj~jr(z@3zYgtGC1^S5O`W3N=z58Tr=3pm{pol_jtr<(6G}6|Ze=p@9s-GAxO3S{| zb>kOxR>FnD|GuO80`9Yqfm`}VZQwby?XCRsX3Lj@RZv^JITk+PIDT`Ux(mSFvT%BNC(J6KE`D?WD$!`q?w{j&POhlU+$eUeI5phicUsnZ ztYhCWHK8E#!8e)_$~S#d z+sAFv>4(Z`uPoepLSEW3w_84}L?f zbL^KudTzK!%#$~QhnMe{6>U(b`(3T_4ShuaJPr7J)d0WHv$~EJ@0OExapw<-^n!~C zTYUWB(!p&R$H%&dG`2lRiMx##Zg1V&Y^i|x5lv=M!)nhr&Qm%i}6)^|2GzpiY< zo=R)b1+Qc8e99wEQazS#lZ9~XjccOk2R#<11TW^#+&(q#)q8O&w&QSm$1R}zwzDll zBFPQ^OMH}S+px6c?Q6}t?P^+==5_${ 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/itemRedstoneConduit.png b/resources/assets/enderio/textures/items/itemRedstoneConduit.png index d54383950961a5d5cb7050d9511769bfefba9637..b45cb2b44ea7babc69db83876810015067442271 100644 GIT binary patch literal 869 zcmV-r1DgDaP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{TfrK~zXfWtMAl z+b|4-MOl6{nMuwOJHK+f-lX?T8$Tpl*>BC&Fz(JEAOUazkhGYx-|y$uYSn@3_1bN> zTaQaAi@x1%%Y2?^kD~+T;Cw!Jec#&$UwMCjpP!$fZ8#o}CL{Qf0E8HUBr$CP6uaB) zJpcUsB<`M#plO=C2*i$rD85Hq>!WJ80LjYR+uJ-0g9C6rJv}WIp-B{t4TPX22Fy>V zlZj(5A0Hp{<#MrMv)Oci6tIPq^HAce>^I3ui_dk8ZLDJu-&Ki!zr6SyNCsb@s?Zk3 zlADs8v}KbPjgl`Vgy5gF0^P;TS_ugU>2EuBt-Byj>JF`h+o6gguEza*1-4vrIuGbe8{1K$WO;<-yuz}(3NbnAbd z=S@cF$_ZXyU+v@#ZOH)RR1H`NLi!jFUi9d&#&0t15s)7VK)0lT7|0XT;xRs71#kV~ vaF`h+Apf?cG6WwQL_a1cC(n=p8Nws4 zW(q-}$`_55tw>g*tCEAmB+2m-4np=?26$?@xB)qe!GKntpwMu&Jo0;l;oB~cT=iks1S$4p@K9jjYh!{6wO8j25Tt_js27b zKB|$ZWhzXjQ~;9}VX-n1NSyg{O?Fg;i9@4W!EDlX1OAYp_uC ze{OshtqI$xLaCvsMwzIV;PsH&Pm%H5{k6~}5ch@~qL$%BffM*jNunH8U;%s{8UNyj z$PlhX42#7Gn?->+pgV;FF%XJa3L_L2%^d+H43Nd9)2Hlwj?Z@&fIe&v2%O>uC^Q(Xkf2lAGFVrEZtAGGQ`E^m`M{>F7il=#|(5*w4ZyF)UF4~t$;WV^KLi@@>G(dNFF$*}Lv z#Jx{{N-GQ4ew(*+S!#P-)S=Y}ylitF!VliiKW7hH1wj=YC&;wBI%?>T-ZvxXN=~&9 zZtFDuE)DleHxIby^gnMrx?%szq*23dnm#Wv@zG#~YI8E3clDm?_kk`iSkI6#!_R+;ZVX6$_{ zW5Qs1$0{z}x*pkXIUP{wUF&Uw76)}%9QbyLsKzq~T~fXD z@K;|^mPZ`py=~xZ>=zkGt^Q=z`PPA<#Zu<9%HwgiFA5)IrW1!9c2&1vg$8$L3y*yV)1I~0 z*=_9zF*~?n^uLtjY!{;#bn7BPhuy&1%q^yrQeb;q3oZSmXw}$v4Jan7p1~-OGtOS5 zEPin6@h#Geq3Eu7>uJ3`-i_uZ%})<#vkWfv1`bVe&8IwE;`Hy?&pVupD$$+xG;wc|w3_2#rZqaUiiew>wZrR64n`Mg(( za=X4Y!u0YtgnIiiOtbdpABKh0h5o-tXO|ouIzQ`jUt^n31~TvG5pD^0)5@FQGk>Wy zcwKkib@aaO$0MXAb9n_&Y8{9quN|AwFn|7@dGOD9?_)?Pj?r89vV}_r1J3{`B-j&jQWaP1fVX$D8#1&JQoZnH$dZ)SmIO zO?|Q{I`{2BxCdRc?7lR&Sk<0(HrSk5Kit#n=(FuHLivaNwf-$dZ_b_A>+d;GR~F>4 zh167<^+j{r*=I4wEaIL{+cBXXD3R|uG}CL;e(PoP3cLQDEZYk0aNJujqiKYSklxL@ SHWF#_$00xv%s=Q8o%SbWe~_O5 diff --git a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png index 319b4348de8df7105cf97b40480faa509e5ea70a..0e8dc861572b81af46d695e823925d7efe0941d0 100644 GIT binary patch literal 913 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 diff --git a/resources/assets/enderio/textures/items/itemRedstoneSwitch.png b/resources/assets/enderio/textures/items/itemRedstoneSwitch.png index 1fcf7018d3673280bb6a5264a9fbcdb0854f1540..dfac7132721c02f744cf6286b7719b183b9e3faf 100644 GIT binary patch literal 920 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 diff --git a/resources/assets/enderio/textures/items/melodicAlloy.png b/resources/assets/enderio/textures/items/melodicAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..889b8a642850c275ee48f6a86d33c19ddaa62e90 GIT binary patch literal 479 zcmV<50U-W~P)N2bZe?^J zG%heMGBNQWX_Wu~0bEH$K~y+TrIXuA0#Ou(eG6Zro9N(05M@OWM1)X~j-(`w$DEtY z#EZnkphOZ5il+-j6u|?E*WQbG;{*68f2>6_mIZ14uvu#}>-+Yefzh39>UICkI_&B( zZ<|5ubGuxu1}lVJ0hS#LO8ydNh1uT{8YYO~fjmGr*+u=i&TuEvfozw5O4REStUM^_ z$NQMRO}VOYGu%Wg(L(XDh^RF>mrxTp5AaD@Da)rU!qiv8RoDzR2wQ@-OdBS!VE8^n z@FJ+4+>7-Xrd~Rg;4ymO*mLkccb`M-CWgp$WG+yl&}E2UfriC>5$;1bKWhXUNITNV zJM)+%Cs6K`?}GMAn+I!8HTaHwD0|DuI5SAyrcjY8nuH*NNAVF?O&}UYP2xTBaxJ(E zc(uPmaVeTah1A6#k@8jII&kq-$MP77s|5Tf{@#fPw=O8sd4Sbr3;ssKniG#O=yLnZIH{5 z`M%SIaVjz0w(sgJ&hwm;bKrkRy%x1v4FIh*Pft%Yx0)g%WHK25PC6$_L{RDlF~$I} z@z&;f9=q&H@FAdHujBhZl}d&C`+FS6k;lhJuAZ+HK&e!EFW9&DrO{|msZ_{hGI*ZH zXfz_1%W-gUK)GCI$*%P6D-R@MA+QiWIP@N&}y|f{CFtu1jZPA-zS^RGMP*; z#-Nm2al?U(B-#dJFTBLLXm-ex!)qO~TKN|Dd!6S!0=aeI4HHNo37x0>R49!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*AN10$QK zi(`m||I!Huvko~3v^`g?5xK8W*)O-JLP-DKt?I7|O-;AL_`@d8;E)OoT)9+4)0KZ| z)fd~MKX)S|3=I!T@XH_e`}ecVYzmWL!;u({l34pd?I#H~w#~0A=kL@yk$U+9Uv-76 zf0*5Iv4S7pckASbNi#&xcX_JJ`uhANnLA(APqLi3e_@LMgH=@}sHX?#Y)*2I10o|jEteUCe7 zcJIL71hXK8w!{)C8;`!5lMW^Hb&7B-ap1Xh;pK&_hh6^vWQ4U6maS|3S>ho7S#a$% kz1+HeF29Y$H9Oc}a7Z_%O`8|Q0SasePgg&ebxsLQ03_?1V*mgE literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png b/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..de3824ed61d47833f38488a08951fad91eb0556a GIT binary patch literal 681 zcmV;a0#^NrP)N2bZe?^J zG%heMGBNQWX_Wu~0wzgBK~y+TrIB4olTjRpw+P)wYS=D<@WQT&pvykyZUT!khEkD5 zV4_erB~lm5%&l!Y-29x&{3wg)rklzl$nJ^|B3;(paO%YJqbTO`eO=Jq)7eYD&hny< zA3U7HpYwYT?|C)Af3fE9Z%{XRd3g%No3w&;=bATC-LZ*_y_>mka|@}NMntRCDy%6; zm2J24X@6=aIO||)se|!k6R#HS*!#Cp?$cp1nKbFB0;PN_pP^4qrjwoU{WG&tCu5SE zw~0EQ%v9okQ^>KanX4q}g7xmZ+lhS*DCKFnm3g^OtnEY-9tNf>xe+d+#A75YD@(JC zDsbH2!N{TqzReMny`tDA)<))pWI}4><;N=e#;iDldpOmyL6xWi_v4)mC+m5?be%~d zn38?WNZm>~CN(jHkp4;DU`Ixt56R;k8`DVA95;FK20q?#C4_ z;H1wW{@>3m3sNa*FcJtKq<7rPgZT=c#m_U4sN!M#4E|UVj?iun)MTL7>y`5&8LI@v z_DozMGYugNt>HqtCaiQ!9KsvjC*}pzg?4e+u3NeNS3&Awj*IU*+Ma_`6x^d09HV=2 zM$DY($;E2dqtoe>vue@>={fDsq3l{NWnCu9yG_3xPN2bZe?^J zG%heMGBNQWX_Wu~0zOGZK~y+TrIOuCQ(+v(k9g6BXcu{945ADFgUAeZzIHY>OOS$! z#E?X>MCTZ`7hllrG!@;L;tOS&!>}x^EE@z-RQ6(7I6}IJpr8vaLMY^HpLRqK8+g&n z7d|`>59j$j&+qpf0r)SrT>Kl*^R|CK9rdL^@={G@r9=7mv1o;xw7Pk)<Cn@C|l!}2}4L2g|!js*{0 zD}G$^DBeijz4CP=*^jh#h30RAoLh|CVA6u2>JSMD39*9w$|B4GCml-zI9EoHR!4EK zj?uC*NawO2`$r#5Z@a0vZAGjsiM-!NHU&ybt;exG>B6??q4|Rkd!!`WyIxv@{aEJR zG(2;XdqhO}Pn7K3w_6hORc}~Le!cFac2RUU0>gn5e z?bsG0P#Tk#l}@Ip$Mm=Z^K%K)oD0)aCne^ipGElET{R5(v#`2YVuMHs6fDHy9D39@V{(c)PE4Y=+1=yUE6a0hh^FV zrBT&_Fopm~)BM}*|Bt@h{eQ{%Y5xzr*ab9X(*L&2>HkABtbs~U)uV7gIHxD%|KXRr z{vQDvaOczI|CisL2J(0OpLwbZ>>_maC>#(5DLVFQ&;Ms%@BP07)O_Ii*8d%w%m2?m z*F;AHPQO0zf7R7F|MxuG0Q3qd3?}|Bm=KCJN>Ml<3^HKNgSr1VJzDaA;(_}AOYTnj zzvJnq|E(L-h%=yebqv@LP{=p0O#eUcT*LpiE$KKD6ovpO9W<;@0vnRrgBd literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/precientPowder.png b/resources/assets/enderio/textures/items/precientPowder.png new file mode 100644 index 0000000000000000000000000000000000000000..106bec540c596f4122dc8f7e4ec242b5a9560b11 GIT binary patch literal 460 zcmV;-0W}s(J)^98PfA90H|Eq2; z{2$fo`+vdJ$zU3rAs7N6+cw`>{(s-|&Hq?I4*Wmoa{vD; z@6UiWgA7la81g@3M$~^reMz7eGy^>I?fy?X+yb_7&Xo!Or=Dv24+=;SojETCY#_*> z!ezVQ1viW})&oWg?(g27Z2h;@82(lR@u4$_XR*Yc)%n*|R?f>Q>x?meYwz+0n{ZE@70d}^5n;JwB z5a2Wb20)5c&1J!wK$@Y#DC)s_&;>}vSOtm4{}}*1z@pzv_z;f(0000G~E6A_5ZvlPyWa3+4Fw^kcJt8(*UK647lbkZ{LD#?+4lrVuR?mn>XQxfB=R8 zAOKRZ`PHlcbAdL3G%W`j0@4U#7oIuuKV<7xxFHw@fFwYQy6)WhKl9G{RK79C}4|GitP&3H+pn!Boqq1=QlF? z&!esmSBTR97~s{`2HOV1P+>U0Fo0Z)Rgif6p8)_zEnQ?v`MS~o0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00IC>L_t(IPo9}^RJ-`|fN0ydIK+$ZF6EaroFfM75v7Wq+{|IE+h+t?UB7Ye8sir8^oZ1kk@ zFdD^q%R(p=5)FBPTcm#)8p5xc8GIQYR-H(|eqSGIxjeQAsB$j1+uATk&_95ito~tO z00&c3*w5!x>+<=Q)%SRW7s(XXqBfQd0}C9gX_{)N9$<+bykX+U!9l#s<&=4k=2|9$ zS~iQVcmh=#R|vSlT*EN@fN6HH%_+Z3XRw{g;&rM=8F$(Gt5gc>F$WJgdDeG)?7t(F|yg3JvnQ qN|c<>(Y6!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({99UN2bZe?^J zG%heMGBNQWX_Wu~0mVr~K~zXfV}ODG|NoPOQ2;gt#A2+1q+qOq(t*zZ^-{wAD@Azy z*G>%nZ(W%D-#9ZG>~3_mD4bW>ivPuY?f*wF==z_sa`OLo1#15vCW`$p-n#04>8>UJ z4bvn4zsObsD#c;IW^d{LQUOl?lUGavYkHC@`Tt@F*ZSr-ma80vX`l zR|m%CHEI9X*z~g9O57b%71p;3e|kv@Qp( z*rG1u|Na2+{}%Px|9vJ_gVh>mpm_ykkS;Xv4#(^KHv|S2SRoLD0`6S0&VSR~1aLS& zwcrMi)8sG|VH3j%J{GBADE?Wlj@Z=>rZ_f?Rge@62iPR>VHAK(0kIgX zASoED;AnY3rSjnP@xA|-^|$_CHNEHmndAGwVkDOb#}94$f8y|t(eeNa25Winp8)_n WdI~y)4Um8U00007l{FL;6%7?gFSXR?^F6hC6+ty5G&M9k36>x_Bhf>{|Z z)=-0mAP9nstN+cndkz`Yv!SUAAMOwC`JDUXSS+6nz@L~I?6Z7pe-#iW!Ty$x-GC2< zrXc8ZV@nY5x}YnYjOKO-oaiZ_z;yToSK0&$CpJ7Dt>8hQMaDLXv~0zVZxT00R$T9l zBcQrr66^&vT%YZrP$(dm%b{2-BAHAg9*-lDNbp)Vn?><(4gsIXEHHEx8Do_9W4AJP+Yh@mU&~N z(cqr4S1J{jQ7{p9jzLp;2n@f1yl0++RaIqZOu^kbNss6I;dMF80>Aj4M`Hn{Qi(HD zU^E(Kx+kE=yj&iF%OUp`yo6-r^ZBogKcPoFogNT^HM4*U|uAnH@8 z6o09Aqz|4AyIG)a+VQF{;XP!>Q*aR%OXJuZmY_{ZP$nd(qY}2Q5@aFhc>-F{M7jD! tmHDZB1vIAzBizn)cm&=1n*{&XJ^)BN2bZe?^J zG%heMGBNQWX_Wu~0tZP%K~y+TWs~W0+CUJ5{W__#3p-pA1_8qHk=O}`K=-ji!o*45 z|L3H8WGKaQK%dyJk z_iHI{wUJ|;%b`rgiEgy6F9n|qit8#1)#zBg zf9mmWje02bD&W__s5#txKSLfCQ#s%UH6Ty-uGZRn>O5`$eE%O@{o@7#jsP4?DqkNK z{~hpJB$}N9e&YQswjnM8t%Hr2U@dd3+h(fHq6RRr7-A&Dt55QXQ(qqMv>P-yc2691 z-~^=ZW@8!mZ=^y7^eQ03Df@5(t)+@LlI@n_+z!R}en=R4SPvximSX(1lt_P%z;l1o z0H&ipTH=X`JhaP~GWI0#USu+{B})Q5o$F+~f@v)UlmkW}y$UdSAa=JS_jm#|hk-^8 zl7oRcJ>lugT)rXD8EPqj3gC1VxqlAl6e5E&yOrz%PtB~gLric3dK&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Hw!L_t(IPo#jj%~2P zEXEGlPzW}O!Ije~_GNxnrdYfJQ;UhwBr3yF172#T0Mm4zBwqE}a?{XKhRmG_(|c0}=qj z;V^ZiEBJALiPu*%Ozj%R?JCBk$OGIAO}rc#&@wD&nx<9`0N&9*KO5oG?IXYF%kvWq zn-whPUG$71+^&XGGmnuX!bs2oBmf+$B0gUAuyFerG>UkC;o#U%@a}OJNBc6S?GoC` z9$b>A#%M4M;}10e*kvB~a|=%f4fM?-oVtR8s*J8K!`5=JN<5kZi+M?eM$?GLUcG=rUBau=CTul}4(Z&=rclo$Fe~!V*(78oP^|4jEichE*0| zk>pOELrY{~a0!g_85DLHc>iRn2OEHLYzMs@kMn94qmn?nru}1E1TZ7O2>~i8_E-1c z0p4IL1X78{Fez{t${7r#6dZEBa-4>m-bEx5@pA*M1J*k*u)KB4t#(a0hI{yFw002ovPDHLkV1k3j5%2&2 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/stellarAlloy.png b/resources/assets/enderio/textures/items/stellarAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..eb8ec64c7d96e1dcbff4cdf7f21f26509f4b9d38 GIT binary patch literal 474 zcmV<00VV#4P)N2bZe?^J zG%heMGBNQWX_Wu~0ar;xK~y+TrIX1{!cY{3`xZQhui@UM!=9ZC3lrlMl?4kD!W1Az zRz$Wgh=fXNWRRgnv_S+lidJ!FqH$w>IY)0%G!g8doZQ>=eBWtrQ)zO-CjB>7*zq&% zaDeLba*yj{w<+qf(X8UY{BUDaMms}e0_U@eMR{x5syc3MOAV4 z(8L>(yb8E|Swq(_(9m^cWO*Q=%~~YFlWO%kPZ@@3-|BSW_Ifez@t8Gbw}S;w&t0rX zqvqtUp)*YTjaUpTp%4~)K9(I-Wn^}9h9fq*vSahx^_+`Q=bV>uY)d*>Gw6w75) z)sKTLlrrB1S2xGp*ld;fb+m@UXK|3vvrtF~B3MXF!B!$+N>;;RUTgi&c33Q;s%fUA zP)ai-iVusdEG`jvx8(R^*b~iAtAxY&~QjHHe@;0erKEX4qo1nU)YuS QzW@LL07*qoM6N<$f;KA1z5oCK literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png b/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d7682d4670a63bb88209eebef0a033baae8140 GIT binary patch literal 1588 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z81_llpi<;HsXMd|v6mX?-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{ zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+ILD!*GCez(Z{OV z2AC48eDhN>(<)sOOH%EO3=A!F4GnY+OhXJUtPBmTj7@Cx(bOQh03_pFl$uzQUlfv` zpJNC1MJ|Y|V5|oWD0F$KRvUd#E<(yxkSq%p1?E{hE}%|W{<1)W=%Wz{=2gPi%9p;`eOb$Yr{_S zv^t%5S`;9{y6RWoM~kky{rxXXx}w%TONyE9w>E7Pg zIP&ua@3Ed-l$le!&9g6Wdv=V8Dcdn+jzO!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>JlP#A?fS(Q2zh5CYO zE%?GBBBj2l4I-_II9RG8YSBWbige0UP=XFFF5)8M;wDZVGdSqjHEZV1cR$|$w-M4@ z!QzEOZchI5o!pQBfPYD8wj-t4j+CaWBWD%+c1mv5&q+#?bn0k$#1%}TBl$2WC)Kk` zvtTDt$0u&Y1s0!%VTc31svtgt+U|vcXI$eFXSl^V^7VOStqCN|J|Dz$GkX`|R#H_Q zb92$j@DbLnaRx>Ax;>De&6E*_?&O-S6)e3(Q4x8(mwG@Sk3!T+phJ5ZdLxUJJOYUzbMj64(?LIg z7M*X)p21E%0s04Mzam2vq-OGma-BTv1GtdUlMrI15I0iWbTy1jEyk}svfK4NB-gJ1 tchT^G7UU3xo3>}3Gp$CuQks7k0$2 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/vividAlloy.png b/resources/assets/enderio/textures/items/vividAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..daa57de63dd13438cb27411f12990427b1eede56 GIT binary patch literal 642 zcmV-|0)737P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E-_;&oJ#-z0rN>jK~y+T)sfFj({UKb_g5seHODq}rTJqS z)}bGVm}!jW_WdS?&Gns1laN~UgQy*pwz)+ewxF zsHl_h>ht|(U>>BaZ+PJI9A2;I`S9pAPpobqYOS{a7mK7|YB`C%rIRCLvyA*)LGSW! zEUEBxU~(%MrEUV#O9bY=(L6rKqaQ2C6Q60!&SG#W|4J%lg>u=C(cOvb`8(S4MbZLj z%P-*=FYr*j-MM*uuagDj50r|i9vp+0;UyAY^w z_0@zB$mq69KH72xx@NxO8GDWO!cBHv&#*7~g!<@x4kjOSbXBrbKq^=x1ht_A<|ZMi zlDyPLQ?ySma^}M?Ea&3vPmHizzzy+X4hVtTJJZiJSnrT9iq*|cV*S4%NEfpiX;d(K?|1=BnB;_twb)Y zFfj=#2#JEgAcI7sghr&P$@k{XdsDpcwip_mq-~wmS={rx=U({VQol`WYbyXj5Kt%- z@JVxYGd(=_Qx)$?#U&txnn#ZQYg zKDea-(&_X@z|z2=9PjUE=e9Q5>!7U;rq?u?RElgi%YjUi^O1T<-5semuL5$p9Knw= zmSwSLGcbdd-<)J@{v)9VlXAIST^g#op;75Ra+KXxf~GJ$EkY!u5TLt3 z@#I@2G(30?=gbw^01y#O(`0`Xo;lzL8bd*693B^bA|jmF+s6IpFF+}jQaFyYt^sgt z$5tj*OZY)RI258I1~cCSlu{gSj4=6rx$=D@Ob`UM4RqOO?ByG5+s5-e4#r?AU&eJ^ zx{?MHA6C&?V;BbL0M~W@_`&r{YHn^0+qUUU#~EK-A)n84D3f4(;WLio;QKzWW~PYV zysQ9PI@%*OC%CRl&%RyUdHoLG_vzc-!oB$=ip3%#La9^&9pHH$0L7IxQR@MTL;|}j zE7Zps8NI>u+XX}ftu?c=vv^;>5V<|9eBZBTY5+Alc~-EtK+*yoz_p7tvm)}hp&vf00000NkvXXu0mjfQ-=v1 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/models/armor/endSteel_layer_1.png b/resources/assets/enderio/textures/models/armor/endSteel_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb9085b59a714fa73b8c0bea1b71361d64d75b5 GIT binary patch literal 2404 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_1.png b/resources/assets/enderio/textures/models/armor/stellar_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7dcac9f4d261adf431c6c627c310f1dcb85b01e5 GIT binary patch literal 1313 zcmV++1>X9JP)N2bZe?^J zG%heMGBNQWX_Wu~1fEGmK~!i%-Iz~noK+OY-%Y-YWGlglbRmwVm13zHYgfo85;QU z-h0nE_r1?^@12>pT3%ir%fVAG6?o*pzVc(YYtYvC+}vDRH!YM>#*!9!yaBg1HVkjT z;d8GWv94`=r^!Tn(jpIHg+BoTkvDGMY>3Uqc8g53CoS?ww02);{DC(>g8v?r1{#-G z`0mOTL;VNB0Ds)I>wXN87~;idW4lEr+LIP}5ZU%2$a8jf)&$48X%G*YXir+?kyv*A z_ue&wwl^TFn-((Bo@(x?y(Z?##Umz6I~+my)vNCrw6h#)nS;5QlernE4gGufO7HI7 zx=$=y^mdYo_S6PQyq+?Gc<)ZvgqN~r$OH*gzMq3RiEDnw5w9G@vqf(wUTlULuzus) z6c)MvWiMsX6hsOQ;pBaqF0G@zwP+u`}Ri}A0?`C9+ z-cE)u8B3)PHegqQb}4_=B4=i13<+0X1`Gy&mftqMFW0(X8?-&dGl4QuLM3`I#NW7n8Ql|0*2*1!c zv5#f7ld|guWJR9Gk1P~VmgA8rA6&ZBU{bTPIXzDtJ6z92`=LFLHi-F|XipEhw66B&qR9~$r*?~{?>V8 z5(5zW+#9F=lg9@qF+{Rhi3jy3H30FLAkjQAVQNl5n*qcSIgVHt+3_o|8K1ANHtx7U zuqVc;QLPsL@V<_rel{;0J%83{>wBW$NGfV8_=S&NxK_SgTP?@lJXbG*Hewj3?}c)d zdG`8uhChz_Mz4Rnj=g{JqM>{L>B>rNP=uJShw8l8j8xQC(931OM<0)V2H*bUR};>U zB*bf62Ka?Pc5uH5*Uw|xj1fbGM9BcXOEJyq4dA&W2E;2seV_ z)&_atuK~NQBd*VY?D(sW#j@M#>jWsq4g+m(qUQ7cm>&g4s+HlLSz1~$5TwOPoW?W` zG6{GI_(gD!x%V+WJ0ULfdGZ0EtE{Z3M)4L@xyi;N>!5 zoOoa74W_L;pHCa1%m)(g`!Rp`mkJkE=fxMwp;IRcPvA$(>380)`!OEd@pJ&j@ikb= z4?}*kw#JpCy3Ig@j`XAk`268tDqK|0zIM|7D~qRuc@U|%a-V)>(V(s4_J6@n#nZru}w?TbBmf>@<=Qy%C+Ulad$QS literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_2.png b/resources/assets/enderio/textures/models/armor/stellar_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..244dc233f93af8a2d67712703d75f7a5b1570d50 GIT binary patch literal 1199 zcmV;g1W@~lP)N2bZe?^J zG%heMGBNQWX_Wu~1T0BJK~!i%-IrfWl|c~3&*$+<2+0efK#S8qq|_`+N~9Ex`WoK! z3A~6*Boi$Zj+vO2f55yb3`|fgH8TxMw3{H=e1@KvdH2jYM{CKG7e97(W_Hg!v-`fj zCi?sPvr^tr@4(TsNjJB!Ai$=-sHn(XmoGTyvSKdM=mxB=uM4^X)pwc&e_ba3zs3@+ zF&AkdmgpNmAaZGCB_`JL9Tb*mjk!oe(L8-Z|DkUH1^?V}G3cjQ@OEZK;QUZDKwo#B zy7oaN8luHozJtONtuYsAATrZS5Mx0>fe7~3<%4)&iPo5lG!%=I|FSVJz}5}0*5wP9 zXicK%^hptOqV}=~;|cpf`0VUm0k)Ncwb%oDVNdK0KWy-AYs+nHZboy&tfE6=iPl67 zpm>gK1mYWC7eu&ouLL%M0-3M(z@CV6fA}GuIgDFHheV6DkOnL+O`D*|Q+2g60^R`5 z8MD>`Ho%I3yl4PVb@k(8VSD?z03Ss%nZh||1CYyg+=u(-!YVo>yFZeZ1Yd06{o)$| zwsSxB+<={(@9y*ZJ2$^DCBW7oZh=^Faj{u=C|GMIVt?m}eoi5>tgI|?@phBg05*JV z0H1qnuUs5>19++$6vh`B8{mV@*#L^yd+e3Gya7ZP>Tj%L*4n*t;0;KnQZbU(ueun? zWLi!(kPm8VYGTm8-~FtjLz4D`5RFs)n+Eve$$!&;W7QR|qPgLZ8ej?cvDRh6Dmo-- zKZwuR==3u*AX`%qvxH*KnD*zwDmo;wm)V7;o9;nJhkG_OB=+d&sEmFN;;DfFu^Ss3 zBXJsEh#$uqt}QGq6kkb6i2xfu#H^x2l6WyT<{tO3)76*=3otLk*(o2=DYIhD`!_OEB^_xKPI6=vdmfVUA#4kqW$xa;V?4|$! N002ovPDHLkV1fXNC^P^7 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index a1b73e06..be0a1eca 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -49,6 +49,7 @@ import crazypants.enderio.conduit.oc.OCConduitRenderer; import crazypants.enderio.conduit.oc.OCUtil; import crazypants.enderio.conduit.power.PowerConduit; import crazypants.enderio.conduit.power.PowerConduitRenderer; +import crazypants.enderio.conduit.power.endergy.PowerConduitEndergy; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduitRenderer; import crazypants.enderio.conduit.redstone.RedstoneConduit; @@ -151,12 +152,12 @@ public class ClientProxy extends CommonProxy { // @formatter:off public static int[][] sideAndFacingToSpriteOffset = new int[][] { - { 3, 2, 0, 0, 0, 0 }, - { 2, 3, 1, 1, 1, 1 }, - { 1, 1, 3, 2, 5, 4 }, - { 0, 0, 2, 3, 4, 5 }, - { 4, 5, 4, 5, 3, 2 }, - { 5, 4, 5, 4, 2, 3 } + { 3, 2, 0, 0, 0, 0 }, + { 2, 3, 1, 1, 1, 1 }, + { 1, 1, 3, 2, 5, 4 }, + { 0, 0, 2, 3, 4, 5 }, + { 4, 5, 4, 5, 3, 2 }, + { 5, 4, 5, 4, 2, 3 } }; // @formatter:on @@ -201,13 +202,14 @@ public class ClientProxy extends CommonProxy { public void setCbr(ConduitBundleRenderer cbr) { this.cbr = cbr; } - + @Override public void loadIcons() { RedstoneConduit.initIcons(); InsulatedRedstoneConduit.initIcons(); RedstoneSwitch.initIcons(); PowerConduit.initIcons(); + PowerConduitEndergy.initIcons(); LiquidConduit.initIcons(); AdvancedLiquidConduit.initIcons(); EnderLiquidConduit.initIcons(); @@ -295,6 +297,8 @@ public class ClientProxy extends CommonProxy { ZombieGeneratorRenderer zgr = new ZombieGeneratorRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileZombieGenerator.class, zgr); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockZombieGenerator), zgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockFrankenZombieGenerator), zgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderGenerator), zgr); KillerJoeRenderer kjr = new KillerJoeRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileKillerJoe.class, kjr); @@ -333,6 +337,7 @@ public class ClientProxy extends CommonProxy { ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduitEndergy, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemGasConduit, itemConRenderer); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 3d16d119..734cdc25 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -48,6 +48,7 @@ import crazypants.enderio.conduit.item.ItemExtractSpeedUpgrade; import crazypants.enderio.conduit.item.ItemFunctionUpgrade; import crazypants.enderio.conduit.item.ItemItemConduit; import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter; +import crazypants.enderio.conduit.item.filter.ItemBigItemFilter; import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter; import crazypants.enderio.conduit.item.filter.ItemModItemFilter; import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter; @@ -55,6 +56,7 @@ import crazypants.enderio.conduit.liquid.ItemLiquidConduit; import crazypants.enderio.conduit.me.ItemMEConduit; import crazypants.enderio.conduit.oc.ItemOCConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; +import crazypants.enderio.conduit.power.endergy.ItemPowerConduitEndergy; import crazypants.enderio.conduit.redstone.ConduitBundledRedstoneProvider; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.conduit.redstone.ItemRedstoneConduit; @@ -92,6 +94,8 @@ import crazypants.enderio.machine.farm.FarmersRegistry; import crazypants.enderio.machine.generator.combustion.BlockCombustionGenerator; import crazypants.enderio.machine.generator.stirling.BlockStirlingGenerator; import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator; import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; import crazypants.enderio.machine.hypercube.BlockHyperCube; import crazypants.enderio.machine.hypercube.HyperCubeRegister; @@ -134,18 +138,24 @@ import crazypants.enderio.machine.vat.BlockVat; import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.enderio.machine.wireless.BlockWirelessCharger; import crazypants.enderio.material.Alloy; -import crazypants.enderio.material.BlockDarkIronBars; +import crazypants.enderio.material.BlockDarkSteelBars; +import crazypants.enderio.material.BlockDarkSteelBars.BlockEndSteelBars; +import crazypants.enderio.material.BlockDarkSteelBars.BlockSoulariumBars; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.BlockIngotStorage; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.material.ItemFrankenSkull; import crazypants.enderio.material.ItemFusedQuartzFrame; +import crazypants.enderio.material.ItemGrindingBall; import crazypants.enderio.material.ItemMachinePart; import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; import crazypants.enderio.material.OreDictionaryPreferences; +import crazypants.enderio.material.endergy.BlockIngotStorageEndergy; +import crazypants.enderio.material.endergy.ItemAlloyEndergy; +import crazypants.enderio.material.endergy.ItemGrindingBallEndergy; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.rail.BlockEnderRail; import crazypants.enderio.teleport.ItemTravelStaff; @@ -189,13 +199,19 @@ public class EnderIO { // Materials public static ItemCapacitor itemBasicCapacitor; public static ItemAlloy itemAlloy; + public static ItemGrindingBall itemGrindingBall; + public static ItemAlloyEndergy itemAlloyEndergy; + public static ItemGrindingBallEndergy itemGrindingBallEndergy; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; public static BlockIngotStorage blockIngotStorage; - public static BlockDarkIronBars blockDarkIronBars; + public static BlockIngotStorageEndergy blockIngotStorageEndergy; + public static BlockDarkSteelBars blockDarkIronBars; + public static BlockSoulariumBars blockSoulariumBars; + public static BlockEndSteelBars blockEndSteelBars; public static ItemEnderFood itemEnderFood; // Enderface @@ -225,12 +241,14 @@ public class EnderIO { public static ItemConduitFacade itemConduitFacade; public static ItemRedstoneConduit itemRedstoneConduit; public static ItemPowerConduit itemPowerConduit; + public static ItemPowerConduitEndergy itemPowerConduitEndergy; public static ItemLiquidConduit itemLiquidConduit; public static ItemItemConduit itemItemConduit; public static ItemGasConduit itemGasConduit; public static ItemMEConduit itemMEConduit; public static ItemOCConduit itemOCConduit; public static ItemBasicItemFilter itemBasicFilterUpgrade; + public static ItemBigItemFilter itemBigFilterUpgrade; public static ItemExistingItemFilter itemExistingItemFilter; public static ItemModItemFilter itemModItemFilter; public static ItemPowerItemFilter itemPowerItemFilter; @@ -241,6 +259,8 @@ public class EnderIO { public static BlockStirlingGenerator blockStirlingGenerator; public static BlockCombustionGenerator blockCombustionGenerator; public static BlockZombieGenerator blockZombieGenerator; + public static BlockFrankenZombieGenerator blockFrankenZombieGenerator; + public static BlockEnderGenerator blockEnderGenerator; public static BlockSolarPanel blockSolarPanel; public static BlockReservoir blockReservoir; public static BlockAlloySmelter blockAlloySmelter; @@ -299,19 +319,27 @@ public class EnderIO { public static Fluid fluidFireWater; public static BlockFluidEio blockFireWater; public static ItemBucketEio itemBucketFireWater; - - public static Fluid fluidLiquidSunshine; - public static Fluid fluidCloudSeed; - public static Fluid fluidCloudSeedConcentrated; - - public static BlockFluidEio blockLiquidSunshine; - public static BlockFluidEio blockCloudSeed; - public static BlockFluidEio blockCloudSeedConcentrated; + public static Fluid fluidLiquidSunshine; + public static BlockFluidEio blockLiquidSunshine; public static ItemBucketEio itemBucketLiquidSunshine; + + public static Fluid fluidCloudSeed; + public static BlockFluidEio blockCloudSeed; public static ItemBucketEio itemBucketCloudSeed; + + public static Fluid fluidCloudSeedConcentrated; + public static BlockFluidEio blockCloudSeedConcentrated; public static ItemBucketEio itemBucketCloudSeedConcentrated; - + + public static Fluid fluidEnderDistillation; + public static BlockFluidEio blockEnderDistillation; + public static ItemBucketEio itemBucketEnderDistillation; + + public static Fluid fluidVapourOfLevity; + public static BlockFluidEio blockVapourOfLevity; + public static ItemBucketEio itemBucketVapourOfLevity; + //Open block compatable liquid XP public static Fluid fluidXpJuice; public static ItemBucketEio itemBucketXpJuice; @@ -328,11 +356,11 @@ public class EnderIO { @EventHandler public void preInit(FMLPreInitializationEvent event) { - + EnderIOCrashCallable.create(); Config.load(event); - + proxy.loadIcons(); ConduitGeometryUtil.setupBounds((float) Config.conduitScale); @@ -340,6 +368,8 @@ public class EnderIO { blockStirlingGenerator = BlockStirlingGenerator.create(); blockCombustionGenerator = BlockCombustionGenerator.create(); blockZombieGenerator = BlockZombieGenerator.create(); + blockFrankenZombieGenerator = BlockFrankenZombieGenerator.create(); + blockEnderGenerator = BlockEnderGenerator.create(); blockSolarPanel = BlockSolarPanel.create(); blockCrusher = BlockCrusher.create(); @@ -415,6 +445,7 @@ public class EnderIO { itemRedstoneConduit = ItemRedstoneConduit.create(); itemPowerConduit = ItemPowerConduit.create(); + itemPowerConduitEndergy = ItemPowerConduitEndergy.create(); itemLiquidConduit = ItemLiquidConduit.create(); itemItemConduit = ItemItemConduit.create(); itemGasConduit = ItemGasConduit.create(); @@ -422,6 +453,7 @@ public class EnderIO { itemOCConduit = ItemOCConduit.create(); itemBasicFilterUpgrade = ItemBasicItemFilter.create(); + itemBigFilterUpgrade = ItemBigItemFilter.create(); itemExistingItemFilter = ItemExistingItemFilter.create(); itemModItemFilter = ItemModItemFilter.create(); itemPowerItemFilter = ItemPowerItemFilter.create(); @@ -432,6 +464,9 @@ public class EnderIO { itemMachinePart = ItemMachinePart.create(); itemMaterial = ItemMaterial.create(); itemAlloy = ItemAlloy.create(); + itemGrindingBall = ItemGrindingBall.create(); + itemAlloyEndergy = ItemAlloyEndergy.create(); + itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); itemPowderIngot = ItemPowderIngot.create(); registerFluids(); @@ -446,9 +481,13 @@ public class EnderIO { itemSoulVessel = ItemSoulVessel.create(); blockIngotStorage = BlockIngotStorage.create(); + blockIngotStorageEndergy = BlockIngotStorageEndergy.create(); + + blockDarkIronBars = BlockDarkSteelBars.create(); + blockSoulariumBars = BlockSoulariumBars.create(); + blockEndSteelBars = BlockEndSteelBars.create(); + - blockDarkIronBars = BlockDarkIronBars.create(); - itemEnderFood = ItemEnderFood.create(); DarkSteelItems.createDarkSteelArmorItems(); @@ -467,52 +506,63 @@ public class EnderIO { } private void registerFluids() { - Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); + Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); - blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water); + blockNutrientDistillation = BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water); PacketHandler.INSTANCE.registerMessage(PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT); - f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); + f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidHootch = FluidRegistry.getFluid(f.getName()); - blockHootch = BlockFluidEio.create(fluidHootch, Material.water); + blockHootch = BlockFluidEio.Hootch.create(fluidHootch, Material.water); FluidFuelRegister.instance.addFuel(f, Config.hootchPowerPerCycleRF, Config.hootchPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH + "@" + (Config.hootchPowerPerCycleRF / 10 * Config.hootchPowerTotalBurnTime)); - f = new Fluid(Fluids.ROCKET_FUEL_NAME).setDensity(900).setViscosity(1000); + f = new Fluid(Fluids.ROCKET_FUEL).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidRocketFuel = FluidRegistry.getFluid(f.getName()); - blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, Material.water); + blockRocketFuel = BlockFluidEio.RocketFuel.create(fluidRocketFuel, Material.water); FluidFuelRegister.instance.addFuel(f, Config.rocketFuelPowerPerCycleRF, Config.rocketFuelPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL + "@" + (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime)); - f = new Fluid(Fluids.FIRE_WATER_NAME).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2); + f = new Fluid(Fluids.FIRE_WATER).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2); FluidRegistry.registerFluid(f); fluidFireWater = FluidRegistry.getFluid(f.getName()); - blockFireWater = BlockFluidEio.create(fluidFireWater, Material.lava); + blockFireWater = BlockFluidEio.FireWater.create(fluidFireWater, Material.lava); FluidFuelRegister.instance.addFuel(f, Config.fireWaterPowerPerCycleRF, Config.fireWaterPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER + "@" + (Config.fireWaterPowerPerCycleRF / 10 * Config.fireWaterPowerTotalBurnTime)); - f = new Fluid(Fluids.LIQUID_SUNSHINE_NAME).setDensity(200).setViscosity(400); + f = new Fluid(Fluids.LIQUID_SUNSHINE).setDensity(200).setViscosity(400); FluidRegistry.registerFluid(f); fluidLiquidSunshine = FluidRegistry.getFluid(f.getName()); blockLiquidSunshine = BlockFluidEio.create(fluidLiquidSunshine, Material.water); - f = new Fluid(Fluids.CLOUD_SEED_NAME).setDensity(500).setViscosity(800); + f = new Fluid(Fluids.CLOUD_SEED).setDensity(500).setViscosity(800); FluidRegistry.registerFluid(f); fluidCloudSeed = FluidRegistry.getFluid(f.getName()); blockCloudSeed = BlockFluidEio.create(fluidCloudSeed, Material.water); - - f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED_NAME).setDensity(1000).setViscosity(1200); + + f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200); FluidRegistry.registerFluid(f); fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName()); - blockCloudSeedConcentrated = BlockFluidEio.create(fluidCloudSeedConcentrated, Material.water); - + blockCloudSeedConcentrated = BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water); + + f = new Fluid(Fluids.ENDER_DISTILLATION).setDensity(200).setViscosity(1000).setTemperature(175); + FluidRegistry.registerFluid(f); + fluidEnderDistillation = FluidRegistry.getFluid(f.getName()); + blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water); + + f = new Fluid(Fluids.VAPOR_OF_LEVITY).setDensity(-10).setViscosity(100).setTemperature(5).setGaseous(true); + FluidRegistry.registerFluid(f); + fluidVapourOfLevity = FluidRegistry.getFluid(f.getName()); + blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water); + FluidFuelRegister.instance.addCoolant(f, 0.0314f); + if (!Loader.isModLoaded("OpenBlocks")) { Log.info("XP Juice registered by Ender IO."); fluidXpJuice = new Fluid(Config.xpJuiceName).setLuminosity(10).setDensity(800).setViscosity(1500).setUnlocalizedName("eio.xpjuice"); @@ -529,6 +579,9 @@ public class EnderIO { itemBucketLiquidSunshine = ItemBucketEio.create(fluidLiquidSunshine); itemBucketCloudSeed = ItemBucketEio.create(fluidCloudSeed); itemBucketCloudSeedConcentrated = ItemBucketEio.create(fluidCloudSeedConcentrated); + itemBucketEnderDistillation = ItemBucketEio.create(fluidEnderDistillation); + itemBucketVapourOfLevity = ItemBucketEio.create(fluidVapourOfLevity); + } @EventHandler @@ -617,7 +670,7 @@ public class EnderIO { ItemRecipes.addRecipes(); TeleportRecipes.addRecipes(); EE3Util.registerMiscRecipes(); - + proxy.load(); } @@ -628,7 +681,7 @@ public class EnderIO { //Regsiter the enchants Enchantments.getInstance(); - + //This must be loaded before parsing the recipes so we get the preferred outputs OreDictionaryPreferences.loadConfig(); @@ -641,7 +694,7 @@ public class EnderIO { SoulBinderRecipeManager.getInstance().addDefaultRecipes(); PaintSourceValidator.instance.loadConfig(); - if(fluidXpJuice == null) { //should have been registered by open blocks + if(fluidXpJuice == null) { //should have been registered by open blocks fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName()); if(fluidXpJuice == null) { Log.error("Liquid XP Juice registration left to open blocks but could not be found."); @@ -667,7 +720,7 @@ public class EnderIO { } addModIntegration(); - + //Register villagers FMLInterModComms.sendMessage("EnderStructures", "addResourcePath", "/assets/enderio/villagers"); FMLInterModComms.sendMessage("EnderStructures", "registerVillageGenerator", "enderioMobDropVillager"); @@ -714,7 +767,7 @@ public class EnderIO { Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades"); } } - + ThaumcraftCompat.load(); } diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 0bfd7e40..a2871a5d 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -13,8 +13,9 @@ public enum ModObject { itemItemConduit, itemGasConduit, itemMEConduit, - itemOCConduit, + itemOCConduit, itemBasicFilterUpgrade, + itemBigFilterUpgrade, itemExistingItemFilter, itemModItemFilter, itemPowerItemFilter, @@ -23,6 +24,7 @@ public enum ModObject { // Power itemPowerConduit, + itemPowerConduitEndergy, // Liquid itemLiquidConduit, @@ -30,17 +32,24 @@ public enum ModObject { // Materials itemBasicCapacitor, itemAlloy, + itemAlloyEndergy, + itemGrindingBall, + itemGrindingBallEndergy, itemMaterial, itemMachinePart, itemPowderIngot, blockFusedQuartz, itemFusedQuartzFrame, blockDarkIronBars, + blockSoulariumBars, + blockEndSteelBars, // Machines blockStirlingGenerator, blockCombustionGenerator, blockZombieGenerator, + blockFrankenzombieGenerator, + blockEnderGenerator, blockReservoir, blockAlloySmelter, blockSolarPanel, @@ -82,6 +91,7 @@ public enum ModObject { blockDarkSteelLadder, blockReinforcedObsidian, blockIngotStorage, + blockIngotStorageEndergy, // Painter blockPainter, @@ -104,12 +114,12 @@ public enum ModObject { itemTravelStaff, itemMagnet, itemGliderWing, - blockEndermanSkull, - itemSoulVessel, - itemFrankenSkull, - + blockEndermanSkull, + itemSoulVessel, + itemFrankenSkull, + blockEnderRail, - + itemEnderFood; public final String unlocalisedName; diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 6e91d754..a1835185 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -4,6 +4,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import appeng.api.AEApi; import cpw.mods.fml.common.Optional.Method; @@ -20,8 +21,10 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; + import static crazypants.enderio.ModObject.blockPainter; import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; import static crazypants.enderio.material.Material.*; import static crazypants.util.RecipeUtil.addShaped; @@ -35,6 +38,13 @@ public class ConduitRecipes { ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); + String crudeSteel = CRUDE_STEEL.getOreIngot(); + String energeticSilver = ENERGETIC_SILVER.getOreIngot(); + String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); + String crystallinePinkSlime = CRYSTALLINE_PINK_SLIME.getOreIngot(); + String melodicAlloy = MELODIC_ALLOY.getOreIngot(); + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); + String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); String phasedGold = PHASED_GOLD.getOreIngot(); String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); @@ -45,6 +55,7 @@ public class ConduitRecipes { String binder = CONDUIT_BINDER.oreDict; ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal()); //Recipes addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder); @@ -55,13 +66,92 @@ public class ConduitRecipes { addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', fusedGlass); addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', fusedQuartz); addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 2), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', phasedGold); - 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.itemRedstoneConduit, numConduits, 0), "###", '#', redstoneAlloy); addShaped(new ItemStack(EnderIO.itemRedstoneConduit, 1, 1), "lbl", "bcb", "lbl", 'b', binder, 'c', redstoneConduit, 'l', Blocks.lever); addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', redstoneAlloy); + if(Config.useHardRecipes) { + + ItemStack lastTier; + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 0); + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotIron"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 1); + + if(OreDictionary.doesOreNameExist("ingotAluminum")||OreDictionary.doesOreNameExist("ingotAluminium")) { + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminum"); + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminium"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 2); + } + + addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotGold"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 3); + + if(OreDictionary.doesOreNameExist("ingotCopper") && OreDictionary.getOres("ingotCopper").size()>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); } @@ -78,6 +168,12 @@ public class ConduitRecipes { ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone"); + ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0); + addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian"); + + ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1); + addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot()); + ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0); addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench); 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 new file mode 100644 index 00000000..cbcacb7d --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java @@ -0,0 +1,71 @@ +package crazypants.enderio.conduit.item.filter; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemBigItemFilter extends ItemBasicItemFilter { + + public static ItemBigItemFilter create() { + ItemBigItemFilter result = new ItemBigItemFilter(); + result.init(); + return result; + } + + private final IIcon[] icons; + + protected ItemBigItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBigFilterUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + icons = new IIcon[2]; + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBigFilterUpgrade.unlocalisedName); + } + + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); + ItemFilter filter; + if(damage == 0) { + filter = new ItemFilterBig(24, false); + } else { + filter = new ItemFilterBig(24, true); + } + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBig"); + icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeBigAdvanced"); + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); + return i == 0 ? "enderio.filterUpgradeBig" : "enderio.filterUpgradeBigAdvanced"; + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index c8f0f1ee..a90e13b4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -45,11 +45,12 @@ public class ItemFilter implements IInventory, IItemFilter { boolean sticky = false; FuzzyMode fuzzyMode = FuzzyMode.DISABLED; + int numItems; ItemStack[] items; final List oreIds; - private boolean isAdvanced; + private boolean isAdvanced; public void copyFrom(ItemFilter o) { isBlacklist = o.isBlacklist; @@ -67,13 +68,14 @@ public class ItemFilter implements IInventory, IItemFilter { public ItemFilter() { this(5, false); } - + public ItemFilter(boolean advanced) { this(advanced ? 10 : 5, advanced); } - private ItemFilter(int numItems, boolean isAdvanced) { + public ItemFilter(int numItems, boolean isAdvanced) { this.isAdvanced = isAdvanced; + this.numItems = numItems; items = new ItemStack[numItems]; oreIds = new ArrayList(numItems); for(int i=0;i slots, int xOffset, int yOffset, Runnable cb) { int topY = yOffset; int leftX = xOffset; - int index = 0; - int numRows = isAdvanced ? 2 : 1; + int index = 0; + int numRows = (int) Math.ceil(items.length/5); for (int row = 0; row < numRows; ++row) { for (int col = 0; col < 5; ++col) { int x = leftX + col * 18; @@ -404,14 +410,14 @@ public class ItemFilter implements IInventory, IItemFilter { } @Override - public int getSlotCount() { + public int getSlotCount() { return getSizeInventory(); } - public boolean isAdvanced() { + public boolean isAdvanced() { return isAdvanced; } - + public boolean isDefault() { return !isAdvanced && !isValid() && isBlacklist == DEFAULT_BLACKLIST && matchMeta == DEFAULT_META && 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 6bafcaa9..30245f4d 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -22,7 +22,7 @@ public class ItemPowerConduit extends AbstractItemConduit { static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { 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() + "Ender", "enderio:itemPowerConduitEnder"), }; public static ItemPowerConduit create() { @@ -35,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; @@ -56,7 +60,7 @@ public class ItemPowerConduit extends AbstractItemConduit { ICapacitor cap = PowerConduit.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/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 41ddb226..1729d5c3 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -47,22 +47,22 @@ import crazypants.enderio.tool.ToolUtil; public class PowerConduit extends AbstractConduit implements IPowerConduit { static final Map ICONS = new HashMap(); - + private static ICapacitor[] capacitors; - static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; + static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender"}; static ICapacitor[] getCapacitors() { if(capacitors == null) { capacitors = new BasicCapacitor[] { new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), - new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF) + new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF), }; } return capacitors; } - + static ItemStack createItemStackForSubtype(int subtype) { ItemStack result = new ItemStack(EnderIO.itemPowerConduit, 1, subtype); return result; @@ -75,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)); @@ -199,13 +199,13 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } return res; } - + @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + 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()); @@ -240,9 +240,9 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { if(nbtRoot.hasKey("energyStored")) { nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); - + } - setEnergyStored(nbtRoot.getInteger("energyStoredRF")); + setEnergyStored(nbtRoot.getInteger("energyStoredRF")); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { String key = "pRsMode." + dir.name(); @@ -263,7 +263,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } @Override - public void onTick() { + public void onTick() { } @Override @@ -273,10 +273,10 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public void setEnergyStored(int energyStored) { - energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); + energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); } - + private boolean isRedstoneEnabled(ForgeDirection dir) { boolean result; RedstoneControlMode mode = getExtractionRedstoneMode(dir); @@ -293,8 +293,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { 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 { + 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)); } @@ -375,7 +375,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { int freeSpace = getMaxEnergyStored() - getEnergyStored(); int result = (int) Math.min(maxReceive, freeSpace); if(!simulate && result > 0) { - setEnergyStored(getEnergyStored() + result); + setEnergyStored(getEnergyStored() + result); if(getBundle() != null) { if(recievedTicks == null) { @@ -422,10 +422,10 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @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); @@ -438,7 +438,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { if( !(conduit instanceof IPowerConduit)) { return false; } - IPowerConduit pc = (IPowerConduit)conduit; + IPowerConduit pc = (IPowerConduit)conduit; return pc.getMaxEnergyStored() == getMaxEnergyStored(); } @@ -502,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 522e7678..e2da841d 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -116,7 +116,7 @@ public final class Config { public static boolean useSneakMouseWheelYetaWrench = true; public static boolean useSneakRightClickYetaWrench = false; public static int yetaWrenchOverlayMode = 0; - + public static boolean itemConduitUsePhyscialDistance = false; public static int enderFluidConduitExtractRate = 200; @@ -157,11 +157,13 @@ public final class Config { public static int enderIoRange = 8; public static boolean enderIoMeAccessEnabled = true; - public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.75, 0.95}; + public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.7, 0.85, 0.95}; public static int darkSteelPowerStorageBase = 100000; public static int darkSteelPowerStorageLevelOne = 150000; public static int darkSteelPowerStorageLevelTwo = 250000; public static int darkSteelPowerStorageLevelThree = 1000000; + public static int darkSteelPowerStorageLevelFour = 2500000; + public static float darkSteelSpeedOneWalkModifier = 0.1f; public static float darkSteelSpeedTwoWalkMultiplier = 0.2f; @@ -225,6 +227,7 @@ public final class Config { public static int darkSteelUpgradePowerOneCost = 10; public static int darkSteelUpgradePowerTwoCost = 15; public static int darkSteelUpgradePowerThreeCost = 20; + public static int darkSteelUpgradePowerFourCost = 25; public static int darkSteelGliderCost = 10; public static double darkSteelGliderHorizontalSpeed = 0.03; @@ -250,6 +253,9 @@ public final class Config { public static int darkSteelSolarOneCost = 15; public static int darkSteelSolarTwoGen = 40; public static int darkSteelSolarTwoCost = 30; + public static int darkSteelSolarThreeGen = 160; + public static int darkSteelSolarThreeCost = 40; + public static boolean darkSteelSolarChargeOthers = true; public static float darkSteelAnvilDamageChance = 0.024f; @@ -266,9 +272,19 @@ public final class Config { public static int maxPhotovoltaicOutputRF = 10; public static int maxPhotovoltaicAdvancedOutputRF = 40; + public static int maxPhotovoltaicVibrantOutputRF = 160; public static int zombieGeneratorRfPerTick = 80; - public static int zombieGeneratorTicksPerBucketFuel = 10000; + public static int zombieGeneratorTicksPerBucketFuel = 12000; + + public static int frankenzombieGeneratorRfPerTick = 120; + public static int frankenzombieGeneratorTicksPerBucketFuel = 12000; + + 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; @@ -278,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; @@ -336,7 +356,7 @@ public final class Config { public static boolean magnetAllowDeactivatedInBaublesSlot = false; public static boolean magnetAllowPowerExtraction = false; public static String magnetBaublesType = "AMULET"; - + public static boolean useCombustionGenModel = false; public static int crafterRfPerCraft = 2500; @@ -417,6 +437,8 @@ public final class Config { public static int soulBinderReanimationLevels = 10; public static int soulBinderEnderCystalRF = 100000; public static int soulBinderEnderCystalLevels = 10; + public static int soulBinderPrecientCystalRF = 100000; + public static int soulBinderPrecientCystalLevels = 10; public static int soulBinderAttractorCystalRF = 100000; public static int soulBinderAttractorCystalLevels = 10; public static int soulBinderEnderRailRF = 100000; @@ -427,6 +449,7 @@ public final class Config { public static int powerConduitTierOneRF = 640; public static int powerConduitTierTwoRF = 5120; public static int powerConduitTierThreeRF = 20480; + 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; @@ -505,7 +528,8 @@ public final class Config { public static float inventoryPanelExtractCostPerItem = 12.0f; public static float inventoryPanelExtractCostPerOperation = 32.0f; - + + public static void load(FMLPreInitializationEvent event) { PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); @@ -597,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"); @@ -816,6 +843,8 @@ public final class Config { "Amount of power stored by dark steel items with a level 2 upgrade.").getInt(darkSteelPowerStorageLevelTwo); darkSteelPowerStorageLevelThree = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelThree", darkSteelPowerStorageLevelThree, "Amount of power stored by dark steel items with a level 3 upgrade.").getInt(darkSteelPowerStorageLevelThree); + darkSteelPowerStorageLevelFour = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelFour", darkSteelPowerStorageLevelFour, + "Amount of power stored by dark steel items with a level 4 upgrade.").getInt(darkSteelPowerStorageLevelFour); darkSteelUpgradeVibrantCost = config.get(sectionDarkSteel.name, "darkSteelUpgradeVibrantCost", darkSteelUpgradeVibrantCost, "Number of levels required for the 'Empowered.").getInt(darkSteelUpgradeVibrantCost); @@ -825,6 +854,8 @@ public final class Config { "Number of levels required for the 'Power 2.").getInt(darkSteelUpgradePowerTwoCost); darkSteelUpgradePowerThreeCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerThreeCost", darkSteelUpgradePowerThreeCost, "Number of levels required for the 'Power 3' upgrade.").getInt(darkSteelUpgradePowerThreeCost); + darkSteelUpgradePowerFourCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerFourCost", darkSteelUpgradePowerFourCost, + "Number of levels required for the 'Power 4' upgrade.").getInt(darkSteelUpgradePowerFourCost); darkSteelJumpOneCost = config.get(sectionDarkSteel.name, "darkSteelJumpOneCost", darkSteelJumpOneCost, "Number of levels required for the 'Jump 1' upgrade.").getInt(darkSteelJumpOneCost); @@ -1030,22 +1061,46 @@ public final class Config { zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, "The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel); + frankenzombieGeneratorRfPerTick = config.get(sectionPower.name, "frankenzombieGeneratorRfPerTick", frankenzombieGeneratorRfPerTick, + "The amount of power generated per tick.").getInt(frankenzombieGeneratorRfPerTick); + frankenzombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "frankenzombieGeneratorTicksPerMbFuel", frankenzombieGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.").getInt(frankenzombieGeneratorTicksPerBucketFuel); + + enderGeneratorRfPerTick = config.get(sectionPower.name, "enderGeneratorRfPerTick", enderGeneratorRfPerTick, + "The amount of power generated per tick.").getInt(enderGeneratorRfPerTick); + 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( @@ -1097,7 +1152,7 @@ public final class Config { "The amount of saplings the farm has to have in reserve to switch to shearing all leaves. If there are less " + "saplings in store, it will only shear part the leaves and break the others for spalings. Set this to 0 to " + "always shear all leaves.").getInt(farmSaplingReserveAmount); - + combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic.name, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel); @@ -1115,18 +1170,18 @@ public final class Config { magnetAllowInMainInventory = config.get(sectionMagnet.name, "magnetAllowInMainInventory", magnetAllowInMainInventory, "If true the magnet will also work in the main inventory, not just the hotbar").getBoolean(magnetAllowInMainInventory); - + magnetAllowInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowInBaublesSlot", magnetAllowInBaublesSlot, "If true the magnet can be put into the 'amulet' Baubles slot (requires Baubles to be installed)").getBoolean(magnetAllowInBaublesSlot); magnetAllowDeactivatedInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowDeactivatedInBaublesSlot", magnetAllowDeactivatedInBaublesSlot, "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot); - + magnetAllowPowerExtraction = config.get(sectionMagnet.name, "magnetAllowPowerExtraction", magnetAllowPowerExtraction, "If true the magnet can be used as a battery.").getBoolean(magnetAllowPowerExtraction); magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType, "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); - + useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); @@ -1206,7 +1261,7 @@ public final class Config { "Allows OC conduits. Only has an effect with OpenComputers installed."); enableOCConduitsAnimatedTexture = config.getBoolean("enableOCConduitsAnimatedTexture", sectionItems.name, enableOCConduitsAnimatedTexture, "Use the animated texture for OC conduits."); - + soulVesselBlackList = config.getStringList("soulVesselBlackList", sectionSoulBinder.name, soulVesselBlackList, "Entities listed here will can not be captured in a Soul Vial"); @@ -1225,6 +1280,8 @@ public final class Config { "The number of RF required to to re-animated a mob head.").getInt(soulBinderReanimationRF); soulBinderEnderCystalRF = config.get(sectionSoulBinder.name, "soulBinderEnderCystalRF", soulBinderEnderCystalRF, "The number of RF required to create an ender crystal.").getInt(soulBinderEnderCystalRF); + soulBinderPrecientCystalRF = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalRF", soulBinderPrecientCystalRF, + "The number of RF required to create an precient crystal.").getInt(soulBinderPrecientCystalRF); soulBinderAttractorCystalRF = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalRF", soulBinderAttractorCystalRF, "The number of RF required to create an attractor crystal.").getInt(soulBinderAttractorCystalRF); soulBinderEnderRailRF = config.get(sectionSoulBinder.name, "soulBinderEnderRailRF", soulBinderEnderRailRF, @@ -1234,6 +1291,8 @@ public final class Config { "The number of levels required to create an attractor crystal.").getInt(soulBinderAttractorCystalLevels); soulBinderEnderCystalLevels = config.get(sectionSoulBinder.name, "soulBinderEnderCystalLevels", soulBinderEnderCystalLevels, "The number of levels required to create an ender crystal.").getInt(soulBinderEnderCystalLevels); + soulBinderPrecientCystalLevels = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalLevels", soulBinderPrecientCystalLevels, + "The number of levels required to create an precient crystal.").getInt(soulBinderPrecientCystalLevels); soulBinderReanimationLevels = config.get(sectionSoulBinder.name, "soulBinderReanimationLevels", soulBinderReanimationLevels, "The number of levels required to re-animate a mob head.").getInt(soulBinderReanimationLevels); soulBinderBrokenSpawnerLevels = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerLevels", soulBinderBrokenSpawnerLevels, diff --git a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java index db5eb8ab..44b20229 100644 --- a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java +++ b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java @@ -89,7 +89,7 @@ public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchan // wait for that because gravestone mods also listen to this event. So we have // to fetch Baubles items ourselves here. // For the same reason we cannot put the items into Baubles slots. - IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer); + /*IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer); if (baubles != null) { for (int i = 0; i < baubles.getSizeInventory(); i++) { ItemStack item = baubles.getStackInSlot(i); @@ -99,7 +99,7 @@ public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchan } } } - } + }*/ // Galacticraft. Again we are too early for those items. We just dump the // stuff into the normal inventory to not have to keep a separate list. diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index 151cead3..c706e568 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -1,28 +1,203 @@ package crazypants.enderio.fluid; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; +import java.util.Random; import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; public class BlockFluidEio extends BlockFluidClassic { + public static class FireWater extends BlockFluidEio { + + protected FireWater(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote){ + entity.setFire(50); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class Hootch extends BlockFluidEio { + + protected Hootch(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class RocketFuel extends BlockFluidEio { + + protected RocketFuel(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); + + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class NutrientDistillation extends BlockFluidEio { + + private static final String EIO_LAST_FOOD_BOOST = "eioLastFoodBoost"; + + protected NutrientDistillation(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + long time = entity.worldObj.getTotalWorldTime(); + EntityPlayerMP player = (EntityPlayerMP) entity; + if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong(EIO_LAST_FOOD_BOOST) != time) { + player.getFoodStats().addStats(1, 0.1f); + player.getEntityData().setLong(EIO_LAST_FOOD_BOOST, time); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + + } + + } + + public static class CloudSeedConcentrated extends BlockFluidEio { + + protected CloudSeedConcentrated(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 40, 0, true)); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + } + + public static class VapourOfLevity extends BlockFluidEio { + + private static final int[] COLORS = { 0x0c82d0, 0x90c8ec, 0x5174ed, 0x0d2f65, 0x4accee }; + + protected VapourOfLevity(Fluid fluid, Material material, int fogColor) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityPlayer || (!world.isRemote && entity instanceof EntityLivingBase)) { + ((EntityLivingBase) entity).motionY += 0.1; + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if (rand.nextFloat() < .5f) { + int col = COLORS[rand.nextInt(COLORS.length)]; + world.spawnParticle("reddust", x, y, z, (col >> 16 & 255) / 255d, (col >> 8 & 255) / 255d, (col & 255) / 255d); + } + } + + } + + public static BlockFluidEio create(Fluid fluid, Material material) { BlockFluidEio res = new BlockFluidEio(fluid, material); res.init(); @@ -76,28 +251,4 @@ public class BlockFluidEio extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } - @Override - public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { - if(entity.worldObj.isRemote) { - super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity); - return; - } - - if(this == EnderIO.blockFireWater) { - entity.setFire(50); - } else if(this == EnderIO.blockRocketFuel && entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); - } else if(this == EnderIO.blockNutrientDistillation && entity instanceof EntityPlayerMP) { - long time = entity.worldObj.getTotalWorldTime(); - EntityPlayerMP player = (EntityPlayerMP) entity; - if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time) { - player.getFoodStats().addStats(1, 0.1f); - player.getEntityData().setLong("eioLastFoodBoost", time); - } - } else if (this == EnderIO.blockHootch && entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); - } - - super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity); - } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index ac004331..5917e5e3 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -1,32 +1,29 @@ package crazypants.enderio.fluid; -import net.minecraftforge.fluids.IFluidTank; import crazypants.enderio.EnderIO; +import net.minecraftforge.fluids.IFluidTank; public class Fluids { - public static final String NUTRIENT_DISTILLATION_NAME = "nutrient_distillation"; + public static final String NUTRIENT_DISTILLATION = "nutrient_distillation"; + public static final String HOOTCH = "hootch"; + public static final String ROCKET_FUEL = "rocket_fuel"; + public static final String FIRE_WATER = "fire_water"; + public static final String LIQUID_SUNSHINE = "liquid_sunshine"; + public static final String CLOUD_SEED = "cloud_seed"; + public static final String CLOUD_SEED_CONCENTRATED = "cloud_seed_concentrated"; + public static final String ENDER_DISTILLATION = "ender_distillation"; + public static final String VAPOR_OF_LEVITY = "vapor_of_levity"; - public static final String HOOTCH_NAME = "hootch"; - - public static final String ROCKET_FUEL_NAME = "rocket_fuel"; - - public static final String FIRE_WATER_NAME = "fire_water"; - - public static final String LIQUID_SUNSHINE_NAME = "liquid_sunshine"; - public static final String CLOUD_SEED_NAME = "cloud_seed"; - public static final String CLOUD_SEED_CONCENTRATED_NAME = "cloud_seed_concentrated"; - - public static String toCapactityString(IFluidTank tank) { - if(tank == null) { - return "0/0 " + MB(); - } - return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); - } - - public static String MB() { - return EnderIO.lang.localize("fluid.millibucket.abr"); - } + public static String toCapactityString(IFluidTank tank) { + if(tank == null) { + return "0/0 " + MB(); + } + return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); + } + public static String MB() { + return EnderIO.lang.localize("fluid.millibucket.abr"); + } } diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index 4eb91e16..3932078d 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -7,9 +7,11 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.DarkSteelItems; +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; @@ -17,12 +19,16 @@ 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; String enAlloy = ENERGETIC_ALLOY.getOreIngot(); 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); @@ -39,6 +45,18 @@ public class ItemRecipes { addShaped(DarkSteelItems.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); addShaped(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel); + //End Steel + addShaped(DarkSteelItems.itemEndSteelHelmet.createItemStack(), "sss", "sds", 's', endSteel, 'd', diode); + addShaped(DarkSteelItems.itemEndSteelChestplate.createItemStack(), "sds", "sss", "sss", 's', endSteel, 'd', diode); + 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); @@ -58,6 +76,7 @@ public class ItemRecipes { //XP Rod addShaped(new ItemStack(EnderIO.itemXpTransfer), " s", " v ", "s ", 's', soularium, 'v', enAlloy); + // DS Tools addShaped(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood"); addShaped(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick"); @@ -65,5 +84,21 @@ public class ItemRecipes { addShaped(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick"); addShaped(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick"); addShaped(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood"); + + // ES Tools + addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "stickDarkSteel"); + addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); + addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "stickDarkSteel"); + addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); + 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/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 96fa2c78..2ffcbc1f 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -165,7 +165,7 @@ public class KeyTracker { } if(gogglesKey.isPressed()) { boolean isActive = !DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive(); - sendEnabledChatMessage("darksteel.upgrade.goggles", isActive); + sendEnabledChatMessage("darksteel.upgrade.gogglesOfRevealing", isActive); DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(isActive); } } @@ -223,7 +223,7 @@ public class KeyTracker { private void handleNightVision() { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if(!DarkSteelController.instance.isNightVisionUpgradeEquipped(player)){ + if(!DarkSteelController.instance.isNightVisionUpgradeOrEnchEquipped(player)){ return; } if(nightVisionKey.isPressed()) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 8baa2681..f3fe4b55 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -9,6 +9,7 @@ import java.util.UUID; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; @@ -16,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; @@ -66,7 +68,7 @@ public class DarkSteelController { private final AttributeModifier[] sprintModifiers = new AttributeModifier[] { new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[0], 1), new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[1], 1), - new AttributeModifier(new UUID (12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1), + new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1), }; private final AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier", @@ -119,19 +121,19 @@ public class DarkSteelController { public boolean isGlideActive(EntityPlayer player) { return isActive(player, Type.GLIDE); } - + public boolean isSpeedActive(EntityPlayer player) { return isActive(player, Type.SPEED); } - + public boolean isStepAssistActive(EntityPlayer player) { return isActive(player, Type.STEP_ASSIST); } - + public boolean isJumpActive(EntityPlayer player) { return isActive(player, Type.JUMP); } - + @SubscribeEvent public void onPlayerTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; @@ -149,9 +151,9 @@ public class DarkSteelController { updateGlide(player); updateSwim(player); - + updateSolar(player); - + } } @@ -161,18 +163,18 @@ public class DarkSteelController { if (player.worldObj.isRemote) { return; } - + ItemStack helm = player.getEquipmentInSlot(4); SolarUpgrade upgrade = SolarUpgrade.loadFromItem(helm); if(upgrade == null) { return; } - + int RFperSecond = Math.round((float) upgrade.getRFPerSec() * TileEntitySolarPanel.calculateLightRatio(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY + 1), MathHelper.floor_double(player.posZ))); - + int leftover = RFperSecond % 20; boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover; - + int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0); if(toAdd != 0) { @@ -186,7 +188,7 @@ public class DarkSteelController { } nextIndex = (nextIndex + 1) % 4; } - + player.getEntityData().setInteger("dsarmor:solar", nextIndex); } } @@ -284,7 +286,7 @@ public class DarkSteelController { ItemStack leggings = player.getEquipmentInSlot(2); SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings); - if(leggings != null && leggings.getItem() == DarkSteelItems.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) { + if(leggings != null && DarkSteelItems.isArmorPart(leggings.getItem(),2) && speedUpgrade != null && isSpeedActive(player)) { double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified); double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; @@ -306,7 +308,7 @@ public class DarkSteelController { private void updateStepHeightAndFallDistance(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); - if(boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && !player.capabilities.allowFlying) { + if(boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) { int costedDistance = (int) player.fallDistance; if(costedDistance > 0) { int energyCost = costedDistance * Config.darkSteelFallDistanceCost; @@ -319,7 +321,7 @@ public class DarkSteelController { } JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade != null && boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && isStepAssistActive(player)) { + if(jumpUpgrade != null && boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && isStepAssistActive(player)) { player.stepHeight = 1.0023F; } else if(player.stepHeight == 1.0023F) { player.stepHeight = 0.5001F; @@ -337,7 +339,7 @@ public class DarkSteelController { IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); int used = cont.extractEnergy(stack, remaining, false); remaining -= used; - if(remaining <= 0) { + if(remaining <= 0) { return; } } @@ -368,7 +370,7 @@ public class DarkSteelController { } return res; } - + @SubscribeEvent public void onStartTracking(PlayerEvent.StartTracking event) { if (event.target instanceof EntityPlayerMP) { @@ -460,11 +462,11 @@ public class DarkSteelController { if (!isJumpActive(player)) { return; } - + ItemStack boots = player.getEquipmentInSlot(1); JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade == null || boots == null || boots.getItem() != DarkSteelItems.itemDarkSteelBoots) { + if(jumpUpgrade == null || boots == null || !DarkSteelItems.isArmorPart(boots.getItem(), 3)) { return; } @@ -488,13 +490,13 @@ public class DarkSteelController { } } - - + + private void updateNightvision(EntityPlayer player) { - if(isNightVisionUpgradeEquipped(player) && nightVisionActive) { + if(isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { player.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 210, 0, true)); - } - if(!isNightVisionUpgradeEquipped(player) && nightVisionActive) { + } + if(!isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { nightVisionActive = false; removeNightvision = true; } @@ -504,16 +506,49 @@ public class DarkSteelController { } } - public boolean isNightVisionUpgradeEquipped(EntityPlayer player) { - ItemStack helmet = player.getEquipmentInSlot(4); - return NightVisionUpgrade.loadFromItem(helmet) != null; + // --- Thaumic Exploration Night Vision enchant support + + private static int nightVisionEnchID = -6; + + public static int getNightVisionEnchID() { + if (nightVisionEnchID == -6) setNightVisionEnchID(); + return nightVisionEnchID; + } + + private static void setNightVisionEnchID() { + for (Enchantment ench : Enchantment.enchantmentsList) { + if (ench != null && ench.getName().equals("enchantment.nightVision")) { + nightVisionEnchID = ench.effectId; + return; + } + } nightVisionEnchID = -1; + } + + public boolean isNightVisionEnch(ItemStack helmet) { + if (helmet == null) return false; + NBTTagList stackEnch = helmet.getEnchantmentTagList(); + if (getNightVisionEnchID () >= 0 && stackEnch != null) { + for (int i = 0; i < stackEnch.tagCount(); i++) { + int id = stackEnch.getCompoundTagAt(i).getInteger("id"); + if (id == getNightVisionEnchID()) + return true; + } + } + return false; + } + + // --- + + public boolean isNightVisionUpgradeOrEnchEquipped(EntityPlayer player) { + ItemStack helmet = player.getEquipmentInSlot(4); + return (NightVisionUpgrade.loadFromItem(helmet) != null || isNightVisionEnch(helmet)); } public void setNightVisionActive(boolean isNightVisionActive) { if(nightVisionActive && !isNightVisionActive) { removeNightvision = true; } - this.nightVisionActive = isNightVisionActive; + this.nightVisionActive = isNightVisionActive; } public boolean isNightVisionActive() { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java index 1f6a54d1..e29b9e79 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java @@ -1,5 +1,6 @@ package crazypants.enderio.item.darksteel; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.client.MinecraftForgeClient; @@ -22,6 +23,22 @@ public class DarkSteelItems { public static ItemDarkSteelAxe itemDarkSteelAxe; public static ItemDarkSteelShears itemDarkSteelShears; + public static ItemEndSteelArmor itemEndSteelHelmet; + public static ItemEndSteelArmor itemEndSteelChestplate; + public static ItemEndSteelArmor itemEndSteelLeggings; + public static ItemEndSteelArmor itemEndSteelBoots; + public static ItemEndSteelSword itemEndSteelSword; + 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() { @@ -40,7 +57,36 @@ public class DarkSteelItems { itemDarkSteelAxe = ItemDarkSteelAxe.create(); itemDarkSteelShears = ItemDarkSteelShears.create(); + itemEndSteelHelmet = ItemEndSteelArmor.create(0); + itemEndSteelChestplate = ItemEndSteelArmor.create(1); + itemEndSteelLeggings = ItemEndSteelArmor.create(2); + itemEndSteelBoots = ItemEndSteelArmor.create(3); + + itemEndSteelSword = ItemEndSteelSword.create(); + 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||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; + } } public static void addLoot() { @@ -70,5 +116,21 @@ public class DarkSteelItems { MinecraftForgeClient.registerItemRenderer(itemDarkSteelPickaxe, dsr); MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr); MinecraftForgeClient.registerItemRenderer(itemDarkSteelShears, dsr); + + MinecraftForgeClient.registerItemRenderer(itemEndSteelBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelHelmet, dsr); + 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 370246b7..ace3363e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -20,6 +20,8 @@ import com.google.common.collect.ImmutableList; 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; @@ -34,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 { @@ -47,6 +50,7 @@ public class DarkSteelRecipeManager { upgrades.add(EnergyUpgrade.EMPOWERED_TWO); upgrades.add(EnergyUpgrade.EMPOWERED_THREE); upgrades.add(EnergyUpgrade.EMPOWERED_FOUR); + upgrades.add(EnergyUpgrade.EMPOWERED_FIVE); upgrades.add(JumpUpgrade.JUMP_ONE); upgrades.add(JumpUpgrade.JUMP_TWO); upgrades.add(JumpUpgrade.JUMP_THREE); @@ -61,6 +65,7 @@ public class DarkSteelRecipeManager { upgrades.add(SpoonUpgrade.INSTANCE); upgrades.add(SolarUpgrade.SOLAR_ONE); upgrades.add(SolarUpgrade.SOLAR_TWO); + upgrades.add(SolarUpgrade.SOLAR_THREE); if(Loader.isModLoaded("Thaumcraft")) { ThaumcraftCompat.loadUpgrades(upgrades); } @@ -79,9 +84,19 @@ public class DarkSteelRecipeManager { return; } - if(evt.left.getItem() instanceof IDarkSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.DARK_STEEL.getOreIngot())) { + if(evt.left.getItem() instanceof IStellarItem && OreDictionaryHelper.hasName(evt.right, AlloyEndergy.STELLAR_ALLOY.getOreIngot())) { + handleRepair(evt); + } + + 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); } } @@ -89,23 +104,23 @@ public class DarkSteelRecipeManager { private void handleRepair(AnvilUpdateEvent evt) { ItemStack targetStack = evt.left; ItemStack ingots = evt.right; - + //repair event IDarkSteelItem targetItem = (IDarkSteelItem)targetStack.getItem(); int maxIngots = targetItem.getIngotsRequiredForFullRepair(); - + double damPerc = (double)targetStack.getItemDamage()/ targetStack.getMaxDamage(); int requiredIngots = (int)Math.ceil(damPerc * maxIngots); if(ingots.stackSize > requiredIngots) { return; } - + int damageAddedPerIngot = (int)Math.ceil((double)targetStack.getMaxDamage()/maxIngots); int totalDamageRemoved = damageAddedPerIngot * ingots.stackSize; - + ItemStack resultStack = targetStack.copy(); resultStack.setItemDamage(Math.max(0, resultStack.getItemDamage() - totalDamageRemoved)); - + evt.output = resultStack; evt.cost = ingots.stackSize + (int)Math.ceil(getEnchantmentRepairCost(resultStack)/2); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java index 34941519..3f4d3fcd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java +++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java @@ -3,5 +3,13 @@ package crazypants.enderio.item.darksteel; public interface IDarkSteelItem { int getIngotsRequiredForFullRepair(); - + + public interface IEndSteelItem extends IDarkSteelItem { + + } + + public interface IStellarItem extends IEndSteelItem { + + } + } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index f1baca02..576b9c69 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -99,24 +99,30 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte } public static ItemDarkSteelArmor create(int armorType) { - ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); + ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); res.init(); return res; } - private final int powerPerDamagePoint; - - protected ItemDarkSteelArmor(int armorType) { - super(MATERIAL, 0, armorType); - setCreativeTab(EnderIOTab.tabEnderIO); - - String str = "darkSteel_" + NAMES[armorType]; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN+ ":" + str); + protected int powerPerDamagePoint; + protected String name; + public ItemDarkSteelArmor(int armorType) { + this(MATERIAL, "darkSteel", armorType); powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getDurability(armorType); + } + public ItemDarkSteelArmor(ArmorMaterial mat, String name, int armorType) { + super(mat, 0, armorType); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name + "_" + NAMES[armorType]; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN+ ":" + str); + + } + protected void init() { GameRegistry.registerItem(this, getUnlocalizedName()); } @@ -131,7 +137,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte is = new ItemStack(this); EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); EnergyUpgrade.setPowerFull(is); - + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); while (iter.hasNext()) { IDarkSteelUpgrade upgrade = iter.next(); @@ -139,7 +145,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte upgrade.writeToItem(is); } } - + par3List.add(is); } @@ -178,11 +184,11 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_armor.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_armor.tooltip.line2")); - if(itemstack.getItem() == DarkSteelItems.itemDarkSteelBoots) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_boots.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_boots.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line2")); + if(DarkSteelItems.isArmorPart(itemstack.getItem(), 3)) { + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line2")); } } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); @@ -196,9 +202,9 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override public String getArmorTexture(ItemStack itemStack, Entity entity, int slot, String layer) { if(armorType == 2) { - return "enderio:textures/models/armor/darkSteel_layer_2.png"; + return "enderio:textures/models/armor/"+name+"_layer_2.png"; } - return "enderio:textures/models/armor/darkSteel_layer_1.png"; + return "enderio:textures/models/armor/"+name+"_layer_1.png"; } public ItemStack createItemStack() { @@ -287,7 +293,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Thaumcraft") public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { return 0; } return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0; @@ -312,7 +318,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Forestry") public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { - if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) { return false; } return NaturalistEyeUpgrade.isUpgradeEquipped(player); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index db7e6970..4aeb5913 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -50,7 +50,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I if(equipped == null) { return false; } - return equipped.getItem() == DarkSteelItems.itemDarkSteelAxe; + return equipped.getItem() instanceof ItemDarkSteelAxe; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { @@ -71,34 +71,41 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I return res; } - private int logOreId = -1; - private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); - + protected int logOreId = -1; + protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + protected String name; + + protected ItemDarkSteelAxe() { - super(ItemDarkSteelSword.MATERIAL); - setCreativeTab(EnderIOTab.tabEnderIO); - String str = "darkSteel_axe"; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN + ":" + str); + this("darkSteel",ItemDarkSteelSword.MATERIAL); } + protected ItemDarkSteelAxe(String name, ToolMaterial mat) { + super(mat); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name+"_axe"; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN + ":" + str); + } + @Override public int getIngotsRequiredForFullRepair() { - return 3; + return 3; } - + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); + ItemStack is = new ItemStack(this); par3List.add(is); is = new ItemStack(this); EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); + EnergyUpgrade.setPowerFull(is); par3List.add(is); } - + @Override public boolean isDamaged(ItemStack stack) { return false; @@ -134,17 +141,17 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I return false; } - private boolean doMultiHarvest(EntityPlayer player, World worldObj, BlockCoord bc, Block refBlock, int refMeta) { - + private boolean doMultiHarvest(EntityPlayer player, World worldObj, BlockCoord bc, Block refBlock, int refMeta) { + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); int meta = worldObj.getBlockMetadata(bc.x, bc.y, bc.z); ItemStack held = player.getCurrentEquippedItem(); - + ArrayList itemDrops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, 0); - float chance = ForgeEventFactory.fireBlockHarvesting(itemDrops, worldObj, refBlock, bc.x, bc.y, bc.z, refMeta, + float chance = ForgeEventFactory.fireBlockHarvesting(itemDrops, worldObj, refBlock, bc.x, bc.y, bc.z, refMeta, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, held), 1, EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, held) != 0, player); - + worldObj.setBlockToAir(bc.x, bc.y, bc.z); boolean usedPower = false; if (itemDrops != null) { @@ -190,7 +197,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I super.setDamage(stack, newDamage); } else { int damage = newDamage - oldDamage; - + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelAxePowerUsePerDamagePoint)) { super.setDamage(stack, newDamage); } @@ -221,7 +228,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I private boolean isLog(Block block, int meta) { if(logOreId == -1) { - logOreId = OreDictionary.getOreID("logWood"); + logOreId = OreDictionary.getOreID("logWood"); } int targetOreId = OreDictionary.getOreID(new ItemStack(block, 1, meta)); //NB: Specifying the wildcard as meta is a work around for forge issue #1103 @@ -279,9 +286,9 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnderIO.lang.localize("item.darkSteel_axe.tooltip.multiHarvest")); + list.add(EnderIO.lang.localize("item."+name+"_axe.tooltip.multiHarvest")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelAxeEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 2134d520..2f50d355 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -47,7 +47,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine if(equipped == null) { return false; } - return equipped.getItem() == DarkSteelItems.itemDarkSteelPickaxe; + return equipped.getItem() instanceof ItemDarkSteelPickaxe; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { @@ -65,15 +65,21 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } private long lastBlickTick = -1; + protected String name; - public ItemDarkSteelPickaxe() { - super(ItemDarkSteelSword.MATERIAL); + public ItemDarkSteelPickaxe(String name, ToolMaterial mat) { + super(mat); + this.name = name; setCreativeTab(EnderIOTab.tabEnderIO); - String str = "darkSteel_pickaxe"; + String str = name+"_pickaxe"; setUnlocalizedName(str); setTextureName(EnderIO.DOMAIN + ":" + str); } + public ItemDarkSteelPickaxe(){ + this("darkSteel",ItemDarkSteelSword.MATERIAL); + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { @@ -153,7 +159,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine super.setDamage(stack, newDamage); } else { int damage = newDamage - oldDamage; - + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelPickPowerUsePerDamagePoint)) { super.setDamage(stack, newDamage); } @@ -171,7 +177,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } } - + @Override public boolean canHarvestBlock(Block block, ItemStack item) { if(hasSpoonUpgrade(item) && getEnergyStored(item) > 0) { @@ -283,10 +289,10 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyObsidian + " " - + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); - list.add(EnumChatFormatting.WHITE + " " + "(" + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.cost") + " " + + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effObs") + " "); + list.add(EnumChatFormatting.WHITE + " " + "(" + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.cost") + " " + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian) + " " + PowerDisplayUtil.abrevation() + ")"); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index d9f50adc..85142091 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -45,7 +45,7 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI if(equipped == null) { return false; } - return equipped.getItem() == DarkSteelItems.itemDarkSteelShears; + return equipped.getItem() instanceof ItemDarkSteelShears; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { @@ -66,18 +66,24 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI return res; } - private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); - private final EntityComparator entityComparator = new EntityComparator(); + protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + protected final EntityComparator entityComparator = new EntityComparator(); + protected String name; - protected ItemDarkSteelShears() { + protected ItemDarkSteelShears(String name) { super(); + this.name = name; this.setMaxDamage(this.getMaxDamage() * Config.darkSteelShearsDurabilityFactor); setCreativeTab(EnderIOTab.tabEnderIO); - String str = "darkSteel_shears"; + String str = name+"_shears"; setUnlocalizedName(str); setTextureName("enderIO:" + str); } + protected ItemDarkSteelShears() { + this("darkSteel"); + } + @Override public int getIngotsRequiredForFullRepair() { return 2; @@ -265,9 +271,9 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnderIO.lang.localize("item.darkSteel_shears.tooltip.multiHarvest")); + list.add(EnderIO.lang.localize("item."+name+"_shears.tooltip.multiHarvest")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelShearsEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 1693d50d..c17770c7 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -57,7 +57,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte if(equipped == null) { return false; } - return equipped.getItem() == DarkSteelItems.itemDarkSteelSword; + return equipped.getItem() instanceof ItemDarkSteelSword; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { @@ -74,18 +74,24 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte return res; } - private final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); - private long lastBlickTick = -1; + protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); + protected long lastBlickTick = -1; + protected String name; - public ItemDarkSteelSword() { - super(MATERIAL); + public ItemDarkSteelSword(String name, ToolMaterial mat) { + super(mat); + this.name = name; setCreativeTab(EnderIOTab.tabEnderIO); - String str = "darkSteel_sword"; + String str = name+"_sword"; setUnlocalizedName(str); setTextureName(EnderIO.DOMAIN + ":" + str); } + public ItemDarkSteelSword() { + this("darkSteel",MATERIAL); + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { @@ -116,7 +122,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte } } - //Set priorty to lowest in the hope any other mod adding head drops will have already added them + //Set priorty to lowest in the hope any other mod adding head drops will have already added them //by the time this is called to prevent multiple head drops @SubscribeEvent(priority = EventPriority.LOWEST) public void onEntityDrop(LivingDropsEvent evt) { @@ -355,10 +361,10 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte if(str != null) { list.add(str); } - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line1")); if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line2")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line3")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line3")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java new file mode 100644 index 00000000..d133971c --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java @@ -0,0 +1,73 @@ +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.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 ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem { + + public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("endSteel", 50, new int[] { 4, 7, 10, 5 }, 25); + + public ItemEndSteelArmor(int armorType) { + super(MATERIAL, "endSteel", armorType); + + } + + public static ItemEndSteelArmor create(int armorType) { + ItemEndSteelArmor res = new ItemEndSteelArmor(armorType); + res.init(); + return res; + } + + public static ItemEndSteelArmor forArmorType(int armorType) { + switch (armorType) { + case 0: return DarkSteelItems.itemEndSteelHelmet; + case 1: return DarkSteelItems.itemEndSteelChestplate; + case 2: return DarkSteelItems.itemEndSteelLeggings; + case 3: return DarkSteelItems.itemEndSteelBoots; + } + return null; + } + + public static int getPoweredProtectionIncrease(int armorType) { + switch (armorType) { + case 0: return 1; + case 1: return 2; + case 2: + case 3: return 1; + } + 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/ItemEndSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java new file mode 100644 index 00000000..114c84e9 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.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.IEndSteelItem; +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 ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem { + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelAxe; + } + + public static ItemEndSteelAxe create() { + ItemEndSteelAxe res = new ItemEndSteelAxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemEndSteelAxe() { + super("endSteel", ItemEndSteelSword.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/ItemEndSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java new file mode 100644 index 00000000..9b733174 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.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.IEndSteelItem; +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 ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSteelItem { + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelPickaxe; + } + + public static ItemEndSteelPickaxe create() { + ItemEndSteelPickaxe res = new ItemEndSteelPickaxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemEndSteelPickaxe() { + super("endSteel", ItemEndSteelSword.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/ItemEndSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java new file mode 100644 index 00000000..bce4417f --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.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.IEndSteelItem; +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 ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelItem { + + static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("endSteel", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 2000, 12, 5, 30); + + public static boolean isEquipped(EntityPlayer player) { + if(player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelSword; + } + + + public static ItemEndSteelSword create() { + ItemEndSteelSword res = new ItemEndSteelSword(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + public ItemEndSteelSword() { + super("endSteel",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/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/item/darksteel/upgrade/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java index b6c9d134..d1cd1214 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java @@ -1,11 +1,13 @@ package crazypants.enderio.item.darksteel.upgrade; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; +import crazypants.enderio.item.darksteel.ItemEndSteelArmor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; public class ApiaristArmorUpgrade extends AbstractUpgrade { @@ -56,7 +58,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != ItemDarkSteelArmor.forArmorType(slot) || getUpgradeItem() == null) { + if(stack == null || ! DarkSteelItems.isArmorPart(stack.getItem(), slot) || getUpgradeItem() == null) { return false; } ApiaristArmorUpgrade up = loadFromItem(stack); @@ -65,7 +67,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade { @Override public boolean hasUpgrade(ItemStack stack) { - return super.hasUpgrade(stack) && stack.getItem() == ItemDarkSteelArmor.forArmorType(slot); + return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot); } @Override diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java index 005c4b19..050d279a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java @@ -16,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.IDarkSteelItem; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Material; @@ -45,6 +46,12 @@ public class EnergyUpgrade extends AbstractUpgrade { Config.darkSteelPowerStorageLevelThree, Config.darkSteelPowerStorageLevelThree / 100); + public static final AbstractUpgrade EMPOWERED_FIVE = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_five", Config.darkSteelUpgradePowerFourCost, + new ItemStack(EnderIO.itemBasicCapacitor, 1, 3), + Config.darkSteelPowerStorageLevelFour, + Config.darkSteelPowerStorageLevelFour / 100); + private static final String UPGRADE_NAME = "energyUpgrade"; private static final String KEY_CAPACITY = "capacity"; private static final String KEY_ENERGY = "energy"; @@ -54,7 +61,7 @@ public class EnergyUpgrade extends AbstractUpgrade { private static final Random RANDOM = new Random(); - + public static EnergyUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -81,6 +88,8 @@ public class EnergyUpgrade extends AbstractUpgrade { return EMPOWERED_THREE; } else if(upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) { return EMPOWERED_FOUR; + } else if(upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { + return EMPOWERED_FIVE; } return null; } @@ -108,7 +117,7 @@ public class EnergyUpgrade extends AbstractUpgrade { } return res; } - + public static void setPowerLevel(ItemStack item, int amount) { if(item == null || !itemHasAnyPowerUpgrade(item)) { return; @@ -118,13 +127,13 @@ public class EnergyUpgrade extends AbstractUpgrade { eu.setEnergy(amount); eu.writeToItem(item); } - + public static void setPowerFull(ItemStack item) { if(item == null || !itemHasAnyPowerUpgrade(item)) { return; } - EnergyUpgrade eu = loadFromItem(item); - eu.setEnergy(eu.getCapacity()); + EnergyUpgrade eu = loadFromItem(item); + eu.setEnergy(eu.getCapacity()); eu.writeToItem(item); } @@ -153,7 +162,7 @@ public class EnergyUpgrade extends AbstractUpgrade { } protected int capacity; - protected int energy; + protected int energy; protected int maxInRF; protected int maxOutRF; @@ -169,7 +178,7 @@ public class EnergyUpgrade extends AbstractUpgrade { public EnergyUpgrade(NBTTagCompound tag) { super(UPGRADE_NAME, tag); capacity = tag.getInteger(KEY_CAPACITY); - energy = tag.getInteger(KEY_ENERGY); + energy = tag.getInteger(KEY_ENERGY); maxInRF = tag.getInteger(KEY_MAX_IN); maxOutRF = tag.getInteger(KEY_MAX_OUT); } @@ -195,6 +204,10 @@ public class EnergyUpgrade extends AbstractUpgrade { if(up == null) { return false; } + + if(!(stack.getItem() instanceof IEndSteelItem) && up.unlocName.equals(EMPOWERED_FIVE.unlocName)) + return false; + return up.unlocName.equals(unlocName); } @@ -222,7 +235,7 @@ public class EnergyUpgrade extends AbstractUpgrade { public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { upgradeRoot.setInteger(KEY_CAPACITY, capacity); upgradeRoot.setInteger(KEY_ENERGY, energy); - + upgradeRoot.setInteger(KEY_MAX_IN, maxInRF); upgradeRoot.setInteger(KEY_MAX_OUT, maxOutRF); } @@ -241,6 +254,8 @@ public class EnergyUpgrade extends AbstractUpgrade { index = 2; } else if (upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { index = 3; + } else if (upgrade.unlocName.equals(EMPOWERED_FIVE.unlocName)) { + index = 4; } return Config.darkSteelPowerDamgeAbsorptionRatios[index]; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java index e704d81b..8c070e52 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java @@ -22,12 +22,12 @@ import static org.lwjgl.opengl.GL11.glDepthMask; public class GliderUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "glide"; - + public static final GliderUpgrade INSTANCE = new GliderUpgrade(); - + @SideOnly(Side.CLIENT) private Render render; - + public static GliderUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -40,19 +40,19 @@ public class GliderUpgrade extends AbstractUpgrade { } return new GliderUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - - + + public GliderUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public GliderUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(DarkSteelItems.itemGliderWing,1,1), Config.darkSteelGliderCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelChestplate) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 1)) { return false; } GliderUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java index 0061a6b3..92e1dc24 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java @@ -20,10 +20,10 @@ public class JumpUpgrade extends AbstractUpgrade { private short level; public static boolean isEquipped(EntityPlayer player) { - ItemStack boots = player.getEquipmentInSlot(1); + ItemStack boots = player.getEquipmentInSlot(1); return loadFromItem(boots) != null; } - + public static JumpUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -49,7 +49,7 @@ public class JumpUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } JumpUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java index bda4ae84..45a0abf1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java @@ -1,12 +1,12 @@ package crazypants.enderio.item.darksteel.upgrade; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class NaturalistEyeUpgrade extends AbstractUpgrade { @@ -50,7 +50,7 @@ public class NaturalistEyeUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getUpgradeItem() == null) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getUpgradeItem() == null) { return false; } NaturalistEyeUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java index 3896f6f3..f49036d6 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java @@ -1,18 +1,18 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionHelper; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class NightVisionUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "nightVision"; - + public static final NightVisionUpgrade INSTANCE = new NightVisionUpgrade(); - + public static NightVisionUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -25,26 +25,26 @@ public class NightVisionUpgrade extends AbstractUpgrade { } return new NightVisionUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - + private static ItemStack createUpgradeItem() { ItemStack pot = new ItemStack(Items.potionitem, 1, 0); int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.goldenCarrotEffect); + res = PotionHelper.applyIngredient(res, PotionHelper.goldenCarrotEffect); pot.setItemDamage(res); return pot; } - + public NightVisionUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public NightVisionUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.nightVision", createUpgradeItem(), Config.darkSteelNightVisionCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { return false; } NightVisionUpgrade up = loadFromItem(stack); @@ -55,6 +55,6 @@ public class NightVisionUpgrade extends AbstractUpgrade { } @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 551ac003..1eea72ca 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -1,13 +1,6 @@ package crazypants.enderio.item.darksteel.upgrade; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionHelper; -import net.minecraftforge.client.event.RenderPlayerEvent; +import static org.lwjgl.opengl.GL11.glDepthMask; import org.lwjgl.opengl.GL11; @@ -18,18 +11,23 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; - -import static org.lwjgl.opengl.GL11.glDepthMask; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.client.event.RenderPlayerEvent; public class SolarUpgrade extends AbstractUpgrade { private static final String KEY_LEVEL = "level"; - + private static final String UPGRADE_NAME = "speedBoost"; - + public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); - + public static final SolarUpgrade SOLAR_THREE = new SolarUpgrade("enderio.darksteel.upgrade.solar_three", (byte) 3, Config.darkSteelSolarThreeCost); + private Render render; public static SolarUpgrade loadFromItem(ItemStack stack) { @@ -45,14 +43,10 @@ public class SolarUpgrade extends AbstractUpgrade { return new SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - private static ItemStack createUpgradeItem() { - ItemStack pot = new ItemStack(Items.potionitem, 1, 0); - int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); - pot.setItemDamage(res); - return pot; + private static ItemStack createUpgradeItem(int level) { + return new ItemStack(EnderIO.blockSolarPanel,1,level-1); } - + private byte level; public SolarUpgrade(NBTTagCompound tag) { @@ -61,13 +55,13 @@ public class SolarUpgrade extends AbstractUpgrade { } public SolarUpgrade(String unlocName, byte level, int levelCost) { - super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost); + super(UPGRADE_NAME, unlocName, createUpgradeItem(level), levelCost); this.level = (byte) level; } - + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SolarUpgrade up = loadFromItem(stack); @@ -76,7 +70,7 @@ public class SolarUpgrade extends AbstractUpgrade { } return up.level == level - 1; } - + @Override public boolean hasUpgrade(ItemStack stack) { if(!super.hasUpgrade(stack)) { @@ -88,7 +82,7 @@ public class SolarUpgrade extends AbstractUpgrade { } return up.unlocName.equals(unlocName); } - + @Override public ItemStack getUpgradeItem() { return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); @@ -100,9 +94,12 @@ public class SolarUpgrade extends AbstractUpgrade { } public int getRFPerSec() { - return level == 1 ? Config.darkSteelSolarOneGen : Config.darkSteelSolarTwoGen; + if(level==0) return Config.darkSteelSolarOneGen; + if(level==1) return Config.darkSteelSolarTwoGen; + else return Config.darkSteelSolarThreeGen; + } - + @Override @SideOnly(Side.CLIENT) public IRenderUpgrade getRender() { @@ -113,8 +110,6 @@ public class SolarUpgrade extends AbstractUpgrade { private class Render implements IRenderUpgrade { private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); - private ItemStack panel1 = new ItemStack(EnderIO.blockSolarPanel, 1, 0); - private ItemStack panel2 = new ItemStack(EnderIO.blockSolarPanel, 1, 1); @Override public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { @@ -127,7 +122,7 @@ public class SolarUpgrade extends AbstractUpgrade { GL11.glRotated(180, 1, 0, 0); GL11.glScalef(2.1f, 2.1f, 2.1f); byte level = loadFromItem(stack).level; - item.setEntityItemStack(level == 0 ? panel1 : panel2); + item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level-1)); RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java index 70a6e14d..fba77422 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java @@ -1,17 +1,17 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class SoundDetectorUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "soundDetector"; - + public static final SoundDetectorUpgrade INSTANCE = new SoundDetectorUpgrade(); - + public static SoundDetectorUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -24,19 +24,19 @@ public class SoundDetectorUpgrade extends AbstractUpgrade { } return new SoundDetectorUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - - + + public SoundDetectorUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public SoundDetectorUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.sound", new ItemStack(Blocks.noteblock), Config.darkSteelSoundLocatorCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { return false; } SoundDetectorUpgrade up = loadFromItem(stack); @@ -47,6 +47,6 @@ public class SoundDetectorUpgrade extends AbstractUpgrade { } @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java index bd9a7db0..a446af09 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java @@ -37,10 +37,10 @@ public class SpeedUpgrade extends AbstractUpgrade { protected float sprintMultiplier; public static boolean isEquipped(EntityPlayer player) { - ItemStack legs = player.getEquipmentInSlot(2); + ItemStack legs = player.getEquipmentInSlot(2); return loadFromItem(legs) != null; } - + public static SpeedUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -57,7 +57,7 @@ public class SpeedUpgrade extends AbstractUpgrade { private static ItemStack createUpgradeItem() { ItemStack pot = new ItemStack(Items.potionitem, 1, 0); int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); + res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); pot.setItemDamage(res); return pot; } @@ -74,7 +74,7 @@ public class SpeedUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelLeggings || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 2) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SpeedUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java index 1662f373..800340e4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java @@ -1,17 +1,17 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class SpoonUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "spoon"; - + public static final SpoonUpgrade INSTANCE = new SpoonUpgrade(); - + public static SpoonUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -24,19 +24,19 @@ public class SpoonUpgrade extends AbstractUpgrade { } return new SpoonUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - - + + public SpoonUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public SpoonUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.spoon", new ItemStack(Items.diamond_shovel), Config.darkSteelSpoonCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SpoonUpgrade up = loadFromItem(stack); @@ -47,7 +47,7 @@ public class SpoonUpgrade extends AbstractUpgrade { } @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java index fb57fcb6..982ff91b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java @@ -1,17 +1,17 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class SwimUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "swim"; - + public static final SwimUpgrade INSTANCE = new SwimUpgrade(); - + public static SwimUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -24,19 +24,19 @@ public class SwimUpgrade extends AbstractUpgrade { } return new SwimUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - - + + public SwimUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public SwimUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.swim", new ItemStack(Blocks.waterlily), Config.darkSteelSwimCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3)) { return false; } SwimUpgrade up = loadFromItem(stack); @@ -47,7 +47,7 @@ public class SwimUpgrade extends AbstractUpgrade { } @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java index d97cfb6d..b41eb903 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java @@ -1,18 +1,18 @@ package crazypants.enderio.item.darksteel.upgrade; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TravelUpgrade extends AbstractUpgrade { private static String UPGRADE_NAME = "travel"; - + public static final TravelUpgrade INSTANCE = new TravelUpgrade(); - + public static TravelUpgrade loadFromItem(ItemStack stack) { if(stack == null) { return null; @@ -25,19 +25,19 @@ public class TravelUpgrade extends AbstractUpgrade { } return new TravelUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - - + + public TravelUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); + super(UPGRADE_NAME, tag); } public TravelUpgrade() { super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial,1,Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost); - } - + } + @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } TravelUpgrade up = loadFromItem(stack); @@ -48,7 +48,7 @@ public class TravelUpgrade extends AbstractUpgrade { } @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 5a7dd8d3..6531e3ae 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -8,24 +8,26 @@ 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; public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { // Power - private Capacitors capacitorType; - private ICapacitor capacitor; + private Capacitors capacitorType = Capacitors.BASIC_CAPACITOR; + private ICapacitor capacitor = Capacitors.BASIC_CAPACITOR.capacitor; - private int storedEnergyRF; + private int storedEnergyRF = 0; protected float lastSyncPowerStored = -1; 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/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 03e9f5b1..24c48b5e 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -42,12 +42,14 @@ public class MachineRecipes { ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); ItemStack obsidian = new ItemStack(Blocks.obsidian); + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); String darkSteel = DARK_STEEL.getOreIngot(); String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); String phasedGold = PHASED_GOLD.getOreIngot(); String phasedIron = PHASED_IRON.getOreIngot(); String soularium = SOULARIUM.getOreIngot(); + String endSteel = END_STEEL.getOreIngot(); String vibCry = VIBRANT_CYSTAL.oreDict; String pulCry = PULSATING_CYSTAL.oreDict; @@ -73,6 +75,14 @@ public class MachineRecipes { ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); addShaped(zg, "eee", "qzq", "qqq", 'e', electricalSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0)); + //FrankenzombieGen + ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0); + addShaped(fg, "eee", "qzq", "qqq", 'e', soularium, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 2)); + + //EnderGen + ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0); + addShaped(eg, "eee", "qzq", "qqq", 'e', endSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 3)); + //KillerJoe ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); @@ -97,7 +107,7 @@ public class MachineRecipes { addShaped(poweredSpawner, "ese", "eme", "vzv", 'e', electricalSteel, 's', "itemSkull", 'v', vibCry, 'm', machineChassi, 'z', zombieBit); if (Config.reservoirEnabled) { - //reservoir + //reservoir ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); Object glassSides; if (Config.useHardRecipes) { @@ -185,14 +195,17 @@ public class MachineRecipes { ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0); ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1); + ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2); + if (Config.useHardRecipes) { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', - phasedGold); + addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', phasedGold); addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2, 'e', phasedIron, 'p', phasedGold); + addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor3, 'e', endSteel, 'p', phasedGold); } else { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', - electricalSteel); - addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', phasedIron); + addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', redstoneAlloy); + addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', pulCry, 'e', phasedIron, 'c', electricalSteel); + addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', endSteel); + } } 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 69b60241..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 { @@ -129,7 +130,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS; public static final int NUM_SUPPLY_SLOTS = 4; - + public static final int minSupSlot = maxFirtSlot + 1; public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS; @@ -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(); } } @@ -486,7 +487,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } private int bonemealCooldown = 5; // no need to persist this - + private boolean hasBonemeal() { if (inventory[minFirtSlot] != null) { return true; @@ -519,7 +520,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { /* * Returns a fuzzy boolean: - * + * * <=0 - break no leaves for saplings * 50 - break half the leaves for saplings * 90 - break 90% of the leaves for saplings @@ -527,7 +528,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public int isLowOnSaplings(BlockCoord bc) { int slot = getSupplySlotForCoord(bc); ItemStack inv = inventory[slot]; - + return 90 * (Config.farmSaplingReserveAmount - (inv == null ? 0 : inv.stackSize)) / Config.farmSaplingReserveAmount; } @@ -614,7 +615,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { for (int j = minSupSlot; j < slot; j++) { slots[k++] = j; } - + int origSize = stack.stackSize; stack = stack.copy(); @@ -709,14 +710,16 @@ 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; } currentTask = createTask(); } @@ -781,6 +784,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return 32; case ENDER_CAPACITOR: return 64; + default: + break; } } return 64; diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java index 108bddd9..b2145b7b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java @@ -19,7 +19,7 @@ public class RubberTreeFarmerIC2 extends TreeFarmer { private ItemStack stickyResin; public RubberTreeFarmerIC2() { - super(GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood")); + super(true, GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood")); Item item = GameRegistry.findItem("IC2", "itemTreetap"); if(item != null) { treeTap = item.getClass(); @@ -37,19 +37,24 @@ public class RubberTreeFarmerIC2 extends TreeFarmer { @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - for(int x=-1;x<2;x++) { - for(int z=-1;z<2;z++) { - Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z); - if(isWood(blk) || sapling == blk) { - return false; - } - } + if(!farm.hasAxe()) { + for(int x=-1;x<2;x++) { + for(int z=-1;z<2;z++) { + Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z); + if(isWood(blk) || sapling == blk) { + return false; + } + } + } } return super.prepareBlock(farm, bc, block, meta); } @Override public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if(farm.hasAxe()) { + return super.harvestBlock(farm, bc, block, meta); + } HarvestResult res = new HarvestResult(); int y = bc.y; boolean done = false; 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/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index e4987add..2f296ae3 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -18,9 +18,48 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; + public class BlockZombieGenerator extends AbstractMachineBlock { + public static class BlockFrankenZombieGenerator extends BlockZombieGenerator { + + public BlockFrankenZombieGenerator() { + super(ModObject.blockFrankenzombieGenerator, TileFrankenZombieGenerator.class); + } + + public static BlockFrankenZombieGenerator create() { + BlockFrankenZombieGenerator gen = new BlockFrankenZombieGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType(){ + return GeneratorType.FRANKENZOMBIE; + } + + } + + public static class BlockEnderGenerator extends BlockZombieGenerator { + + public BlockEnderGenerator() { + super(ModObject.blockEnderGenerator, TileEnderGenerator.class); + } + + public static BlockEnderGenerator create() { + BlockEnderGenerator gen = new BlockEnderGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType(){ + return GeneratorType.ENDER; + } + + } + public static BlockZombieGenerator create() { BlockZombieGenerator gen = new BlockZombieGenerator(); gen.init(); @@ -28,7 +67,11 @@ public class BlockZombieGenerator extends AbstractMachineBlock clazz) { + super(obj, (Class) clazz, Material.anvil); } @Override @@ -117,4 +160,8 @@ public class BlockZombieGenerator extends AbstractMachineBlock= (getMaxEnergyStored() - (outputPerTick * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { + if (inPause && getEnergyStored() >= (getMaxEnergyStored() - (getOutputPerTick() * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { return false; } inPause = false; - if(fuelTank.getFluidAmount() < getActivationAmount()) { + if(fuelTank.getFluidAmount() < getActivationAmount()) { return false; } - - - ticksRemaingFuel--; + + + ticksRemaingFuel--; if(ticksRemaingFuel <= 0) { fuelTank.drain(1, true); - ticksRemaingFuel = tickPerBucketOfFuel/1000; + ticksRemaingFuel = tickPerBucketOfFuel/1000; tanksDirty = true; - } - setEnergyStored(getEnergyStored() + outputPerTick); + } + setEnergyStored(getEnergyStored() + getOutputPerTick()); return true; } - + int getActivationAmount() { - return (int) (fuelTank.getCapacity() * 0.7f); + return minimumTankLevel; } private boolean transmitEnergy() { @@ -177,8 +215,8 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - int transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, getEnergyStored())); - setEnergyStored(getEnergyStored() - transmitted); + int transmitted = powerDis.transmitEnergy(worldObj, Math.min(getOutputPerTick() * 2, getEnergyStored())); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; } @@ -219,7 +257,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu public int getFluidStored(ForgeDirection from) { return fuelTank.getFluidAmount(); } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); @@ -257,7 +295,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu @Override public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null && forFluidType.getFluid() == EnderIO.fluidNutrientDistillation) { + if (forFluidType != null && forFluidType.getFluid() == getFluidType()) { return fuelTank; } return null; @@ -278,4 +316,22 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu return fuelTank; } + protected Fluid getFluidType() { + return EnderIO.fluidNutrientDistillation; + } + + public int getTicksPerBucketOfFuel() { + return tickPerBucketOfFuel; + } + + public GeneratorType getGeneratorType(){ + return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType(); + } + + public int getOutputPerTick(){ + 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/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 7f3d807a..11c463e9 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -1,18 +1,5 @@ package crazypants.enderio.machine.generator.zombie; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidTank; - import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.BoundingBox; @@ -23,13 +10,27 @@ import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; import crazypants.util.RenderPassHelper; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidTank; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final String TEXTURE = "enderio:models/ZombieJar.png"; - private ModelZombieJar model = new ModelZombieJar(); @Override @@ -48,7 +49,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); if (RenderPassHelper.getEntityRenderPass() == 0) { - renderModel(gen.facing); + renderModel(gen.getGeneratorType(), gen.facing); } else if (RenderPassHelper.getEntityRenderPass() == 1) { renderFluid(gen); } @@ -106,7 +107,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement } } - private void renderModel(int facing) { + private void renderModel(GeneratorType gen, int facing) { GL11.glPushMatrix(); @@ -123,7 +124,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement } GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(TEXTURE); + RenderUtil.bindTexture(gen.getTexture()); model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glTranslatef(-0.5F, 0, -0.5F); @@ -143,15 +144,16 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderItem(0, 0, 0); + renderItem(((BlockZombieGenerator) Block.getBlockFromItem(item.getItem())).getGeneratorType(),0,0,0); + } - private void renderItem(float x, float y, float z) { + private void renderItem(GeneratorType gen, float x, float y, float z) { GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - renderModel(ForgeDirection.SOUTH.ordinal()); + renderModel(gen,ForgeDirection.SOUTH.ordinal()); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } 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/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 3c64fcfb..4d6323eb 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -38,9 +38,9 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan public String getUnlocalizedName(ItemStack par1ItemStack) { int meta = par1ItemStack.getItemDamage(); String result = super.getUnlocalizedName(par1ItemStack); - if(meta == 1) { - result += ".advanced"; - } + if(meta == 1) result += ".advanced"; + if(meta == 2) result += ".vibrant"; + return result; } @@ -52,6 +52,8 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan par3List.add(stack); stack = new ItemStack(this, 1,1); par3List.add(stack); + stack = new ItemStack(this, 1,2); + par3List.add(stack); } @SuppressWarnings("rawtypes") @@ -70,9 +72,11 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); int prod = Config.maxPhotovoltaicOutputRF; - if(itemstack.getItemDamage() == 1) { + if(itemstack.getItemDamage() == 1) prod = Config.maxPhotovoltaicAdvancedOutputRF; - } + if(itemstack.getItemDamage() == 2) + prod = Config.maxPhotovoltaicVibrantOutputRF; + list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index b90242ad..601396ac 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -45,6 +45,10 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide IIcon borderIcon; IIcon advancedBorderIcon; + IIcon vibrantIcon; + IIcon vibrantSideIcon; + IIcon vibrantBorderIcon; + private BlockSolarPanel() { super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class); if(!Config.photovoltaicCellEnabled) { @@ -80,13 +84,28 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { if(side == ForgeDirection.UP.ordinal()) { - return meta == 0 ? blockIcon : advancedIcon; + switch(meta){ + case 0:return blockIcon; + case 1:return advancedIcon; + case 2:return vibrantIcon; + default: return blockIcon; + } } - return meta == 0 ? sideIcon : advancedSideIcon; + switch(meta){ + case 0:return sideIcon; + case 1:return advancedSideIcon; + case 2:return vibrantSideIcon; + default: return sideIcon; + } } public IIcon getBorderIcon(int i, int meta) { - return meta == 0 ? borderIcon : advancedBorderIcon; + switch(meta){ + case 0:return borderIcon; + case 1:return advancedBorderIcon; + case 2:return vibrantBorderIcon; + default: return borderIcon; + } } @Override @@ -107,10 +126,14 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide public void registerBlockIcons(IIconRegister register) { blockIcon = register.registerIcon("enderio:solarPanelTop"); advancedIcon = register.registerIcon("enderio:solarPanelAdvancedTop"); + vibrantIcon = register.registerIcon("enderio:solarPanelVibrantTop"); sideIcon = register.registerIcon("enderio:solarPanelSide"); advancedSideIcon = register.registerIcon("enderio:solarPanelAdvancedSide"); + vibrantSideIcon = register.registerIcon("enderio:solarPanelVibrantSide"); borderIcon = register.registerIcon("enderio:solarPanelBorder"); advancedBorderIcon = register.registerIcon("enderio:solarPanelAdvancedBorder"); + vibrantBorderIcon = register.registerIcon("enderio:solarPanelVibrantBorder"); + } @Override diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index d96952f1..842cc7e2 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -25,24 +25,24 @@ import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.waila.IWailaNBTProvider; public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider { - + private final List receptors = new ArrayList(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; private int lastCollectionValue = -1; - + private static final int CHECK_INTERVAL = 100; - + EnergyStorage destroyedNetworkBuffer = null; - + protected SolarPanelNetwork network = new SolarPanelNetwork(); public void onNeighborBlockChange() { receptorsDirty = true; } - + // RF Power @@ -65,7 +65,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public int getMaxEnergyStored(ForgeDirection from) { return getMaxEnergyStored(); } - + @Override public int getMaxEnergyRecieved(ForgeDirection dir) { return 0; @@ -93,7 +93,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe } collectEnergy(); transmitEnergy(); - + if (network.isValid()) { if (destroyedNetworkBuffer != null) { network.addBuffer(destroyedNetworkBuffer); @@ -101,12 +101,12 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe } network.onUpdate(this); } - + if (!network.isValid() || (shouldDoWorkThisTick(20, 1) && network.addToNetwork(this))) { findNetwork(); } } - + @Override public void invalidate() { network.removeFromNetwork(this); @@ -147,16 +147,17 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe private int getEnergyPerTick() { int meta = getBlockMetadata(); - if(meta == 0) { + if(meta == 0) return Config.maxPhotovoltaicOutputRF; - } - return Config.maxPhotovoltaicAdvancedOutputRF; + if(meta == 1) + return Config.maxPhotovoltaicAdvancedOutputRF; + return Config.maxPhotovoltaicVibrantOutputRF; } float calculateLightRatio() { return calculateLightRatio(worldObj, xCoord, yCoord, zCoord); } - + boolean canSeeSun() { return worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord); } @@ -211,7 +212,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe appliedCount++; } - setEnergyStored(getEnergyStored() - transmitted); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; @@ -269,7 +270,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); } - + @Override public boolean displayPower() { return true; @@ -278,7 +279,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public void setNetwork(SolarPanelNetwork network) { this.network = network; } - + public boolean isMaster() { return network.getMaster() == this; } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java new file mode 100644 index 00000000..4a0f6d88 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java @@ -0,0 +1,26 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.material.Material; + +public class SoulBinderPrecientCystalRecipe extends AbstractSoulBinderRecipe { + + public static SoulBinderPrecientCystalRecipe instance = new SoulBinderPrecientCystalRecipe(); + + private SoulBinderPrecientCystalRecipe() { + super(Config.soulBinderPrecientCystalRF, Config.soulBinderPrecientCystalLevels, "SoulBinderPrecientCystalRecipe", "SpecialMobs.SpecialEnderman", "Enderman"); + } + + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + } + + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PRECIENT_CRYSTAL.ordinal()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java index ebbf9cb6..08238927 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java @@ -30,6 +30,7 @@ public class SoulBinderRecipeManager { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderPrecientCystalRecipe.instance); //Ender Rail if(Config.transceiverEnabled && Config.enderRailEnabled) { @@ -40,7 +41,7 @@ public class SoulBinderRecipeManager { } // Example of how to add a recipe: - // + // // NBTTagCompound root = new NBTTagCompound(); // root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); @@ -54,14 +55,14 @@ public class SoulBinderRecipeManager { // stackRoot = new NBTTagCompound(); // is.writeToNBT(stackRoot); // root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - // + // // SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); // FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); //@formatter:off /** * Example of how to add a recipe: - * + * * NBTTagCompound root = new NBTTagCompound(); * root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); @@ -75,10 +76,10 @@ public class SoulBinderRecipeManager { * stackRoot = new NBTTagCompound(); * is.writeToNBT(stackRoot); * root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - * + * * SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); * FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); - * + * * @param root * @return */ diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 495b0dbc..759228ae 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -32,17 +32,17 @@ 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(0,POWER_PER_TICK_ONE * 2, Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; - 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.soulBinderLevelThreePowerPerTickRF; - 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); - + 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/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 37ef6cba..b6b8f5dd 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -48,7 +48,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private final SetMultimap sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); private final SetMultimap recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - private ICapacitor capacitor = new BasicCapacitor(Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF); private boolean sendChannelsDirty = false; private boolean recieveChannelsDirty = false; private boolean registered = false; @@ -69,12 +68,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid public TileTransceiver() { super(new SlotDefinition(8, 8, 0)); - currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); railController = new EnderRailController(this); sendItemFilter = new ItemFilter(true); recieveItemFilter = new ItemFilter(true); + setCapacitor(new BasicCapacitor(0,Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF)); } public EnderRailController getRailController() { @@ -161,11 +160,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid return hasPower(); } - @Override - public ICapacitor getCapacitor() { - return capacitor; - } - @Override public int getPowerUsePerTick() { return Config.transceiverUpkeepCostRF; @@ -260,7 +254,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid static void readChannels(NBTTagCompound nbtRoot, SetMultimap channels, String key) { channels.clear(); - + if(!nbtRoot.hasKey(key)) { return; } diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index acb5b6bb..df5c5064 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -18,7 +18,9 @@ public enum Alloy { CONDUCTIVE_IRON("conductiveIron", 5.2f), PHASED_IRON("phasedIron", 7.0f, "pulsatingIron"), DARK_STEEL("darkSteel", 10.0f), - SOULARIUM("soularium", 10.0f); + SOULARIUM("soularium", 10.0f), + END_STEEL("endSteel", 10.0f); + public final String unlocalisedName; public final String iconKey; @@ -54,6 +56,10 @@ public enum Alloy { return new ItemStack(EnderIO.itemAlloy, size, ordinal()); } + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBall, size, ordinal()); + } + public ItemStack getStackBlock() { return getStackBlock(1); } @@ -77,4 +83,5 @@ public enum Alloy { public List getOreBlocks() { return oreBlocks; } + } diff --git a/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java new file mode 100644 index 00000000..819b53b1 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java @@ -0,0 +1,69 @@ +package crazypants.enderio.material; + +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class BlockDarkSteelBars extends BlockPane { + + public static class BlockSoulariumBars extends BlockDarkSteelBars { + + public BlockSoulariumBars() { + super(ModObject.blockSoulariumBars, "blockSoulariumBars"); + setBlockName(ModObject.blockSoulariumBars.unlocalisedName); + } + + public static BlockSoulariumBars create() { + BlockSoulariumBars res = new BlockSoulariumBars(); + res.init(); + return res; + } + + } + + public static class BlockEndSteelBars extends BlockDarkSteelBars { + + public BlockEndSteelBars() { + super(ModObject.blockEndSteelBars, "blockEndSteelBars"); + setBlockName(ModObject.blockEndSteelBars.unlocalisedName); + } + + public static BlockEndSteelBars create() { + BlockEndSteelBars res = new BlockEndSteelBars(); + res.init(); + return res; + } + + } + + public static BlockDarkSteelBars create() { + BlockDarkSteelBars res = new BlockDarkSteelBars(); + res.init(); + return res; + } + + ModObject modObj; + + public BlockDarkSteelBars(ModObject obj, String name) { + super("enderio:"+name, "enderio:"+name, Material.iron, true); + this.modObj = obj; + setResistance(2000.0F); //TNT Proof + setHardness(5.0F); + setStepSound(soundTypeMetal); + setBlockName(obj.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + public BlockDarkSteelBars() { + this(ModObject.blockDarkIronBars,"blockDarkIronBars"); + } + + protected void init() { + GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, modObj.unlocalisedName); + OreDictionary.registerOre("barsIron", this); + } + +} diff --git a/src/main/java/crazypants/enderio/material/FrankenSkull.java b/src/main/java/crazypants/enderio/material/FrankenSkull.java index 94089ca5..6204c889 100644 --- a/src/main/java/crazypants/enderio/material/FrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/FrankenSkull.java @@ -6,20 +6,23 @@ public enum FrankenSkull { ZOMBIE_CONTROLLER("skullZombieController", false), FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true), ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false), - SENTIENT_ENDER("skullSentientEnder", "enderio:skullEnderResonator", true); - + SENTIENT_ENDER("skullSentientEnder", "enderio:skullEnderResonator", true), + SKELETAL_CONTRACTOR("skullSkeletalContractor", "enderio:skullSkeletalContractor", false), + GUARDIAN_DIODE("skullGuardianDiode", "enderio:skullGuardianDiode", false); + + public final String unlocalisedName; public final String iconKey; public final boolean isAnimated; - + private FrankenSkull(String unlocalisedName, String iconKey, boolean isAnimated) { this.unlocalisedName = unlocalisedName; this.iconKey = iconKey; this.isAnimated = isAnimated; } - + private FrankenSkull(String unlocalisedName, boolean isAnimated) { - this(unlocalisedName, "enderio:" + unlocalisedName, isAnimated); + this(unlocalisedName, "enderio:" + unlocalisedName, isAnimated); } public String getUnlocalisedName() { @@ -29,5 +32,5 @@ public enum FrankenSkull { public String getIconKey() { return iconKey; } - + } diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index fc380639..665f5bdc 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -18,8 +18,8 @@ public class ItemAlloy extends Item { static final boolean useNuggets = false; - private final IIcon[] icons; - private final int numItems; + protected final IIcon[] icons; + protected final int numItems; public static ItemAlloy create() { ItemAlloy alloy = new ItemAlloy(); @@ -27,7 +27,7 @@ public class ItemAlloy extends Item { return alloy; } - private ItemAlloy() { + protected ItemAlloy() { setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); 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/ItemGrindingBall.java b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java new file mode 100644 index 00000000..98289f01 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java @@ -0,0 +1,50 @@ +package crazypants.enderio.material; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemGrindingBall extends ItemAlloy { + + public static ItemGrindingBall create() { + ItemGrindingBall ball = new ItemGrindingBall(); + ball.init(); + return ball; + } + + private ItemGrindingBall() { + setUnlocalizedName(ModObject.itemGrindingBall.unlocalisedName); + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBall.unlocalisedName); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = Alloy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey+"GrindingBall"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return Alloy.values()[i].unlocalisedName+"_ball"; + } +} diff --git a/src/main/java/crazypants/enderio/material/MachinePart.java b/src/main/java/crazypants/enderio/material/MachinePart.java index 005d407c..c2f8a0d9 100644 --- a/src/main/java/crazypants/enderio/material/MachinePart.java +++ b/src/main/java/crazypants/enderio/material/MachinePart.java @@ -9,7 +9,10 @@ import org.apache.commons.lang3.StringUtils; public enum MachinePart { MACHINE_CHASSI("machineChassi"), - BASIC_GEAR("basicGear"); + BASIC_GEAR("basicGear"), + SOUL_MACHINE_CHASSIS("soulMachineChassi"), + END_STEEL_MACHINE_CHASSIS("endSteelMachineChassi"); + public final String unlocalisedName; public final String iconKey; @@ -20,7 +23,7 @@ public enum MachinePart { this.iconKey = "enderio:" + unlocalisedName; this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); } - + public static void registerOres(Item item) { for (MachinePart m : values()) { OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index e468d447..1d89b680 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -24,7 +24,7 @@ public class MachinePartRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - if(item != null && item.getItemDamage() == MachinePart.MACHINE_CHASSI.ordinal()) { + if(item != null && item.getItemDamage() != MachinePart.BASIC_GEAR.ordinal()) { return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; } else { diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 6db4e1c7..5baf4493 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -20,7 +20,17 @@ public enum Material { DARK_GRINDING_BALL("darkGrindingBall"), ENDER_CRYSTAL("enderCrystal", true), ATTRACTOR_CRYSTAL("attractorCrystal", true), - WEATHER_CRYSTAL("weatherCrystal", true); + WEATHER_CRYSTAL("weatherCrystal", true), + END_STEEL_NUGGET("endSteelNugget"), + DARK_STEEL_ROD("darkSteelRod"), + PRECIENT_CRYSTAL("precientCrystal",true), + PULSATING_POWDER("pulsatingPowder", true), + VIBRANT_POWDER("vibrantPowder", true), + ENDER_POWDER("enderCrystalPowder", true), + PRECIENT_POWDER("precientPowder",true); + + + public final String unlocalisedName; public final String iconKey; @@ -47,7 +57,7 @@ public enum Material { public ItemStack getStack() { return getStack(1); } - + public ItemStack getStack(int size) { return new ItemStack(EnderIO.itemMaterial, size, ordinal()); } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index f3053ba0..c83e3023 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 { @@ -41,7 +44,11 @@ public class MaterialRecipes { OreDictionary.registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); } } - + + 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,8 +73,33 @@ 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())); + OreDictionary.registerOre("nuggetEndSteel", new ItemStack(EnderIO.itemMaterial, 1, Material.END_STEEL_NUGGET.ordinal())); OreDictionary.registerOre("glass", Blocks.glass); OreDictionary.registerOre("stickWood", Items.stick); @@ -106,8 +138,54 @@ public class MaterialRecipes { String phasedGold = PHASED_GOLD.getOreIngot(); String phasedIron = PHASED_IRON.getOreIngot(); String darkSteel = DARK_STEEL.getOreIngot(); + 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); @@ -131,6 +209,12 @@ public class MaterialRecipes { vibrantNugget.stackSize = 1; addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget); + ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal()); + addShapeless(endSteelNugget, endSteel); + endSteelNugget = endSteelNugget.copy(); + endSteelNugget.stackSize = 1; + addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget); + //Crystals ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond"); @@ -138,10 +222,6 @@ public class MaterialRecipes { ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); - //Balls - ItemStack darkBall = new ItemStack(EnderIO.itemMaterial, 5, Material.DARK_GRINDING_BALL.ordinal()); - addShaped(darkBall, " s ", "sss", " s ", 's', darkSteel); - //Smelting ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); @@ -159,6 +239,14 @@ public class MaterialRecipes { ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); addShaped(diBars, "ddd", "ddd", 'd', darkSteel); + //Dark Iron Bars + ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0); + addShaped(soBars, "ddd", "ddd", 'd', soularium); + + //Dark Iron Bars + ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0); + addShaped(esBars, "ddd", "ddd", 'd', endSteel); + // Fused Quartz Frame addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); @@ -171,20 +259,18 @@ public class MaterialRecipes { String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel" : "ingotIron"; addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); + ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); + addShaped(soulchassis, "fif", "ici", "fif", 'f', EnderIO.blockSoulariumBars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor); + + ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); + addShaped(endchassis, "fif", "ici", "fif", 'f', EnderIO.blockEndSteelBars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor); + + // Basic Gear ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); 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"); - } - // 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 */)); @@ -204,46 +290,38 @@ public class MaterialRecipes { for (Alloy alloy : Alloy.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()); } + 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); + //Food ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); ItemStack bread = new ItemStack(Items.bread, 1, 0); GameRegistry.addSmelting(flour, bread, 0.35f); - + ItemStack enderios = EnderFood.ENDERIOS.getStack(); addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); 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/material/endergy/AlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java new file mode 100644 index 00000000..a49b6c5d --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java @@ -0,0 +1,85 @@ +package crazypants.enderio.material.endergy; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import org.apache.commons.lang3.StringUtils; + +import crazypants.enderio.EnderIO; + +public enum AlloyEndergy { + + CRUDE_STEEL("crudeSteel", 2.0f), + CRYSTALLINE_ALLOY("crystallineAlloy", 6.0f), + MELODIC_ALLOY("melodicAlloy", 5.0f), + STELLAR_ALLOY("stellarAlloy", 10.0f), + CRYSTALLINE_PINK_SLIME("crystallinePinkSlime", 7.0f), + ENERGETIC_SILVER("energeticSilver", 7.0f), + VIVID_ALLOY("vividAlloy", 4.0f); + + + public final String unlocalisedName; + public final String iconKey; + private final List oreIngots = new ArrayList(); + private final List oreBlocks = new ArrayList(); + private final float hardness; + + private AlloyEndergy(String baseName, float hardness, String oreDictName) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + if(oreDictName != null) { + this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); + this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + } + this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); + this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); + this.hardness = hardness; + } + + private AlloyEndergy(String baseName, float hardness) { + this(baseName, hardness, null); + } + + public float getHardness() { + return hardness; + } + + public ItemStack getStackIngot() { + return getStackIngot(1); + } + + public ItemStack getStackIngot(int size) { + return new ItemStack(EnderIO.itemAlloyEndergy, size, ordinal()); + } + + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBallEndergy, size, ordinal()); + } + + public ItemStack getStackBlock() { + return getStackBlock(1); + } + + public ItemStack getStackBlock(int size) { + return new ItemStack(EnderIO.blockIngotStorageEndergy, size, ordinal()); + } + + public String getOreIngot() { + return oreIngots.get(0); + } + + public String getOreBlock() { + return oreBlocks.get(0); + } + + public List getOreIngots() { + return oreIngots; + } + + public List getOreBlocks() { + return oreBlocks; + } + +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java new file mode 100644 index 00000000..c55b5e87 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java @@ -0,0 +1,105 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; + +public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedTooltipProvider { + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public static BlockIngotStorageEndergy create() { + BlockIngotStorageEndergy res = new BlockIngotStorageEndergy(); + res.init(); + return res; + } + + private BlockIngotStorageEndergy() { + super(ModObject.blockIngotStorageEndergy.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } + + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemIngotStorageEndergy.class, ModObject.blockIngotStorageEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[AlloyEndergy.values().length]; + for (AlloyEndergy alloy : AlloyEndergy.values()) { + icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.values().length - 1); + return icons[meta]; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + return AlloyEndergy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java new file mode 100644 index 00000000..b976917f --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java @@ -0,0 +1,39 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockItemIngotStorageEndergy extends ItemBlock { + + public BlockItemIngotStorageEndergy(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + AlloyEndergy.values()[stack.getItemDamage()].unlocalisedName; + } + + @Override + public int getMetadata(int damage) { + return damage; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (AlloyEndergy alloy : AlloyEndergy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java new file mode 100644 index 00000000..77f84ea7 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java @@ -0,0 +1,86 @@ +package crazypants.enderio.material.endergy; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemAlloyEndergy extends Item { + + static final boolean useNuggets = false; + + protected final IIcon[] icons; + protected final int numItems; + + public static ItemAlloyEndergy create() { + ItemAlloyEndergy alloy = new ItemAlloyEndergy(); + alloy.init(); + return alloy; + } + + protected ItemAlloyEndergy() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); + + numItems = AlloyEndergy.values().length; + if(useNuggets) { + numItems = numItems * 2; + } + icons = new IIcon[numItems]; + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemAlloyEndergy.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) { + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + } + if(useNuggets) { + for (int i = 0; i < numAlloys; i++) { + icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); + } + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + if(i < AlloyEndergy.values().length) { + return AlloyEndergy.values()[i].unlocalisedName; + } else { + return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < numItems; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } +} diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java new file mode 100644 index 00000000..46cb0766 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java @@ -0,0 +1,50 @@ +package crazypants.enderio.material.endergy; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemGrindingBallEndergy extends ItemAlloyEndergy { + + public static ItemGrindingBallEndergy create() { + ItemGrindingBallEndergy ball = new ItemGrindingBallEndergy(); + ball.init(); + return ball; + } + + private ItemGrindingBallEndergy() { + setUnlocalizedName(ModObject.itemGrindingBallEndergy.unlocalisedName); + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBallEndergy.unlocalisedName); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey+"GrindingBall"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return AlloyEndergy.values()[i].unlocalisedName+"GrindingBall"; + } +} 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 ec6cde38..062048d5 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -6,25 +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(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(); + } diff --git a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java index be5e3d9a..eb70bd5f 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java +++ b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java @@ -35,10 +35,10 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade { } return new GogglesOfRevealingUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - + public static boolean isUpgradeEquipped(EntityPlayer player) { - ItemStack helmet = player.getEquipmentInSlot(4); - return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null; + ItemStack helmet = player.getEquipmentInSlot(4); + return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null; } public GogglesOfRevealingUpgrade(NBTTagCompound tag) { @@ -51,7 +51,7 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getGoggles() == null) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getGoggles() == null) { return false; } GogglesOfRevealingUpgrade up = loadFromItem(stack);

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 literal 2149 zcmbVNYgiL!77o`H6bKmc2JH|<;+9+{34{b927(&cc!4Y+DrJ(HKm?MQOdw>zQc97F zY*p+kAcBf6j|g3?LY0e)1_B~>tt_(2C96d(mYYyk5J?9GcYpZw$IkQ2e3yCO^PY3Q zbDl3}=k~33wrgy0IGmke8$T2qf%$idHTG5Obd%Vy8V!m>!xU098B!rQ9;^@}fFKcy zMM4n>PC3wy_~CFC2V|m1G*b8njzp12f#xw3ZK4um<8XfdS|ucjM^HeF#LDDc;%NO1 zA|Qjg#0W1TO{fe+;$+)&DkMy|T_n-POV}{ce-q%RGX8B~x)rL)N($YHWL zpf|Aa5HU3sEaimqw=8I3D=sk(MU@;XH90w%lFXneRIyZ$&1O?+bSj-r#t>w6iX4Ts zWVw3Xq6I#pmZ)S(RHl#v^A;hoLW6RNn5XYTNK^`i?+we<3yH!~M%6+}DoCMG6BFm- zdW%-0p~!#T_#j#>N>L)zP(-cJs3h2VNY^crvE2Q(&^!?HhOB?ZgvBb@ z8K*!M>NtfG2n+;B5i&WfNLFv0KcRO4^AVLS34yn$6p6sw6mw)BkjLWlV$kSPG6b^` zG6FKO_}OAHnN1Um5igh}rL&mC1wQ=$rjCj^MV+sc|EZhBEvy*lr|-J}TfFZhM2RMO^Ccy#b;nS2nH_<`lod-onMDRFI{n4R_X@bI`CRh8*rSi5%Z@aws`{--^L zlLLdM+S=NziMqPFT5n;&crlI5<$itqSZ{A{kC~JH+r~z6X=&-FtBhujBjYaJ{r&w- zrv}wZC15ZZT1SV5f}Q5F+YN?8eq8RqKCa24dRm+%Sn9_!+zRji9{#gJ1VmYU-_en` z+tT6r4hIK^B;03u>r0dhONahvje3j zQ|`s`>6U_!qx2gSJ6xZ6ep0&9BWm_=w_x9?s*6qEFvyys8=uY1jL*#M?|wKiaDs5Y zHFDfA9n<_m-&W=mww!`*sf3xPk12yXy6)ryO{D!pi*zF^$bT0e-;vUFUH0NNa5}A2 z9Z?tWdL^Q6Nnb$3hW*=(8*SR!YApR*Yi1fUuhnXXpY;_vuFEpB$8&lz3-5GQR%<9f zq*kMXNtU$P9L>KLa?y9(aJ;n_qGa2&dg6bwu2RLEd{apXu521(SXFFpEu`7sX9$U}EIc+HUxzK*SPd7fJCGDe$fZ{_x2Kl;MKW(tiV?55{ z^9x`W*M86K&O7N8!ey5)@7Z!+b&ui4LXv4_EnNwR8!N8z^<7KM!spC?$A$wVs)7P+ zpL_h`Hr=Djw>%RnKag?oEK^IqWBzJCKaPQp_dGDhx{Aa1kxo_mY&@;^gO)W0TDYA9 zE(B+6cZVC1BKw$GiiYt0lcAqnY%MJCH#z5!&bu{TcO5sE?;%~ogQIoam1ix@DwTgL zkG)fFmrAzni8^pjyDFUJGn8g$Zqv%(F%D38`1Bw02>}-dk7b`*vLz~gSIpn{obON^!Gnr(HuW(1QA3Y8tC+)Jc7!!14#=jwbF`Bou0A5xl)%O)tIX!Ld*aR z^={5nQ&T@nQLUEL5uUdDa*6;-u5UP;x^ev9QP}MjTQ<;aQ=&BoHsqkQsSCpem~$SNHD&^ zqr*)$;_uEMBUOjIpnOfpc>2|YQO%o!mJeU*4yL8`O_^+HxJ}y2_544^pPs+?1wq^S J)d4XXzXIo3Y%Kr) diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png b/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png index de3de255901c7b692c922a1a7166e2a1939efc46..c9e8c82dec8c006f60617c61bcd80e6751cdc16f 100644 GIT binary patch literal 822 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 FV1oQFt=a$p literal 1911 zcmbVNX;2eq7!Gm_FdX&}f)!l@j6mJ&Zb%5blc10Vp#o|Q7ON;@tv8TrK(VpH!T#9m@(FXmSPCNtWDDyF|(BS+AhZKt*;>-@EXFT zN_lUbN{F2e$Y=uvi1;E<1q%>BjPenY5JixwfB;5dnLz{tg8)eNK> zljD&iTI@;6OJNv2203l81_e#0jdsE86q=!pDYPDt$pHUPH9C?u z83U{pdJ`~C88k~NGSWb6f!8U=XI26jr^@U(Px__jvlVG8rFY4h6C z+u^Z&w%hT`QT)29x=A|VwvSXTk9?W9V)??Al6Cl_+^O{0w)cdQGVc}VYU$j^H*bDd zb!WSOV|rS9aAU&Hz?`rA&Ri32Xv7?Iq{;E|J;xVSm*%a$#2M)Bw%K&?W}fTBTe&H+ zygh3Qe;Zu;;^%uyE$3|RY}>YNTzoFgbr`#~eo94vwn<;n>~Yh1rA;mXOnJKO)!<;h zbn4l0le|8&K)>%6RLv}sJejyqs~6XK_H*oevO}+Bmrkc^x}r`j>{A^7HlWGR511GB zjd~vZ#O3IXvl)o78`8a8-3l&Ke61YS@rZxb@lv54Mgb~4@*&;)9#@#*EQT{jxTmKK6LHyZcF)~Uf6Pd`1w%( zu8K~fP1*GPLz9PdavGZhkNT%ObP6Wy`ylYty53A~R&vQKvn;FD&#_C{C8;cG)!W%U zzW&Rs3ME)$GiLw{d|!LWtsGh_!8@`aKi})w;dd+Pyr+8&7PrUGWaqPHN7YsP`~%7j z2|Uq0>`1C6qdR}Ut$gF*zBy4F;^X^IZT_m&r*e05&`5VeH7lMzGWQuj z4A_@HR9V@1{Oj7T>m|$Aedbc#vD&76e_4$AHYMK~iC${$UF`qz&z5KWU9ar994Pd` U!0r0Px#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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