diff --git a/bin/minecraft/resources/mekanism/gui/GuiBioGenerator.png b/bin/minecraft/mods/mekanism/gui/GuiBioGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiBioGenerator.png rename to bin/minecraft/mods/mekanism/gui/GuiBioGenerator.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiChamber.png b/bin/minecraft/mods/mekanism/gui/GuiChamber.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiChamber.png rename to bin/minecraft/mods/mekanism/gui/GuiChamber.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiCombiner.png b/bin/minecraft/mods/mekanism/gui/GuiCombiner.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiCombiner.png rename to bin/minecraft/mods/mekanism/gui/GuiCombiner.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiCompressor.png b/bin/minecraft/mods/mekanism/gui/GuiCompressor.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiCompressor.png rename to bin/minecraft/mods/mekanism/gui/GuiCompressor.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiControlPanel.png b/bin/minecraft/mods/mekanism/gui/GuiControlPanel.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiControlPanel.png rename to bin/minecraft/mods/mekanism/gui/GuiControlPanel.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiCrusher.png b/bin/minecraft/mods/mekanism/gui/GuiCrusher.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiCrusher.png rename to bin/minecraft/mods/mekanism/gui/GuiCrusher.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiElectrolyticSeparator.png b/bin/minecraft/mods/mekanism/gui/GuiElectrolyticSeparator.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiElectrolyticSeparator.png rename to bin/minecraft/mods/mekanism/gui/GuiElectrolyticSeparator.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiElementizer.png b/bin/minecraft/mods/mekanism/gui/GuiElementizer.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiElementizer.png rename to bin/minecraft/mods/mekanism/gui/GuiElementizer.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiEnergyCube.png b/bin/minecraft/mods/mekanism/gui/GuiEnergyCube.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiEnergyCube.png rename to bin/minecraft/mods/mekanism/gui/GuiEnergyCube.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiGasTank.png b/bin/minecraft/mods/mekanism/gui/GuiGasTank.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiGasTank.png rename to bin/minecraft/mods/mekanism/gui/GuiGasTank.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiHeatGenerator.png b/bin/minecraft/mods/mekanism/gui/GuiHeatGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiHeatGenerator.png rename to bin/minecraft/mods/mekanism/gui/GuiHeatGenerator.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiHydrogenGenerator.png b/bin/minecraft/mods/mekanism/gui/GuiHydrogenGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiHydrogenGenerator.png rename to bin/minecraft/mods/mekanism/gui/GuiHydrogenGenerator.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiMetallurgicInfuser.png b/bin/minecraft/mods/mekanism/gui/GuiMetallurgicInfuser.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiMetallurgicInfuser.png rename to bin/minecraft/mods/mekanism/gui/GuiMetallurgicInfuser.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiPortableTeleporter.png b/bin/minecraft/mods/mekanism/gui/GuiPortableTeleporter.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiPortableTeleporter.png rename to bin/minecraft/mods/mekanism/gui/GuiPortableTeleporter.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiPurificationChamber.png b/bin/minecraft/mods/mekanism/gui/GuiPurificationChamber.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiPurificationChamber.png rename to bin/minecraft/mods/mekanism/gui/GuiPurificationChamber.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiSolarGenerator.png b/bin/minecraft/mods/mekanism/gui/GuiSolarGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiSolarGenerator.png rename to bin/minecraft/mods/mekanism/gui/GuiSolarGenerator.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiStopwatch.png b/bin/minecraft/mods/mekanism/gui/GuiStopwatch.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiStopwatch.png rename to bin/minecraft/mods/mekanism/gui/GuiStopwatch.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiTeleporter.png b/bin/minecraft/mods/mekanism/gui/GuiTeleporter.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiTeleporter.png rename to bin/minecraft/mods/mekanism/gui/GuiTeleporter.png diff --git a/bin/minecraft/resources/mekanism/gui/GuiWeatherOrb.png b/bin/minecraft/mods/mekanism/gui/GuiWeatherOrb.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/GuiWeatherOrb.png rename to bin/minecraft/mods/mekanism/gui/GuiWeatherOrb.png diff --git a/bin/minecraft/resources/mekanism/gui/smelting/GuiAdvancedSmeltingFactory.png b/bin/minecraft/mods/mekanism/gui/smelting/GuiAdvancedSmeltingFactory.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/smelting/GuiAdvancedSmeltingFactory.png rename to bin/minecraft/mods/mekanism/gui/smelting/GuiAdvancedSmeltingFactory.png diff --git a/bin/minecraft/resources/mekanism/gui/smelting/GuiBasicSmeltingFactory.png b/bin/minecraft/mods/mekanism/gui/smelting/GuiBasicSmeltingFactory.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/smelting/GuiBasicSmeltingFactory.png rename to bin/minecraft/mods/mekanism/gui/smelting/GuiBasicSmeltingFactory.png diff --git a/bin/minecraft/resources/mekanism/gui/smelting/GuiEliteSmeltingFactory.png b/bin/minecraft/mods/mekanism/gui/smelting/GuiEliteSmeltingFactory.png similarity index 100% rename from bin/minecraft/resources/mekanism/gui/smelting/GuiEliteSmeltingFactory.png rename to bin/minecraft/mods/mekanism/gui/smelting/GuiEliteSmeltingFactory.png diff --git a/bin/minecraft/resources/mekanism/render/AdvancedSolarGenerator.png b/bin/minecraft/mods/mekanism/render/AdvancedSolarGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/AdvancedSolarGenerator.png rename to bin/minecraft/mods/mekanism/render/AdvancedSolarGenerator.png diff --git a/bin/minecraft/resources/mekanism/render/BioGenerator.png b/bin/minecraft/mods/mekanism/render/BioGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/BioGenerator.png rename to bin/minecraft/mods/mekanism/render/BioGenerator.png diff --git a/bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorHydrogen.png b/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorHydrogen.png rename to bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png diff --git a/bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorNone.png b/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorNone.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorNone.png rename to bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorNone.png diff --git a/bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorOxygen.png b/bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorOxygen.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/ElectrolyticSeparatorOxygen.png rename to bin/minecraft/mods/mekanism/render/ElectrolyticSeparatorOxygen.png diff --git a/bin/minecraft/resources/mekanism/render/HeatGenerator.png b/bin/minecraft/mods/mekanism/render/HeatGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/HeatGenerator.png rename to bin/minecraft/mods/mekanism/render/HeatGenerator.png diff --git a/bin/minecraft/resources/mekanism/render/HeatGeneratorOn.png b/bin/minecraft/mods/mekanism/render/HeatGeneratorOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/HeatGeneratorOn.png rename to bin/minecraft/mods/mekanism/render/HeatGeneratorOn.png diff --git a/bin/minecraft/resources/mekanism/render/HydrogenGenerator.png b/bin/minecraft/mods/mekanism/render/HydrogenGenerator.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/HydrogenGenerator.png rename to bin/minecraft/mods/mekanism/render/HydrogenGenerator.png diff --git a/bin/minecraft/resources/mekanism/render/PressurizedTube.png b/bin/minecraft/mods/mekanism/render/PressurizedTube.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/PressurizedTube.png rename to bin/minecraft/mods/mekanism/render/PressurizedTube.png diff --git a/bin/minecraft/resources/mekanism/render/TheoreticalElementizer.png b/bin/minecraft/mods/mekanism/render/TheoreticalElementizer.png similarity index 100% rename from bin/minecraft/resources/mekanism/render/TheoreticalElementizer.png rename to bin/minecraft/mods/mekanism/render/TheoreticalElementizer.png diff --git a/bin/minecraft/resources/mekanism/sound/BioGenerator.ogg b/bin/minecraft/mods/mekanism/sound/BioGenerator.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/BioGenerator.ogg rename to bin/minecraft/mods/mekanism/sound/BioGenerator.ogg diff --git a/bin/minecraft/resources/mekanism/sound/Chamber.ogg b/bin/minecraft/mods/mekanism/sound/Chamber.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/Chamber.ogg rename to bin/minecraft/mods/mekanism/sound/Chamber.ogg diff --git a/bin/minecraft/resources/mekanism/sound/Combiner.ogg b/bin/minecraft/mods/mekanism/sound/Combiner.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/Combiner.ogg rename to bin/minecraft/mods/mekanism/sound/Combiner.ogg diff --git a/bin/minecraft/resources/mekanism/sound/Compressor.ogg b/bin/minecraft/mods/mekanism/sound/Compressor.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/Compressor.ogg rename to bin/minecraft/mods/mekanism/sound/Compressor.ogg diff --git a/bin/minecraft/resources/mekanism/sound/Crusher.ogg b/bin/minecraft/mods/mekanism/sound/Crusher.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/Crusher.ogg rename to bin/minecraft/mods/mekanism/sound/Crusher.ogg diff --git a/bin/minecraft/resources/mekanism/sound/Elementizer.ogg b/bin/minecraft/mods/mekanism/sound/Elementizer.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/Elementizer.ogg rename to bin/minecraft/mods/mekanism/sound/Elementizer.ogg diff --git a/bin/minecraft/resources/mekanism/sound/HeatGenerator.ogg b/bin/minecraft/mods/mekanism/sound/HeatGenerator.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/HeatGenerator.ogg rename to bin/minecraft/mods/mekanism/sound/HeatGenerator.ogg diff --git a/bin/minecraft/resources/mekanism/sound/HydrogenGenerator.ogg b/bin/minecraft/mods/mekanism/sound/HydrogenGenerator.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/HydrogenGenerator.ogg rename to bin/minecraft/mods/mekanism/sound/HydrogenGenerator.ogg diff --git a/bin/minecraft/resources/mekanism/sound/MetallurgicInfuser.ogg b/bin/minecraft/mods/mekanism/sound/MetallurgicInfuser.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/MetallurgicInfuser.ogg rename to bin/minecraft/mods/mekanism/sound/MetallurgicInfuser.ogg diff --git a/bin/minecraft/resources/mekanism/sound/PurificationChamber.ogg b/bin/minecraft/mods/mekanism/sound/PurificationChamber.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/PurificationChamber.ogg rename to bin/minecraft/mods/mekanism/sound/PurificationChamber.ogg diff --git a/bin/minecraft/resources/mekanism/sound/SmeltingFactory.ogg b/bin/minecraft/mods/mekanism/sound/SmeltingFactory.ogg similarity index 100% rename from bin/minecraft/resources/mekanism/sound/SmeltingFactory.ogg rename to bin/minecraft/mods/mekanism/sound/SmeltingFactory.ogg diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png new file mode 100755 index 000000000..c5402336d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png new file mode 100755 index 000000000..4e21d92fa Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png new file mode 100644 index 000000000..7407ed96b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactorySide.png b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactorySide.png new file mode 100755 index 000000000..b1eb966e7 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactorySide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryTop.png b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryTop.png new file mode 100755 index 000000000..18e2eb83d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/AdvancedSmeltingFactoryTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png b/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png new file mode 100755 index 000000000..095da9915 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png b/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png new file mode 100755 index 000000000..7b13e9330 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryFront.png b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryFront.png new file mode 100755 index 000000000..3c4dbe028 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactorySide.png b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactorySide.png new file mode 100755 index 000000000..ea7b16ef4 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactorySide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryTop.png b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryTop.png new file mode 100644 index 000000000..cdf498a6d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BasicSmeltingFactoryTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/BronzeBlock.png b/bin/minecraft/mods/mekanism/textures/blocks/BronzeBlock.png new file mode 100755 index 000000000..edc72e637 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/BronzeBlock.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CoalBlock.png b/bin/minecraft/mods/mekanism/textures/blocks/CoalBlock.png new file mode 100755 index 000000000..69bb8eb12 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/CoalBlock.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOff.png new file mode 100755 index 000000000..6c5f0ea73 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/CombinerFront.png b/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/CombinerFront.png rename to bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/CombinerFrontOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOff.png new file mode 100755 index 000000000..2c2e6ac84 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/CrusherFront.png b/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/CrusherFront.png rename to bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/CrusherFrontOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png b/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png new file mode 100755 index 000000000..1db1e1439 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png b/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png new file mode 100755 index 000000000..54aa21156 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryFront.png b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryFront.png new file mode 100755 index 000000000..fcce7ffd4 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactorySide.png b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactorySide.png new file mode 100755 index 000000000..92cdb2c9d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactorySide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryTop.png b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryTop.png new file mode 100755 index 000000000..491eda5ec Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EliteSmeltingFactoryTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png new file mode 100755 index 000000000..52399c73c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png new file mode 100644 index 000000000..a41f7df39 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankFront.png b/bin/minecraft/mods/mekanism/textures/blocks/GasTankFront.png new file mode 100755 index 000000000..77a8b1905 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/GasTankFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankSide.png b/bin/minecraft/mods/mekanism/textures/blocks/GasTankSide.png new file mode 100755 index 000000000..73c2a985b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/GasTankSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/GasTankTop.png b/bin/minecraft/mods/mekanism/textures/blocks/GasTankTop.png new file mode 100644 index 000000000..b52567be6 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/GasTankTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png new file mode 100755 index 000000000..e582143c0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/InfuserBack.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/InfuserBack.png rename to bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png new file mode 100755 index 000000000..f80b78a74 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/InfuserFront.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/InfuserFront.png rename to bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png new file mode 100755 index 000000000..b8fbca7d5 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/InfuserSide.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/InfuserSide.png rename to bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png new file mode 100755 index 000000000..ba846c62c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png new file mode 100755 index 000000000..e12a71b20 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTBottom.png b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTBottom.png new file mode 100755 index 000000000..db6a5eab8 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTBottom.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTSide.png b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTSide.png new file mode 100755 index 000000000..a12d9c502 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTTop.png b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTTop.png new file mode 100755 index 000000000..878871c5f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/ObsidianTNTTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumBlock.png b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumBlock.png new file mode 100755 index 000000000..9e8131df4 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumBlock.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png new file mode 100755 index 000000000..2f52c4143 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/CompressorFront.png b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/CompressorFront.png rename to bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/OsmiumOre.png b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumOre.png new file mode 100755 index 000000000..d21b3490e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/OsmiumOre.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png b/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png new file mode 100755 index 000000000..ce5b7f36b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png differ diff --git a/bin/minecraft/resources/mekanism/animate/PurificationChamberFront.png b/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png similarity index 100% rename from bin/minecraft/resources/mekanism/animate/PurificationChamberFront.png rename to bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png diff --git a/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt b/bin/minecraft/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt new file mode 100644 index 000000000..e69de29bb diff --git a/bin/minecraft/mods/mekanism/textures/blocks/RefinedGlowstone.png b/bin/minecraft/mods/mekanism/textures/blocks/RefinedGlowstone.png new file mode 100755 index 000000000..3e0f657d9 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/RefinedGlowstone.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/RefinedObsidian.png b/bin/minecraft/mods/mekanism/textures/blocks/RefinedObsidian.png new file mode 100755 index 000000000..6bdd7e21b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/RefinedObsidian.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorFront.png b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorFront.png new file mode 100755 index 000000000..6b8a2110b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorSide.png b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorSide.png new file mode 100644 index 000000000..bf8a8ed33 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorTop.png b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorTop.png new file mode 100755 index 000000000..ae32071b3 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/SolarGeneratorTop.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/SteelBlock.png b/bin/minecraft/mods/mekanism/textures/blocks/SteelBlock.png new file mode 100755 index 000000000..aee67ed13 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/SteelBlock.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/Teleporter.png b/bin/minecraft/mods/mekanism/textures/blocks/Teleporter.png new file mode 100755 index 000000000..b48b57c58 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/Teleporter.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/TeleporterFrame.png b/bin/minecraft/mods/mekanism/textures/blocks/TeleporterFrame.png new file mode 100644 index 000000000..30e908a00 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/TeleporterFrame.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png b/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png new file mode 100755 index 000000000..9f2507059 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png differ diff --git a/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png b/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png new file mode 100755 index 000000000..151fe8b60 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/AtomicCore.png b/bin/minecraft/mods/mekanism/textures/items/AtomicCore.png new file mode 100755 index 000000000..6a9daad49 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/AtomicCore.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/AtomicDisassembler.png b/bin/minecraft/mods/mekanism/textures/items/AtomicDisassembler.png new file mode 100755 index 000000000..0762a913e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/AtomicDisassembler.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BioFuel.png b/bin/minecraft/mods/mekanism/textures/items/BioFuel.png new file mode 100755 index 000000000..d8ed495eb Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BioFuel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeAxe.png b/bin/minecraft/mods/mekanism/textures/items/BronzeAxe.png new file mode 100755 index 000000000..f21740c69 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeBoots.png b/bin/minecraft/mods/mekanism/textures/items/BronzeBoots.png new file mode 100755 index 000000000..d7f8b97c9 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeChestplate.png b/bin/minecraft/mods/mekanism/textures/items/BronzeChestplate.png new file mode 100755 index 000000000..13cdafa67 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeHelmet.png b/bin/minecraft/mods/mekanism/textures/items/BronzeHelmet.png new file mode 100755 index 000000000..150053edc Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeHoe.png b/bin/minecraft/mods/mekanism/textures/items/BronzeHoe.png new file mode 100755 index 000000000..f8b60673e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeIngot.png b/bin/minecraft/mods/mekanism/textures/items/BronzeIngot.png new file mode 100755 index 000000000..220bff74a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeIngot.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeLeggings.png b/bin/minecraft/mods/mekanism/textures/items/BronzeLeggings.png new file mode 100755 index 000000000..958849dcc Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzePaxel.png b/bin/minecraft/mods/mekanism/textures/items/BronzePaxel.png new file mode 100755 index 000000000..39e5cc216 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzePaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzePickaxe.png b/bin/minecraft/mods/mekanism/textures/items/BronzePickaxe.png new file mode 100644 index 000000000..025d09fec Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzePickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeShovel.png b/bin/minecraft/mods/mekanism/textures/items/BronzeShovel.png new file mode 100755 index 000000000..d368cccb7 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/BronzeSword.png b/bin/minecraft/mods/mekanism/textures/items/BronzeSword.png new file mode 100755 index 000000000..fd37539ec Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/BronzeSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/CompressedCarbon.png b/bin/minecraft/mods/mekanism/textures/items/CompressedCarbon.png new file mode 100755 index 000000000..b26af0d26 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/CompressedCarbon.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/Configurator.png b/bin/minecraft/mods/mekanism/textures/items/Configurator.png new file mode 100755 index 000000000..8ac995124 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/Configurator.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ControlCircuit.png b/bin/minecraft/mods/mekanism/textures/items/ControlCircuit.png new file mode 100755 index 000000000..781448bdb Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ControlCircuit.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/CopperClump.png b/bin/minecraft/mods/mekanism/textures/items/CopperClump.png new file mode 100755 index 000000000..91b62056a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/CopperClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/CopperDust.png b/bin/minecraft/mods/mekanism/textures/items/CopperDust.png new file mode 100755 index 000000000..45c19c1ee Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/CopperDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DiamondDust.png b/bin/minecraft/mods/mekanism/textures/items/DiamondDust.png new file mode 100755 index 000000000..03d90195b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DiamondDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DiamondPaxel.png b/bin/minecraft/mods/mekanism/textures/items/DiamondPaxel.png new file mode 100755 index 000000000..1fb848dcd Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DiamondPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyCopperDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyCopperDust.png new file mode 100755 index 000000000..ad4f6c10c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyCopperDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyGoldDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyGoldDust.png new file mode 100755 index 000000000..061b236b3 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyGoldDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyIronDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyIronDust.png new file mode 100755 index 000000000..debc9df53 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyIronDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyObsidianDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyObsidianDust.png new file mode 100755 index 000000000..5ce8e60ea Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyObsidianDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyOsmiumDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyOsmiumDust.png new file mode 100755 index 000000000..e44fb488f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyOsmiumDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtySilverDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtySilverDust.png new file mode 100755 index 000000000..e129be66e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtySilverDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/DirtyTinDust.png b/bin/minecraft/mods/mekanism/textures/items/DirtyTinDust.png new file mode 100755 index 000000000..85ee2f06e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/DirtyTinDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ElectricBow.png b/bin/minecraft/mods/mekanism/textures/items/ElectricBow.png new file mode 100755 index 000000000..65b364811 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ElectricBow.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ElectrolyticCore.png b/bin/minecraft/mods/mekanism/textures/items/ElectrolyticCore.png new file mode 100755 index 000000000..e3f75462e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ElectrolyticCore.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/EnergyTablet.png b/bin/minecraft/mods/mekanism/textures/items/EnergyTablet.png new file mode 100755 index 000000000..4f47026d7 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/EnergyTablet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/EnergyUpgrade.png b/bin/minecraft/mods/mekanism/textures/items/EnergyUpgrade.png new file mode 100755 index 000000000..f1f8acdb5 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/EnergyUpgrade.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/EnrichedAlloy.png b/bin/minecraft/mods/mekanism/textures/items/EnrichedAlloy.png new file mode 100755 index 000000000..1503625dd Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/EnrichedAlloy.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/EnrichedIron.png b/bin/minecraft/mods/mekanism/textures/items/EnrichedIron.png new file mode 100755 index 000000000..528b9f69b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/EnrichedIron.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneAxe.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneAxe.png new file mode 100755 index 000000000..9a7ec8623 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneBoots.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneBoots.png new file mode 100755 index 000000000..6531cf573 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneChestplate.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneChestplate.png new file mode 100755 index 000000000..9166800c5 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneHelmet.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneHelmet.png new file mode 100755 index 000000000..a61d441ff Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneHoe.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneHoe.png new file mode 100755 index 000000000..cadc8920c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneIngot.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneIngot.png new file mode 100755 index 000000000..fa901456c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneIngot.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneLeggings.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneLeggings.png new file mode 100755 index 000000000..1033c017e Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstonePaxel.png b/bin/minecraft/mods/mekanism/textures/items/GlowstonePaxel.png new file mode 100755 index 000000000..aa80ef86d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstonePaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstonePickaxe.png b/bin/minecraft/mods/mekanism/textures/items/GlowstonePickaxe.png new file mode 100755 index 000000000..95415a552 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstonePickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneShovel.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneShovel.png new file mode 100755 index 000000000..b20c25e84 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GlowstoneSword.png b/bin/minecraft/mods/mekanism/textures/items/GlowstoneSword.png new file mode 100755 index 000000000..b22d64022 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GlowstoneSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldClump.png b/bin/minecraft/mods/mekanism/textures/items/GoldClump.png new file mode 100755 index 000000000..636c9f207 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GoldClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldDust.png b/bin/minecraft/mods/mekanism/textures/items/GoldDust.png new file mode 100755 index 000000000..60ad8d122 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GoldDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/GoldPaxel.png b/bin/minecraft/mods/mekanism/textures/items/GoldPaxel.png new file mode 100755 index 000000000..032f86691 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/GoldPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/IronClump.png b/bin/minecraft/mods/mekanism/textures/items/IronClump.png new file mode 100755 index 000000000..f2caa9863 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/IronClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/IronDust.png b/bin/minecraft/mods/mekanism/textures/items/IronDust.png new file mode 100755 index 000000000..51067a44c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/IronDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/IronPaxel.png b/bin/minecraft/mods/mekanism/textures/items/IronPaxel.png new file mode 100755 index 000000000..53eac923d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/IronPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliAxe.png b/bin/minecraft/mods/mekanism/textures/items/LazuliAxe.png new file mode 100755 index 000000000..2ed32ff19 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliBoots.png b/bin/minecraft/mods/mekanism/textures/items/LazuliBoots.png new file mode 100755 index 000000000..95bbaf300 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliChestplate.png b/bin/minecraft/mods/mekanism/textures/items/LazuliChestplate.png new file mode 100755 index 000000000..85042a408 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliHelmet.png b/bin/minecraft/mods/mekanism/textures/items/LazuliHelmet.png new file mode 100755 index 000000000..1cfbf231f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliHoe.png b/bin/minecraft/mods/mekanism/textures/items/LazuliHoe.png new file mode 100755 index 000000000..20c8e0e8f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliLeggings.png b/bin/minecraft/mods/mekanism/textures/items/LazuliLeggings.png new file mode 100755 index 000000000..945f33376 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliPaxel.png b/bin/minecraft/mods/mekanism/textures/items/LazuliPaxel.png new file mode 100755 index 000000000..993189079 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliPickaxe.png b/bin/minecraft/mods/mekanism/textures/items/LazuliPickaxe.png new file mode 100755 index 000000000..10d7311a1 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliPickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliShovel.png b/bin/minecraft/mods/mekanism/textures/items/LazuliShovel.png new file mode 100755 index 000000000..3c2fc7a6f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/LazuliSword.png b/bin/minecraft/mods/mekanism/textures/items/LazuliSword.png new file mode 100755 index 000000000..78246d88c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/LazuliSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianAxe.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianAxe.png new file mode 100755 index 000000000..57e45fc01 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianBoots.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianBoots.png new file mode 100755 index 000000000..fdcab2f7a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianChestplate.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianChestplate.png new file mode 100755 index 000000000..2daa7e181 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianDust.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianDust.png new file mode 100755 index 000000000..c907bc0f6 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianHelmet.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianHelmet.png new file mode 100755 index 000000000..c5d29f0b0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianHoe.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianHoe.png new file mode 100755 index 000000000..ab25f754d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianIngot.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianIngot.png new file mode 100755 index 000000000..7d7d476f0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianIngot.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianLeggings.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianLeggings.png new file mode 100755 index 000000000..1807a4103 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianPaxel.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianPaxel.png new file mode 100755 index 000000000..38ad7a67b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianPickaxe.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianPickaxe.png new file mode 100755 index 000000000..9c3055c61 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianPickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianShovel.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianShovel.png new file mode 100755 index 000000000..38c952ee1 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/ObsidianSword.png b/bin/minecraft/mods/mekanism/textures/items/ObsidianSword.png new file mode 100755 index 000000000..756e8c400 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/ObsidianSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumAxe.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumAxe.png new file mode 100755 index 000000000..6b3214311 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumBoots.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumBoots.png new file mode 100755 index 000000000..6b5710130 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumChestplate.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumChestplate.png new file mode 100755 index 000000000..f8e968a4f Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumClump.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumClump.png new file mode 100755 index 000000000..31af05694 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumDust.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumDust.png new file mode 100755 index 000000000..415ae11a3 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumHelmet.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumHelmet.png new file mode 100755 index 000000000..071b856d1 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumHoe.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumHoe.png new file mode 100755 index 000000000..bc5521495 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumIngot.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumIngot.png new file mode 100755 index 000000000..cb15a91c7 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumIngot.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumLeggings.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumLeggings.png new file mode 100755 index 000000000..7ded5f26a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumPaxel.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumPaxel.png new file mode 100755 index 000000000..0e70ec6bd Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumPickaxe.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumPickaxe.png new file mode 100755 index 000000000..4d5786261 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumPickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumShovel.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumShovel.png new file mode 100755 index 000000000..340371aba Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/OsmiumSword.png b/bin/minecraft/mods/mekanism/textures/items/OsmiumSword.png new file mode 100755 index 000000000..9d8f26155 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/OsmiumSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/PortableTeleporter.png b/bin/minecraft/mods/mekanism/textures/items/PortableTeleporter.png new file mode 100755 index 000000000..466d1bb8d Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/PortableTeleporter.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SilverClump.png b/bin/minecraft/mods/mekanism/textures/items/SilverClump.png new file mode 100755 index 000000000..d4d3424b2 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SilverClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SilverDust.png b/bin/minecraft/mods/mekanism/textures/items/SilverDust.png new file mode 100755 index 000000000..7fa85e284 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SilverDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SolarPanel.png b/bin/minecraft/mods/mekanism/textures/items/SolarPanel.png new file mode 100755 index 000000000..1c31873e2 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SolarPanel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SpeedUpgrade.png b/bin/minecraft/mods/mekanism/textures/items/SpeedUpgrade.png new file mode 100755 index 000000000..c79774f89 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SpeedUpgrade.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelAxe.png b/bin/minecraft/mods/mekanism/textures/items/SteelAxe.png new file mode 100755 index 000000000..9fe7dfa58 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelAxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelBoots.png b/bin/minecraft/mods/mekanism/textures/items/SteelBoots.png new file mode 100755 index 000000000..82640e749 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelBoots.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelChestplate.png b/bin/minecraft/mods/mekanism/textures/items/SteelChestplate.png new file mode 100755 index 000000000..8f79824cd Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelChestplate.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelDust.png b/bin/minecraft/mods/mekanism/textures/items/SteelDust.png new file mode 100755 index 000000000..cdac9358a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelHelmet.png b/bin/minecraft/mods/mekanism/textures/items/SteelHelmet.png new file mode 100755 index 000000000..a0412d573 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelHelmet.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelHoe.png b/bin/minecraft/mods/mekanism/textures/items/SteelHoe.png new file mode 100755 index 000000000..de0c9b43c Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelHoe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelIngot.png b/bin/minecraft/mods/mekanism/textures/items/SteelIngot.png new file mode 100755 index 000000000..b29341edc Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelIngot.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelLeggings.png b/bin/minecraft/mods/mekanism/textures/items/SteelLeggings.png new file mode 100755 index 000000000..b4781df9a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelLeggings.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelPaxel.png b/bin/minecraft/mods/mekanism/textures/items/SteelPaxel.png new file mode 100755 index 000000000..1e0f0c4fe Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelPickaxe.png b/bin/minecraft/mods/mekanism/textures/items/SteelPickaxe.png new file mode 100755 index 000000000..096f170b0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelPickaxe.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelShovel.png b/bin/minecraft/mods/mekanism/textures/items/SteelShovel.png new file mode 100755 index 000000000..779c78201 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelShovel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/SteelSword.png b/bin/minecraft/mods/mekanism/textures/items/SteelSword.png new file mode 100755 index 000000000..3ea9f6961 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/SteelSword.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/StonePaxel.png b/bin/minecraft/mods/mekanism/textures/items/StonePaxel.png new file mode 100755 index 000000000..daeb99288 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/StonePaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/Stopwatch.png b/bin/minecraft/mods/mekanism/textures/items/Stopwatch.png new file mode 100755 index 000000000..5eb565d81 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/Stopwatch.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/StorageTank.png b/bin/minecraft/mods/mekanism/textures/items/StorageTank.png new file mode 100755 index 000000000..fe996df43 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/StorageTank.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/TeleportationCore.png b/bin/minecraft/mods/mekanism/textures/items/TeleportationCore.png new file mode 100755 index 000000000..0cc31d66a Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/TeleportationCore.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/TinClump.png b/bin/minecraft/mods/mekanism/textures/items/TinClump.png new file mode 100755 index 000000000..33b66866b Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/TinClump.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/TinDust.png b/bin/minecraft/mods/mekanism/textures/items/TinDust.png new file mode 100755 index 000000000..56708f508 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/TinDust.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/WeatherOrb.png b/bin/minecraft/mods/mekanism/textures/items/WeatherOrb.png new file mode 100755 index 000000000..43f675bb0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/WeatherOrb.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/WoodPaxel.png b/bin/minecraft/mods/mekanism/textures/items/WoodPaxel.png new file mode 100755 index 000000000..3e318f108 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/WoodPaxel.png differ diff --git a/bin/minecraft/mods/mekanism/textures/items/swordDiamond.png b/bin/minecraft/mods/mekanism/textures/items/swordDiamond.png new file mode 100755 index 000000000..8040051c0 Binary files /dev/null and b/bin/minecraft/mods/mekanism/textures/items/swordDiamond.png differ diff --git a/bin/minecraft/resources/mekanism/textures/items.png b/bin/minecraft/resources/mekanism/textures/items.png deleted file mode 100644 index 95c6c93c2..000000000 Binary files a/bin/minecraft/resources/mekanism/textures/items.png and /dev/null differ diff --git a/bin/minecraft/resources/mekanism/textures/terrain.png b/bin/minecraft/resources/mekanism/textures/terrain.png deleted file mode 100755 index 459742c7c..000000000 Binary files a/bin/minecraft/resources/mekanism/textures/terrain.png and /dev/null differ diff --git a/src/minecraft/mekanism/api/GasTransmission.java b/src/minecraft/mekanism/api/GasTransmission.java index a55b4f64b..2f6af4c2e 100644 --- a/src/minecraft/mekanism/api/GasTransmission.java +++ b/src/minecraft/mekanism/api/GasTransmission.java @@ -3,6 +3,7 @@ package mekanism.api; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; public class GasTransmission { @@ -19,7 +20,7 @@ public class GasTransmission { if(orientation != ForgeDirection.UNKNOWN) { - TileEntity tube = Vector3.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity tube = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); if(tube instanceof IPressurizedTube && ((IPressurizedTube)tube).canTransferGas()) { @@ -44,7 +45,7 @@ public class GasTransmission { if(orientation != ForgeDirection.UNKNOWN) { - TileEntity acceptor = Vector3.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity acceptor = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); if(acceptor instanceof IGasAcceptor) { @@ -69,7 +70,7 @@ public class GasTransmission { if(orientation != ForgeDirection.UNKNOWN) { - TileEntity connection = Vector3.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity connection = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); if(connection instanceof ITubeConnection) { @@ -91,7 +92,7 @@ public class GasTransmission */ public static int emitGasToNetwork(EnumGas type, int amount, TileEntity sender, ForgeDirection facing) { - TileEntity pointer = Vector3.getTileEntityFromSide(sender.worldObj, new Vector3(sender.xCoord, sender.yCoord, sender.zCoord), facing); + TileEntity pointer = VectorHelper.getTileEntityFromSide(sender.worldObj, new Vector3(sender.xCoord, sender.yCoord, sender.zCoord), facing); if(pointer != null) { diff --git a/src/minecraft/mekanism/client/BlockRenderingHandler.java b/src/minecraft/mekanism/client/BlockRenderingHandler.java index c9ce01bc9..56978458b 100644 --- a/src/minecraft/mekanism/client/BlockRenderingHandler.java +++ b/src/minecraft/mekanism/client/BlockRenderingHandler.java @@ -30,11 +30,10 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -0.8F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/TheoreticalElementizer.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/TheoreticalElementizer.png")); theoreticalElementizer.render(0.0560F); } else { - ForgeHooksClient.bindTexture(block.getTextureFile(), 0); renderItem(renderer, metadata, block); } } diff --git a/src/minecraft/mekanism/client/ClientProxy.java b/src/minecraft/mekanism/client/ClientProxy.java index 0e5b0ec80..056d6e165 100644 --- a/src/minecraft/mekanism/client/ClientProxy.java +++ b/src/minecraft/mekanism/client/ClientProxy.java @@ -78,32 +78,6 @@ public class ClientProxy extends CommonProxy @Override public void registerRenderInformation() { - //Preload block/item textures - MinecraftForgeClient.preloadTexture("/resources/mekanism/textures/items.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/textures/terrain.png"); - - //Preload animated textures - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/CrusherFront.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/CompressorFront.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/CombinerFront.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/InfuserFront.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/InfuserBack.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/InfuserSide.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/animate/PurificationChamberFront.png"); - - //Register animated TextureFX - try { - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/CrusherFront.png", Mekanism.ANIMATED_TEXTURE_INDEX+1)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/CompressorFront.png", Mekanism.ANIMATED_TEXTURE_INDEX+2)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/CombinerFront.png", Mekanism.ANIMATED_TEXTURE_INDEX+3)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/InfuserFront.png", Mekanism.ANIMATED_TEXTURE_INDEX+4)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/InfuserBack.png", Mekanism.ANIMATED_TEXTURE_INDEX+5)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/InfuserSide.png", Mekanism.ANIMATED_TEXTURE_INDEX+6)); - TextureFXManager.instance().addAnimation(new TextureAnimatedFX("/resources/mekanism/animate/PurificationChamberFront.png", Mekanism.ANIMATED_TEXTURE_INDEX+9)); - } catch (IOException e) { - System.err.println("[Mekanism] Error registering animation with FML: " + e.getMessage()); - } - //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new RenderObsidianTNT()); diff --git a/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java b/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java index 036d88340..5c3f5d80d 100644 --- a/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java +++ b/src/minecraft/mekanism/client/GuiAdvancedElectricMachine.java @@ -30,9 +30,8 @@ public class GuiAdvancedElectricMachine extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture(tileEntity.guiTexturePath); + mc.renderEngine.func_98187_b(tileEntity.guiTexturePath); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/client/GuiControlPanel.java b/src/minecraft/mekanism/client/GuiControlPanel.java index 231ac2035..1ff093d5b 100644 --- a/src/minecraft/mekanism/client/GuiControlPanel.java +++ b/src/minecraft/mekanism/client/GuiControlPanel.java @@ -35,8 +35,8 @@ public class GuiControlPanel extends GuiScreen public void initGui() { super.initGui(); - controlList.clear(); - controlList.add(new GuiButton(0, width / 2 - 80, height / 4 + 72 + 12, 60, 20, "Access")); + buttonList.clear(); + buttonList.add(new GuiButton(0, width / 2 - 80, height / 4 + 72 + 12, 60, 20, "Access")); xField = new GuiTextField(fontRenderer, width / 2 - 80, 53, 35, 12); xField.setMaxStringLength(4); @@ -56,8 +56,7 @@ public class GuiControlPanel extends GuiScreen public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int k = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiControlPanel.png"); - mc.renderEngine.bindTexture(k); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiControlPanel.png"); drawTexturedModalRect(width / 2 - 100, height / 2 - 100, 0, 0, 176, 166); xField.drawTextBox(); yField.drawTextBox(); diff --git a/src/minecraft/mekanism/client/GuiCredits.java b/src/minecraft/mekanism/client/GuiCredits.java index 59b13ead0..e44e8407d 100644 --- a/src/minecraft/mekanism/client/GuiCredits.java +++ b/src/minecraft/mekanism/client/GuiCredits.java @@ -3,20 +3,21 @@ package mekanism.client; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -public class GuiCredits extends GuiScreen { - +public class GuiCredits extends GuiScreen +{ private static String updateProgress = ""; @Override public void initGui() { - controlList.clear(); - controlList.add(new GuiButton(0, width / 2 - 100, height / 4 + 72 + 12, "Update")); - controlList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96 + 12, "Cancel")); - ((GuiButton)controlList.get(0)).enabled = !MekanismUtils.isNotOutdated(); + buttonList.clear(); + buttonList.add(new GuiButton(0, width / 2 - 100, height / 4 + 72 + 12, "Update")); + buttonList.add(new GuiButton(1, width / 2 - 100, height / 4 + 96 + 12, "Cancel")); + ((GuiButton)buttonList.get(0)).enabled = !MekanismUtils.isNotOutdated(); } @Override diff --git a/src/minecraft/mekanism/client/GuiElectricMachine.java b/src/minecraft/mekanism/client/GuiElectricMachine.java index 929f4b08a..5a72df1c1 100644 --- a/src/minecraft/mekanism/client/GuiElectricMachine.java +++ b/src/minecraft/mekanism/client/GuiElectricMachine.java @@ -30,9 +30,8 @@ public class GuiElectricMachine extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture(tileEntity.guiTexturePath); + mc.renderEngine.func_98187_b(tileEntity.guiTexturePath); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/client/GuiEnergyCube.java b/src/minecraft/mekanism/client/GuiEnergyCube.java index 8948e2882..af79dca12 100644 --- a/src/minecraft/mekanism/client/GuiEnergyCube.java +++ b/src/minecraft/mekanism/client/GuiEnergyCube.java @@ -8,8 +8,8 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; public class GuiEnergyCube extends GuiContainer { @@ -27,7 +27,7 @@ public class GuiEnergyCube extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - String capacityInfo = ElectricInfo.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES) + "/" + ElectricInfo.getDisplayShort(tileEntity.tier.MAX_ELECTRICITY, ElectricUnit.JOULES); + String capacityInfo = ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES) + "/" + ElectricityDisplay.getDisplayShort(tileEntity.tier.MAX_ELECTRICITY, ElectricUnit.JOULES); String outputInfo = "Voltage: " + tileEntity.getVoltage() + "v"; fontRenderer.drawString(tileEntity.tier.name + " Energy Cube", 43, 6, 0x404040); fontRenderer.drawString(capacityInfo, 45, 40, 0x00CD00); @@ -38,9 +38,8 @@ public class GuiEnergyCube extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiEnergyCube.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiEnergyCube.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/src/minecraft/mekanism/client/GuiGasTank.java b/src/minecraft/mekanism/client/GuiGasTank.java index 662684f87..8f15644c6 100644 --- a/src/minecraft/mekanism/client/GuiGasTank.java +++ b/src/minecraft/mekanism/client/GuiGasTank.java @@ -34,9 +34,8 @@ public class GuiGasTank extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiGasTank.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiGasTank.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java b/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java index d600d21d9..bf8028bac 100644 --- a/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java +++ b/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java @@ -55,9 +55,8 @@ public class GuiMetallurgicInfuser extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiMetallurgicInfuser.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiMetallurgicInfuser.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/client/GuiPortableTeleporter.java b/src/minecraft/mekanism/client/GuiPortableTeleporter.java index c21c804c6..308dd22d1 100644 --- a/src/minecraft/mekanism/client/GuiPortableTeleporter.java +++ b/src/minecraft/mekanism/client/GuiPortableTeleporter.java @@ -30,8 +30,8 @@ public class GuiPortableTeleporter extends GuiScreen @Override public void initGui() { - controlList.clear(); - controlList.add(new GuiButton(0, 173, 105, 80, 20, "Teleport")); + buttonList.clear(); + buttonList.add(new GuiButton(0, 173, 105, 80, 20, "Teleport")); } @Override @@ -42,9 +42,8 @@ public class GuiPortableTeleporter extends GuiScreen itemStack = mc.thePlayer.getCurrentEquippedItem(); } - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiPortableTeleporter.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiPortableTeleporter.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); @@ -65,8 +64,8 @@ public class GuiPortableTeleporter extends GuiScreen ItemPortableTeleporter item = (ItemPortableTeleporter)itemStack.getItem(); - ((GuiButton)controlList.get(0)).xPosition = guiWidth+48; - ((GuiButton)controlList.get(0)).yPosition = guiHeight+68; + ((GuiButton)buttonList.get(0)).xPosition = guiWidth+48; + ((GuiButton)buttonList.get(0)).yPosition = guiHeight+68; fontRenderer.drawString("Portable Teleporter", guiWidth+39, guiHeight+6, 0x404040); fontRenderer.drawString(item.getStatusAsString(item.getStatus(itemStack)), guiWidth+53, guiHeight+19, 0x00CD00); diff --git a/src/minecraft/mekanism/client/GuiSmeltingFactory.java b/src/minecraft/mekanism/client/GuiSmeltingFactory.java index 50ef4bb3a..329927c9c 100644 --- a/src/minecraft/mekanism/client/GuiSmeltingFactory.java +++ b/src/minecraft/mekanism/client/GuiSmeltingFactory.java @@ -31,9 +31,8 @@ public class GuiSmeltingFactory extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/smelting/" + tileEntity.tier.guiTexturePath); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/smelting/" + tileEntity.tier.guiTexturePath); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/client/GuiStopwatch.java b/src/minecraft/mekanism/client/GuiStopwatch.java index a2e08fd9a..09f930f25 100644 --- a/src/minecraft/mekanism/client/GuiStopwatch.java +++ b/src/minecraft/mekanism/client/GuiStopwatch.java @@ -23,21 +23,20 @@ public class GuiStopwatch extends GuiScreen @Override public void initGui() { - controlList.clear(); - controlList.add(new GuiButton(0, width / 2 - 80, height / 2 - 65, 50, 20, "Sunrise")); - controlList.add(new GuiButton(1, width / 2 - 80, height / 2 - 35, 50, 20, "Noon")); - controlList.add(new GuiButton(2, width / 2 + 5, height / 2 - 65, 50, 20, "Sunset")); - controlList.add(new GuiButton(3, width / 2 + 5, height / 2 - 35, 50, 20, "Midnight")); - controlList.add(new GuiButton(4, width / 2 - 94, height / 2 + 30, 80, 20, "Credits")); - controlList.add(new GuiButton(5, width / 2 - 10, height / 2 + 30, 80, 20, "Close")); + buttonList.clear(); + buttonList.add(new GuiButton(0, width / 2 - 80, height / 2 - 65, 50, 20, "Sunrise")); + buttonList.add(new GuiButton(1, width / 2 - 80, height / 2 - 35, 50, 20, "Noon")); + buttonList.add(new GuiButton(2, width / 2 + 5, height / 2 - 65, 50, 20, "Sunset")); + buttonList.add(new GuiButton(3, width / 2 + 5, height / 2 - 35, 50, 20, "Midnight")); + buttonList.add(new GuiButton(4, width / 2 - 94, height / 2 + 30, 80, 20, "Credits")); + buttonList.add(new GuiButton(5, width / 2 - 10, height / 2 + 30, 80, 20, "Close")); } @Override public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int k = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiStopwatch.png"); - mc.renderEngine.bindTexture(k); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiStopwatch.png"); drawTexturedModalRect(width / 2 - 100, height / 2 - 100, 0, 0, 176, 166); drawString(fontRenderer, "Steve's Stopwatch", width / 2 - 60, height / 2 - 95, 0xffffff); super.drawScreen(i, j, f); diff --git a/src/minecraft/mekanism/client/GuiTeleporter.java b/src/minecraft/mekanism/client/GuiTeleporter.java index ef1d5e458..e252652e9 100644 --- a/src/minecraft/mekanism/client/GuiTeleporter.java +++ b/src/minecraft/mekanism/client/GuiTeleporter.java @@ -79,9 +79,8 @@ public class GuiTeleporter extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiTeleporter.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiTeleporter.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/client/GuiWeatherOrb.java b/src/minecraft/mekanism/client/GuiWeatherOrb.java index d8e273f9c..539883764 100644 --- a/src/minecraft/mekanism/client/GuiWeatherOrb.java +++ b/src/minecraft/mekanism/client/GuiWeatherOrb.java @@ -24,21 +24,20 @@ public class GuiWeatherOrb extends GuiScreen @Override public void initGui() { - controlList.clear(); - controlList.add(new GuiButton(0, width / 2 - 80, height / 2 - 65, 50, 20, "Clear")); - controlList.add(new GuiButton(1, width / 2 - 80, height / 2 - 35, 50, 20, "Storm")); - controlList.add(new GuiButton(2, width / 2 + 5, height / 2 - 65, 50, 20, "Haze")); - controlList.add(new GuiButton(3, width / 2 + 5, height / 2 - 35, 50, 20, "Rain")); - controlList.add(new GuiButton(4, width / 2 - 94, height / 2 + 30, 80, 20, "Credits")); - controlList.add(new GuiButton(5, width / 2 - 10, height / 2 + 30, 80, 20, "Close")); + buttonList.clear(); + buttonList.add(new GuiButton(0, width / 2 - 80, height / 2 - 65, 50, 20, "Clear")); + buttonList.add(new GuiButton(1, width / 2 - 80, height / 2 - 35, 50, 20, "Storm")); + buttonList.add(new GuiButton(2, width / 2 + 5, height / 2 - 65, 50, 20, "Haze")); + buttonList.add(new GuiButton(3, width / 2 + 5, height / 2 - 35, 50, 20, "Rain")); + buttonList.add(new GuiButton(4, width / 2 - 94, height / 2 + 30, 80, 20, "Credits")); + buttonList.add(new GuiButton(5, width / 2 - 10, height / 2 + 30, 80, 20, "Close")); } @Override public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int k = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiWeatherOrb.png"); - mc.renderEngine.bindTexture(k); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiWeatherOrb.png"); drawTexturedModalRect(width / 2 - 100, height / 2 - 100, 0, 0, 176, 166); drawString(fontRenderer, "Weather Orb", width / 2 - 45, height / 2 - 95, 0xffffff); super.drawScreen(i, j, f); diff --git a/src/minecraft/mekanism/client/ItemRenderingHandler.java b/src/minecraft/mekanism/client/ItemRenderingHandler.java index 47e2deb9f..464258212 100644 --- a/src/minecraft/mekanism/client/ItemRenderingHandler.java +++ b/src/minecraft/mekanism/client/ItemRenderingHandler.java @@ -32,15 +32,13 @@ public class ItemRenderingHandler implements IItemRenderer if(item.getItem() instanceof IEnergyCube) { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getTier(item); - - ForgeHooksClient.bindTexture(item.getItem().getTextureFile(), 0); if(type == ItemRenderType.EQUIPPED) { GL11.glTranslatef(0.5F, 0.5F, 0.5F); } - renderItem((RenderBlocks)data[0], tier == EnergyCubeTier.BASIC ? 0 : (tier == EnergyCubeTier.ADVANCED ? 1 : (tier == EnergyCubeTier.ELITE ? 2 : 3))); + renderItem((RenderBlocks)data[0], tier.ordinal()); } } @@ -70,27 +68,27 @@ public class ItemRenderingHandler implements IItemRenderer Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, metadata)); + renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, metadata)); + renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, metadata)); + renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, metadata)); + renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 5, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, metadata)); + renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, metadata)); + renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, renderer.func_94165_a(block, 3, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/mekanism/client/PressurizedTubeRenderer.java b/src/minecraft/mekanism/client/PressurizedTubeRenderer.java index eab4b6b6b..d924265ad 100644 --- a/src/minecraft/mekanism/client/PressurizedTubeRenderer.java +++ b/src/minecraft/mekanism/client/PressurizedTubeRenderer.java @@ -18,7 +18,7 @@ public class PressurizedTubeRenderer implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/PressurizedTube.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/PressurizedTube.png")); pressurizedTube.Center.render(0.0625F); pressurizedTube.Up.render(0.0625F); pressurizedTube.Down.render(0.0625F); diff --git a/src/minecraft/mekanism/client/RenderObsidianTNT.java b/src/minecraft/mekanism/client/RenderObsidianTNT.java index a1f37e7d8..116a260e5 100644 --- a/src/minecraft/mekanism/client/RenderObsidianTNT.java +++ b/src/minecraft/mekanism/client/RenderObsidianTNT.java @@ -44,10 +44,10 @@ public class RenderObsidianTNT extends Render } float f3 = (1.0F - (((float)entityobsidiantnt.fuse - f1) + 1.0F) / 100F) * 0.8F; - loadTexture("/resources/mekanism/textures/terrain.png"); + loadTexture("/terrain.png"); blockRenderer.renderBlockAsItem(Mekanism.ObsidianTNT, 0, entityobsidiantnt.getBrightness(f1)); - if ((entityobsidiantnt.fuse / 5) % 2 == 0) + if(entityobsidiantnt.fuse / 5 % 2 == 0) { GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/minecraft/mekanism/client/RenderPressurizedTube.java b/src/minecraft/mekanism/client/RenderPressurizedTube.java index 135777de1..d27c41e93 100644 --- a/src/minecraft/mekanism/client/RenderPressurizedTube.java +++ b/src/minecraft/mekanism/client/RenderPressurizedTube.java @@ -25,7 +25,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityPressurizedTube tileEntity, double d, double d1, double d2, float f) { - bindTextureByName("/resources/mekanism/render/PressurizedTube.png"); + bindTextureByName("/mods/mekanism/render/PressurizedTube.png"); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); diff --git a/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java b/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java index 671212013..4b9f1d32a 100644 --- a/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java +++ b/src/minecraft/mekanism/client/RenderTheoreticalElementizer.java @@ -20,7 +20,7 @@ public class RenderTheoreticalElementizer extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); - bindTextureByName("/resources/mekanism/render/TheoreticalElementizer.png"); + bindTextureByName("/mods/mekanism/render/TheoreticalElementizer.png"); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/client/Sound.java b/src/minecraft/mekanism/client/Sound.java index 439cd8f87..009e6f18b 100644 --- a/src/minecraft/mekanism/client/Sound.java +++ b/src/minecraft/mekanism/client/Sound.java @@ -57,7 +57,7 @@ public class Sound yCoord = y; zCoord = z; - URL url = getClass().getClassLoader().getResource("resources/mekanism/sound/" + sound); + URL url = getClass().getClassLoader().getResource("mods/mekanism/sound/" + sound); if(url == null) { System.out.println("[Mekanism] Invalid sound file: " + sound); diff --git a/src/minecraft/mekanism/client/TextureAnimatedFX.java b/src/minecraft/mekanism/client/TextureAnimatedFX.java deleted file mode 100644 index 66e070e9a..000000000 --- a/src/minecraft/mekanism/client/TextureAnimatedFX.java +++ /dev/null @@ -1,26 +0,0 @@ -package mekanism.client; - -import java.io.IOException; - -import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.src.ModTextureAnimation; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.TextureFXManager; - -public class TextureAnimatedFX extends ModTextureAnimation -{ - public TextureAnimatedFX(String texture, int index) throws IOException - { - super(index, 1, texture, TextureFXManager.instance().loadImageFromTexturePack(FMLClientHandler.instance().getClient().renderEngine, texture), 5); - } - - @Override - public void bindImage(RenderEngine renderengine) - { - //Binds texture with GL11 to use specific icon index. - GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, renderengine.getTexture("/resources/mekanism/textures/terrain.png")); - } -} diff --git a/src/minecraft/mekanism/client/ThreadSendData.java b/src/minecraft/mekanism/client/ThreadSendData.java index 726ca94ce..3f6903ba3 100644 --- a/src/minecraft/mekanism/client/ThreadSendData.java +++ b/src/minecraft/mekanism/client/ThreadSendData.java @@ -33,6 +33,7 @@ public class ThreadSendData extends Thread writer.println("USER:" + FMLClientHandler.instance().getClient().session.username); writer.println("VERSION:" + Mekanism.versionNumber); writer.println("OS:" + System.getProperty("os.name") + "-" + System.getProperty("os.version")); + writer.println("PACK:" + Mekanism.modPack); writer.println("DONE"); writer.close(); socket.close(); diff --git a/src/minecraft/mekanism/common/BlockBasic.java b/src/minecraft/mekanism/common/BlockBasic.java index 95799ee70..72ca65221 100644 --- a/src/minecraft/mekanism/common/BlockBasic.java +++ b/src/minecraft/mekanism/common/BlockBasic.java @@ -10,6 +10,7 @@ import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.GuiControlPanel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -18,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.src.*; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeChunkManager; @@ -38,40 +40,33 @@ import net.minecraftforge.common.ForgeChunkManager; */ public class BlockBasic extends Block { + public Icon[] icons = new Icon[256]; public BlockBasic(int id) { super(id, Material.iron); setHardness(5F); setResistance(10F); setCreativeTab(Mekanism.tabMekanism); - setRequiresSelfNotify(); } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public void func_94332_a(IconRegister register) { - switch(meta) - { - case 0: - return 2; - case 1: - return 1; - case 2: - return 0; - case 3: - return 10; - case 4: - return 11; - case 5: - return 29; - case 6: - return 0; - case 7: - return 25; - case 8: - return 27; - } - return 0; + icons[0] = register.func_94245_a("mekanism:OsmiumBlock"); + icons[1] = register.func_94245_a("mekanism:BronzeBlock"); + icons[2] = register.func_94245_a("mekanism:RefinedObsidian"); + icons[3] = register.func_94245_a("mekanism:CoalBlock"); + icons[4] = register.func_94245_a("mekanism:RefinedGlowstone"); + icons[5] = register.func_94245_a("mekanism:SteelBlock"); + icons[6] = register.func_94245_a("mekanism:ControlPanel"); + icons[7] = register.func_94245_a("mekanism:Teleporter"); + icons[8] = register.func_94245_a("mekanism:TeleporterFrame"); + } + + @Override + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) + { + return icons[meta]; } @Override @@ -172,7 +167,7 @@ public class BlockBasic extends Block } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) { world.markBlockForRenderUpdate(x, y, z); world.updateAllLightTypes(x, y, z); @@ -227,10 +222,4 @@ public class BlockBasic extends Block super.breakBlock(world, x, y, z, i1, i2); } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } } \ No newline at end of file diff --git a/src/minecraft/mekanism/common/BlockEnergyCube.java b/src/minecraft/mekanism/common/BlockEnergyCube.java index 64667db42..e46f53bbb 100644 --- a/src/minecraft/mekanism/common/BlockEnergyCube.java +++ b/src/minecraft/mekanism/common/BlockEnergyCube.java @@ -10,7 +10,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import thermalexpansion.api.core.IDismantleable; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; import universalelectricity.prefab.implement.IToolConfigurator; import mekanism.api.IEnergyCube; @@ -19,6 +19,7 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.BlockGenerator.GeneratorType; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLiving; @@ -29,6 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.src.*; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -45,6 +47,7 @@ import net.minecraftforge.common.ForgeDirection; */ public class BlockEnergyCube extends BlockContainer implements IDismantleable { + public Icon[][] icons = new Icon[256][256]; private Random powerRand = new Random(); public BlockEnergyCube(int id) @@ -56,6 +59,19 @@ public class BlockEnergyCube extends BlockContainer implements IDismantleable setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } + @Override + public void func_94332_a(IconRegister register) + { + icons[0][0] = register.func_94245_a("mekanism:BasicEnergyCubeFront"); + icons[0][1] = register.func_94245_a("mekanism:BasicEnergyCubeSide"); + icons[1][0] = register.func_94245_a("mekanism:AdvancedEnergyCubeFront"); + icons[1][1] = register.func_94245_a("mekanism:AdvancedEnergyCubeSide"); + icons[2][0] = register.func_94245_a("mekanism:EliteEnergyCubeFront"); + icons[2][1] = register.func_94245_a("mekanism:EliteEnergyCubeSide"); + icons[3][0] = register.func_94245_a("mekanism:UltimateEnergyCubeFront"); + icons[3][1] = register.func_94245_a("mekanism:UltimateEnergyCubeSide"); + } + @Override public void setBlockBoundsForItemRender() { @@ -63,53 +79,19 @@ public class BlockEnergyCube extends BlockContainer implements IDismantleable } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { - if(meta == 0) + if(side == 3) { - if(side == 3) - { - return 4; - } - else { - return 21; - } + return icons[meta][0]; } - else if(meta == 1) - { - if(side == 3) - { - return 38; - } - else { - return 22; - } + else { + return icons[meta][1]; } - else if(meta == 2) - { - if(side == 3) - { - return 24; - } - else { - return 23; - } - } - else if(meta == 3) - { - if(side == 3) - { - return 33; - } - else { - return 32; - } - } - return 0; } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); int side = MathHelper.floor_double((double)(entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; @@ -139,52 +121,18 @@ public class BlockEnergyCube extends BlockContainer implements IDismantleable @Override @SideOnly(Side.CLIENT) - public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { int metadata = world.getBlockMetadata(x, y, z); TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getBlockTileEntity(x, y, z); - - if(tileEntity.tier == EnergyCubeTier.BASIC) - { - if(side == tileEntity.facing) - { - return 4; - } - else { - return 21; - } - } - else if(tileEntity.tier == EnergyCubeTier.ADVANCED) - { - if(side == tileEntity.facing) - { - return 38; - } - else { - return 22; - } - } - else if(tileEntity.tier == EnergyCubeTier.ELITE) - { - if(side == tileEntity.facing) - { - return 24; - } - else { - return 23; - } - } - else if(tileEntity.tier == EnergyCubeTier.ULTIMATE) - { - if(side == tileEntity.facing) - { - return 33; - } - else { - return 32; - } - } - return 0; + + if(side == tileEntity.facing) + { + return icons[tileEntity.tier.ordinal()][0]; + } + else { + return icons[tileEntity.tier.ordinal()][1]; + } } @Override @@ -383,13 +331,7 @@ public class BlockEnergyCube extends BlockContainer implements IDismantleable world.spawnEntityInWorld(entityItem); } - return world.setBlockWithNotify(x, y, z, 0); - } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; + return world.func_94571_i(x, y, z); } @Override @@ -425,7 +367,7 @@ public class BlockEnergyCube extends BlockContainer implements IDismantleable IItemElectric electricItem = (IItemElectric)itemStack.getItem(); electricItem.setJoules(tileEntity.electricityStored, itemStack); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if(!returnBlock) { diff --git a/src/minecraft/mekanism/common/BlockGasTank.java b/src/minecraft/mekanism/common/BlockGasTank.java index 1ea006a5e..5d20be5e2 100644 --- a/src/minecraft/mekanism/common/BlockGasTank.java +++ b/src/minecraft/mekanism/common/BlockGasTank.java @@ -10,12 +10,14 @@ import mekanism.api.IUpgradeManagement; import mekanism.common.BlockMachine.MachineType; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; 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.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -24,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockGasTank extends BlockContainer implements IDismantleable { + public Icon[] icons = new Icon[256]; public Random machineRand = new Random(); public BlockGasTank(int id) @@ -36,7 +39,15 @@ public class BlockGasTank extends BlockContainer implements IDismantleable } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void func_94332_a(IconRegister register) + { + icons[0] = register.func_94245_a("mekanism:GasTankTop"); + icons[1] = register.func_94245_a("mekanism:GasTankSide"); + icons[2] = register.func_94245_a("mekanism:GasTankFront"); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); @@ -55,37 +66,37 @@ public class BlockGasTank extends BlockContainer implements IDismantleable } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { if(side == 3) { - return 37; + return icons[2]; } else if(side == 0 || side == 1) { - return 31; + return icons[0]; } else { - return 36; + return icons[1]; } } @Override @SideOnly(Side.CLIENT) - public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); if(side == tileEntity.facing) { - return 37; + return icons[2]; } else if(side == 0 || side == 1) { - return 31; + return icons[0]; } else { - return 36; + return icons[1]; } } @@ -228,7 +239,7 @@ public class BlockGasTank extends BlockContainer implements IDismantleable TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getBlockTileEntity(x, y, z); ItemStack itemStack = new ItemStack(Mekanism.GasTank); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if(!returnBlock) { @@ -251,12 +262,6 @@ public class BlockGasTank extends BlockContainer implements IDismantleable return true; } - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } - @Override public boolean renderAsNormalBlock() { diff --git a/src/minecraft/mekanism/common/BlockMachine.java b/src/minecraft/mekanism/common/BlockMachine.java index 2756345e1..36f7e0486 100644 --- a/src/minecraft/mekanism/common/BlockMachine.java +++ b/src/minecraft/mekanism/common/BlockMachine.java @@ -6,7 +6,7 @@ import java.util.Random; import buildcraft.api.tools.IToolWrench; import thermalexpansion.api.core.IDismantleable; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; import universalelectricity.prefab.implement.IToolConfigurator; import mekanism.api.IActiveState; @@ -15,6 +15,7 @@ import mekanism.api.IUpgradeManagement; import mekanism.client.ClientProxy; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -23,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -48,6 +50,7 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class BlockMachine extends BlockContainer implements IDismantleable { + public Icon[][] icons = new Icon[256][256]; public Random machineRand = new Random(); public BlockMachine(int id) @@ -56,11 +59,47 @@ public class BlockMachine extends BlockContainer implements IDismantleable setHardness(3.5F); setResistance(8F); setCreativeTab(Mekanism.tabMekanism); - setRequiresSelfNotify(); } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void func_94332_a(IconRegister register) + { + icons[0][0] = register.func_94245_a("mekanism:EnrichmentChamberFrontOff"); + icons[0][1] = register.func_94245_a("mekanism:EnrichmentChamberFrontOn"); + icons[0][2] = register.func_94245_a("mekanism:OsmiumBlock"); + icons[1][0] = register.func_94245_a("mekanism:OsmiumCompressorFrontOff"); + icons[1][1] = register.func_94245_a("mekanism:OsmiumCompressorFrontOn"); + icons[1][2] = register.func_94245_a("mekanism:OsmiumBlock"); + icons[2][0] = register.func_94245_a("mekanism:CombinerFrontOff"); + icons[2][1] = register.func_94245_a("mekanism:CombinerFrontOn"); + icons[2][2] = register.func_94245_a("mekanism:OsmiumBlock"); + icons[3][0] = register.func_94245_a("mekanism:CrusherFrontOff"); + icons[3][1] = register.func_94245_a("mekanism:CrusherFrontOn"); + icons[3][2] = register.func_94245_a("mekanism:OsmiumBlock"); + icons[5][0] = register.func_94245_a("mekanism:BasicSmeltingFactoryFront"); + icons[5][1] = register.func_94245_a("mekanism:BasicSmeltingFactorySide"); + icons[5][2] = register.func_94245_a("mekanism:BasicSmeltingFactoryTop"); + icons[6][0] = register.func_94245_a("mekanism:AdvancedSmeltingFactoryFront"); + icons[6][1] = register.func_94245_a("mekanism:AdvancedSmeltingFactorySide"); + icons[6][2] = register.func_94245_a("mekanism:AdvancedSmeltingFactoryTop"); + icons[7][0] = register.func_94245_a("mekanism:EliteSmeltingFactoryFront"); + icons[7][1] = register.func_94245_a("mekanism:EliteSmeltingFactorySide"); + icons[7][2] = register.func_94245_a("mekanism:EliteSmeltingFactoryTop"); + icons[8][0] = register.func_94245_a("mekanism:MetallurgicInfuserFrontOff"); + icons[8][1] = register.func_94245_a("mekanism:MetallurgicInfuserFrontOn"); + icons[8][2] = register.func_94245_a("mekanism:MetallurgicInfuserSideOff"); + icons[8][3] = register.func_94245_a("mekanism:MetallurgicInfuserSideOn"); + icons[8][4] = register.func_94245_a("mekanism:MetallurgicInfuserTopOff"); + icons[8][5] = register.func_94245_a("mekanism:MetallurgicInfuserTopOn"); + icons[8][6] = register.func_94245_a("mekanism:MetallurgicInfuserBackOff"); + icons[8][7] = register.func_94245_a("mekanism:MetallurgicInfuserBackOn"); + icons[9][0] = register.func_94245_a("mekanism:PurificationChamberFrontOff"); + icons[9][1] = register.func_94245_a("mekanism:PurificationChamberFrontOn"); + icons[9][2] = register.func_94245_a("mekanism:OsmiumBlock"); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) { TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getBlockTileEntity(x, y, z); int side = MathHelper.floor_double((double)(entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; @@ -135,136 +174,125 @@ public class BlockMachine extends BlockContainer implements IDismantleable } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { if(meta == 0) { if(side == 3) { - return 9; + return icons[0][0]; } else { - return 2; + return icons[0][2]; } } else if(meta == 1) { if(side == 3) { - return 14; + return icons[1][0]; } else { - return 2; + return icons[1][2]; } } else if(meta == 2) { if(side == 3) { - return 15; + return icons[2][0]; } else { - return 2; + return icons[2][2]; } } else if(meta == 3) { if(side == 3) { - return 13; + return icons[3][0]; } else { - return 2; - } - } - else if(meta == 4) - { - if(side == 0 || side == 1) - { - return 18; - } - else if(side == 3) - { - return 16; - } - else { - return 19; + return icons[3][2]; } } else if(meta == 5) { if(side == 3) { - return 41; + return icons[5][0]; } else if(side == 0 || side == 1) { - return 47; + return icons[5][2]; } else { - return 44; + return icons[5][1]; } } else if(meta == 6) { if(side == 3) { - return 42; + return icons[6][0]; } else if(side == 0 || side == 1) { - return 48; + return icons[6][2]; } else { - return 45; + return icons[6][1]; } } else if(meta == 7) { if(side == 3) { - return 43; + return icons[7][0]; } else if(side == 0 || side == 1) { - return 49; + return icons[7][2]; } else { - return 46; + return icons[7][1]; } } else if(meta == 8) { if(side == 0 || side == 1) { - return 18; + return icons[8][4]; } else if(side == 3) { - return 16; + return icons[8][0]; + } + else if(side == 2) + { + return icons[8][6]; } else { - return 19; + return icons[8][2]; } } else if(meta == 9) { if(side == 3) { - return 12; + return icons[9][0]; } else { - return 2; + return icons[9][2]; } } - else { - return 0; - } + + return null; } @Override @SideOnly(Side.CLIENT) - public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { int metadata = world.getBlockMetadata(x, y, z); TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getBlockTileEntity(x, y, z); @@ -273,121 +301,101 @@ public class BlockMachine extends BlockContainer implements IDismantleable { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? 8 : 9; + return MekanismUtils.isActive(world, x, y, z) ? icons[0][1] : icons[0][0]; } else { - return 2; + return icons[0][2]; } } else if(metadata == 1) { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+2 : 14; + return MekanismUtils.isActive(world, x, y, z) ? icons[1][1] : icons[1][0]; } else { - return 2; + return icons[1][2]; } } else if(metadata == 2) { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+3 : 15; + return MekanismUtils.isActive(world, x, y, z) ? icons[2][1] : icons[2][0]; } else { - return 2; + return icons[2][2]; } } else if(metadata == 3) { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+1 : 13; + return MekanismUtils.isActive(world, x, y, z) ? icons[3][1] : icons[3][0]; } else { - return 2; - } - } - else if(metadata == 4) - { - if(side == 0 || side == 1) - { - return MekanismUtils.isActive(world, x, y, z) ? 20 : 18; - } - else { - if(side == tileEntity.facing) - { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+4 : 16; - } - else if(side == ForgeDirection.getOrientation(tileEntity.facing).getOpposite().ordinal()) - { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+5 : 17; - } - else { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+6 : 19; - } + return icons[3][2]; } } else if(metadata == 5) { if(side == tileEntity.facing) { - return 41; + return icons[5][0]; } else if(side == 0 || side == 1) { - return 47; + return icons[5][2]; } else { - return 44; + return icons[5][1]; } } else if(metadata == 6) { if(side == tileEntity.facing) { - return 42; + return icons[6][0]; } else if(side == 0 || side == 1) { - return 48; + return icons[6][2]; } else { - return 45; + return icons[6][1]; } } else if(metadata == 7) { if(side == tileEntity.facing) { - return 43; + return icons[7][0]; } else if(side == 0 || side == 1) { - return 49; + return icons[7][2]; } else { - return 46; + return icons[7][1]; } } else if(metadata == 8) { if(side == 0 || side == 1) { - return MekanismUtils.isActive(world, x, y, z) ? 20 : 18; + return MekanismUtils.isActive(world, x, y, z) ? icons[8][5] : icons[8][4]; } else { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+4 : 16; + return MekanismUtils.isActive(world, x, y, z) ? icons[8][1] : icons[8][0]; } else if(side == ForgeDirection.getOrientation(tileEntity.facing).getOpposite().ordinal()) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+5 : 17; + return MekanismUtils.isActive(world, x, y, z) ? icons[8][7] : icons[8][6]; } else { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+6 : 19; + return MekanismUtils.isActive(world, x, y, z) ? icons[8][3] : icons[8][2]; } } } @@ -395,15 +403,14 @@ public class BlockMachine extends BlockContainer implements IDismantleable { if(side == tileEntity.facing) { - return MekanismUtils.isActive(world, x, y, z) ? Mekanism.ANIMATED_TEXTURE_INDEX+9 : 12; + return MekanismUtils.isActive(world, x, y, z) ? icons[9][1] : icons[9][0]; } else { - return 2; + return icons[9][2]; } } - else { - return 0; - } + + return null; } @Override @@ -565,13 +572,7 @@ public class BlockMachine extends BlockContainer implements IDismantleable } @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) + public TileEntity createTileEntity(World world, int metadata) { return MachineType.getFromMetadata(metadata).create(); } @@ -625,7 +626,7 @@ public class BlockMachine extends BlockContainer implements IDismantleable world.spawnEntityInWorld(entityItem); } - return world.setBlockWithNotify(x, y, z, 0); + return world.func_94571_i(x, y, z); } @Override @@ -663,7 +664,7 @@ public class BlockMachine extends BlockContainer implements IDismantleable IItemElectric electricItem = (IItemElectric)itemStack.getItem(); electricItem.setJoules(tileEntity.electricityStored, itemStack); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if(!returnBlock) { diff --git a/src/minecraft/mekanism/common/BlockObsidianTNT.java b/src/minecraft/mekanism/common/BlockObsidianTNT.java index 5a97b6284..d25bbee87 100644 --- a/src/minecraft/mekanism/common/BlockObsidianTNT.java +++ b/src/minecraft/mekanism/common/BlockObsidianTNT.java @@ -4,34 +4,48 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.Explosion; import net.minecraft.world.World; public class BlockObsidianTNT extends Block { + public Icon[] icons = new Icon[256]; + public BlockObsidianTNT(int id) { super(id, Material.tnt); - setStepSound(Block.soundGrassFootstep); - setHardness(0.0F); - setResistance(0.0F); + setCreativeTab(Mekanism.tabMekanism); } + + @Override + public void func_94332_a(IconRegister register) + { + icons[0] = register.func_94245_a("mekanism:ObsidianTNTBottom"); + icons[1] = register.func_94245_a("mekanism:ObsidianTNTTop"); + icons[2] = register.func_94245_a("mekanism:ObsidianTNTSide"); + } @Override - public int getBlockTextureFromSide(int side) + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { if(side == 1) { - return 5; + return icons[1]; } if(side == 0) { - return 7; + return icons[0]; } else { - return 6; + return icons[2]; } } @@ -40,33 +54,33 @@ public class BlockObsidianTNT extends Block { super.onBlockAdded(world, x, y, z); - if (world.isBlockIndirectlyGettingPowered(x, y, z)) + if(world.isBlockIndirectlyGettingPowered(x, y, z)) { onBlockDestroyedByPlayer(world, x, y, z, 1); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); } } @Override public void onNeighborBlockChange(World world, int x, int y, int z, int blockID) { - if (blockID > 0 && Block.blocksList[blockID].canProvidePower() && world.isBlockIndirectlyGettingPowered(x, y, z)) + if(world.isBlockIndirectlyGettingPowered(x, y, z)) { onBlockDestroyedByPlayer(world, x, y, z, 1); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); } } @Override public int quantityDropped(Random random) { - return 0; + return 1; } @Override - public void onBlockDestroyedByExplosion(World world, int x, int y, int z) + public void onBlockDestroyedByExplosion(World world, int x, int y, int z, Explosion explosion) { - if (!world.isRemote) + if(!world.isRemote) { EntityObsidianTNT entity = new EntityObsidianTNT(world, (double)((float)x + 0.5F), (double)((float)y + 0.5F), (double)((float)z + 0.5F)); entity.fuse = world.rand.nextInt(entity.fuse / 4) + entity.fuse / 8; @@ -77,14 +91,13 @@ public class BlockObsidianTNT extends Block @Override public void onBlockDestroyedByPlayer(World world, int x, int y, int z, int meta) { - if (!world.isRemote) + if(!world.isRemote) { - if ((meta & 1) == 0) + if((meta & 1) == 0) { dropBlockAsItem_do(world, x, y, z, new ItemStack(Mekanism.ObsidianTNT, 1, 0)); } - else - { + else { EntityObsidianTNT entity = new EntityObsidianTNT(world, (double)((float)x + 0.5F), (double)((float)y + 0.5F), (double)((float)z + 0.5F)); world.spawnEntityInWorld(entity); world.playSoundAtEntity(entity, "random.fuse", 1.0F, 1.0F); @@ -101,10 +114,10 @@ public class BlockObsidianTNT extends Block @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int i1, float f1, float f2, float f3) { - if (entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().itemID == Item.flintAndSteel.itemID) + if(entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().itemID == Item.flintAndSteel.itemID) { onBlockDestroyedByPlayer(world, x, y, z, 1); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); return true; } else @@ -112,16 +125,31 @@ public class BlockObsidianTNT extends Block return super.onBlockActivated(world, x, y, z, entityplayer, i1, f1, f2, f3); } } + + @Override + public boolean canDropFromExplosion(Explosion explosion) + { + return false; + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) + { + if(entity instanceof EntityArrow && !world.isRemote) + { + EntityArrow entityarrow = (EntityArrow)entity; + + if(entityarrow.isBurning()) + { + onBlockDestroyedByPlayer(world, x, y, z, 1); + world.func_94571_i(x, y, z); + } + } + } @Override protected ItemStack createStackedBlock(int i) { return null; } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } } diff --git a/src/minecraft/mekanism/common/BlockOre.java b/src/minecraft/mekanism/common/BlockOre.java index 2d6900b42..93b7c616b 100644 --- a/src/minecraft/mekanism/common/BlockOre.java +++ b/src/minecraft/mekanism/common/BlockOre.java @@ -4,8 +4,10 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,24 +20,31 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class BlockOre extends Block { + public Icon[] icons = new Icon[256]; + public BlockOre(int id) { super(id, Material.rock); setHardness(3F); setResistance(5F); setCreativeTab(Mekanism.tabMekanism); - setRequiresSelfNotify(); } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public void func_94332_a(IconRegister register) + { + icons[0] = register.func_94245_a("mekanism:OsmiumOre"); + } + + @Override + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { switch(meta) { case 0: - return 3; + return icons[0]; } - return 0; + return null; } @Override @@ -50,10 +59,4 @@ public class BlockOre extends Block { list.add(new ItemStack(i, 1, 0)); } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } } diff --git a/src/minecraft/mekanism/common/BlockPressurizedTube.java b/src/minecraft/mekanism/common/BlockPressurizedTube.java index 1353bfa2e..7ddf52ce9 100644 --- a/src/minecraft/mekanism/common/BlockPressurizedTube.java +++ b/src/minecraft/mekanism/common/BlockPressurizedTube.java @@ -29,7 +29,6 @@ public class BlockPressurizedTube extends Block setResistance(5.0F); setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 0.7F, 0.7F); setCreativeTab(Mekanism.tabMekanism); - blockIndexInTexture = 204; } @Override @@ -121,10 +120,4 @@ public class BlockPressurizedTube extends Block { return new TileEntityPressurizedTube(); } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/items.png"; - } } diff --git a/src/minecraft/mekanism/common/CommonProxy.java b/src/minecraft/mekanism/common/CommonProxy.java index 9d41b5d92..114f284c6 100644 --- a/src/minecraft/mekanism/common/CommonProxy.java +++ b/src/minecraft/mekanism/common/CommonProxy.java @@ -72,6 +72,8 @@ public class CommonProxy Mekanism.disableBCBronzeCrafting = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisableBCBronzeCrafting", false).getBoolean(true); Mekanism.updateNotifications = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpdateNotifications", true).getBoolean(true); Mekanism.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean(true); + Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); + Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); Mekanism.configuration.save(); } diff --git a/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java b/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java index aac4fcd11..a7f14d867 100644 --- a/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java +++ b/src/minecraft/mekanism/common/ContainerAdvancedElectricMachine.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerAdvancedElectricMachine extends Container { diff --git a/src/minecraft/mekanism/common/ContainerElectricMachine.java b/src/minecraft/mekanism/common/ContainerElectricMachine.java index 7927e19ca..6e13cffb5 100644 --- a/src/minecraft/mekanism/common/ContainerElectricMachine.java +++ b/src/minecraft/mekanism/common/ContainerElectricMachine.java @@ -8,7 +8,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; + +import universalelectricity.core.item.IItemElectric; public class ContainerElectricMachine extends Container { diff --git a/src/minecraft/mekanism/common/ContainerEnergyCube.java b/src/minecraft/mekanism/common/ContainerEnergyCube.java index ed36e2cc9..4c84302f1 100644 --- a/src/minecraft/mekanism/common/ContainerEnergyCube.java +++ b/src/minecraft/mekanism/common/ContainerEnergyCube.java @@ -7,7 +7,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; + +import universalelectricity.core.item.IItemElectric; public class ContainerEnergyCube extends Container { diff --git a/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java b/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java index f3ccaba29..18ae450b9 100644 --- a/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java +++ b/src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.Map; +import universalelectricity.core.item.IItemElectric; + import ic2.api.IElectricItem; import mekanism.api.InfusionInput; import mekanism.api.InfusionOutput; @@ -12,9 +14,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import universalelectricity.core.implement.IItemElectric; public class ContainerMetallurgicInfuser extends Container { @@ -86,7 +88,7 @@ public class ContainerMetallurgicInfuser extends Container return null; } } - else if(slotStack.getItem() instanceof IItemElectric || slotStack.getItem() instanceof IElectricItem) + else if(slotStack.getItem() instanceof IItemElectric || slotStack.getItem() instanceof IElectricItem || slotStack.itemID == Item.redstone.itemID) { if(!mergeItemStack(slotStack, 4, 5, false)) { diff --git a/src/minecraft/mekanism/common/ContainerSmeltingFactory.java b/src/minecraft/mekanism/common/ContainerSmeltingFactory.java index 3d6347147..3f5dc7916 100644 --- a/src/minecraft/mekanism/common/ContainerSmeltingFactory.java +++ b/src/minecraft/mekanism/common/ContainerSmeltingFactory.java @@ -1,5 +1,6 @@ package mekanism.common; +import universalelectricity.core.item.IItemElectric; import ic2.api.IElectricItem; import mekanism.api.Tier; import mekanism.api.Tier.SmeltingFactoryTier; @@ -11,7 +12,6 @@ import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import universalelectricity.core.implement.IItemElectric; public class ContainerSmeltingFactory extends Container { diff --git a/src/minecraft/mekanism/common/ContainerTeleporter.java b/src/minecraft/mekanism/common/ContainerTeleporter.java index f43f5afcc..f67c0ddd1 100644 --- a/src/minecraft/mekanism/common/ContainerTeleporter.java +++ b/src/minecraft/mekanism/common/ContainerTeleporter.java @@ -1,5 +1,6 @@ package mekanism.common; +import universalelectricity.core.item.IItemElectric; import ic2.api.IElectricItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -8,7 +9,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; public class ContainerTeleporter extends Container { diff --git a/src/minecraft/mekanism/common/EntityObsidianTNT.java b/src/minecraft/mekanism/common/EntityObsidianTNT.java index d97dda6b4..1d0f43906 100644 --- a/src/minecraft/mekanism/common/EntityObsidianTNT.java +++ b/src/minecraft/mekanism/common/EntityObsidianTNT.java @@ -29,7 +29,7 @@ public class EntityObsidianTNT extends Entity motionX = -(Math.sin(randPi))*0.02F; motionY = 0.2; motionZ = -(Math.cos(randPi))*0.02F; - fuse = Mekanism.ObsidianTNTDelay; + fuse = Mekanism.obsidianTNTDelay; prevPosX = x; prevPosY = y; prevPosZ = z; @@ -93,7 +93,7 @@ public class EntityObsidianTNT extends Entity private void explode() { - worldObj.createExplosion((Entity)null, posX, posY, posZ, Mekanism.ObsidianTNTBlastRadius, true); + worldObj.createExplosion((Entity)null, posX, posY, posZ, Mekanism.obsidianTNTBlastRadius, true); hasExploded = true; } diff --git a/src/minecraft/mekanism/common/ItemAtomicDisassembler.java b/src/minecraft/mekanism/common/ItemAtomicDisassembler.java index 568cbb1fa..e56ff620f 100644 --- a/src/minecraft/mekanism/common/ItemAtomicDisassembler.java +++ b/src/minecraft/mekanism/common/ItemAtomicDisassembler.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.List; +import universalelectricity.core.electricity.ElectricityPack; + import mekanism.api.EnumColor; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; @@ -39,7 +41,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(getJoules(itemstack) > 0) { hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), 20); - onUse(2000, itemstack); + onProvide(new ElectricityPack(2000/120, 120), itemstack); } else { hitEntity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer)player), 4); @@ -58,10 +60,10 @@ public class ItemAtomicDisassembler extends ItemEnergized { if(Block.blocksList[id].getBlockHardness(world, x, y, z) != 0.0D) { - onUse(getEfficiency(itemstack), itemstack); + onProvide(new ElectricityPack(getEfficiency(itemstack), 120), itemstack); } else { - onUse(getEfficiency(itemstack)/2, itemstack); + onProvide(new ElectricityPack((getEfficiency(itemstack)/2)/120, 120), itemstack); } return true; @@ -73,11 +75,11 @@ public class ItemAtomicDisassembler extends ItemEnergized return true; } - @Override - public boolean canProduceElectricity() - { - return false; - } + @Override + public ElectricityPack getProvideRequest(ItemStack itemStack) + { + return new ElectricityPack(); + } @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) diff --git a/src/minecraft/mekanism/common/ItemBlockBasic.java b/src/minecraft/mekanism/common/ItemBlockBasic.java index ff4677d72..f88e49025 100644 --- a/src/minecraft/mekanism/common/ItemBlockBasic.java +++ b/src/minecraft/mekanism/common/ItemBlockBasic.java @@ -3,6 +3,7 @@ package mekanism.common; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; /** * Item class for handling multiple metal block IDs. @@ -36,13 +37,13 @@ public class ItemBlockBasic extends ItemBlock } @Override - public int getIconFromDamage(int i) + public Icon getIconFromDamage(int i) { return metaBlock.getBlockTextureFromSideAndMetadata(2, i); } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { String name = ""; switch(itemstack.getItemDamage()) @@ -78,6 +79,6 @@ public class ItemBlockBasic extends ItemBlock name = "Unknown"; break; } - return getItemName() + "." + name; + return getUnlocalizedName() + "." + name; } } diff --git a/src/minecraft/mekanism/common/ItemBlockEnergyCube.java b/src/minecraft/mekanism/common/ItemBlockEnergyCube.java index af9c1abce..b331b4153 100644 --- a/src/minecraft/mekanism/common/ItemBlockEnergyCube.java +++ b/src/minecraft/mekanism/common/ItemBlockEnergyCube.java @@ -5,6 +5,12 @@ import ic2.api.ICustomElectricItem; import java.util.ArrayList; import java.util.List; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityPack; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; +import universalelectricity.core.item.ElectricItemHelper; +import universalelectricity.core.item.IItemElectric; + import mekanism.api.IEnergyCube; import mekanism.api.Tier.EnergyCubeTier; import net.minecraft.block.Block; @@ -15,9 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagFloat; import net.minecraft.world.World; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; -import universalelectricity.core.implement.IItemElectric; public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEnergyCube, ICustomElectricItem { @@ -38,7 +41,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEn { double energy = getJoules(itemstack); - list.add("Stored Energy: " + ElectricInfo.getDisplayShort(energy, ElectricUnit.JOULES)); + list.add("Stored Energy: " + ElectricityDisplay.getDisplayShort(energy, ElectricUnit.JOULES)); list.add("Voltage: " + getVoltage(itemstack) + "v"); } @@ -51,111 +54,91 @@ public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEn } @Override - public double getJoules(Object... data) + public double getJoules(ItemStack itemStack) { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - return 0; - } - - double electricityStored = 0; - - if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) - { - electricityStored = itemStack.stackTagCompound.getFloat("electricity"); - } - else - { - electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - } - - itemStack.setItemDamage((int)(Math.abs(((electricityStored/getTier(itemStack).MAX_ELECTRICITY)*100)-100))); - return electricityStored; - } - - return -1; - } - - @Override - public void setJoules(double wattHours, Object... data) - { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); - itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)(Math.abs(((electricityStored/getTier(itemStack).MAX_ELECTRICITY)*100)-100))); - } - } - - @Override - public double getMaxJoules(Object... data) - { - if(data[0] instanceof ItemStack) - { - ItemStack itemstack = (ItemStack)data[0]; - - return getTier(itemstack).MAX_ELECTRICITY; + if (itemStack.stackTagCompound == null) + { + return 0; } - return EnergyCubeTier.BASIC.MAX_ELECTRICITY; - } - - @Override - public double getVoltage(Object... data) - { - if(data[0] instanceof ItemStack) + double electricityStored = 0; + + if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) { - ItemStack itemstack = (ItemStack)data[0]; - - return getTier(itemstack).VOLTAGE; + electricityStored = itemStack.stackTagCompound.getFloat("electricity"); + } + else + { + electricityStored = itemStack.stackTagCompound.getDouble("electricity"); } - return EnergyCubeTier.BASIC.VOLTAGE; + itemStack.setItemDamage((int)(Math.abs(((electricityStored/getTier(itemStack).MAX_ELECTRICITY)*100)-100))); + return electricityStored; } @Override - public double onReceive(double amps, double voltage, ItemStack itemStack) + public void setJoules(double wattHours, ItemStack itemStack) { - double rejectedElectricity = Math.max((getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1)) - getMaxJoules(itemStack), 0); - setJoules(getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1) - rejectedElectricity, itemStack); - return rejectedElectricity; + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); + itemStack.stackTagCompound.setDouble("electricity", electricityStored); + itemStack.setItemDamage((int)(Math.abs(((electricityStored/getTier(itemStack).MAX_ELECTRICITY)*100)-100))); } @Override - public double onUse(double joulesNeeded, ItemStack itemStack) + public double getMaxJoules(ItemStack itemStack) { - double electricityToUse = Math.min(getJoules(itemStack), joulesNeeded); + return getTier(itemStack).MAX_ELECTRICITY; + } + + @Override + public double getVoltage(ItemStack itemStack) + { + return getTier(itemStack).VOLTAGE; + } + + @Override + public ElectricityPack onReceive(ElectricityPack electricityPack, ItemStack itemStack) + { + double rejectedElectricity = Math.max((getJoules(itemStack) + electricityPack.getWatts()) - getMaxJoules(itemStack), 0); + double joulesToStore = electricityPack.getWatts() - rejectedElectricity; + this.setJoules(getJoules(itemStack) + joulesToStore, itemStack); + return ElectricityPack.getFromWatts(joulesToStore, getVoltage(itemStack)); + } + + @Override + public ElectricityPack onProvide(ElectricityPack electricityPack, ItemStack itemStack) + { + double electricityToUse = Math.min(getJoules(itemStack), electricityPack.getWatts()); setJoules(getJoules(itemStack) - electricityToUse, itemStack); - return electricityToUse; + return ElectricityPack.getFromWatts(electricityToUse, getVoltage(itemStack)); } @Override - public boolean canReceiveElectricity() + public ElectricityPack getReceiveRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getMaxJoules(itemStack) - getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); } @Override - public boolean canProduceElectricity() + public ElectricityPack getProvideRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); + } + + public double getTransferRate(ItemStack itemStack) + { + return getMaxJoules(itemStack)*0.01; } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { - return getItemName() + "." + getTier(itemstack).name; + return getUnlocalizedName() + "." + getTier(itemstack).name; } @Override @@ -163,7 +146,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEn { boolean place = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); - if (place) + if(place) { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getBlockTileEntity(x, y, z); tileEntity.tier = ((IEnergyCube)stack.getItem()).getTier(stack); @@ -253,7 +236,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEn @Override public boolean canProvideEnergy() { - return canProduceElectricity(); + return true; } @Override @@ -283,6 +266,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IItemElectric, IEn @Override public int getTransferLimit() { - return (int)(getVoltage()*Mekanism.TO_IC2); + return 0; } } diff --git a/src/minecraft/mekanism/common/ItemBlockMachine.java b/src/minecraft/mekanism/common/ItemBlockMachine.java index 02c89a0b8..37a97ee3c 100644 --- a/src/minecraft/mekanism/common/ItemBlockMachine.java +++ b/src/minecraft/mekanism/common/ItemBlockMachine.java @@ -2,10 +2,12 @@ package mekanism.common; import java.util.List; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityPack; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; +import universalelectricity.core.item.IItemElectric; + import ic2.api.ICustomElectricItem; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; -import universalelectricity.core.implement.IItemElectric; import mekanism.api.IUpgradeManagement; import mekanism.common.BlockMachine.MachineType; import net.minecraft.block.Block; @@ -52,7 +54,7 @@ public class ItemBlockMachine extends ItemBlock implements IItemElectric, ICusto } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { String name = ""; switch(itemstack.getItemDamage()) @@ -91,7 +93,7 @@ public class ItemBlockMachine extends ItemBlock implements IItemElectric, ICusto name = "Unknown"; break; } - return getItemName() + "." + name; + return getUnlocalizedName() + "." + name; } @Override @@ -99,102 +101,88 @@ public class ItemBlockMachine extends ItemBlock implements IItemElectric, ICusto { double energy = getJoules(itemstack); - list.add("Stored Energy: " + ElectricInfo.getDisplayShort(energy, ElectricUnit.JOULES)); + list.add("Stored Energy: " + ElectricityDisplay.getDisplayShort(energy, ElectricUnit.JOULES)); list.add("Energy: x" + (getEnergyMultiplier(itemstack)+1)); list.add("Speed: x" + (getSpeedMultiplier(itemstack)+1)); } @Override - public double getJoules(Object... data) + public double getJoules(ItemStack itemStack) { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - return 0; - } - - double electricityStored = 0; - - if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) - { - electricityStored = itemStack.stackTagCompound.getFloat("electricity"); - } - else - { - electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - } - - return electricityStored; - } - - return -1; - } - - @Override - public void setJoules(double wattHours, Object... data) - { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack)data[0]; - - if (itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); - itemStack.stackTagCompound.setDouble("electricity", electricityStored); - } - } - - @Override - public double getMaxJoules(Object... data) - { - if(data[0] instanceof ItemStack) - { - ItemStack itemstack = (ItemStack)data[0]; - - return MekanismUtils.getEnergy(getEnergyMultiplier(itemstack), MachineType.getFromMetadata(itemstack.getItemDamage()).baseEnergy); + if(itemStack.stackTagCompound == null) + { + return 0; } - return 3200; + double electricityStored = 0; + + if(itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) + { + electricityStored = itemStack.stackTagCompound.getFloat("electricity"); + } + else { + electricityStored = itemStack.stackTagCompound.getDouble("electricity"); + } + + return electricityStored; } @Override - public double getVoltage(Object... data) + public void setJoules(double wattHours, ItemStack itemStack) + { + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); + itemStack.stackTagCompound.setDouble("electricity", electricityStored); + } + + @Override + public double getMaxJoules(ItemStack itemStack) + { + return MekanismUtils.getEnergy(getEnergyMultiplier(itemStack), MachineType.getFromMetadata(itemStack.getItemDamage()).baseEnergy); + } + + @Override + public double getVoltage(ItemStack itemStack) { return 120; } @Override - public double onReceive(double amps, double voltage, ItemStack itemStack) + public ElectricityPack onReceive(ElectricityPack electricityPack, ItemStack itemStack) { - double rejectedElectricity = Math.max((getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1)) - getMaxJoules(itemStack), 0); - setJoules(getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1) - rejectedElectricity, itemStack); - return rejectedElectricity; + double rejectedElectricity = Math.max((getJoules(itemStack) + electricityPack.getWatts()) - getMaxJoules(itemStack), 0); + double joulesToStore = electricityPack.getWatts() - rejectedElectricity; + this.setJoules(getJoules(itemStack) + joulesToStore, itemStack); + return ElectricityPack.getFromWatts(joulesToStore, getVoltage(itemStack)); } @Override - public double onUse(double joulesNeeded, ItemStack itemStack) + public ElectricityPack onProvide(ElectricityPack electricityPack, ItemStack itemStack) { - double electricityToUse = Math.min(getJoules(itemStack), joulesNeeded); + double electricityToUse = Math.min(getJoules(itemStack), electricityPack.getWatts()); setJoules(getJoules(itemStack) - electricityToUse, itemStack); - return electricityToUse; + return ElectricityPack.getFromWatts(electricityToUse, getVoltage(itemStack)); } @Override - public boolean canReceiveElectricity() + public ElectricityPack getReceiveRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getMaxJoules(itemStack) - getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); } @Override - public boolean canProduceElectricity() + public ElectricityPack getProvideRequest(ItemStack itemStack) { - return false; + return ElectricityPack.getFromWatts(Math.min(getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); + } + + public double getTransferRate(ItemStack itemStack) + { + return getMaxJoules(itemStack)*0.01; } @Override @@ -260,7 +248,7 @@ public class ItemBlockMachine extends ItemBlock implements IItemElectric, ICusto @Override public boolean canProvideEnergy() { - return canProduceElectricity(); + return false; } @Override @@ -290,7 +278,7 @@ public class ItemBlockMachine extends ItemBlock implements IItemElectric, ICusto @Override public int getTransferLimit() { - return (int)(getVoltage()*Mekanism.TO_IC2); + return 0; } @Override diff --git a/src/minecraft/mekanism/common/ItemBlockOre.java b/src/minecraft/mekanism/common/ItemBlockOre.java index 7a88847e9..8dafc2ddf 100644 --- a/src/minecraft/mekanism/common/ItemBlockOre.java +++ b/src/minecraft/mekanism/common/ItemBlockOre.java @@ -3,6 +3,7 @@ package mekanism.common; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; /** * Item class for handling multiple ore block IDs. @@ -28,13 +29,13 @@ public class ItemBlockOre extends ItemBlock } @Override - public int getIconFromDamage(int i) + public Icon getIconFromDamage(int i) { return metaBlock.getBlockTextureFromSideAndMetadata(2, i); } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { String name = ""; switch(itemstack.getItemDamage()) @@ -46,6 +47,6 @@ public class ItemBlockOre extends ItemBlock name = "Unknown"; break; } - return getItemName() + "." + name; + return getUnlocalizedName() + "." + name; } } diff --git a/src/minecraft/mekanism/common/ItemClump.java b/src/minecraft/mekanism/common/ItemClump.java index 0dc777ce9..cb09b11b0 100644 --- a/src/minecraft/mekanism/common/ItemClump.java +++ b/src/minecraft/mekanism/common/ItemClump.java @@ -2,11 +2,14 @@ package mekanism.common; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; public class ItemClump extends ItemMekanism { + public Icon[] icons = new Icon[256]; public static String[] en_USNames = {"Iron", "Gold", "Osmium", "Copper", "Tin", "Silver"}; @@ -16,33 +19,33 @@ public class ItemClump extends ItemMekanism setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public void func_94581_a(IconRegister register) + { + for(int i = 0; i <= 5; i++) + { + icons[i] = register.func_94245_a("mekanism:" + en_USNames[i] + "Clump"); + } + } @Override - public int getIconFromDamage(int meta) + public Icon getIconFromDamage(int meta) { - switch (meta) - { - case 0: return 216; - case 1: return 218; - case 2: return 210; - case 3: return 211; - case 4: return 212; - case 5: return 214; - default: return 0; - } + return icons[meta]; } @Override public void getSubItems(int id, CreativeTabs tabs, List itemList) { - for (int counter = 0; counter <= 5; ++counter) + for(int counter = 0; counter <= 5; ++counter) { itemList.add(new ItemStack(this, 1, counter)); } } @Override - public String getItemNameIS(ItemStack item) + public String getUnlocalizedName(ItemStack item) { return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Clump"; } diff --git a/src/minecraft/mekanism/common/ItemConfigurator.java b/src/minecraft/mekanism/common/ItemConfigurator.java index 44c232af2..e56a7f932 100644 --- a/src/minecraft/mekanism/common/ItemConfigurator.java +++ b/src/minecraft/mekanism/common/ItemConfigurator.java @@ -1,6 +1,6 @@ package mekanism.common; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.electricity.ElectricityPack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -34,7 +34,7 @@ public class ItemConfigurator extends ItemEnergized else { if(getJoules(stack) >= ENERGY_PER_USE) { - onUse(ENERGY_PER_USE, stack); + onProvide(new ElectricityPack(ENERGY_PER_USE/120, 120), stack); MekanismUtils.incrementOutput(config, MekanismUtils.getBaseOrientation(side, config.getOrientation())); player.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Color bumped to: " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName()); return true; @@ -45,9 +45,9 @@ public class ItemConfigurator extends ItemEnergized return false; } - @Override - public boolean canProduceElectricity() - { - return false; - } + @Override + public ElectricityPack getProvideRequest(ItemStack itemStack) + { + return new ElectricityPack(); + } } diff --git a/src/minecraft/mekanism/common/ItemDirtyDust.java b/src/minecraft/mekanism/common/ItemDirtyDust.java index 580d44b98..b7c460525 100644 --- a/src/minecraft/mekanism/common/ItemDirtyDust.java +++ b/src/minecraft/mekanism/common/ItemDirtyDust.java @@ -2,11 +2,14 @@ package mekanism.common; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; public class ItemDirtyDust extends ItemMekanism { + public Icon[] icons = new Icon[256]; public static String[] en_USNames = {"Iron", "Gold", "Osmium", "Copper", "Tin", "Silver", "Obsidian"}; @@ -17,21 +20,20 @@ public class ItemDirtyDust extends ItemMekanism setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public void func_94581_a(IconRegister register) + { + for(int i = 0; i <= 6; i++) + { + icons[i] = register.func_94245_a("mekanism:Dirty" + en_USNames[i] + "Dust"); + } + } @Override - public int getIconFromDamage(int meta) + public Icon getIconFromDamage(int meta) { - switch (meta) - { - case 0: return 200; - case 1: return 202; - case 2: return 194; - case 3: return 195; - case 4: return 196; - case 5: return 198; - case 6: return 193; - default: return 0; - } + return icons[meta]; } @Override @@ -44,7 +46,7 @@ public class ItemDirtyDust extends ItemMekanism } @Override - public String getItemNameIS(ItemStack item) + public String getUnlocalizedName(ItemStack item) { return "item.dirty" + en_USNames[item.getItemDamage()] + "Dust"; } diff --git a/src/minecraft/mekanism/common/ItemDust.java b/src/minecraft/mekanism/common/ItemDust.java index 4fe31ddb3..1cbd1e201 100644 --- a/src/minecraft/mekanism/common/ItemDust.java +++ b/src/minecraft/mekanism/common/ItemDust.java @@ -2,11 +2,14 @@ package mekanism.common; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; public class ItemDust extends ItemMekanism { + public Icon[] icons = new Icon[256]; public static String[] en_USNames = {"Iron", "Gold", "Osmium", "Obsidian", "Diamond", "Steel", "Copper", "Tin", "Silver"}; @@ -17,23 +20,20 @@ public class ItemDust extends ItemMekanism setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public void func_94581_a(IconRegister register) + { + for(int i = 0; i <= 8; i++) + { + icons[i] = register.func_94245_a("mekanism:" + en_USNames[i] + "Dust"); + } + } @Override - public int getIconFromDamage(int meta) + public Icon getIconFromDamage(int meta) { - switch (meta) - { - case 0: return 248; - case 1: return 250; - case 2: return 242; - case 3: return 241; - case 4: return 249; - case 5: return 245; - case 6: return 243; - case 7: return 244; - case 8: return 246; - default: return 0; - } + return icons[meta]; } @Override @@ -46,7 +46,7 @@ public class ItemDust extends ItemMekanism } @Override - public String getItemNameIS(ItemStack item) + public String getUnlocalizedName(ItemStack item) { return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Dust"; } diff --git a/src/minecraft/mekanism/common/ItemElectricBow.java b/src/minecraft/mekanism/common/ItemElectricBow.java index 0709c087d..2b4e72f4c 100644 --- a/src/minecraft/mekanism/common/ItemElectricBow.java +++ b/src/minecraft/mekanism/common/ItemElectricBow.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.List; +import universalelectricity.core.electricity.ElectricityPack; + import mekanism.api.EnumColor; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -59,7 +61,7 @@ public class ItemElectricBow extends ItemEnergized if(!player.capabilities.isCreativeMode) { - onUse((getFireState(itemstack) ? 1200 : 120), itemstack); + onProvide(new ElectricityPack((getFireState(itemstack) ? 1200 : 120)/120, 120), itemstack); } world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); @@ -83,7 +85,7 @@ public class ItemElectricBow extends ItemEnergized } @Override - public ItemStack onFoodEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) + public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { return itemstack; } @@ -157,9 +159,9 @@ public class ItemElectricBow extends ItemEnergized return state; } - @Override - public boolean canProduceElectricity() - { - return false; - } + @Override + public ElectricityPack getProvideRequest(ItemStack itemStack) + { + return new ElectricityPack(); + } } diff --git a/src/minecraft/mekanism/common/ItemEnergized.java b/src/minecraft/mekanism/common/ItemEnergized.java index bb5e6dd41..70cd2b98d 100644 --- a/src/minecraft/mekanism/common/ItemEnergized.java +++ b/src/minecraft/mekanism/common/ItemEnergized.java @@ -4,6 +4,11 @@ import ic2.api.ICustomElectricItem; import java.util.List; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityPack; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; +import universalelectricity.core.item.IItemElectric; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -11,9 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagFloat; import net.minecraft.world.World; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; -import universalelectricity.core.implement.IItemElectric; public class ItemEnergized extends ItemMekanism implements IItemElectric, ICustomElectricItem { @@ -39,7 +41,7 @@ public class ItemEnergized extends ItemMekanism implements IItemElectric, ICusto { double energy = getJoules(itemstack); - list.add("Stored Energy: " + ElectricInfo.getDisplayShort(energy, ElectricUnit.JOULES)); + list.add("Stored Energy: " + ElectricityDisplay.getDisplayShort(energy, ElectricUnit.JOULES)); } @Override @@ -62,96 +64,90 @@ public class ItemEnergized extends ItemMekanism implements IItemElectric, ICusto discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); - setJoules(((IItemElectric)charged.getItem()).getMaxJoules(), charged); + setJoules(((IItemElectric)charged.getItem()).getMaxJoules(charged), charged); list.add(charged); } @Override - public double getJoules(Object... data) + public double getJoules(ItemStack itemStack) { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - return 0; - } - - double electricityStored = 0; - - if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) - { - electricityStored = itemStack.stackTagCompound.getFloat("electricity"); - } - else - { - electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - } - - itemStack.setItemDamage((int)(Math.abs(((electricityStored/MAX_ELECTRICITY)*100)-100))); - return electricityStored; + if (itemStack.stackTagCompound == null) + { + return 0; } - - return -1; + + double electricityStored = 0; + + if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) + { + electricityStored = itemStack.stackTagCompound.getFloat("electricity"); + } + else + { + electricityStored = itemStack.stackTagCompound.getDouble("electricity"); + } + + itemStack.setItemDamage((int)(Math.abs(((electricityStored/MAX_ELECTRICITY)*100)-100))); + return electricityStored; } @Override - public void setJoules(double wattHours, Object... data) + public void setJoules(double wattHours, ItemStack itemStack) { - if (data[0] instanceof ItemStack) + if(itemStack.stackTagCompound == null) { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(wattHours, getMaxJoules()), 0); - itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)(Math.abs(((electricityStored/MAX_ELECTRICITY)*100)-100))); + itemStack.setTagCompound(new NBTTagCompound()); } + + double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); + itemStack.stackTagCompound.setDouble("electricity", electricityStored); + itemStack.setItemDamage((int)(Math.abs(((electricityStored/MAX_ELECTRICITY)*100)-100))); } @Override - public double getMaxJoules(Object... data) + public double getMaxJoules(ItemStack itemStack) { return MAX_ELECTRICITY; } @Override - public double getVoltage(Object... data) + public double getVoltage(ItemStack itemStack) { return VOLTAGE; } @Override - public double onReceive(double amps, double voltage, ItemStack itemStack) + public ElectricityPack onReceive(ElectricityPack electricityPack, ItemStack itemStack) { - double rejectedElectricity = Math.max((getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1)) - getMaxJoules(), 0); - setJoules(getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1) - rejectedElectricity, itemStack); - return rejectedElectricity; + double rejectedElectricity = Math.max((getJoules(itemStack) + electricityPack.getWatts()) - getMaxJoules(itemStack), 0); + double joulesToStore = electricityPack.getWatts() - rejectedElectricity; + this.setJoules(getJoules(itemStack) + joulesToStore, itemStack); + return ElectricityPack.getFromWatts(joulesToStore, getVoltage(itemStack)); } @Override - public double onUse(double joulesNeeded, ItemStack itemStack) + public ElectricityPack onProvide(ElectricityPack electricityPack, ItemStack itemStack) { - double electricityToUse = Math.min(getJoules(itemStack), joulesNeeded); + double electricityToUse = Math.min(getJoules(itemStack), electricityPack.getWatts()); setJoules(getJoules(itemStack) - electricityToUse, itemStack); - return electricityToUse; + return ElectricityPack.getFromWatts(electricityToUse, getVoltage(itemStack)); } @Override - public boolean canReceiveElectricity() + public ElectricityPack getReceiveRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getMaxJoules(itemStack) - getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); } @Override - public boolean canProduceElectricity() + public ElectricityPack getProvideRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); + } + + public double getTransferRate(ItemStack itemStack) + { + return getMaxJoules(itemStack)*0.01; } @Override @@ -196,7 +192,7 @@ public class ItemEnergized extends ItemMekanism implements IItemElectric, ICusto @Override public boolean canProvideEnergy() { - return canProduceElectricity(); + return true; } @Override @@ -226,6 +222,6 @@ public class ItemEnergized extends ItemMekanism implements IItemElectric, ICusto @Override public int getTransferLimit() { - return (int)(getVoltage()*Mekanism.TO_IC2); + return 0; } } diff --git a/src/minecraft/mekanism/common/ItemIngot.java b/src/minecraft/mekanism/common/ItemIngot.java index f048e4fea..aaadf84e5 100644 --- a/src/minecraft/mekanism/common/ItemIngot.java +++ b/src/minecraft/mekanism/common/ItemIngot.java @@ -2,11 +2,14 @@ package mekanism.common; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; public class ItemIngot extends ItemMekanism { + public Icon[] icons = new Icon[256]; public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel"}; public ItemIngot(int id) @@ -15,19 +18,20 @@ public class ItemIngot extends ItemMekanism setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public void func_94581_a(IconRegister register) + { + for(int i = 0; i <= 4; i++) + { + icons[i] = register.func_94245_a("mekanism:" + en_USNames[i] + "Ingot"); + } + } @Override - public int getIconFromDamage(int meta) + public Icon getIconFromDamage(int meta) { - switch (meta) - { - case 0: return 161; - case 1: return 162; - case 2: return 163; - case 3: return 164; - case 4: return 165; - default: return 0; - } + return icons[meta]; } @Override @@ -40,7 +44,7 @@ public class ItemIngot extends ItemMekanism } @Override - public String getItemNameIS(ItemStack item) + public String getUnlocalizedName(ItemStack item) { return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Ingot"; } diff --git a/src/minecraft/mekanism/common/ItemMachineUpgrade.java b/src/minecraft/mekanism/common/ItemMachineUpgrade.java index 6d505141c..7fb203dc5 100644 --- a/src/minecraft/mekanism/common/ItemMachineUpgrade.java +++ b/src/minecraft/mekanism/common/ItemMachineUpgrade.java @@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemMachineUpgrade extends Item implements IModifier +public class ItemMachineUpgrade extends ItemMekanism implements IModifier { public ItemMachineUpgrade(int id, int energyBoost, int tickReduction) { @@ -18,12 +18,6 @@ public class ItemMachineUpgrade extends Item implements IModifier setMaxStackSize(8); setCreativeTab(Mekanism.tabMekanism); } - - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/items.png"; - } @Override public String getName(ItemStack itemstack) diff --git a/src/minecraft/mekanism/common/ItemMekanism.java b/src/minecraft/mekanism/common/ItemMekanism.java index fa10ea52b..362755551 100644 --- a/src/minecraft/mekanism/common/ItemMekanism.java +++ b/src/minecraft/mekanism/common/ItemMekanism.java @@ -1,6 +1,8 @@ package mekanism.common; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; +import net.minecraft.util.Icon; public class ItemMekanism extends Item { @@ -9,10 +11,10 @@ public class ItemMekanism extends Item super(i); setCreativeTab(Mekanism.tabMekanism); } - + @Override - public String getTextureFile() + public void func_94581_a(IconRegister register) { - return "/resources/mekanism/textures/items.png"; + iconIndex = register.func_94245_a("mekanism:" + getUnlocalizedName().replace("item.", "")); } } diff --git a/src/minecraft/mekanism/common/ItemPortableTeleporter.java b/src/minecraft/mekanism/common/ItemPortableTeleporter.java index fd4df805c..0cf421505 100644 --- a/src/minecraft/mekanism/common/ItemPortableTeleporter.java +++ b/src/minecraft/mekanism/common/ItemPortableTeleporter.java @@ -1,5 +1,6 @@ package mekanism.common; +import universalelectricity.core.electricity.ElectricityPack; import mekanism.api.EnumColor; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -106,8 +107,8 @@ public class ItemPortableTeleporter extends ItemEnergized } @Override - public boolean canProduceElectricity() + public ElectricityPack getProvideRequest(ItemStack itemStack) { - return false; + return new ElectricityPack(); } } diff --git a/src/minecraft/mekanism/common/MachineryManager.java b/src/minecraft/mekanism/common/MachineryManager.java index 86507b805..563ba184d 100644 --- a/src/minecraft/mekanism/common/MachineryManager.java +++ b/src/minecraft/mekanism/common/MachineryManager.java @@ -87,7 +87,7 @@ public class MachineryManager { MekanismUtils.doFakeBlockExplosion(machine.worldObj, machine.xCoord, machine.yCoord, machine.zCoord); } - machine.worldObj.setBlockAndMetadataWithNotify(machine.xCoord, machine.yCoord, machine.zCoord, 0, 0); + machine.worldObj.func_94571_i(machine.xCoord, machine.yCoord, machine.zCoord); machine.worldObj.removeBlockTileEntity(machine.xCoord, machine.yCoord, machine.zCoord); remove(machine); } diff --git a/src/minecraft/mekanism/common/Mekanism.java b/src/minecraft/mekanism/common/Mekanism.java index 0e8e0f939..e4cdd151d 100644 --- a/src/minecraft/mekanism/common/Mekanism.java +++ b/src/minecraft/mekanism/common/Mekanism.java @@ -2,6 +2,7 @@ package mekanism.common; import ic2.api.Ic2Recipes; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -23,7 +24,7 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import universalelectricity.core.UniversalElectricity; +import thermalexpansion.api.crafting.CraftingManagers; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -51,7 +52,7 @@ import cpw.mods.fml.server.FMLServerHandler; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "5.4.1") +@Mod(modid = "Mekanism", name = "Mekanism", version = "5.4.2") @NetworkMod(channels = {"Mekanism"}, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) public class Mekanism { @@ -73,7 +74,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(5, 4, 1); + public static Version versionNumber = new Version(5, 4, 2); /** Map of Teleporters */ public static Map> teleporters = new HashMap>(); @@ -102,6 +103,9 @@ public class Mekanism /** The port used to connect to the Mekanism server */ public static int hostPort = 3073; + + /** The modpack this client is using */ + public static String modPack = "none"; //Block IDs public static int basicBlockID = 3000; @@ -147,7 +151,7 @@ public class Mekanism public static Item Clump; public static Item DirtyDust; - //Boolean Values + //Config Values public static boolean extrasEnabled = true; public static boolean osmiumGenerationEnabled = true; public static boolean disableBCBronzeCrafting = true; @@ -155,10 +159,8 @@ public class Mekanism public static boolean updateNotifications = true; public static boolean enableSounds = true; public static boolean controlCircuitOreDict = true; - - //Extra data - public static float ObsidianTNTBlastRadius = 12.0F; - public static int ObsidianTNTDelay = 100; + public static int obsidianTNTBlastRadius = 12; + public static int obsidianTNTDelay = 100; /** Total ticks passed since thePlayer joined theWorld */ public static int ticksPassed = 0; @@ -293,7 +295,7 @@ public class Mekanism "CAC", "cFc", "CAC", Character.valueOf('C'), "basicCircuit", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('c'), AtomicCore, Character.valueOf('F'), "electricFurnace" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(MachineBlock, 1, 8), new Object[] { - "IFI", "CEC", "IFI", Character.valueOf('I'), Item.ingotIron, Character.valueOf('F'), Block.stoneOvenIdle, Character.valueOf('C'), "basicCircuit", Character.valueOf('E'), EnrichedAlloy + "IFI", "CEC", "IFI", Character.valueOf('I'), Item.ingotIron, Character.valueOf('F'), Block.furnaceIdle, Character.valueOf('C'), "basicCircuit", Character.valueOf('E'), EnrichedAlloy })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(TeleportationCore), new Object[] { "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('A'), AtomicCore, Character.valueOf('G'), Item.ingotGold, Character.valueOf('D'), Item.diamond @@ -332,7 +334,7 @@ public class Mekanism FurnaceRecipes.smelting().addSmelting(Dust.itemID, 5, new ItemStack(Ingot, 1, 4), 1.0F); //Enrichment Chamber Recipes - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreRedstone), new ItemStack(Item.redstone, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreRedstone), new ItemStack(Item.redstone, 12)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(DirtyDust, 1, 6)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreIron), new ItemStack(Dust, 2, 0)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreGold), new ItemStack(Dust, 2, 1)); @@ -347,6 +349,10 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.stoneBrick, 1, 0), new ItemStack(Block.stoneBrick, 1, 3)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.stoneBrick, 1, 1), new ItemStack(Block.stoneBrick, 1, 0)); + //Combiner recipes + RecipeHandler.addCombinerRecipe(new ItemStack(Item.redstone, 16), new ItemStack(Block.oreRedstone)); + RecipeHandler.addCombinerRecipe(new ItemStack(Item.dyePowder, 16, 4), new ItemStack(Block.oreLapis)); + //Osmium Compressor Recipes RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Item.lightStoneDust), new ItemStack(Ingot, 1, 3)); @@ -480,63 +486,36 @@ public class Mekanism LanguageRegistry.instance().addStringLocalization("itemGroup.tabMekanism", "Mekanism"); } - /** - * Adds all item textures from the sprite sheet. - */ - public void addTextures() - { - if(extrasEnabled == true) - { - Stopwatch.setIconIndex(224); - WeatherOrb.setIconIndex(226); - } - - EnrichedAlloy.setIconIndex(227); - EnergyTablet.setIconIndex(228); - SpeedUpgrade.setIconIndex(232); - EnergyUpgrade.setIconIndex(231); - AtomicDisassembler.setIconIndex(253); - AtomicCore.setIconIndex(254); - ElectricBow.setIconIndex(252); - StorageTank.setIconIndex(255); - ControlCircuit.setIconIndex(223); - EnrichedIron.setIconIndex(222); - CompressedCarbon.setIconIndex(221); - PortableTeleporter.setIconIndex(206); - TeleportationCore.setIconIndex(207); - Configurator.setIconIndex(205); - } - /** * Adds and registers all items. */ public void addItems() { configuration.load(); - ElectricBow = (ItemElectricBow) new ItemElectricBow(configuration.getItem("ElectricBow", 11200).getInt()).setItemName("ElectricBow"); + ElectricBow = (ItemElectricBow) new ItemElectricBow(configuration.getItem("ElectricBow", 11200).getInt()).setUnlocalizedName("ElectricBow"); if(extrasEnabled == true) { - Stopwatch = new ItemStopwatch(configuration.getItem("Stopwatch", 11202).getInt()).setItemName("Stopwatch"); - WeatherOrb = new ItemWeatherOrb(configuration.getItem("WeatherOrb", 11203).getInt()).setItemName("WeatherOrb"); + Stopwatch = new ItemStopwatch(configuration.getItem("Stopwatch", 11202).getInt()).setUnlocalizedName("Stopwatch"); + WeatherOrb = new ItemWeatherOrb(configuration.getItem("WeatherOrb", 11203).getInt()).setUnlocalizedName("WeatherOrb"); } Dust = new ItemDust(configuration.getItem("Dust", 11204).getInt()-256); Ingot = new ItemIngot(configuration.getItem("Ingot", 11205).getInt()-256); - EnergyTablet = (ItemEnergized) new ItemEnergized(configuration.getItem("EnergyTablet", 11206).getInt(), 1000000, 120).setItemName("EnergyTablet"); - SpeedUpgrade = new ItemMachineUpgrade(configuration.getItem("SpeedUpgrade", 11207).getInt(), 0, 150).setItemName("SpeedUpgrade"); - EnergyUpgrade = new ItemMachineUpgrade(configuration.getItem("EnergyUpgrade", 11208).getInt(), 1000, 0).setItemName("EnergyUpgrade"); + EnergyTablet = (ItemEnergized) new ItemEnergized(configuration.getItem("EnergyTablet", 11206).getInt(), 1000000, 120).setUnlocalizedName("EnergyTablet"); + SpeedUpgrade = new ItemMachineUpgrade(configuration.getItem("SpeedUpgrade", 11207).getInt(), 0, 150).setUnlocalizedName("SpeedUpgrade"); + EnergyUpgrade = new ItemMachineUpgrade(configuration.getItem("EnergyUpgrade", 11208).getInt(), 1000, 0).setUnlocalizedName("EnergyUpgrade"); //FREE ID 11209 - AtomicDisassembler = (ItemAtomicDisassembler) new ItemAtomicDisassembler(configuration.getItem("AtomicDisassembler", 11210).getInt()).setItemName("AtomicDisassembler"); - AtomicCore = new ItemMekanism(configuration.getItem("AtomicCore", 11211).getInt()).setItemName("AtomicCore"); - EnrichedAlloy = new ItemMekanism(configuration.getItem("EnrichedAlloy", 11212).getInt()).setItemName("EnrichedAlloy"); - StorageTank = (ItemStorageTank) new ItemStorageTank(configuration.getItem("StorageTank", 11213).getInt(), 1600, 16).setItemName("StorageTank"); - ControlCircuit = new ItemMekanism(configuration.getItem("ControlCircuit", 11214).getInt()).setItemName("ControlCircuit"); - EnrichedIron = new ItemMekanism(configuration.getItem("EnrichedIron", 11215).getInt()).setItemName("EnrichedIron"); - CompressedCarbon = new ItemMekanism(configuration.getItem("CompressedCarbon", 11216).getInt()).setItemName("CompressedCarbon"); - PortableTeleporter = new ItemPortableTeleporter(configuration.getItem("PortableTeleporter", 11217).getInt()).setItemName("PortableTeleporter"); - TeleportationCore = new ItemMekanism(configuration.getItem("TeleportationCore", 11218).getInt()).setItemName("TeleportationCore"); + AtomicDisassembler = (ItemAtomicDisassembler) new ItemAtomicDisassembler(configuration.getItem("AtomicDisassembler", 11210).getInt()).setUnlocalizedName("AtomicDisassembler"); + AtomicCore = new ItemMekanism(configuration.getItem("AtomicCore", 11211).getInt()).setUnlocalizedName("AtomicCore"); + EnrichedAlloy = new ItemMekanism(configuration.getItem("EnrichedAlloy", 11212).getInt()).setUnlocalizedName("EnrichedAlloy"); + StorageTank = (ItemStorageTank) new ItemStorageTank(configuration.getItem("StorageTank", 11213).getInt(), 1600, 16).setUnlocalizedName("StorageTank"); + ControlCircuit = new ItemMekanism(configuration.getItem("ControlCircuit", 11214).getInt()).setUnlocalizedName("ControlCircuit"); + EnrichedIron = new ItemMekanism(configuration.getItem("EnrichedIron", 11215).getInt()).setUnlocalizedName("EnrichedIron"); + CompressedCarbon = new ItemMekanism(configuration.getItem("CompressedCarbon", 11216).getInt()).setUnlocalizedName("CompressedCarbon"); + PortableTeleporter = new ItemPortableTeleporter(configuration.getItem("PortableTeleporter", 11217).getInt()).setUnlocalizedName("PortableTeleporter"); + TeleportationCore = new ItemMekanism(configuration.getItem("TeleportationCore", 11218).getInt()).setUnlocalizedName("TeleportationCore"); Clump = new ItemClump(configuration.getItem("Clump", 11219).getInt()-256); DirtyDust = new ItemDirtyDust(configuration.getItem("DirtyDust", 11220).getInt()-256); - Configurator = new ItemConfigurator(configuration.getItem("Configurator", 11221).getInt()).setItemName("Configurator"); + Configurator = new ItemConfigurator(configuration.getItem("Configurator", 11221).getInt()).setUnlocalizedName("Configurator"); configuration.save(); } @@ -546,14 +525,14 @@ public class Mekanism public void addBlocks() { //Declarations - BasicBlock = new BlockBasic(basicBlockID).setBlockName("BasicBlock"); - MachineBlock = new BlockMachine(machineBlockID).setBlockName("MachineBlock"); - OreBlock = new BlockOre(oreBlockID).setBlockName("OreBlock"); - EnergyCube = new BlockEnergyCube(energyCubeID).setBlockName("EnergyCube"); - ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setBlockName("ObsidianTNT").setCreativeTab(tabMekanism); - BoundingBlock = (BlockBounding) new BlockBounding(boundingBlockID).setBlockName("BoundingBlock"); - GasTank = new BlockGasTank(gasTankID).setBlockName("GasTank"); - PressurizedTube = new BlockPressurizedTube(pressurizedTubeID).setBlockName("PressurizedTube"); + BasicBlock = new BlockBasic(basicBlockID).setUnlocalizedName("BasicBlock"); + MachineBlock = new BlockMachine(machineBlockID).setUnlocalizedName("MachineBlock"); + OreBlock = new BlockOre(oreBlockID).setUnlocalizedName("OreBlock"); + EnergyCube = new BlockEnergyCube(energyCubeID).setUnlocalizedName("EnergyCube"); + ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setUnlocalizedName("ObsidianTNT").setCreativeTab(tabMekanism); + BoundingBlock = (BlockBounding) new BlockBounding(boundingBlockID).setUnlocalizedName("BoundingBlock"); + GasTank = new BlockGasTank(gasTankID).setUnlocalizedName("GasTank"); + PressurizedTube = new BlockPressurizedTube(pressurizedTubeID).setUnlocalizedName("PressurizedTube"); //Registrations GameRegistry.registerBlock(ObsidianTNT, "ObsidianTNT"); @@ -562,10 +541,10 @@ public class Mekanism GameRegistry.registerBlock(PressurizedTube, "PressurizedTube"); //Add block items into itemsList for blocks with common IDs. - Item.itemsList[basicBlockID] = new ItemBlockBasic(basicBlockID - 256, BasicBlock).setItemName("BasicBlock"); - Item.itemsList[machineBlockID] = new ItemBlockMachine(machineBlockID - 256, MachineBlock).setItemName("MachineBlock"); - Item.itemsList[oreBlockID] = new ItemBlockOre(oreBlockID - 256, OreBlock).setItemName("OreBlock"); - Item.itemsList[energyCubeID] = new ItemBlockEnergyCube(energyCubeID - 256, EnergyCube).setItemName("EnergyCube"); + Item.itemsList[basicBlockID] = new ItemBlockBasic(basicBlockID - 256, BasicBlock).setUnlocalizedName("BasicBlock"); + Item.itemsList[machineBlockID] = new ItemBlockMachine(machineBlockID - 256, MachineBlock).setUnlocalizedName("MachineBlock"); + Item.itemsList[oreBlockID] = new ItemBlockOre(oreBlockID - 256, OreBlock).setUnlocalizedName("OreBlock"); + Item.itemsList[energyCubeID] = new ItemBlockEnergyCube(energyCubeID - 256, EnergyCube).setUnlocalizedName("EnergyCube"); } /** @@ -617,6 +596,23 @@ public class Mekanism OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0)); + try { + CraftingManagers.pulverizerManager.addRecipe(400, new ItemStack(OreBlock, 1, 0), new ItemStack(Dust, 2, 2), false); + + CraftingManagers.pulverizerManager.addRecipe(40, new ItemStack(Mekanism.Ingot, 1, 1), new ItemStack(Mekanism.Dust, 1, 2), false); + CraftingManagers.pulverizerManager.addRecipe(40, new ItemStack(Mekanism.Ingot, 1, 0), new ItemStack(Mekanism.Dust, 1, 3), false); + CraftingManagers.pulverizerManager.addRecipe(40, new ItemStack(Mekanism.Ingot, 1, 3), new ItemStack(Item.lightStoneDust), false); + CraftingManagers.pulverizerManager.addRecipe(40, new ItemStack(Mekanism.Ingot, 1, 4), new ItemStack(Mekanism.Dust, 1, 5), false); + + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 0), new ItemStack(DirtyDust, 1, 0), false); + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 1), new ItemStack(DirtyDust, 1, 1), false); + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 2), new ItemStack(DirtyDust, 1, 2), false); + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 3), new ItemStack(DirtyDust, 1, 3), false); + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 4), new ItemStack(DirtyDust, 1, 4), false); + CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 5), new ItemStack(DirtyDust, 1, 5), false); + System.out.println("[Mekanism] Hooked into Thermal Expansion successfully."); + } catch(Exception e) {} + if(controlCircuitOreDict) { OreDictionary.registerOre("basicCircuit", new ItemStack(ControlCircuit)); @@ -629,7 +625,7 @@ public class Mekanism { if(!hooks.RailcraftLoaded) { - Ic2Recipes.addMaceratorRecipe(new ItemStack(Block.obsidian), new ItemStack(Dust, 1, 3)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Block.obsidian), new ItemStack(DirtyDust, 1, 6)); } RecipeHandler.addCrusherRecipe(new ItemStack(Item.coal), hooks.IC2CoalDust); @@ -765,15 +761,28 @@ public class Mekanism } try { - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 6, OreDictionary.getOres("ingotCopper").get(0), 1.0F); + RecipeHandler.addCrusherRecipe(new ItemStack(Ingot, 1, 2), MekanismUtils.getStackWithSize(OreDictionary.getOres("dustBronze").get(0), 1)); + + if(hooks.IC2Loaded) + { + Ic2Recipes.addMaceratorRecipe(new ItemStack(Ingot, 1, 2), MekanismUtils.getStackWithSize(OreDictionary.getOres("dustBronze").get(0), 1)); + } + if(hooks.TELoaded) + { + CraftingManagers.pulverizerManager.addRecipe(40, new ItemStack(Ingot, 1, 2), MekanismUtils.getStackWithSize(OreDictionary.getOres("dustBronze").get(0), 1), false); + } } catch(Exception e) {} try { - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 7, OreDictionary.getOres("ingotTin").get(0), 1.0F); + FurnaceRecipes.smelting().addSmelting(Dust.itemID, 6, MekanismUtils.getStackWithSize(OreDictionary.getOres("ingotCopper").get(0), 1), 1.0F); } catch(Exception e) {} try { - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 8, OreDictionary.getOres("ingotSilver").get(0), 1.0F); + FurnaceRecipes.smelting().addSmelting(Dust.itemID, 7, MekanismUtils.getStackWithSize(OreDictionary.getOres("ingotTin").get(0), 1), 1.0F); + } catch(Exception e) {} + + try { + FurnaceRecipes.smelting().addSmelting(Dust.itemID, 8, MekanismUtils.getStackWithSize(OreDictionary.getOres("ingotSilver").get(0), 1), 1.0F); } catch(Exception e) {} try { @@ -827,7 +836,7 @@ public class Mekanism try { for(ItemStack ore : OreDictionary.getOres("dustCopper")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), OreDictionary.getOres("oreCopper").get(0)); + RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreCopper").get(0), 1)); } } catch(Exception e) {} @@ -841,7 +850,7 @@ public class Mekanism try { for(ItemStack ore : OreDictionary.getOres("dustTin")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), OreDictionary.getOres("oreTin").get(0)); + RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreTin").get(0), 1)); infusions.put(ore, new InfuseObject(InfusionType.TIN, 50)); } } catch(Exception e) {} @@ -849,14 +858,14 @@ public class Mekanism try { for(ItemStack ore : OreDictionary.getOres("dustLead")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), OreDictionary.getOres("oreLead").get(0)); + RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreLead").get(0), 1)); } } catch(Exception e) {} try { for(ItemStack ore : OreDictionary.getOres("dustSilver")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), OreDictionary.getOres("oreSilver").get(0)); + RecipeHandler.addCombinerRecipe(MekanismUtils.getStackWithSize(ore, 8), MekanismUtils.getStackWithSize(OreDictionary.getOres("oreSilver").get(0), 1)); } } catch(Exception e) {} } @@ -908,8 +917,15 @@ public class Mekanism @PreInit public void preInit(FMLPreInitializationEvent event) { + File config = event.getSuggestedConfigurationFile(); //Set the mod's configuration - configuration = new Configuration(event.getSuggestedConfigurationFile()); + configuration = new Configuration(config); + + if(config.getAbsolutePath().contains("voltz")) + { + System.out.println("[Mekanism] Detected Voltz in root directory - hello, fellow user!"); + modPack = "Voltz"; + } } @PostInit @@ -955,7 +971,6 @@ public class Mekanism addItems(); addBlocks(); addNames(); - addTextures(); addRecipes(); addEntities(); diff --git a/src/minecraft/mekanism/common/MekanismHooks.java b/src/minecraft/mekanism/common/MekanismHooks.java index 61819962f..b2cb0ace8 100644 --- a/src/minecraft/mekanism/common/MekanismHooks.java +++ b/src/minecraft/mekanism/common/MekanismHooks.java @@ -48,6 +48,7 @@ public final class MekanismHooks public boolean BasicComponentsLoaded = false; public boolean BuildCraftLoaded = false; public boolean ForestryLoaded = false; + public boolean TELoaded = false; public void hook() { @@ -56,6 +57,7 @@ public final class MekanismHooks if(Loader.isModLoaded("BasicComponents")) BasicComponentsLoaded = true; if(Loader.isModLoaded("BuildCraft|Energy")) BuildCraftLoaded = true; if(Loader.isModLoaded("Forestry")) ForestryLoaded = true; + if(Loader.isModLoaded("ThermalExpansion")) TELoaded = true; if(IC2Loaded) { @@ -66,10 +68,18 @@ public final class MekanismHooks Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Ingot, 1, 1), new ItemStack(Mekanism.Dust, 1, 2)); Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Ingot, 1, 0), new ItemStack(Mekanism.Dust, 1, 3)); - Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Ingot, 1, 2), new ItemStack(Item.redstone)); Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Ingot, 1, 3), new ItemStack(Item.lightStoneDust)); Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Ingot, 1, 4), new ItemStack(Mekanism.Dust, 1, 5)); - Ic2Recipes.addMatterAmplifier(Mekanism.EnrichedAlloy, 100000); + + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 0), new ItemStack(Mekanism.DirtyDust, 1, 0)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 1), new ItemStack(Mekanism.DirtyDust, 1, 1)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 2), new ItemStack(Mekanism.DirtyDust, 1, 2)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 3), new ItemStack(Mekanism.DirtyDust, 1, 3)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 4), new ItemStack(Mekanism.DirtyDust, 1, 4)); + Ic2Recipes.addMaceratorRecipe(new ItemStack(Mekanism.Clump, 1, 5), new ItemStack(Mekanism.DirtyDust, 1, 5)); + + Ic2Recipes.addMatterAmplifier(Mekanism.EnrichedAlloy, 50000); + System.out.println("[Mekanism] Hooked into IC2 successfully."); } if(RailcraftLoaded) @@ -208,9 +218,4 @@ public final class MekanismHooks return null; } } - - public LiquidStack getLiquid(String name) - { - return LiquidDictionary.getLiquid(name, 1); - } } diff --git a/src/minecraft/mekanism/common/MekanismUtils.java b/src/minecraft/mekanism/common/MekanismUtils.java index a74a3bc5a..6d72a8ffc 100644 --- a/src/minecraft/mekanism/common/MekanismUtils.java +++ b/src/minecraft/mekanism/common/MekanismUtils.java @@ -426,7 +426,7 @@ public final class MekanismUtils */ public static void makeBoundingBlock(World world, int x, int y, int z, int origX, int origY, int origZ) { - world.setBlockWithNotify(x, y, z, Mekanism.BoundingBlock.blockID); + world.setBlockAndMetadataWithNotify(x, y, z, Mekanism.BoundingBlock.blockID, 0, 2); ((TileEntityBoundingBlock)world.getBlockTileEntity(x, y, z)).setMainLocation(origX, origY, origZ); } } diff --git a/src/minecraft/mekanism/common/PacketHandler.java b/src/minecraft/mekanism/common/PacketHandler.java index 059d6a85d..13266eb41 100644 --- a/src/minecraft/mekanism/common/PacketHandler.java +++ b/src/minecraft/mekanism/common/PacketHandler.java @@ -6,6 +6,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Random; +import universalelectricity.core.electricity.ElectricityPack; + import mekanism.api.ITileNetwork; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -199,7 +201,7 @@ public class PacketHandler implements IPacketHandler { Teleporter.Coords coords = Mekanism.teleporters.get(new Teleporter.Code(item.getDigit(itemstack, 0), item.getDigit(itemstack, 1), item.getDigit(itemstack, 2), item.getDigit(itemstack, 3))).get(0); - item.onUse(item.calculateEnergyCost(entityPlayerMP, coords), itemstack); + item.onProvide(new ElectricityPack(item.calculateEnergyCost(entityPlayerMP, coords)/120, 120), itemstack); if(entityPlayerMP.worldObj.provider.dimensionId != coords.dimensionId) { diff --git a/src/minecraft/mekanism/common/SlotEnergy.java b/src/minecraft/mekanism/common/SlotEnergy.java index 8d98e3cb3..e4a68fa33 100644 --- a/src/minecraft/mekanism/common/SlotEnergy.java +++ b/src/minecraft/mekanism/common/SlotEnergy.java @@ -1,11 +1,11 @@ package mekanism.common; +import universalelectricity.core.item.IItemElectric; import ic2.api.IElectricItem; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; public class SlotEnergy extends Slot { diff --git a/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java b/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java index 4175d2858..ec29adc93 100644 --- a/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java +++ b/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.ArrayList; +import universalelectricity.core.item.ElectricItemHelper; + import ic2.api.ElectricItem; import ic2.api.IElectricItem; import mekanism.api.EnumColor; @@ -13,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.implement.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -80,18 +81,9 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM { if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) { - if(inventory[3].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[3].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[3])*0.005, joulesNeeded), inventory[3]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[3].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[3], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[3].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[3].getItem(); if(item.canProvideEnergy()) diff --git a/src/minecraft/mekanism/common/TileEntityBasicMachine.java b/src/minecraft/mekanism/common/TileEntityBasicMachine.java index 4cf7b066b..122178fe2 100644 --- a/src/minecraft/mekanism/common/TileEntityBasicMachine.java +++ b/src/minecraft/mekanism/common/TileEntityBasicMachine.java @@ -22,11 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.item.IItemElectric; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; @@ -34,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public abstract class TileEntityBasicMachine extends TileEntityElectricBlock implements IElectricMachine, IEnergySink, IJouleStorage, IVoltage, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement +public abstract class TileEntityBasicMachine extends TileEntityElectricBlock implements IElectricMachine, IEnergySink, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement { /** The Sound instance for this machine. */ @SideOnly(Side.CLIENT) @@ -94,7 +90,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp public TileEntityBasicMachine(String soundPath, String name, String path, int perTick, int ticksRequired, int maxEnergy) { super(name, maxEnergy); - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); ENERGY_PER_TICK = perTick; TICKS_REQUIRED = ticksRequired; soundURL = soundPath; @@ -119,30 +114,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp registered = true; } - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - double electricityNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY) - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - if(worldObj.isRemote) { try { @@ -341,29 +312,11 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp } @Override - public double getMaxJoules(Object... data) + public double getMaxJoules() { return MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY); } - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - - @Override - public double getVoltage(Object... data) - { - return 120; - } - @Override public boolean getActive() { diff --git a/src/minecraft/mekanism/common/TileEntityCombiner.java b/src/minecraft/mekanism/common/TileEntityCombiner.java index eaa936a0b..2519e4091 100644 --- a/src/minecraft/mekanism/common/TileEntityCombiner.java +++ b/src/minecraft/mekanism/common/TileEntityCombiner.java @@ -12,7 +12,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine { public TileEntityCombiner() { - super("Combiner.ogg", "Combiner", "/resources/mekanism/gui/GuiCombiner.png", 10, 1, 200, 2000, 200); + super("Combiner.ogg", "Combiner", "/mods/mekanism/gui/GuiCombiner.png", 10, 1, 200, 2000, 200); } @Override diff --git a/src/minecraft/mekanism/common/TileEntityContainerBlock.java b/src/minecraft/mekanism/common/TileEntityContainerBlock.java index d6567a19d..fe18181cc 100644 --- a/src/minecraft/mekanism/common/TileEntityContainerBlock.java +++ b/src/minecraft/mekanism/common/TileEntityContainerBlock.java @@ -33,12 +33,12 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl NBTTagList tagList = nbtTags.getTagList("Items"); inventory = new ItemStack[getSizeInventory()]; - for (int slots = 0; slots < tagList.tagCount(); ++slots) + for(int slots = 0; slots < tagList.tagCount(); slots++) { NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(slots); byte slotID = tagCompound.getByte("Slot"); - if (slotID >= 0 && slotID < inventory.length) + if(slotID >= 0 && slotID < inventory.length) { inventory[slotID] = ItemStack.loadItemStackFromNBT(tagCompound); } @@ -52,9 +52,9 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl NBTTagList tagList = new NBTTagList(); - for (int slots = 0; slots < inventory.length; ++slots) + for(int slots = 0; slots < inventory.length; slots++) { - if (inventory[slots] != null) + if(inventory[slots] != null) { NBTTagCompound tagCompound = new NBTTagCompound(); tagCompound.setByte("Slot", (byte)slots); @@ -85,49 +85,47 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public ItemStack getStackInSlot(int par1) + public ItemStack getStackInSlot(int slotID) { - return inventory[par1]; + return inventory[slotID]; } @Override - public ItemStack decrStackSize(int par1, int par2) + public ItemStack decrStackSize(int slotID, int amount) { - if (inventory[par1] != null) + if(inventory[slotID] != null) { - ItemStack var3; + ItemStack tempStack; - if (inventory[par1].stackSize <= par2) + if(inventory[slotID].stackSize <= amount) { - var3 = inventory[par1]; - inventory[par1] = null; - return var3; + tempStack = inventory[slotID]; + inventory[slotID] = null; + return tempStack; } - else - { - var3 = inventory[par1].splitStack(par2); + else { + tempStack = inventory[slotID].splitStack(amount); - if (inventory[par1].stackSize == 0) + if(inventory[slotID].stackSize == 0) { - inventory[par1] = null; + inventory[slotID] = null; } - return var3; + return tempStack; } } - else - { + else { return null; } } @Override - public ItemStack getStackInSlotOnClosing(int par1) + public ItemStack getStackInSlotOnClosing(int slotID) { - if (inventory[par1] != null) + if (inventory[slotID] != null) { - ItemStack var2 = inventory[par1]; - inventory[par1] = null; + ItemStack var2 = inventory[slotID]; + inventory[slotID] = null; return var2; } else @@ -137,20 +135,20 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public void setInventorySlotContents(int par1, ItemStack par2ItemStack) + public void setInventorySlotContents(int slotID, ItemStack itemstack) { - inventory[par1] = par2ItemStack; + inventory[slotID] = itemstack; - if (par2ItemStack != null && par2ItemStack.stackSize > getInventoryStackLimit()) + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { - par2ItemStack.stackSize = getInventoryStackLimit(); + itemstack.stackSize = getInventoryStackLimit(); } } @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return worldObj.getBlockTileEntity(xCoord, yCoord, zCoord) != this ? false : entityplayer.getDistanceSq((double)xCoord + 0.5D, (double)yCoord + 0.5D, (double)zCoord + 0.5D) <= 64.0D; + return worldObj.getBlockTileEntity(xCoord, yCoord, zCoord) != this ? false : entityplayer.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64.0D; } @Override @@ -176,4 +174,16 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl { playersUsing--; } + + @Override + public boolean func_94042_c() + { + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + return false; + } } diff --git a/src/minecraft/mekanism/common/TileEntityCrusher.java b/src/minecraft/mekanism/common/TileEntityCrusher.java index 14e355f9a..639029c8f 100644 --- a/src/minecraft/mekanism/common/TileEntityCrusher.java +++ b/src/minecraft/mekanism/common/TileEntityCrusher.java @@ -10,7 +10,7 @@ public class TileEntityCrusher extends TileEntityElectricMachine { public TileEntityCrusher() { - super("Crusher.ogg", "Crusher", "/resources/mekanism/gui/GuiCrusher.png", 10, 200, 2000); + super("Crusher.ogg", "Crusher", "/mods/mekanism/gui/GuiCrusher.png", 10, 200, 2000); } @Override diff --git a/src/minecraft/mekanism/common/TileEntityElectricBlock.java b/src/minecraft/mekanism/common/TileEntityElectricBlock.java index 73f70c18d..4a25b8613 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricBlock.java +++ b/src/minecraft/mekanism/common/TileEntityElectricBlock.java @@ -1,6 +1,13 @@ package mekanism.common; import java.util.ArrayList; +import java.util.EnumSet; + +import universalelectricity.core.block.IConnector; +import universalelectricity.core.block.IElectricityStorage; +import universalelectricity.core.block.IVoltage; +import universalelectricity.core.electricity.ElectricityNetworkHelper; +import universalelectricity.core.electricity.ElectricityPack; import com.google.common.io.ByteArrayDataInput; @@ -11,13 +18,14 @@ import ic2.api.energy.tile.IEnergyTile; import mekanism.api.ITileNetwork; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; import net.minecraftforge.common.MinecraftForge; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; -public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IWrenchable, ISidedInventory, IInventory, ITileNetwork, IPowerReceptor, IEnergyTile +public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IWrenchable, ISidedInventory, IInventory, ITileNetwork, IPowerReceptor, IEnergyTile, IElectricityStorage, IVoltage, IConnector { /** How much energy is stored in this block. */ public double electricityStored; @@ -58,6 +66,52 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i initialized = true; } + + if(!worldObj.isRemote) + { + ElectricityPack electricityPack = ElectricityNetworkHelper.consumeFromMultipleSides(this, getConsumingSides(), getRequest()); + setJoules(getJoules()+electricityPack.getWatts()); + } + } + + protected EnumSet getConsumingSides() + { + return EnumSet.allOf(ForgeDirection.class); + } + + @Override + public boolean canConnect(ForgeDirection direction) + { + return true; + } + + public ElectricityPack getRequest() + { + return new ElectricityPack((getMaxJoules() - getJoules()) / getVoltage(), getVoltage()); + } + + @Override + public double getMaxJoules() + { + return MAX_ELECTRICITY; + } + + @Override + public double getJoules() + { + return electricityStored; + } + + @Override + public void setJoules(double joules) + { + electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); + } + + @Override + public double getVoltage() + { + return 120; } @Override @@ -78,7 +132,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public void invalidate() { - super.invalidate(); + ElectricityNetworkHelper.invalidate(this); if(initialized) { @@ -87,6 +141,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); } } + + super.invalidate(); } @Override diff --git a/src/minecraft/mekanism/common/TileEntityElectricMachine.java b/src/minecraft/mekanism/common/TileEntityElectricMachine.java index da5f23cda..12036c4ea 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricMachine.java +++ b/src/minecraft/mekanism/common/TileEntityElectricMachine.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.ElectricItemHelper; import com.google.common.io.ByteArrayDataInput; @@ -53,18 +53,9 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine { if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, joulesNeeded), inventory[1]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[1], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[1].getItem(); if(item.canProvideEnergy()) diff --git a/src/minecraft/mekanism/common/TileEntityEnergyCube.java b/src/minecraft/mekanism/common/TileEntityEnergyCube.java index 4313b26b2..271393665 100644 --- a/src/minecraft/mekanism/common/TileEntityEnergyCube.java +++ b/src/minecraft/mekanism/common/TileEntityEnergyCube.java @@ -11,6 +11,7 @@ import ic2.api.energy.tile.IEnergySource; import java.util.ArrayList; import java.util.EnumSet; +import java.util.HashSet; import mekanism.api.IEnergyCube; import mekanism.api.Tier.EnergyCubeTier; @@ -23,14 +24,14 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.electricity.ElectricityNetwork; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.block.IElectricityStorage; +import universalelectricity.core.block.IVoltage; +import universalelectricity.core.electricity.ElectricityNetworkHelper; +import universalelectricity.core.electricity.IElectricityNetwork; +import universalelectricity.core.item.ElectricItemHelper; +import universalelectricity.core.item.IItemElectric; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; @@ -41,7 +42,7 @@ import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEnergySink, IEnergySource, IEnergyStorage, IPowerReceptor, IJouleStorage, IVoltage, IPeripheral +public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEnergySink, IEnergySource, IEnergyStorage, IPowerReceptor, IElectricityStorage, IVoltage, IPeripheral { public EnergyCubeTier tier = EnergyCubeTier.BASIC; @@ -57,7 +58,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn { super("Energy Cube", 0); - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); inventory = new ItemStack[2]; } @@ -72,47 +72,11 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn setJoules(electricityStored + received); } - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - if(direction != ForgeDirection.getOrientation(facing)) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < tier.MAX_ELECTRICITY) - { - double electricityNeeded = tier.MAX_ELECTRICITY - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= tier.MAX_ELECTRICITY) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - } - if(inventory[0] != null && electricityStored > 0) { - if(inventory[0].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[0].getItem(); - - if(electricItem.canReceiveElectricity()) - { - double ampsToGive = Math.min(ElectricInfo.getAmps(Math.min(electricItem.getMaxJoules(inventory[0])*0.005, electricityStored), getVoltage()), electricityStored); - double rejects = electricItem.onReceive(ampsToGive, getVoltage(), inventory[0]); - setJoules(electricityStored - (ElectricInfo.getJoules(ampsToGive, getVoltage(), 1) - rejects)); - } - } - else if(inventory[0].getItem() instanceof IElectricItem) + setJoules(getJoules() - ElectricItemHelper.chargeItem(inventory[0], getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[0].getItem() instanceof IElectricItem) { double sent = ElectricItem.charge(inventory[0], (int)(electricityStored*Mekanism.TO_IC2), 3, false, false)*Mekanism.FROM_IC2; setJoules(electricityStored - sent); @@ -121,18 +85,9 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn if(inventory[1] != null && electricityStored < tier.MAX_ELECTRICITY) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = tier.MAX_ELECTRICITY-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, joulesNeeded), inventory[1]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[1], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[1].getItem(); if(item.canProvideEnergy()) @@ -155,7 +110,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn if(electricityStored > 0) { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); if(Mekanism.hooks.IC2Loaded) { @@ -183,13 +138,13 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn if(!worldObj.isRemote) { ForgeDirection outputDirection = ForgeDirection.getOrientation(facing); - ArrayList inputNetworks = new ArrayList(); + ArrayList inputNetworks = new ArrayList(); - for(ForgeDirection direction : ForgeDirection.values()) + for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - if(direction != outputDirection && direction != ForgeDirection.UNKNOWN) + if(direction != outputDirection) { - ElectricityNetwork network = ElectricityNetwork.getNetworkFromTileEntity(Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction), direction); + IElectricityNetwork network = ElectricityNetworkHelper.getNetworkFromTileEntity(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), direction), direction); if(network != null) { inputNetworks.add(network); @@ -197,9 +152,9 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } } - TileEntity outputTile = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); + TileEntity outputTile = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); - ElectricityNetwork outputNetwork = ElectricityNetwork.getNetworkFromTileEntity(outputTile, outputDirection); + IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(outputTile, outputDirection); if(outputNetwork != null && !inputNetworks.contains(outputNetwork)) { @@ -216,6 +171,22 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } } } + + @Override + protected EnumSet getConsumingSides() + { + HashSet set = new HashSet(); + + for(ForgeDirection dir : ForgeDirection.values()) + { + if(dir != ForgeDirection.getOrientation(facing)) + { + set.add(dir); + } + } + + return EnumSet.copyOf(set); + } @Override public boolean acceptsEnergyFrom(TileEntity emitter, Direction direction) @@ -280,19 +251,19 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } @Override - public double getJoules(Object... data) + public double getJoules() { return electricityStored; } @Override - public void setJoules(double joules, Object... data) + public void setJoules(double joules) { electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); } @Override - public double getMaxJoules(Object... data) + public double getMaxJoules() { return tier.MAX_ELECTRICITY; } @@ -315,7 +286,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } @Override - public double getVoltage(Object... data) + public double getVoltage() { return tier.VOLTAGE; } diff --git a/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java b/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java index d10ad89b6..bab940692 100644 --- a/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java +++ b/src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java @@ -10,7 +10,7 @@ public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { public TileEntityEnrichmentChamber() { - super("Chamber.ogg", "Enrichment Chamber", "/resources/mekanism/gui/GuiChamber.png", 10, 200, 2000); + super("Chamber.ogg", "Enrichment Chamber", "/mods/mekanism/gui/GuiChamber.png", 10, 200, 2000); } @Override diff --git a/src/minecraft/mekanism/common/TileEntityGasTank.java b/src/minecraft/mekanism/common/TileEntityGasTank.java index ff1cfce72..55184cf0e 100644 --- a/src/minecraft/mekanism/common/TileEntityGasTank.java +++ b/src/minecraft/mekanism/common/TileEntityGasTank.java @@ -16,6 +16,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -113,7 +114,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS { setGas(gasType, gasStored - (Math.min(gasStored, output) - GasTransmission.emitGasToNetwork(gasType, Math.min(gasStored, output), this, ForgeDirection.getOrientation(facing)))); - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); if(tileEntity instanceof IGasAcceptor) { diff --git a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java index 4bfdd980b..4d6c3a1d6 100644 --- a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java @@ -30,11 +30,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.item.ElectricItemHelper; import universalelectricity.core.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -46,7 +42,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implements IEnergySink, IJouleStorage, IVoltage, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement +public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implements IEnergySink, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement { /** The Sound instance for this machine. */ @SideOnly(Side.CLIENT) @@ -108,8 +104,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem sideConfig = new byte[] {0, 1, 0, 5, 3, 4}; inventory = new ItemStack[5]; - - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); } @Override @@ -138,46 +132,13 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem boolean testActive = operatingTicks > 0; - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - double electricityNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY) - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - if(inventory[4] != null) { if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) { - if(inventory[4].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[4].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[4])*0.005, joulesNeeded), inventory[4]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[4].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[4], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[4].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[4].getItem(); if(item.canProvideEnergy()) @@ -567,25 +528,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem public void detach(IComputerAccess computer) {} @Override - public double getVoltage(Object... data) - { - return 120; - } - - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - - @Override - public double getMaxJoules(Object... data) + public double getMaxJoules() { return MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY); } diff --git a/src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java b/src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java index 275be9d3e..399ea115f 100644 --- a/src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java +++ b/src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java @@ -11,7 +11,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin { public TileEntityOsmiumCompressor() { - super("Compressor.ogg", "Osmium Compressor", "/resources/mekanism/gui/GuiCompressor.png", 10, 1, 200, 2000, 200); + super("Compressor.ogg", "Osmium Compressor", "/mods/mekanism/gui/GuiCompressor.png", 10, 1, 200, 2000, 200); } @Override diff --git a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java b/src/minecraft/mekanism/common/TileEntityPressurizedTube.java index 321543e23..a926506ed 100644 --- a/src/minecraft/mekanism/common/TileEntityPressurizedTube.java +++ b/src/minecraft/mekanism/common/TileEntityPressurizedTube.java @@ -13,7 +13,7 @@ public class TileEntityPressurizedTube extends TileEntity implements IPressurize @Override public boolean canTransferGas() { - return !worldObj.isBlockGettingPowered(xCoord, yCoord, zCoord); + return worldObj.func_94577_B(xCoord, yCoord, zCoord) == 0; } @Override diff --git a/src/minecraft/mekanism/common/TileEntityPurificationChamber.java b/src/minecraft/mekanism/common/TileEntityPurificationChamber.java index 8e9c679ab..5bc7ed1fd 100644 --- a/src/minecraft/mekanism/common/TileEntityPurificationChamber.java +++ b/src/minecraft/mekanism/common/TileEntityPurificationChamber.java @@ -20,7 +20,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac { public TileEntityPurificationChamber() { - super("PurificationChamber.ogg", "Purification Chamber", "/resources/mekanism/gui/GuiPurificationChamber.png", 30, 1, 200, 12000, 1200); + super("PurificationChamber.ogg", "Purification Chamber", "/mods/mekanism/gui/GuiPurificationChamber.png", 30, 1, 200, 12000, 1200); } @Override diff --git a/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java b/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java index 8f728f7bf..e848303e0 100644 --- a/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java +++ b/src/minecraft/mekanism/common/TileEntitySmeltingFactory.java @@ -24,11 +24,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.item.ElectricItemHelper; import universalelectricity.core.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -40,7 +36,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public class TileEntitySmeltingFactory extends TileEntityElectricBlock implements IEnergySink, IJouleStorage, IVoltage, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement +public class TileEntitySmeltingFactory extends TileEntityElectricBlock implements IEnergySink, IPeripheral, IActiveState, IConfigurable, IUpgradeManagement { /** This Smelting Factory's tier. */ public SmeltingFactoryTier tier; @@ -98,7 +94,6 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement public TileEntitySmeltingFactory(SmeltingFactoryTier type) { super(type.name + " Smelting Factory", type.processes*2000); - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); tier = type; inventory = new ItemStack[2+type.processes*2]; progress = new int[type.processes]; @@ -131,30 +126,6 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement boolean testActive = false; - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - double electricityNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY) - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - for(int i : progress) { if(i > 0) @@ -167,18 +138,9 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement { if(electricityStored < MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY)-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, joulesNeeded), inventory[1]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[1], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[1].getItem(); if(item.canProvideEnergy()) @@ -604,25 +566,7 @@ public class TileEntitySmeltingFactory extends TileEntityElectricBlock implement public void detach(IComputerAccess computer) {} @Override - public double getVoltage(Object... data) - { - return 120; - } - - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - - @Override - public double getMaxJoules(Object... data) + public double getMaxJoules() { return MekanismUtils.getEnergy(energyMultiplier, MAX_ELECTRICITY); } diff --git a/src/minecraft/mekanism/common/TileEntityTeleporter.java b/src/minecraft/mekanism/common/TileEntityTeleporter.java index 2826888b6..906b05fd3 100644 --- a/src/minecraft/mekanism/common/TileEntityTeleporter.java +++ b/src/minecraft/mekanism/common/TileEntityTeleporter.java @@ -10,11 +10,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.item.ElectricItemHelper; import universalelectricity.core.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -40,7 +36,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -public class TileEntityTeleporter extends TileEntityElectricBlock implements IEnergySink, IJouleStorage, IVoltage, IPeripheral +public class TileEntityTeleporter extends TileEntityElectricBlock implements IEnergySink, IPeripheral { /** This teleporter's frequency. */ public Teleporter.Code code; @@ -53,8 +49,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn super("Teleporter", 10000000); inventory = new ItemStack[1]; code = new Teleporter.Code(0, 0, 0, 0); - - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); } @Override @@ -111,46 +105,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn setJoules(electricityStored + received); } - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < MAX_ELECTRICITY) - { - double electricityNeeded = MAX_ELECTRICITY - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= MAX_ELECTRICITY) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - if(inventory[0] != null) { if(electricityStored < MAX_ELECTRICITY) { - if(inventory[0].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[0].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MAX_ELECTRICITY-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[0])*0.005, joulesNeeded), inventory[0]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[0].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[0], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[0].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[0].getItem(); if(item.canProvideEnergy()) @@ -490,30 +451,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn @Override public void detach(IComputerAccess computer) {} - @Override - public double getVoltage(Object... data) - { - return 120; - } - - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - - @Override - public double getMaxJoules(Object... data) - { - return MAX_ELECTRICITY; - } - @Override public int demandsEnergy() { diff --git a/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java b/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java index f9729c214..10ce5f4f5 100644 --- a/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java +++ b/src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java @@ -16,7 +16,7 @@ public class TileEntityTheoreticalElementizer extends TileEntityAdvancedElectric { public TileEntityTheoreticalElementizer() { - super("Elementizer.ogg", "Theoretical Elementizer", "/resources/mekanism/gui/GuiElementizer.png", 24, 1, 1000, 4800, 1000); + super("Elementizer.ogg", "Theoretical Elementizer", "/mods/mekanism/gui/GuiElementizer.png", 24, 1, 1000, 4800, 1000); } @Override diff --git a/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java b/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java index bddcefad5..46217236a 100644 --- a/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java @@ -34,7 +34,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/BioGenerator.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/BioGenerator.png")); bioGenerator.render(0.0625F, 0.0F); } else if(metadata == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) @@ -42,7 +42,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.3F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/AdvancedSolarGenerator.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/AdvancedSolarGenerator.png")); advancedSolarGenerator.render(0.0F, 0.022F); } else if(metadata == GeneratorType.HEAT_GENERATOR.meta) @@ -50,7 +50,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/HeatGenerator.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/HeatGenerator.png")); heatGenerator.render(0.0625F); } else if(metadata == GeneratorType.HYDROGEN_GENERATOR.meta) @@ -58,18 +58,17 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/HydrogenGenerator.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/HydrogenGenerator.png")); hydrogenGenerator.render(0.0625F); } else if(metadata == GeneratorType.ELECTROLYTIC_SEPARATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/resources/mekanism/render/ElectrolyticSeparatorHydrogen.png")); + GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png")); electrolyticSeparator.render(0.0625F); } else { - ForgeHooksClient.bindTexture(block.getTextureFile(), 0); renderItem(renderer, metadata, block); } } diff --git a/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java b/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java index c5c5cfa88..69749c799 100644 --- a/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java @@ -32,10 +32,6 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy @Override public void registerRenderInformation() { - //Preload block/item textures - MinecraftForgeClient.preloadTexture("/resources/mekanism/textures/generators/items.png"); - MinecraftForgeClient.preloadTexture("/resources/mekanism/textures/generators/terrain.png"); - //Register block handler RenderingRegistry.registerBlockHandler(new BlockRenderingHandler()); diff --git a/src/minecraft/mekanism/generators/client/GuiBioGenerator.java b/src/minecraft/mekanism/generators/client/GuiBioGenerator.java index 56845fed0..2dcf63862 100644 --- a/src/minecraft/mekanism/generators/client/GuiBioGenerator.java +++ b/src/minecraft/mekanism/generators/client/GuiBioGenerator.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; public class GuiBioGenerator extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiBioGenerator extends GuiContainer { fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); - fontRenderer.drawString(ElectricInfo.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); + fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); fontRenderer.drawString("BioFuel: " + tileEntity.bioFuelSlot.liquidStored, 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); } @@ -36,9 +36,8 @@ public class GuiBioGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiBioGenerator.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiBioGenerator.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java index bfee8a75b..481791fd9 100644 --- a/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java @@ -93,9 +93,8 @@ public class GuiElectrolyticSeparator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiElectrolyticSeparator.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiElectrolyticSeparator.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java b/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java index 87fe132df..0f44afe35 100644 --- a/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java +++ b/src/minecraft/mekanism/generators/client/GuiHeatGenerator.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; public class GuiHeatGenerator extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiHeatGenerator extends GuiContainer { fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); - fontRenderer.drawString(ElectricInfo.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); + fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); fontRenderer.drawString("Fuel: " + tileEntity.fuelSlot.liquidStored, 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); } @@ -36,9 +36,8 @@ public class GuiHeatGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiHeatGenerator.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiHeatGenerator.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java b/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java index c5bd13cae..dd6e17d0a 100644 --- a/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java +++ b/src/minecraft/mekanism/generators/client/GuiHydrogenGenerator.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; public class GuiHydrogenGenerator extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiHydrogenGenerator extends GuiContainer { fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); - fontRenderer.drawString(ElectricInfo.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); + fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); fontRenderer.drawString("H: " + tileEntity.hydrogenStored, 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); } @@ -36,9 +36,8 @@ public class GuiHydrogenGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiHydrogenGenerator.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiHydrogenGenerator.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java b/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java index 6650679a8..e442c29f6 100644 --- a/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java +++ b/src/minecraft/mekanism/generators/client/GuiSolarGenerator.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; public class GuiSolarGenerator extends GuiContainer { @@ -28,7 +28,7 @@ public class GuiSolarGenerator extends GuiContainer { fontRenderer.drawString(tileEntity.fullName, tileEntity.fullName != "Advanced Solar Generator" ? 45 : 30, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); - fontRenderer.drawString(ElectricInfo.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); + fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); fontRenderer.drawString("Sun: " + tileEntity.seesSun, 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); } @@ -36,9 +36,8 @@ public class GuiSolarGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - int texture = mc.renderEngine.getTexture("/resources/mekanism/gui/GuiSolarGenerator.png"); + mc.renderEngine.func_98187_b("/mods/mekanism/gui/GuiSolarGenerator.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java index 8639ef7f1..c4151815e 100644 --- a/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java +++ b/src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java @@ -1,5 +1,6 @@ package mekanism.generators.client; +import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java index 09f6a85d1..636534380 100644 --- a/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java +++ b/src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java @@ -27,7 +27,7 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - bindTextureByName("/resources/mekanism/render/AdvancedSolarGenerator.png"); + bindTextureByName("/mods/mekanism/render/AdvancedSolarGenerator.png"); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/generators/client/RenderBioGenerator.java b/src/minecraft/mekanism/generators/client/RenderBioGenerator.java index 393f7d6b1..e529c53dd 100644 --- a/src/minecraft/mekanism/generators/client/RenderBioGenerator.java +++ b/src/minecraft/mekanism/generators/client/RenderBioGenerator.java @@ -22,7 +22,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); - bindTextureByName("/resources/mekanism/render/BioGenerator.png"); + bindTextureByName("/mods/mekanism/render/BioGenerator.png"); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java index 2c91acee5..1cf8e63c4 100644 --- a/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/client/RenderElectrolyticSeparator.java @@ -21,8 +21,8 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); - bindTextureByName(tileEntity.outputType == EnumGas.HYDROGEN ? "/resources/mekanism/render/ElectrolyticSeparatorHydrogen.png" : - (tileEntity.outputType == EnumGas.OXYGEN ? "/resources/mekanism/render/ElectrolyticSeparatorOxygen.png" : "/resources/mekanism/render/ElectrolyticSeparatorNone.png")); + bindTextureByName(tileEntity.outputType == EnumGas.HYDROGEN ? "/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png" : + (tileEntity.outputType == EnumGas.OXYGEN ? "/mods/mekanism/render/ElectrolyticSeparatorOxygen.png" : "/mods/mekanism/render/ElectrolyticSeparatorNone.png")); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java b/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java index 2792be9b3..d9722a615 100644 --- a/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java +++ b/src/minecraft/mekanism/generators/client/RenderHeatGenerator.java @@ -20,7 +20,7 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); - bindTextureByName("/resources/mekanism/render/" + (tileEntity.isActive ? "HeatGeneratorOn.png" : "HeatGenerator.png")); + bindTextureByName("/mods/mekanism/render/" + (tileEntity.isActive ? "HeatGeneratorOn.png" : "HeatGenerator.png")); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java b/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java index 36fb3438e..3d573ca8d 100644 --- a/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java +++ b/src/minecraft/mekanism/generators/client/RenderHydrogenGenerator.java @@ -20,7 +20,7 @@ public class RenderHydrogenGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); - bindTextureByName("/resources/mekanism/render/HydrogenGenerator.png"); + bindTextureByName("/mods/mekanism/render/HydrogenGenerator.png"); switch(tileEntity.facing) { diff --git a/src/minecraft/mekanism/generators/common/BlockGenerator.java b/src/minecraft/mekanism/generators/common/BlockGenerator.java index a473b5393..366aea9ec 100644 --- a/src/minecraft/mekanism/generators/common/BlockGenerator.java +++ b/src/minecraft/mekanism/generators/common/BlockGenerator.java @@ -17,6 +17,7 @@ import mekanism.common.TileEntityEnergyCube; import mekanism.generators.client.GeneratorsClientProxy; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -24,13 +25,14 @@ 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.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import thermalexpansion.api.core.IDismantleable; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; import universalelectricity.prefab.implement.IToolConfigurator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,6 +50,7 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class BlockGenerator extends BlockContainer implements IDismantleable { + public Icon[] solarSprites = new Icon[256]; public Random machineRand = new Random(); public BlockGenerator(int id) @@ -56,11 +59,19 @@ public class BlockGenerator extends BlockContainer implements IDismantleable setHardness(3.5F); setResistance(8F); setCreativeTab(Mekanism.tabMekanism); - setRequiresSelfNotify(); } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void func_94332_a(IconRegister register) + { + solarSprites[0] = register.func_94245_a("mekanism:SteelBlock"); + solarSprites[1] = register.func_94245_a("mekanism:SolarGeneratorTop"); + solarSprites[2] = register.func_94245_a("mekanism:SolarGeneratorSide"); + solarSprites[3] = register.func_94245_a("mekanism:SolarGeneratorFront"); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); @@ -142,127 +153,57 @@ public class BlockGenerator extends BlockContainer implements IDismantleable } @Override - public int getBlockTextureFromSideAndMetadata(int side, int meta) + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) { - if(meta == 0) + if(meta == 1) { if(side == 3) { - return 27; - } - else if(side != 0 && side != 1) - { - return 25; - } - else { - return 26; - } - } - else if(meta == 1) - { - if(side == 3) - { - return 39; + return solarSprites[3]; } else if(side == 1) { - return 28; + return solarSprites[1]; } else if(side == 0) { - return 29; + return solarSprites[0]; } else { - return 40; + return solarSprites[2]; } } - else if(meta == 2) - { - if(side == 3) - { - return 34; - } - else { - return 35; - } - } - else if(meta == 3) - { - if(side == 3) - { - return 33; - } - else { - return 32; - } - } - else { - return 0; - } + + return null; } @Override @SideOnly(Side.CLIENT) - public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { int metadata = world.getBlockMetadata(x, y, z); TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); - if(metadata == 0) - { - if(side == tileEntity.facing) - { - return 27; - } - else if(side != 0 && side != 1) - { - return 25; - } - else { - return 26; - } - } - else if(metadata == 1) + if(metadata == 1) { if(side == tileEntity.facing) { - return 39; + return solarSprites[3]; } else if(side == 1) { - return 28; + return solarSprites[1]; } else if(side == 0) { - return 29; + return solarSprites[0]; } else { - return 40; + return solarSprites[2]; } } - else if(metadata == 2) - { - if(side == tileEntity.facing) - { - return 34; - } - else { - return 35; - } - } - else if(metadata == 3) - { - if(side == tileEntity.facing) - { - return 33; - } - else { - return 32; - } - } - else { - return 0; - } + + return null; } @Override @@ -529,12 +470,6 @@ public class BlockGenerator extends BlockContainer implements IDismantleable return false; } - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/terrain.png"; - } - @Override public int quantityDropped(Random random) { @@ -542,7 +477,7 @@ public class BlockGenerator extends BlockContainer implements IDismantleable } @Override - public TileEntity createNewTileEntity(World world, int metadata) + public TileEntity createTileEntity(World world, int metadata) { return GeneratorType.getFromMetadata(metadata).create(); } @@ -613,7 +548,7 @@ public class BlockGenerator extends BlockContainer implements IDismantleable world.spawnEntityInWorld(entityItem); } - return world.setBlockWithNotify(x, y, z, 0); + return world.func_94571_i(x, y, z); } @Override @@ -637,7 +572,7 @@ public class BlockGenerator extends BlockContainer implements IDismantleable IItemElectric electricItem = (IItemElectric)itemStack.getItem(); electricItem.setJoules(tileEntity.electricityStored, itemStack); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if(!returnBlock) { diff --git a/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java b/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java index 9cc760ae5..d9b293fd0 100644 --- a/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java +++ b/src/minecraft/mekanism/generators/common/ContainerBioGenerator.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerBioGenerator extends Container { diff --git a/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java index baa855bae..109106ee5 100644 --- a/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java @@ -14,7 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerElectrolyticSeparator extends Container { diff --git a/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java b/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java index 8aefb2f18..2996cd7f1 100644 --- a/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java +++ b/src/minecraft/mekanism/generators/common/ContainerHeatGenerator.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerHeatGenerator extends Container { diff --git a/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java b/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java index 7ebc1964e..113a309a6 100644 --- a/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java +++ b/src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerHydrogenGenerator extends Container { diff --git a/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java b/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java index 2f8452496..4740e984e 100644 --- a/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java +++ b/src/minecraft/mekanism/generators/common/ContainerSolarGenerator.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.IItemElectric; public class ContainerSolarGenerator extends Container { diff --git a/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java b/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java index 25598db59..a70ea5449 100644 --- a/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java +++ b/src/minecraft/mekanism/generators/common/ItemBlockGenerator.java @@ -3,9 +3,10 @@ package mekanism.generators.common; import java.util.List; import ic2.api.ICustomElectricItem; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricInfo.ElectricUnit; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; +import universalelectricity.core.electricity.ElectricityPack; +import universalelectricity.core.item.IItemElectric; import mekanism.common.Mekanism; import mekanism.common.TileEntityElectricBlock; import mekanism.generators.common.BlockGenerator.GeneratorType; @@ -16,6 +17,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.util.Icon; import net.minecraft.world.World; /** @@ -49,13 +51,13 @@ public class ItemBlockGenerator extends ItemBlock implements IItemElectric, ICus } @Override - public int getIconFromDamage(int i) + public Icon getIconFromDamage(int i) { return metaBlock.getBlockTextureFromSideAndMetadata(2, i); } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { String name = ""; switch(itemstack.getItemDamage()) @@ -85,7 +87,7 @@ public class ItemBlockGenerator extends ItemBlock implements IItemElectric, ICus name = "Unknown"; break; } - return getItemName() + "." + name; + return getUnlocalizedName() + "." + name; } @Override @@ -93,101 +95,86 @@ public class ItemBlockGenerator extends ItemBlock implements IItemElectric, ICus { double energy = getJoules(itemstack); - list.add("Stored Energy: " + ElectricInfo.getDisplayShort(energy, ElectricUnit.JOULES)); + list.add("Stored Energy: " + ElectricityDisplay.getDisplayShort(energy, ElectricUnit.JOULES)); } @Override - public double getJoules(Object... data) + public double getJoules(ItemStack itemStack) { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack) data[0]; - - if (itemStack.stackTagCompound == null) - { - return 0; - } - - double electricityStored = 0; - - if (itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) - { - electricityStored = itemStack.stackTagCompound.getFloat("electricity"); - } - else - { - electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - } - - return electricityStored; - } - - return -1; - } - - @Override - public void setJoules(double wattHours, Object... data) - { - if (data[0] instanceof ItemStack) - { - ItemStack itemStack = (ItemStack)data[0]; - - if (itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); - itemStack.stackTagCompound.setDouble("electricity", electricityStored); - } - } - - @Override - public double getMaxJoules(Object... data) - { - if(data[0] instanceof ItemStack) - { - ItemStack itemstack = (ItemStack)data[0]; - - return GeneratorType.getFromMetadata(itemstack.getItemDamage()).maxEnergy; + if(itemStack.stackTagCompound == null) + { + return 0; } - return 3200; + double electricityStored = 0; + + if(itemStack.stackTagCompound.getTag("electricity") instanceof NBTTagFloat) + { + electricityStored = itemStack.stackTagCompound.getFloat("electricity"); + } + else { + electricityStored = itemStack.stackTagCompound.getDouble("electricity"); + } + + return electricityStored; } @Override - public double getVoltage(Object... data) + public void setJoules(double wattHours, ItemStack itemStack) + { + if (itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + double electricityStored = Math.max(Math.min(wattHours, getMaxJoules(itemStack)), 0); + itemStack.stackTagCompound.setDouble("electricity", electricityStored); + } + + @Override + public double getMaxJoules(ItemStack itemStack) + { + return GeneratorType.getFromMetadata(itemStack.getItemDamage()).maxEnergy; + } + + @Override + public double getVoltage(ItemStack itemStack) { return 120; } @Override - public double onReceive(double amps, double voltage, ItemStack itemStack) + public ElectricityPack onReceive(ElectricityPack electricityPack, ItemStack itemStack) { - double rejectedElectricity = Math.max((getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1)) - getMaxJoules(itemStack), 0); - setJoules(getJoules(itemStack) + ElectricInfo.getJoules(amps, voltage, 1) - rejectedElectricity, itemStack); - return rejectedElectricity; + double rejectedElectricity = Math.max((getJoules(itemStack) + electricityPack.getWatts()) - getMaxJoules(itemStack), 0); + double joulesToStore = electricityPack.getWatts() - rejectedElectricity; + this.setJoules(getJoules(itemStack) + joulesToStore, itemStack); + return ElectricityPack.getFromWatts(joulesToStore, getVoltage(itemStack)); } @Override - public double onUse(double joulesNeeded, ItemStack itemStack) + public ElectricityPack onProvide(ElectricityPack electricityPack, ItemStack itemStack) { - double electricityToUse = Math.min(getJoules(itemStack), joulesNeeded); + double electricityToUse = Math.min(getJoules(itemStack), electricityPack.getWatts()); setJoules(getJoules(itemStack) - electricityToUse, itemStack); - return electricityToUse; + return ElectricityPack.getFromWatts(electricityToUse, getVoltage(itemStack)); } @Override - public boolean canReceiveElectricity() + public ElectricityPack getReceiveRequest(ItemStack itemStack) { - //TODO - return false; + return ElectricityPack.getFromWatts(Math.min(getMaxJoules(itemStack) - getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); } @Override - public boolean canProduceElectricity() + public ElectricityPack getProvideRequest(ItemStack itemStack) { - return true; + return ElectricityPack.getFromWatts(Math.min(getJoules(itemStack), getTransferRate(itemStack)), getVoltage(itemStack)); + } + + public double getTransferRate(ItemStack itemStack) + { + return getMaxJoules(itemStack)*0.01; } @Override @@ -268,7 +255,7 @@ public class ItemBlockGenerator extends ItemBlock implements IItemElectric, ICus @Override public boolean canProvideEnergy() { - return canProduceElectricity(); + return true; } @Override @@ -298,6 +285,6 @@ public class ItemBlockGenerator extends ItemBlock implements IItemElectric, ICus @Override public int getTransferLimit() { - return (int)(getVoltage()*Mekanism.TO_IC2); + return 0; } } diff --git a/src/minecraft/mekanism/generators/common/MekanismGenerators.java b/src/minecraft/mekanism/generators/common/MekanismGenerators.java index 7d9b30c50..b0e334379 100644 --- a/src/minecraft/mekanism/generators/common/MekanismGenerators.java +++ b/src/minecraft/mekanism/generators/common/MekanismGenerators.java @@ -22,7 +22,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "5.4.1", dependencies = "required-after:Mekanism") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "5.4.2", dependencies = "required-after:Mekanism") @NetworkMod(clientSideRequired = true, serverSideRequired = false) public class MekanismGenerators { @@ -57,7 +57,6 @@ public class MekanismGenerators //Load this module addBlocks(); addItems(); - addTextures(); addNames(); addRecipes(); addEntities(); @@ -129,13 +128,6 @@ public class MekanismGenerators LanguageRegistry.instance().addStringLocalization("tile.Generator.AdvancedSolarGenerator.name", "Advanced Solar Generator"); } - public void addTextures() - { - SolarPanel.setIconIndex(239); - BioFuel.setIconIndex(237); - ElectrolyticCore.setIconIndex(238); - } - public void addEntities() { GameRegistry.registerTileEntity(TileEntitySolarGenerator.class, "SolarGenerator"); @@ -143,17 +135,17 @@ public class MekanismGenerators public void addBlocks() { - Generator = new BlockGenerator(generatorID).setBlockName("Generator"); + Generator = new BlockGenerator(generatorID).setUnlocalizedName("Generator"); - Item.itemsList[generatorID] = new ItemBlockGenerator(generatorID - 256, Generator).setItemName("Generator"); + Item.itemsList[generatorID] = new ItemBlockGenerator(generatorID - 256, Generator).setUnlocalizedName("Generator"); } public void addItems() { Mekanism.configuration.load(); - SolarPanel = new ItemMekanism(Mekanism.configuration.getItem("SolarPanel", 11300).getInt()).setItemName("SolarPanel"); - BioFuel = new ItemMekanism(Mekanism.configuration.getItem("BioFuel", 11301).getInt()).setItemName("BioFuel"); - ElectrolyticCore = new ItemMekanism(Mekanism.configuration.getItem("ElectrolyticCore", 11302).getInt()).setItemName("ElectrolyticCore"); + SolarPanel = new ItemMekanism(Mekanism.configuration.getItem("SolarPanel", 11300).getInt()).setUnlocalizedName("SolarPanel"); + BioFuel = new ItemMekanism(Mekanism.configuration.getItem("BioFuel", 11301).getInt()).setUnlocalizedName("BioFuel"); + ElectrolyticCore = new ItemMekanism(Mekanism.configuration.getItem("ElectrolyticCore", 11302).getInt()).setUnlocalizedName("ElectrolyticCore"); Mekanism.configuration.save(); OreDictionary.registerOre("itemBioFuel", new ItemStack(BioFuel)); diff --git a/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java index d7f589507..72e06061c 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java @@ -30,16 +30,16 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i @Override public void onBreak() { - worldObj.setBlock(xCoord, yCoord+1, zCoord, 0); + worldObj.func_94571_i(xCoord, yCoord+1, zCoord); for(int x=-1;x<=1;x++) { for(int z=-1;z<=1;z++) { - worldObj.setBlock(xCoord+x, yCoord+2, zCoord+z, 0); + worldObj.func_94571_i(xCoord+x, yCoord+2, zCoord+z); } } - worldObj.setBlock(xCoord, yCoord, zCoord, 0); + worldObj.func_94571_i(xCoord, yCoord, zCoord); } } diff --git a/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java index bbedc3e91..5355c5d5a 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import universalelectricity.core.item.ElectricItemHelper; + import ic2.api.ElectricItem; import ic2.api.IElectricItem; import mekanism.client.Sound; @@ -23,8 +25,6 @@ import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.implement.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -93,18 +93,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank if(inventory[1] != null && electricityStored > 0) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if(electricItem.canReceiveElectricity()) - { - double ampsToGive = Math.min(ElectricInfo.getAmps(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, electricityStored), getVoltage()), electricityStored); - double rejects = electricItem.onReceive(ampsToGive, getVoltage(), inventory[1]); - setJoules(electricityStored - (ElectricInfo.getJoules(ampsToGive, getVoltage(), 1) - rejects)); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() - ElectricItemHelper.chargeItem(inventory[1], getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { double sent = ElectricItem.charge(inventory[1], (int)(electricityStored*Mekanism.TO_IC2), 3, false, false)*Mekanism.FROM_IC2; setJoules(electricityStored - sent); diff --git a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java index e576d7263..cb6404d39 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java @@ -36,19 +36,16 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IItemElectric; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.item.ElectricItemHelper; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IGasStorage, IEnergySink, IJouleStorage, IVoltage, ITankContainer, IPeripheral, ITubeConnection +public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IGasStorage, IEnergySink, ITankContainer, IPeripheral, ITubeConnection { /** This separator's water slot. */ public LiquidSlot waterSlot = new LiquidSlot(24000, 9); @@ -74,7 +71,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public TileEntityElectrolyticSeparator() { super("Electrolytic Separator", 9600); - ElectricityConnections.registerConnector(this, EnumSet.allOf(ForgeDirection.class)); inventory = new ItemStack[4]; outputType = EnumGas.HYDROGEN; dumpType = EnumGas.NONE; @@ -91,47 +87,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp setJoules(electricityStored + received); } - if(!worldObj.isRemote) - { - for(ForgeDirection direction : ForgeDirection.values()) - { - if(direction != ForgeDirection.getOrientation(facing)) - { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), direction); - if(tileEntity != null) - { - if(tileEntity instanceof IConductor) - { - if(electricityStored < MAX_ELECTRICITY) - { - double electricityNeeded = MAX_ELECTRICITY - electricityStored; - ((IConductor)tileEntity).getNetwork().startRequesting(this, electricityNeeded, electricityNeeded >= getVoltage() ? getVoltage() : electricityNeeded); - setJoules(electricityStored + ((IConductor)tileEntity).getNetwork().consumeElectricity(this).getWatts()); - } - else if(electricityStored >= MAX_ELECTRICITY) - { - ((IConductor)tileEntity).getNetwork().stopRequesting(this); - } - } - } - } - } - } - if(inventory[3] != null && electricityStored < MAX_ELECTRICITY) { - if(inventory[3].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[3].getItem(); - - if (electricItem.canProduceElectricity()) - { - double joulesNeeded = MAX_ELECTRICITY-electricityStored; - double joulesReceived = electricItem.onUse(Math.min(electricItem.getMaxJoules(inventory[3])*0.005, joulesNeeded), inventory[3]); - setJoules(electricityStored + joulesReceived); - } - } - else if(inventory[3].getItem() instanceof IElectricItem) + setJoules(getJoules() + ElectricItemHelper.dechargeItem(inventory[3], getMaxJoules() - getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[3].getItem() instanceof IElectricItem) { IElectricItem item = (IElectricItem)inventory[3].getItem(); if(item.canProvideEnergy()) @@ -239,7 +199,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { setGas(outputType, getGas(outputType) - (Math.min(getGas(outputType), output) - GasTransmission.emitGasToNetwork(outputType, Math.min(getGas(outputType), output), this, ForgeDirection.getOrientation(facing)))); - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); if(tileEntity instanceof IGasAcceptor) { @@ -420,24 +380,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return 0; } - @Override - public double getMaxJoules(Object... data) - { - return MAX_ELECTRICITY; - } - - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - @Override public int demandsEnergy() { @@ -614,12 +556,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp @Override public void detach(IComputerAccess computer) {} - @Override - public double getVoltage(Object... data) - { - return 120; - } - @Override public boolean canTubeConnect(ForgeDirection side) { diff --git a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java index 77de01956..63b64f39e 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java @@ -25,13 +25,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.electricity.ElectricityConnections; -import universalelectricity.core.electricity.ElectricityNetwork; -import universalelectricity.core.implement.IConductor; -import universalelectricity.core.implement.IJouleStorage; -import universalelectricity.core.implement.IVoltage; +import universalelectricity.core.electricity.ElectricityNetworkHelper; +import universalelectricity.core.electricity.IElectricityNetwork; import universalelectricity.core.vector.Vector3; +import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; @@ -39,7 +36,7 @@ import buildcraft.api.power.PowerProvider; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public abstract class TileEntityGenerator extends TileEntityElectricBlock implements IEnergySource, IEnergyStorage, IPowerReceptor, IJouleStorage, IVoltage, IPeripheral, IActiveState +public abstract class TileEntityGenerator extends TileEntityElectricBlock implements IEnergySource, IEnergyStorage, IPowerReceptor, IPeripheral, IActiveState { /** The Sound instance for this generator. */ @SideOnly(Side.CLIENT) @@ -91,20 +88,9 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem } catch(NoSuchMethodError e) {} } - if(packetTick == 20) - { - if(ElectricityConnections.isConnector(this)) - { - ElectricityConnections.unregisterConnector(this); - } - - ElectricityConnections.registerConnector(this, EnumSet.of(ForgeDirection.getOrientation(facing))); - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, MekanismGenerators.generatorID); - } - if(electricityStored > 0) { - TileEntity tileEntity = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); if(Mekanism.hooks.IC2Loaded) { @@ -132,9 +118,9 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(!worldObj.isRemote) { ForgeDirection outputDirection = ForgeDirection.getOrientation(facing); - TileEntity outputTile = Vector3.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); + TileEntity outputTile = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); - ElectricityNetwork outputNetwork = ElectricityNetwork.getNetworkFromTileEntity(outputTile, outputDirection); + IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(outputTile, outputDirection); if(outputNetwork != null) { @@ -182,6 +168,18 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem } } + @Override + protected EnumSet getConsumingSides() + { + return EnumSet.noneOf(ForgeDirection.class); + } + + @Override + public boolean canConnect(ForgeDirection direction) + { + return direction == ForgeDirection.getOrientation(facing); + } + @Override public void invalidate() { @@ -250,18 +248,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem prevActive = active; } - @Override - public double getVoltage(Object... data) - { - return 120; - } - - @Override - public void setJoules(double joules, Object... data) - { - electricityStored = Math.max(Math.min(joules, getMaxJoules()), 0); - } - @Override public String getType() { @@ -280,18 +266,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem @Override public void detach(IComputerAccess computer) {} - @Override - public double getMaxJoules(Object... data) - { - return MAX_ELECTRICITY; - } - - @Override - public double getJoules(Object... data) - { - return electricityStored; - } - @Override public int getMaxEnergyOutput() { @@ -303,12 +277,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem { super.setFacing(orientation); - if(ElectricityConnections.isConnector(this)) - { - ElectricityConnections.unregisterConnector(this); - } - - ElectricityConnections.registerConnector(this, EnumSet.of(ForgeDirection.getOrientation(orientation))); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, MekanismGenerators.generatorID); } diff --git a/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java index 95a825874..f9a4db83c 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java @@ -26,8 +26,7 @@ import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.ElectricItemHelper; import com.google.common.io.ByteArrayDataInput; @@ -73,18 +72,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan if(inventory[1] != null && electricityStored > 0) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if(electricItem.canReceiveElectricity()) - { - double ampsToGive = Math.min(ElectricInfo.getAmps(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, electricityStored), getVoltage()), electricityStored); - double rejects = electricItem.onReceive(ampsToGive, getVoltage(), inventory[1]); - setJoules(electricityStored - (ElectricInfo.getJoules(ampsToGive, getVoltage(), 1) - rejects)); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() - ElectricItemHelper.chargeItem(inventory[1], getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { double sent = ElectricItem.charge(inventory[1], (int)(electricityStored*Mekanism.TO_IC2), 3, false, false)*Mekanism.FROM_IC2; setJoules(electricityStored - sent); diff --git a/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java index 4f075f0d4..753166cc9 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java @@ -9,6 +9,7 @@ import mekanism.api.IGasAcceptor; import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; import mekanism.api.ITubeConnection; +import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import net.minecraft.entity.player.EntityPlayer; @@ -18,8 +19,7 @@ import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.UniversalElectricity; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.implement.IItemElectric; +import universalelectricity.core.item.ElectricItemHelper; import com.google.common.io.ByteArrayDataInput; @@ -45,18 +45,9 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements if(inventory[1] != null && electricityStored > 0) { - if(inventory[1].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[1].getItem(); - - if(electricItem.canReceiveElectricity()) - { - double ampsToGive = Math.min(ElectricInfo.getAmps(Math.min(electricItem.getMaxJoules(inventory[1])*0.005, electricityStored), getVoltage()), electricityStored); - double rejects = electricItem.onReceive(ampsToGive, getVoltage(), inventory[1]); - setJoules(electricityStored - (ElectricInfo.getJoules(ampsToGive, getVoltage(), 1) - rejects)); - } - } - else if(inventory[1].getItem() instanceof IElectricItem) + setJoules(getJoules() - ElectricItemHelper.chargeItem(inventory[1], getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[1].getItem() instanceof IElectricItem) { double sent = ElectricItem.charge(inventory[1], (int)(electricityStored*UniversalElectricity.TO_IC2_RATIO), 3, false, false)*UniversalElectricity.IC2_RATIO; setJoules(electricityStored - sent); @@ -228,7 +219,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements } @Override - public double getVoltage(Object... data) + public double getVoltage() { return 240; } diff --git a/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java b/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java index 7e760de45..7c63ae55c 100644 --- a/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java @@ -2,6 +2,8 @@ package mekanism.generators.common; import java.util.ArrayList; +import universalelectricity.core.item.ElectricItemHelper; + import ic2.api.ElectricItem; import ic2.api.IElectricItem; import mekanism.common.Mekanism; @@ -12,8 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.electricity.ElectricInfo; -import universalelectricity.core.implement.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -63,18 +63,9 @@ public class TileEntitySolarGenerator extends TileEntityGenerator if(inventory[0] != null && electricityStored > 0) { - if(inventory[0].getItem() instanceof IItemElectric) - { - IItemElectric electricItem = (IItemElectric)inventory[0].getItem(); - - if(electricItem.canReceiveElectricity()) - { - double ampsToGive = Math.min(ElectricInfo.getAmps(Math.min(electricItem.getMaxJoules(inventory[0])*0.005, electricityStored), getVoltage()), electricityStored); - double rejects = electricItem.onReceive(ampsToGive, getVoltage(), inventory[0]); - setJoules(electricityStored - (ElectricInfo.getJoules(ampsToGive, getVoltage(), 1) - rejects)); - } - } - else if(inventory[0].getItem() instanceof IElectricItem) + setJoules(getJoules() - ElectricItemHelper.chargeItem(inventory[0], getJoules(), getVoltage())); + + if(Mekanism.hooks.IC2Loaded && inventory[0].getItem() instanceof IElectricItem) { double sent = ElectricItem.charge(inventory[0], (int)(electricityStored*Mekanism.TO_IC2), 3, false, false)*Mekanism.FROM_IC2; setJoules(electricityStored - sent); diff --git a/src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java b/src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java index 564ef4e86..eeb8bb047 100644 --- a/src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java +++ b/src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java @@ -29,7 +29,7 @@ public abstract class AdvancedMachineRecipeHandler extends TemplateRecipeHandler public void drawBackground(GuiContainerManager guimanager, int i) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTextureByName(getGuiTexture()); + guimanager.bindTexture(getGuiTexture()); guimanager.drawTexturedModalRect(12, 0, 28, 5, 144, 68); } diff --git a/src/minecraft/mekanism/nei/MachineRecipeHandler.java b/src/minecraft/mekanism/nei/MachineRecipeHandler.java index 70bcb0c32..89b7b2f78 100644 --- a/src/minecraft/mekanism/nei/MachineRecipeHandler.java +++ b/src/minecraft/mekanism/nei/MachineRecipeHandler.java @@ -27,7 +27,7 @@ public abstract class MachineRecipeHandler extends TemplateRecipeHandler public void drawBackground(GuiContainerManager guimanager, int i) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTextureByName(getGuiTexture()); + guimanager.bindTexture(getGuiTexture()); guimanager.drawTexturedModalRect(12, 0, 28, 5, 144, 68); } diff --git a/src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java b/src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java index 169a5e761..1bc49c9cd 100644 --- a/src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java @@ -130,7 +130,7 @@ public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler public void drawBackground(GuiContainerManager guimanager, int i) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTextureByName(getGuiTexture()); + guimanager.bindTexture(getGuiTexture()); guimanager.drawTexturedModalRect(0, 0, 5, 15, 166, 56); } diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java b/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java index b911bdd5c..52a60b4a9 100644 --- a/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java +++ b/src/minecraft/mekanism/tools/common/ItemMekanismArmor.java @@ -3,6 +3,7 @@ package mekanism.tools.common; import java.util.List; import mekanism.common.Mekanism; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.ItemArmor; @@ -22,9 +23,9 @@ public class ItemMekanismArmor extends ItemArmor list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } - @Override - public String getTextureFile() + @Override + public void func_94581_a(IconRegister register) { - return "/resources/mekanism/textures/items.png"; + iconIndex = register.func_94245_a("mekanism:" + getUnlocalizedName().replace("item.", "")); } } diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java b/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java index d32396f0d..2597367e9 100644 --- a/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java +++ b/src/minecraft/mekanism/tools/common/ItemMekanismHoe.java @@ -65,7 +65,7 @@ public class ItemMekanismHoe extends ItemMekanism return true; } else { - world.setBlockWithNotify(x, y, z, block.blockID); + world.func_94575_c(x, y, z, block.blockID); itemstack.damageItem(1, entityplayer); return true; } diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java b/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java index a8d91ddcd..be5087ad6 100644 --- a/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java +++ b/src/minecraft/mekanism/tools/common/ItemMekanismPaxel.java @@ -7,11 +7,15 @@ import net.minecraft.item.ItemStack; public class ItemMekanismPaxel extends ItemMekanismTool { - private static Block blocksEffectiveAgainst[]; - public ItemMekanismPaxel(int i, EnumToolMaterial enumtoolmaterial) { - super(i, 3, enumtoolmaterial, blocksEffectiveAgainst); + super(i, 3, enumtoolmaterial, new Block[256]); + } + + @Override + public float getStrVsBlock(ItemStack itemstack, Block block) + { + return block.blockID != Block.bedrock.blockID ? efficiencyOnProperMaterial : 1.0F; } @Override @@ -50,30 +54,4 @@ public class ItemMekanismPaxel extends ItemMekanismTool return block.blockMaterial == Material.iron; } } - - @Override - public float getStrVsBlock(ItemStack itemstack, Block block) - { - if (block != null && (block.blockMaterial == Material.iron || block.blockMaterial == Material.rock)) - { - return efficiencyOnProperMaterial; - } - else - { - return super.getStrVsBlock(itemstack, block); - } - } - - static - { - blocksEffectiveAgainst = (new Block[] - { - Block.cobblestone, Block.woodSingleSlab, Block.woodDoubleSlab, Block.stone, Block.sandStone, Block.cobblestoneMossy, Block.oreIron, Block.blockSteel, Block.oreCoal, Block.blockGold, - Block.oreGold, Block.oreDiamond, Block.blockDiamond, Block.ice, Block.netherrack, Block.oreLapis, Block.blockLapis, Block.oreRedstone, Block.oreRedstoneGlowing, Block.rail, - Block.railDetector, Block.railPowered, Block.leaves, Block.grass, Block.dirt, Block.sand, - Block.gravel, Block.snow, Block.blockSnow, Block.blockClay, Block.tilledField, Block.slowSand, Block.mycelium, Block.planks, Block.bookShelf, Block.wood, - Block.chest, Block.stoneDoubleSlab, Block.stoneSingleSlab, Block.pumpkin, Block.pumpkinLantern, Block.snow, Block.pistonBase, Block.pistonStickyBase, Block.workbench, - Block.stoneOvenActive, Block.stoneOvenIdle, Block.music, Block.trapdoor, Block.silverfish, Block.stoneBrick, Block.glowStone, Block.thinGlass - }); - } } diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismSpade.java b/src/minecraft/mekanism/tools/common/ItemMekanismShovel.java similarity index 84% rename from src/minecraft/mekanism/tools/common/ItemMekanismSpade.java rename to src/minecraft/mekanism/tools/common/ItemMekanismShovel.java index 67911030e..f9fd655f9 100644 --- a/src/minecraft/mekanism/tools/common/ItemMekanismSpade.java +++ b/src/minecraft/mekanism/tools/common/ItemMekanismShovel.java @@ -3,11 +3,11 @@ package mekanism.tools.common; import net.minecraft.block.Block; import net.minecraft.item.EnumToolMaterial; -public class ItemMekanismSpade extends ItemMekanismTool +public class ItemMekanismShovel extends ItemMekanismTool { private static Block blocksEffectiveAgainst[]; - public ItemMekanismSpade(int id, EnumToolMaterial enumtoolmaterial) + public ItemMekanismShovel(int id, EnumToolMaterial enumtoolmaterial) { super(id, 1, enumtoolmaterial, blocksEffectiveAgainst); } diff --git a/src/minecraft/mekanism/tools/common/ItemMekanismTool.java b/src/minecraft/mekanism/tools/common/ItemMekanismTool.java index f49f34ec0..fd17ac7f7 100644 --- a/src/minecraft/mekanism/tools/common/ItemMekanismTool.java +++ b/src/minecraft/mekanism/tools/common/ItemMekanismTool.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.ItemStack; @@ -23,9 +24,9 @@ public class ItemMekanismTool extends ItemTool list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } - @Override - public String getTextureFile() - { - return "/resources/mekanism/textures/items.png"; - } + @Override + public void func_94581_a(IconRegister register) + { + iconIndex = register.func_94245_a("mekanism:" + getUnlocalizedName().replace("item.", "")); + } } diff --git a/src/minecraft/mekanism/tools/common/MekanismTools.java b/src/minecraft/mekanism/tools/common/MekanismTools.java index 5d4924569..22de05764 100644 --- a/src/minecraft/mekanism/tools/common/MekanismTools.java +++ b/src/minecraft/mekanism/tools/common/MekanismTools.java @@ -14,7 +14,7 @@ import net.minecraft.src.*; import net.minecraftforge.common.EnumHelper; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.entity.living.LivingSpecialSpawnEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.oredict.ShapedOreRecipe; import mekanism.common.Mekanism; import cpw.mods.fml.common.Mod; @@ -26,7 +26,7 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.4.1", dependencies = "required-after:Mekanism") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.4.2", dependencies = "required-after:Mekanism") @NetworkMod(clientSideRequired = true, serverSideRequired = false) public class MekanismTools { @@ -66,47 +66,47 @@ public class MekanismTools public static Item GlowstonePaxel; public static Item GlowstonePickaxe; public static Item GlowstoneAxe; - public static Item GlowstoneSpade; + public static Item GlowstoneShovel; public static Item GlowstoneHoe; public static Item GlowstoneSword; public static Item GlowstoneHelmet; - public static Item GlowstoneBody; - public static Item GlowstoneLegs; + public static Item GlowstoneChestplate; + public static Item GlowstoneLeggings; public static Item GlowstoneBoots; //Redstone Items public static Item BronzePaxel; public static Item BronzePickaxe; public static Item BronzeAxe; - public static Item BronzeSpade; + public static Item BronzeShovel; public static Item BronzeHoe; public static Item BronzeSword; public static Item BronzeHelmet; - public static Item BronzeBody; - public static Item BronzeLegs; + public static Item BronzeChestplate; + public static Item BronzeLeggings; public static Item BronzeBoots; //Osmium Items public static Item OsmiumPaxel; public static Item OsmiumPickaxe; public static Item OsmiumAxe; - public static Item OsmiumSpade; + public static Item OsmiumShovel; public static Item OsmiumHoe; public static Item OsmiumSword; public static Item OsmiumHelmet; - public static Item OsmiumBody; - public static Item OsmiumLegs; + public static Item OsmiumChestplate; + public static Item OsmiumLeggings; public static Item OsmiumBoots; //Obsidian Items public static Item ObsidianHelmet; - public static Item ObsidianBody; - public static Item ObsidianLegs; + public static Item ObsidianChestplate; + public static Item ObsidianLeggings; public static Item ObsidianBoots; public static Item ObsidianPaxel; public static Item ObsidianPickaxe; public static Item ObsidianAxe; - public static Item ObsidianSpade; + public static Item ObsidianShovel; public static Item ObsidianHoe; public static Item ObsidianSword; @@ -114,24 +114,24 @@ public class MekanismTools public static Item LazuliPaxel; public static Item LazuliPickaxe; public static Item LazuliAxe; - public static Item LazuliSpade; + public static Item LazuliShovel; public static Item LazuliHoe; public static Item LazuliSword; public static Item LazuliHelmet; - public static Item LazuliBody; - public static Item LazuliLegs; + public static Item LazuliChestplate; + public static Item LazuliLeggings; public static Item LazuliBoots; //Steel Items public static Item SteelPaxel; public static Item SteelPickaxe; public static Item SteelAxe; - public static Item SteelSpade; + public static Item SteelShovel; public static Item SteelHoe; public static Item SteelSword; public static Item SteelHelmet; - public static Item SteelBody; - public static Item SteelLegs; + public static Item SteelChestplate; + public static Item SteelLeggings; public static Item SteelBoots; @Init @@ -142,7 +142,6 @@ public class MekanismTools //Load this module addItems(); - addTextures(); addNames(); addRecipes(); @@ -174,17 +173,17 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), ObsidianAxe, Character.valueOf('Y'), ObsidianPickaxe, Character.valueOf('Z'), ObsidianSpade, Character.valueOf('T'), Item.stick + "XYZ", " T ", " T ", Character.valueOf('X'), ObsidianAxe, Character.valueOf('Y'), ObsidianPickaxe, Character.valueOf('Z'), ObsidianShovel, Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick @@ -192,7 +191,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ObsidianHoe, 1), new Object[] { @@ -204,7 +203,7 @@ public class MekanismTools //Glowstone CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstonePaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), GlowstoneAxe, Character.valueOf('Y'), GlowstonePickaxe, Character.valueOf('Z'), GlowstoneSpade, Character.valueOf('T'), Item.stick + "XYZ", " T ", " T ", Character.valueOf('X'), GlowstoneAxe, Character.valueOf('Y'), GlowstonePickaxe, Character.valueOf('Z'), GlowstoneShovel, Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstonePickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Item.stick @@ -212,7 +211,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Item.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneHoe, 1), new Object[] { @@ -224,10 +223,10 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotRefinedGlowstone" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(GlowstoneBoots, 1), new Object[] { @@ -238,17 +237,17 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), new ItemStack(Item.dyePowder, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), new ItemStack(Item.dyePowder, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), new ItemStack(Item.dyePowder, 1, 4) })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), new ItemStack(Item.dyePowder, 1, 4) })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), LazuliAxe, Character.valueOf('Y'), LazuliPickaxe, Character.valueOf('Z'), LazuliSpade, Character.valueOf('T'), Item.stick + "XYZ", " T ", " T ", Character.valueOf('X'), LazuliAxe, Character.valueOf('Y'), LazuliPickaxe, Character.valueOf('Z'), LazuliShovel, Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('T'), Item.stick @@ -256,7 +255,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('T'), Item.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(LazuliHoe, 1), new Object[] { @@ -268,7 +267,7 @@ public class MekanismTools //Osmium CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), OsmiumAxe, Character.valueOf('Y'), OsmiumPickaxe, Character.valueOf('Z'), OsmiumSpade, Character.valueOf('T'), Item.stick + "XYZ", " T ", " T ", Character.valueOf('X'), OsmiumAxe, Character.valueOf('Y'), OsmiumPickaxe, Character.valueOf('Z'), OsmiumShovel, Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Item.stick @@ -276,7 +275,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Item.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumHoe, 1), new Object[] { @@ -288,10 +287,10 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotOsmium" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(OsmiumBoots, 1), new Object[] { @@ -300,7 +299,7 @@ public class MekanismTools //Bronze CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzePaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), BronzeAxe, Character.valueOf('Y'), BronzePickaxe, Character.valueOf('Z'), BronzeSpade, Character.valueOf('T'), Item.stick + "XYZ", " T ", " T ", Character.valueOf('X'), BronzeAxe, Character.valueOf('Y'), BronzePickaxe, Character.valueOf('Z'), BronzeShovel, Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzePickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Item.stick @@ -308,7 +307,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Item.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Item.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeHoe, 1), new Object[] { @@ -320,10 +319,10 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotBronze" })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BronzeBoots, 1), new Object[] { @@ -332,7 +331,7 @@ public class MekanismTools //Steel CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelPaxel, 1), new Object[] { - "XYZ", " I ", " I ", Character.valueOf('X'), SteelAxe, Character.valueOf('Y'), SteelPickaxe, Character.valueOf('Z'), SteelSpade, Character.valueOf('I'), Item.ingotIron + "XYZ", " I ", " I ", Character.valueOf('X'), SteelAxe, Character.valueOf('Y'), SteelPickaxe, Character.valueOf('Z'), SteelShovel, Character.valueOf('I'), Item.ingotIron })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelPickaxe, 1), new Object[] { "XXX", " I ", " I ", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Item.ingotIron @@ -340,7 +339,7 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelAxe, 1), new Object[] { "XX", "XI", " I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Item.ingotIron })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelSpade, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelShovel, 1), new Object[] { "X", "I", "I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Item.ingotIron })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelHoe, 1), new Object[] { @@ -352,10 +351,10 @@ public class MekanismTools CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelHelmet, 1), new Object[] { "***", "I I", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Item.ingotIron })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelBody, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelChestplate, 1), new Object[] { "I I", "*I*", "***", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Item.ingotIron })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelLegs, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelLeggings, 1), new Object[] { "I*I", "* *", "* *", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Item.ingotIron })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(SteelBoots, 1), new Object[] { @@ -374,49 +373,49 @@ public class MekanismTools //Obsidian LanguageRegistry.addName(ObsidianHelmet, "Obsidian Helmet"); - LanguageRegistry.addName(ObsidianBody, "Obsidian Chestplate"); - LanguageRegistry.addName(ObsidianLegs, "Obsidian Leggings"); + LanguageRegistry.addName(ObsidianChestplate, "Obsidian Chestplate"); + LanguageRegistry.addName(ObsidianLeggings, "Obsidian Leggings"); LanguageRegistry.addName(ObsidianBoots, "Obsidian Boots"); LanguageRegistry.addName(ObsidianPaxel, "Obsidian Paxel"); LanguageRegistry.addName(ObsidianPickaxe, "Obsidian Pickaxe"); LanguageRegistry.addName(ObsidianAxe, "Obsidian Axe"); - LanguageRegistry.addName(ObsidianSpade, "Obsidian Shovel"); + LanguageRegistry.addName(ObsidianShovel, "Obsidian Shovel"); LanguageRegistry.addName(ObsidianHoe, "Obsidian Hoe"); LanguageRegistry.addName(ObsidianSword, "Obsidian Sword"); //Lazuli LanguageRegistry.addName(LazuliHelmet, "Lapis Lazuli Helmet"); - LanguageRegistry.addName(LazuliBody, "Lapis Lazuli Chestplate"); - LanguageRegistry.addName(LazuliLegs, "Lapis Lazuli Leggings"); + LanguageRegistry.addName(LazuliChestplate, "Lapis Lazuli Chestplate"); + LanguageRegistry.addName(LazuliLeggings, "Lapis Lazuli Leggings"); LanguageRegistry.addName(LazuliBoots, "Lapis Lazuli Boots"); LanguageRegistry.addName(LazuliPaxel, "Lapis Lazuli Paxel"); LanguageRegistry.addName(LazuliPickaxe, "Lapis Lazuli Pickaxe"); LanguageRegistry.addName(LazuliAxe, "Lapis Lazuli Axe"); - LanguageRegistry.addName(LazuliSpade, "Lapis Lazuli Shovel"); + LanguageRegistry.addName(LazuliShovel, "Lapis Lazuli Shovel"); LanguageRegistry.addName(LazuliHoe, "Lapis Lazuli Hoe"); LanguageRegistry.addName(LazuliSword, "Lapis Lazuli Sword"); //Osmium LanguageRegistry.addName(OsmiumHelmet, "Osmium Helmet"); - LanguageRegistry.addName(OsmiumBody, "Osmium Chestplate"); - LanguageRegistry.addName(OsmiumLegs, "Osmium Leggings"); + LanguageRegistry.addName(OsmiumChestplate, "Osmium Chestplate"); + LanguageRegistry.addName(OsmiumLeggings, "Osmium Leggings"); LanguageRegistry.addName(OsmiumBoots, "Osmium Boots"); LanguageRegistry.addName(OsmiumPaxel, "Osmium Paxel"); LanguageRegistry.addName(OsmiumPickaxe, "Osmium Pickaxe"); LanguageRegistry.addName(OsmiumAxe, "Osmium Axe"); - LanguageRegistry.addName(OsmiumSpade, "Osmium Shovel"); + LanguageRegistry.addName(OsmiumShovel, "Osmium Shovel"); LanguageRegistry.addName(OsmiumHoe, "Osmium Hoe"); LanguageRegistry.addName(OsmiumSword, "Osmium Sword"); //Redstone LanguageRegistry.addName(BronzeHelmet, "Bronze Helmet"); - LanguageRegistry.addName(BronzeBody, "Bronze Chestplate"); - LanguageRegistry.addName(BronzeLegs, "Bronze Leggings"); + LanguageRegistry.addName(BronzeChestplate, "Bronze Chestplate"); + LanguageRegistry.addName(BronzeLeggings, "Bronze Leggings"); LanguageRegistry.addName(BronzeBoots, "Bronze Boots"); LanguageRegistry.addName(BronzePaxel, "Bronze Paxel"); LanguageRegistry.addName(BronzePickaxe, "Bronze Pickaxe"); LanguageRegistry.addName(BronzeAxe, "Bronze Axe"); - LanguageRegistry.addName(BronzeSpade, "Bronze Shovel"); + LanguageRegistry.addName(BronzeShovel, "Bronze Shovel"); LanguageRegistry.addName(BronzeHoe, "Bronze Hoe"); LanguageRegistry.addName(BronzeSword, "Bronze Sword"); @@ -424,195 +423,113 @@ public class MekanismTools LanguageRegistry.addName(GlowstonePaxel, "Glowstone Paxel"); LanguageRegistry.addName(GlowstonePickaxe, "Glowstone Pickaxe"); LanguageRegistry.addName(GlowstoneAxe, "Glowstone Axe"); - LanguageRegistry.addName(GlowstoneSpade, "Glowstone Shovel"); + LanguageRegistry.addName(GlowstoneShovel, "Glowstone Shovel"); LanguageRegistry.addName(GlowstoneHoe, "Glowstone Hoe"); LanguageRegistry.addName(GlowstoneSword, "Glowstone Sword"); LanguageRegistry.addName(GlowstoneHelmet, "Glowstone Helmet"); - LanguageRegistry.addName(GlowstoneBody, "Glowstone Chestplate"); - LanguageRegistry.addName(GlowstoneLegs, "Glowstone Leggings"); + LanguageRegistry.addName(GlowstoneChestplate, "Glowstone Chestplate"); + LanguageRegistry.addName(GlowstoneLeggings, "Glowstone Leggings"); LanguageRegistry.addName(GlowstoneBoots, "Glowstone Boots"); //Steel LanguageRegistry.addName(SteelPaxel, "Steel Paxel"); LanguageRegistry.addName(SteelPickaxe, "Steel Pickaxe"); LanguageRegistry.addName(SteelAxe, "Steel Axe"); - LanguageRegistry.addName(SteelSpade, "Steel Shovel"); + LanguageRegistry.addName(SteelShovel, "Steel Shovel"); LanguageRegistry.addName(SteelHoe, "Steel Hoe"); LanguageRegistry.addName(SteelSword, "Steel Sword"); LanguageRegistry.addName(SteelHelmet, "Steel Helmet"); - LanguageRegistry.addName(SteelBody, "Steel Chestplate"); - LanguageRegistry.addName(SteelLegs, "Steel Leggings"); + LanguageRegistry.addName(SteelChestplate, "Steel Chestplate"); + LanguageRegistry.addName(SteelLeggings, "Steel Leggings"); LanguageRegistry.addName(SteelBoots, "Steel Boots"); } - public void addTextures() - { - //Base - WoodPaxel.setIconIndex(150); - StonePaxel.setIconIndex(151); - IronPaxel.setIconIndex(152); - DiamondPaxel.setIconIndex(153); - GoldPaxel.setIconIndex(154); - - //Glowstone - GlowstoneHelmet.setIconIndex(4); - GlowstoneBody.setIconIndex(20); - GlowstoneLegs.setIconIndex(36); - GlowstoneBoots.setIconIndex(52); - GlowstonePaxel.setIconIndex(148); - GlowstonePickaxe.setIconIndex(68); - GlowstoneAxe.setIconIndex(84); - GlowstoneSpade.setIconIndex(100); - GlowstoneHoe.setIconIndex(116); - GlowstoneSword.setIconIndex(132); - - //Redstone - BronzeHelmet.setIconIndex(3); - BronzeBody.setIconIndex(19); - BronzeLegs.setIconIndex(35); - BronzeBoots.setIconIndex(51); - BronzePaxel.setIconIndex(147); - BronzePickaxe.setIconIndex(67); - BronzeAxe.setIconIndex(83); - BronzeSpade.setIconIndex(99); - BronzeHoe.setIconIndex(115); - BronzeSword.setIconIndex(131); - - //Osmium - OsmiumHelmet.setIconIndex(2); - OsmiumBody.setIconIndex(18); - OsmiumLegs.setIconIndex(34); - OsmiumBoots.setIconIndex(50); - OsmiumPaxel.setIconIndex(146); - OsmiumPickaxe.setIconIndex(66); - OsmiumAxe.setIconIndex(82); - OsmiumSpade.setIconIndex(98); - OsmiumHoe.setIconIndex(114); - OsmiumSword.setIconIndex(130); - - //Obsidian - ObsidianHelmet.setIconIndex(1); - ObsidianBody.setIconIndex(17); - ObsidianLegs.setIconIndex(33); - ObsidianBoots.setIconIndex(49); - ObsidianPaxel.setIconIndex(145); - ObsidianPickaxe.setIconIndex(65); - ObsidianAxe.setIconIndex(81); - ObsidianSpade.setIconIndex(97); - ObsidianHoe.setIconIndex(113); - ObsidianSword.setIconIndex(129); - - //Lazuli - LazuliPaxel.setIconIndex(144); - LazuliPickaxe.setIconIndex(64); - LazuliAxe.setIconIndex(80); - LazuliSpade.setIconIndex(96); - LazuliHoe.setIconIndex(112); - LazuliSword.setIconIndex(128); - LazuliHelmet.setIconIndex(0); - LazuliBody.setIconIndex(16); - LazuliLegs.setIconIndex(32); - LazuliBoots.setIconIndex(48); - - //Steel - SteelHelmet.setIconIndex(5); - SteelBody.setIconIndex(21); - SteelLegs.setIconIndex(37); - SteelBoots.setIconIndex(53); - SteelPaxel.setIconIndex(149); - SteelPickaxe.setIconIndex(69); - SteelAxe.setIconIndex(85); - SteelSpade.setIconIndex(101); - SteelHoe.setIconIndex(117); - SteelSword.setIconIndex(133); - } - public void addItems() { Mekanism.configuration.load(); //Bronze - BronzeHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeHelmet", 11400).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setItemName("BronzeHelmet"); - BronzeBody = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeBody", 11401).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setItemName("BronzeBody"); - BronzeLegs = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeLegs", 11402).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setItemName("BronzeLegs"); - BronzeBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeBoots", 11403).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setItemName("BronzeBoots"); - BronzePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("BronzePaxel", 11404).getInt(), toolBRONZE2).setItemName("BronzePaxel"); - BronzePickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("BronzePickaxe", 11405).getInt(), toolBRONZE).setItemName("BronzePickaxe"); - BronzeAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("BronzeAxe", 11406).getInt(), toolBRONZE).setItemName("BronzeAxe"); - BronzeSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("BronzeSpade", 11407).getInt(), toolBRONZE).setItemName("BronzeSpade"); - BronzeHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("BronzeHoe", 11408).getInt(), toolBRONZE).setItemName("BronzeHoe"); - BronzeSword = new ItemMekanismSword(Mekanism.configuration.getItem("BronzeSword", 11409).getInt(), toolBRONZE).setItemName("BronzeSword"); + BronzeHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeHelmet", 11400).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); + BronzeChestplate = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeChestplate", 11401).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); + BronzeLeggings = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeLeggings", 11402).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings"); + BronzeBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("BronzeBoots", 11403).getInt(), armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots"); + BronzePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("BronzePaxel", 11404).getInt(), toolBRONZE2).setUnlocalizedName("BronzePaxel"); + BronzePickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("BronzePickaxe", 11405).getInt(), toolBRONZE).setUnlocalizedName("BronzePickaxe"); + BronzeAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("BronzeAxe", 11406).getInt(), toolBRONZE).setUnlocalizedName("BronzeAxe"); + BronzeShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("BronzeShovel", 11407).getInt(), toolBRONZE).setUnlocalizedName("BronzeShovel"); + BronzeHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("BronzeHoe", 11408).getInt(), toolBRONZE).setUnlocalizedName("BronzeHoe"); + BronzeSword = new ItemMekanismSword(Mekanism.configuration.getItem("BronzeSword", 11409).getInt(), toolBRONZE).setUnlocalizedName("BronzeSword"); //Osmium - OsmiumHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumHelmet", 11410).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 0)).setItemName("OsmiumHelmet"); - OsmiumBody = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumBody", 11411).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 1)).setItemName("OsmiumBody"); - OsmiumLegs = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumLegs", 11412).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 2)).setItemName("OsmiumLegs"); - OsmiumBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumBoots", 11413).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 3)).setItemName("OsmiumBoots"); - OsmiumPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("OsmiumPaxel", 11414).getInt(), toolOSMIUM2).setItemName("OsmiumPaxel"); - OsmiumPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("OsmiumPickaxe", 11415).getInt(), toolOSMIUM).setItemName("OsmiumPickaxe"); - OsmiumAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("OsmiumAxe", 11416).getInt(), toolOSMIUM).setItemName("OsmiumAxe"); - OsmiumSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("OsmiumSpade", 11417).getInt(), toolOSMIUM).setItemName("OsmiumSpade"); - OsmiumHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("OsmiumHoe", 11418).getInt(), toolOSMIUM).setItemName("OsmiumHoe"); - OsmiumSword = new ItemMekanismSword(Mekanism.configuration.getItem("OsmiumSword", 11419).getInt(), toolOSMIUM).setItemName("OsmiumSword"); + OsmiumHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumHelmet", 11410).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet"); + OsmiumChestplate = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumChestplate", 11411).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate"); + OsmiumLeggings = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumLeggings", 11412).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings"); + OsmiumBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("OsmiumBoots", 11413).getInt(), EnumArmorMaterial.DIAMOND, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots"); + OsmiumPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("OsmiumPaxel", 11414).getInt(), toolOSMIUM2).setUnlocalizedName("OsmiumPaxel"); + OsmiumPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("OsmiumPickaxe", 11415).getInt(), toolOSMIUM).setUnlocalizedName("OsmiumPickaxe"); + OsmiumAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("OsmiumAxe", 11416).getInt(), toolOSMIUM).setUnlocalizedName("OsmiumAxe"); + OsmiumShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("OsmiumShovel", 11417).getInt(), toolOSMIUM).setUnlocalizedName("OsmiumShovel"); + OsmiumHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("OsmiumHoe", 11418).getInt(), toolOSMIUM).setUnlocalizedName("OsmiumHoe"); + OsmiumSword = new ItemMekanismSword(Mekanism.configuration.getItem("OsmiumSword", 11419).getInt(), toolOSMIUM).setUnlocalizedName("OsmiumSword"); //Obsidian - ObsidianHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianHelmet", 11420).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setItemName("ObsidianHelmet"); - ObsidianBody = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianBody", 11421).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setItemName("ObsidianBody"); - ObsidianLegs = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianLegs", 11422).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setItemName("ObsidianLegs"); - ObsidianBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianBoots", 11423).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setItemName("ObsidianBoots"); - ObsidianPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("ObsidianPaxel", 11424).getInt(), toolOBSIDIAN2).setItemName("ObsidianPaxel"); - ObsidianPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("ObsidianPickaxe", 11425).getInt(), toolOBSIDIAN).setItemName("ObsidianPickaxe"); - ObsidianAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("ObsidianAxe", 11426).getInt(), toolOBSIDIAN).setItemName("ObsidianAxe"); - ObsidianSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("ObsidianSpade", 11427).getInt(), toolOBSIDIAN).setItemName("ObsidianSpade"); - ObsidianHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("ObsidianHoe", 11428).getInt(), toolOBSIDIAN).setItemName("ObsidianHoe"); - ObsidianSword = new ItemMekanismSword(Mekanism.configuration.getItem("ObsidianSword", 11429).getInt(), toolOBSIDIAN).setItemName("ObsidianSword"); + ObsidianHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianHelmet", 11420).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet"); + ObsidianChestplate = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianChestplate", 11421).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate"); + ObsidianLeggings = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianLeggings", 11422).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings"); + ObsidianBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("ObsidianBoots", 11423).getInt(), armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots"); + ObsidianPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("ObsidianPaxel", 11424).getInt(), toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel"); + ObsidianPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("ObsidianPickaxe", 11425).getInt(), toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe"); + ObsidianAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("ObsidianAxe", 11426).getInt(), toolOBSIDIAN).setUnlocalizedName("ObsidianAxe"); + ObsidianShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("ObsidianShovel", 11427).getInt(), toolOBSIDIAN).setUnlocalizedName("ObsidianShovel"); + ObsidianHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("ObsidianHoe", 11428).getInt(), toolOBSIDIAN).setUnlocalizedName("ObsidianHoe"); + ObsidianSword = new ItemMekanismSword(Mekanism.configuration.getItem("ObsidianSword", 11429).getInt(), toolOBSIDIAN).setUnlocalizedName("ObsidianSword"); //Lazuli - LazuliPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("LazuliPaxel", 11430).getInt(), toolLAZULI2).setItemName("LazuliPaxel"); - LazuliPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("LazuliPickaxe", 11431).getInt(), toolLAZULI).setItemName("LazuliPickaxe"); - LazuliAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("LazuliAxe", 11432).getInt(), toolLAZULI).setItemName("LazuliAxe"); - LazuliSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("LazuliSpade", 11433).getInt(), toolLAZULI).setItemName("LazuliSpade"); - LazuliHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("LazuliHoe", 11434).getInt(), toolLAZULI).setItemName("LazuliHoe"); - LazuliSword = new ItemMekanismSword(Mekanism.configuration.getItem("LazuliSword", 11435).getInt(), toolLAZULI).setItemName("LazuliSword"); - LazuliHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliHelmet", 11436).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setItemName("LazuliHelmet"); - LazuliBody = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliBody", 11437).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setItemName("LazuliBody"); - LazuliLegs = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliLegs", 11438).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setItemName("LazuliLegs"); - LazuliBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliBoots", 11439).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setItemName("LazuliBoots"); + LazuliPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("LazuliPaxel", 11430).getInt(), toolLAZULI2).setUnlocalizedName("LazuliPaxel"); + LazuliPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("LazuliPickaxe", 11431).getInt(), toolLAZULI).setUnlocalizedName("LazuliPickaxe"); + LazuliAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("LazuliAxe", 11432).getInt(), toolLAZULI).setUnlocalizedName("LazuliAxe"); + LazuliShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("LazuliShovel", 11433).getInt(), toolLAZULI).setUnlocalizedName("LazuliShovel"); + LazuliHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("LazuliHoe", 11434).getInt(), toolLAZULI).setUnlocalizedName("LazuliHoe"); + LazuliSword = new ItemMekanismSword(Mekanism.configuration.getItem("LazuliSword", 11435).getInt(), toolLAZULI).setUnlocalizedName("LazuliSword"); + LazuliHelmet = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliHelmet", 11436).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet"); + LazuliChestplate = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliChestplate", 11437).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate"); + LazuliLeggings = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliLeggings", 11438).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings"); + LazuliBoots = (new ItemMekanismArmor(Mekanism.configuration.getItem("LazuliBoots", 11439).getInt(), armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots"); //Glowstone - GlowstonePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("GlowstonePaxel", 11440).getInt(), toolGLOWSTONE2).setItemName("GlowstonePaxel"); - GlowstonePickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("GlowstonePickaxe", 11441).getInt(), toolGLOWSTONE).setItemName("GlowstonePickaxe"); - GlowstoneAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("GlowstoneAxe", 11442).getInt(), toolGLOWSTONE).setItemName("GlowstoneAxe"); - GlowstoneSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("GlowstoneSpade", 11443).getInt(), toolGLOWSTONE).setItemName("GlowstoneSpade"); - GlowstoneHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("GlowstoneHoe", 11444).getInt(), toolGLOWSTONE).setItemName("GlowstoneHoe"); - GlowstoneSword = new ItemMekanismSword(Mekanism.configuration.getItem("GlowstoneSword", 11445).getInt(), toolGLOWSTONE).setItemName("GlowstoneSword"); - GlowstoneHelmet = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneHelmet", 11446).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setItemName("GlowstoneHelmet"); - GlowstoneBody = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneBody", 11447).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setItemName("GlowstoneBody"); - GlowstoneLegs = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneLegs", 11448).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setItemName("GlowstoneLegs"); - GlowstoneBoots = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneBoots", 11449).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setItemName("GlowstoneBoots"); + GlowstonePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("GlowstonePaxel", 11440).getInt(), toolGLOWSTONE2).setUnlocalizedName("GlowstonePaxel"); + GlowstonePickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("GlowstonePickaxe", 11441).getInt(), toolGLOWSTONE).setUnlocalizedName("GlowstonePickaxe"); + GlowstoneAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("GlowstoneAxe", 11442).getInt(), toolGLOWSTONE).setUnlocalizedName("GlowstoneAxe"); + GlowstoneShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("GlowstoneShovel", 11443).getInt(), toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel"); + GlowstoneHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("GlowstoneHoe", 11444).getInt(), toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe"); + GlowstoneSword = new ItemMekanismSword(Mekanism.configuration.getItem("GlowstoneSword", 11445).getInt(), toolGLOWSTONE).setUnlocalizedName("GlowstoneSword"); + GlowstoneHelmet = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneHelmet", 11446).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet"); + GlowstoneChestplate = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneChestplate", 11447).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate"); + GlowstoneLeggings = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneLeggings", 11448).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings"); + GlowstoneBoots = new ItemMekanismArmor(Mekanism.configuration.getItem("GlowstoneBoots", 11449).getInt(), armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots"); //Base Paxels - WoodPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("WoodPaxel", 11450).getInt(), EnumToolMaterial.WOOD).setItemName("WoodPaxel"); - StonePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("StonePaxel", 11451).getInt(), EnumToolMaterial.STONE).setItemName("StonePaxel"); - IronPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("IronPaxel", 11452).getInt(), EnumToolMaterial.IRON).setItemName("IronPaxel"); - DiamondPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("DiamondPaxel", 11453).getInt(), EnumToolMaterial.EMERALD).setItemName("DiamondPaxel"); - GoldPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("GoldPaxel", 11454).getInt(), EnumToolMaterial.GOLD).setItemName("GoldPaxel"); + WoodPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("WoodPaxel", 11450).getInt(), EnumToolMaterial.WOOD).setUnlocalizedName("WoodPaxel"); + StonePaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("StonePaxel", 11451).getInt(), EnumToolMaterial.STONE).setUnlocalizedName("StonePaxel"); + IronPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("IronPaxel", 11452).getInt(), EnumToolMaterial.IRON).setUnlocalizedName("IronPaxel"); + DiamondPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("DiamondPaxel", 11453).getInt(), EnumToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel"); + GoldPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("GoldPaxel", 11454).getInt(), EnumToolMaterial.GOLD).setUnlocalizedName("GoldPaxel"); //Steel - SteelPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("SteelPaxel", 11455).getInt(), toolSTEEL2).setItemName("SteelPaxel"); - SteelPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("SteelPickaxe", 11456).getInt(), toolSTEEL).setItemName("SteelPickaxe"); - SteelAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("SteelAxe", 11457).getInt(), toolSTEEL).setItemName("SteelAxe"); - SteelSpade = new ItemMekanismSpade(Mekanism.configuration.getItem("SteelSpade", 11458).getInt(), toolSTEEL).setItemName("SteelSpade"); - SteelHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("SteelHoe", 11459).getInt(), toolSTEEL).setItemName("SteelHoe"); - SteelSword = new ItemMekanismSword(Mekanism.configuration.getItem("SteelSword", 11460).getInt(), toolSTEEL).setItemName("SteelSword"); - SteelHelmet = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelHelmet", 11461).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setItemName("SteelHelmet"); - SteelBody = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelBody", 11462).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setItemName("SteelBody"); - SteelLegs = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelLegs", 11463).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setItemName("SteelLegs"); - SteelBoots = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelBoots", 11464).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setItemName("SteelBoots"); + SteelPaxel = new ItemMekanismPaxel(Mekanism.configuration.getItem("SteelPaxel", 11455).getInt(), toolSTEEL2).setUnlocalizedName("SteelPaxel"); + SteelPickaxe = new ItemMekanismPickaxe(Mekanism.configuration.getItem("SteelPickaxe", 11456).getInt(), toolSTEEL).setUnlocalizedName("SteelPickaxe"); + SteelAxe = new ItemMekanismAxe(Mekanism.configuration.getItem("SteelAxe", 11457).getInt(), toolSTEEL).setUnlocalizedName("SteelAxe"); + SteelShovel = new ItemMekanismShovel(Mekanism.configuration.getItem("SteelShovel", 11458).getInt(), toolSTEEL).setUnlocalizedName("SteelShovel"); + SteelHoe = new ItemMekanismHoe(Mekanism.configuration.getItem("SteelHoe", 11459).getInt(), toolSTEEL).setUnlocalizedName("SteelHoe"); + SteelSword = new ItemMekanismSword(Mekanism.configuration.getItem("SteelSword", 11460).getInt(), toolSTEEL).setUnlocalizedName("SteelSword"); + SteelHelmet = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelHelmet", 11461).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); + SteelChestplate = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelChestplate", 11462).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); + SteelLeggings = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelLeggings", 11463).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings"); + SteelBoots = new ItemMekanismArmor(Mekanism.configuration.getItem("SteelBoots", 11464).getInt(), armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots"); Mekanism.configuration.save(); } @ForgeSubscribe - public void onLivingSpecialSpawn(LivingSpecialSpawnEvent event) + public void onLivingSpecialSpawn(LivingSpawnEvent event) { Random random = new Random(); @@ -627,24 +544,24 @@ public class MekanismTools { if(event.entityLiving instanceof EntityZombie) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(GlowstoneSword)); event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(GlowstoneHelmet)); - event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(GlowstoneBody)); - event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(GlowstoneLegs)); + event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(GlowstoneChestplate)); + event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(GlowstoneLeggings)); event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(GlowstoneBoots)); } else if(secondChance == 1) { if(event.entityLiving instanceof EntityZombie) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(LazuliSword)); event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(LazuliHelmet)); - event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(LazuliBody)); - event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(LazuliLegs)); + event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(LazuliChestplate)); + event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(LazuliLeggings)); event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(LazuliBoots)); } else if(secondChance == 2) { if(event.entityLiving instanceof EntityZombie) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(OsmiumSword)); event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(OsmiumHelmet)); - event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(OsmiumBody)); - event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(OsmiumLegs)); + event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(OsmiumChestplate)); + event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(OsmiumLeggings)); event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(OsmiumBoots)); } }