From cfc5dff445952540478625963dd420b97e5ff2d0 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sat, 20 Jul 2013 12:10:14 -0400 Subject: [PATCH] First 1.6 push, still work to be done --- .../api/fuels/IronEngineCoolant.java | 32 -- .../buildcraft/api/fuels/IronEngineFuel.java | 47 --- .../api/recipes/RefineryRecipe.java | 153 --------- common/buildcraft/api/tools/IToolPipette.java | 40 --- common/ic2/api/Direction.java | 35 +- common/ic2/api/crops/CropCard.java | 6 +- common/ic2/api/item/IElectricItemManager.java | 6 +- common/ic2/api/network/NetworkHelper.java | 12 +- common/mekanism/api/EnumGas.java | 5 +- common/mekanism/api/InfuseType.java | 8 +- common/mekanism/api/SideData.java | 10 +- .../client/ClientPlayerTickHandler.java | 5 +- common/mekanism/client/ClientProxy.java | 23 +- common/mekanism/client/ClientTickHandler.java | 100 ++++-- ...ientUpdate.java => FluidClientUpdate.java} | 14 +- .../client/GuiAdvancedElectricMachine.java | 2 +- common/mekanism/client/GuiControlPanel.java | 5 +- common/mekanism/client/GuiDynamicTank.java | 33 +- common/mekanism/client/GuiElectricChest.java | 4 +- .../mekanism/client/GuiElectricMachine.java | 2 +- common/mekanism/client/GuiElectricPump.java | 26 +- common/mekanism/client/GuiEnergyCube.java | 5 +- common/mekanism/client/GuiFactory.java | 2 +- common/mekanism/client/GuiGasTank.java | 5 +- .../client/GuiMetallurgicInfuser.java | 7 +- common/mekanism/client/GuiPasswordEnter.java | 5 +- common/mekanism/client/GuiPasswordModify.java | 5 +- .../client/GuiPortableTeleporter.java | 5 +- common/mekanism/client/GuiRobitCrafting.java | 5 +- common/mekanism/client/GuiRobitInventory.java | 5 +- common/mekanism/client/GuiRobitMain.java | 5 +- common/mekanism/client/GuiRobitRepair.java | 5 +- common/mekanism/client/GuiRobitSmelting.java | 5 +- common/mekanism/client/GuiStopwatch.java | 4 +- common/mekanism/client/GuiTeleporter.java | 5 +- common/mekanism/client/GuiWeatherOrb.java | 4 +- .../mekanism/client/ItemRenderingHandler.java | 9 +- .../client/MachineRenderingHandler.java | 19 +- common/mekanism/client/MekanismRenderer.java | 48 ++- common/mekanism/client/RenderChargepad.java | 4 +- .../client/RenderConfigurableMachine.java | 5 +- common/mekanism/client/RenderDynamicTank.java | 108 ++---- .../mekanism/client/RenderElectricChest.java | 4 +- .../mekanism/client/RenderElectricPump.java | 5 +- .../mekanism/client/RenderMechanicalPipe.java | 49 ++- .../client/RenderMetallurgicInfuser.java | 4 +- common/mekanism/client/RenderObsidianTNT.java | 10 +- .../client/RenderPressurizedTube.java | 6 +- common/mekanism/client/RenderRobit.java | 10 + .../client/RenderTheoreticalElementizer.java | 4 +- .../mekanism/client/RenderUniversalCable.java | 8 +- common/mekanism/client/Sound.java | 33 +- common/mekanism/client/SoundHandler.java | 24 +- .../mekanism/client/ThreadClientUpdate.java | 4 +- .../mekanism/client/TransmitterRenderer.java | 9 +- common/mekanism/common/BlockBasic.java | 52 +-- common/mekanism/common/BlockEnergyCube.java | 4 +- common/mekanism/common/BlockGasTank.java | 9 +- common/mekanism/common/BlockMachine.java | 8 +- common/mekanism/common/CommandMekanism.java | 43 +-- common/mekanism/common/CommonProxy.java | 11 + .../common/CommonWorldTickHandler.java | 2 +- .../ContainerAdvancedElectricMachine.java | 4 +- .../mekanism/common/ContainerDynamicTank.java | 8 +- .../common/ContainerElectricChest.java | 4 +- .../common/ContainerElectricMachine.java | 4 +- .../common/ContainerElectricPump.java | 8 +- .../mekanism/common/ContainerEnergyCube.java | 4 +- common/mekanism/common/ContainerFactory.java | 4 +- common/mekanism/common/ContainerGasTank.java | 4 +- .../common/ContainerMetallurgicInfuser.java | 4 +- .../common/ContainerRobitInventory.java | 4 +- .../mekanism/common/ContainerRobitMain.java | 4 +- .../common/ContainerRobitSmelting.java | 4 +- .../mekanism/common/ContainerTeleporter.java | 4 +- ...cLiquidTank.java => DynamicFluidTank.java} | 66 ++-- common/mekanism/common/DynamicTankCache.java | 4 +- common/mekanism/common/EntityRobit.java | 30 +- .../{LiquidNetwork.java => FluidNetwork.java} | 78 ++--- common/mekanism/common/FluidSlot.java | 39 +++ common/mekanism/common/IMechanicalPipe.java | 24 +- common/mekanism/common/ISustainedTank.java | 6 +- .../common/ItemAtomicDisassembler.java | 6 +- .../mekanism/common/ItemBlockEnergyCube.java | 2 +- common/mekanism/common/ItemBlockMachine.java | 24 +- .../mekanism/common/ItemBlockTransmitter.java | 2 +- common/mekanism/common/ItemConfigurator.java | 7 +- common/mekanism/common/ItemEnergyMeter.java | 13 +- common/mekanism/common/ItemRobit.java | 5 + common/mekanism/common/Mekanism.java | 37 +- common/mekanism/common/MekanismHooks.java | 2 +- common/mekanism/common/MekanismRecipe.java | 8 +- common/mekanism/common/MekanismUtils.java | 139 +++++--- common/mekanism/common/PipeUtils.java | 24 +- .../mekanism/common/SynchronizedTankData.java | 6 +- .../mekanism/common/TankUpdateProtocol.java | 4 +- common/mekanism/common/Tier.java | 14 +- .../TileEntityAdvancedElectricMachine.java | 21 +- .../common/TileEntityAdvancedFactory.java | 10 +- .../common/TileEntityBasicMachine.java | 19 +- .../mekanism/common/TileEntityChargepad.java | 10 +- .../mekanism/common/TileEntityCombiner.java | 3 +- .../common/TileEntityContainerBlock.java | 18 +- common/mekanism/common/TileEntityCrusher.java | 4 +- .../common/TileEntityDynamicTank.java | 72 ++-- .../common/TileEntityDynamicValve.java | 74 ++-- .../common/TileEntityElectricChest.java | 26 +- .../common/TileEntityElectricMachine.java | 17 +- .../common/TileEntityElectricPump.java | 186 +++++----- .../common/TileEntityEliteFactory.java | 10 +- .../common/TileEntityEnergizedSmelter.java | 3 +- .../mekanism/common/TileEntityEnergyCube.java | 19 +- .../common/TileEntityEnrichmentChamber.java | 3 +- common/mekanism/common/TileEntityFactory.java | 24 +- common/mekanism/common/TileEntityGasTank.java | 19 +- .../common/TileEntityMechanicalPipe.java | 96 +++--- .../common/TileEntityMetallurgicInfuser.java | 26 +- .../common/TileEntityOsmiumCompressor.java | 3 +- .../common/TileEntityPurificationChamber.java | 3 +- .../mekanism/common/TileEntityTeleporter.java | 8 +- .../TileEntityTheoreticalElementizer.java | 3 +- .../PacketTransmitterTransferUpdate.java | 23 +- .../client/BlockRenderingHandler.java | 15 +- .../generators/client/GuiBioGenerator.java | 12 +- .../client/GuiElectrolyticSeparator.java | 5 +- .../generators/client/GuiHeatGenerator.java | 7 +- .../client/GuiHydrogenGenerator.java | 5 +- .../generators/client/GuiSolarGenerator.java | 5 +- .../generators/client/GuiWindTurbine.java | 5 +- .../client/RenderAdvancedSolarGenerator.java | 4 +- .../generators/client/RenderBioGenerator.java | 4 +- .../client/RenderElectrolyticSeparator.java | 6 +- .../client/RenderHeatGenerator.java | 4 +- .../client/RenderHydrogenGenerator.java | 4 +- .../generators/client/RenderWindTurbine.java | 4 +- .../generators/common/BlockGenerator.java | 8 +- .../common/ContainerBioGenerator.java | 4 +- .../ContainerElectrolyticSeparator.java | 16 +- .../common/ContainerHeatGenerator.java | 4 +- .../common/ContainerHydrogenGenerator.java | 4 +- .../common/ContainerSolarGenerator.java | 4 +- .../common/ContainerWindTurbine.java | 4 +- .../generators/common/ItemBlockGenerator.java | 24 +- .../generators/common/MekanismGenerators.java | 11 +- .../common/TileEntityBioGenerator.java | 117 +++---- .../TileEntityElectrolyticSeparator.java | 165 ++++----- .../common/TileEntityHeatGenerator.java | 109 +++--- .../common/TileEntityHydrogenGenerator.java | 19 +- .../common/TileEntitySolarGenerator.java | 8 +- .../nei/AdvancedMachineRecipeHandler.java | 138 -------- .../mekanism/nei/CombinerRecipeHandler.java | 54 --- common/mekanism/nei/CrusherRecipeHandler.java | 45 --- .../nei/EnrichmentChamberRecipeHandler.java | 45 --- common/mekanism/nei/MachineRecipeHandler.java | 123 ------- .../mekanism/nei/MekanismRecipeHandler.java | 193 ----------- .../nei/MetallurgicInfuserRecipeHandler.java | 205 ----------- common/mekanism/nei/NEIMekanismConfig.java | 54 --- .../nei/OsmiumCompressorRecipeHandler.java | 54 --- .../nei/PurificationChamberRecipeHandler.java | 53 --- .../api/ThermalExpansionInfo.java | 6 +- .../api/crafting/ICrucibleManager.java | 6 +- .../api/crafting/ICrucibleRecipe.java | 4 +- .../api/crafting/ITransposerManager.java | 14 +- .../api/crafting/ITransposerRecipe.java | 4 +- .../prefab/block/BlockAdvanced.java | 275 --------------- .../prefab/block/BlockConductor.java | 46 --- .../prefab/block/BlockRotatable.java | 76 ----- .../prefab/flag/CommandFlag.java | 319 ------------------ .../prefab/flag/Flag.java | 43 --- .../prefab/flag/FlagBase.java | 26 -- .../prefab/flag/FlagRegion.java | 184 ---------- .../prefab/flag/FlagRegistry.java | 52 --- .../prefab/flag/FlagWorld.java | 200 ----------- .../prefab/flag/ModFlag.java | 117 ------- .../prefab/flag/NBTFileLoader.java | 113 ------- .../mekanism/gui/GuiBioGenerator.png | Bin .../mekanism/gui/GuiChamber.png | Bin .../mekanism/gui/GuiCombiner.png | Bin .../mekanism/gui/GuiCompressor.png | Bin .../mekanism/gui/GuiControlPanel.png | Bin .../mekanism/gui/GuiCrusher.png | Bin .../mekanism/gui/GuiDynamicTank.png | Bin .../mekanism/gui/GuiElectricChest.png | Bin .../mekanism/gui/GuiElectricPump.png | Bin .../mekanism/gui/GuiElectrolyticSeparator.png | Bin .../mekanism/gui/GuiElementizer.png | Bin .../mekanism/gui/GuiEnergizedSmelter.png | Bin .../mekanism/gui/GuiEnergyCube.png | Bin .../mekanism/gui/GuiGasTank.png | Bin .../mekanism/gui/GuiHeatGenerator.png | Bin .../mekanism/gui/GuiHydrogenGenerator.png | Bin .../mekanism/gui/GuiMetallurgicInfuser.png | Bin .../mekanism/gui/GuiPasswordEnter.png | Bin .../mekanism/gui/GuiPasswordModify.png | Bin .../mekanism/gui/GuiPortableTeleporter.png | Bin .../mekanism/gui/GuiPurificationChamber.png | Bin .../mekanism/gui/GuiRobitCrafting.png | Bin .../mekanism/gui/GuiRobitInventory.png | Bin .../mekanism/gui/GuiRobitMain.png | Bin .../mekanism/gui/GuiRobitRepair.png | Bin .../mekanism/gui/GuiRobitSmelting.png | Bin .../mekanism/gui/GuiSolarGenerator.png | Bin .../mekanism/gui/GuiStopwatch.png | Bin .../mekanism/gui/GuiTeleporter.png | Bin .../mekanism/gui/GuiWeatherOrb.png | Bin .../mekanism/gui/GuiWindTurbine.png | Bin .../gui/factory/GuiAdvancedFactory.png | Bin .../mekanism/gui/factory/GuiBasicFactory.png | Bin .../mekanism/gui/factory/GuiEliteFactory.png | Bin .../{mods => assets}/mekanism/infuse/Bio.png | Bin .../mekanism/infuse/Carbon.png | Bin .../mekanism/infuse/Diamond.png | Bin .../mekanism/infuse/Infusions.png | Bin .../{mods => assets}/mekanism/infuse/Tin.png | Bin .../render/AdvancedSolarGenerator.png | Bin .../mekanism/render/BioGenerator.png | Bin .../mekanism/render/Chargepad.png | Bin .../mekanism/render/ElectricChest.png | Bin .../mekanism/render/ElectricPump.png | Bin .../render/ElectrolyticSeparatorHydrogen.png | Bin .../render/ElectrolyticSeparatorNone.png | Bin .../render/ElectrolyticSeparatorOxygen.png | Bin .../mekanism/render/HeatGenerator.png | Bin .../mekanism/render/HeatGeneratorOn.png | Bin .../mekanism/render/HydrogenGenerator.png | Bin .../mekanism/render/MechanicalPipe.png | Bin .../mekanism/render/MechanicalPipeActive.png | Bin .../mekanism/render/MetallurgicInfuser.png | Bin .../mekanism/render/PressurizedTube.png | Bin .../mekanism/render/Robit.png | Bin .../mekanism/render/SideConfigOverlay.png | Bin .../render/TheoreticalElementizer.png | Bin .../mekanism/render/UniversalCable.png | Bin .../mekanism/render/WindTurbine.png | Bin .../mekanism/sound/BioGenerator.ogg | Bin .../mekanism/sound/Chamber.ogg | Bin .../mekanism/sound/Chargepad.ogg | Bin .../mekanism/sound/Combiner.ogg | Bin .../mekanism/sound/Compressor.ogg | Bin .../mekanism/sound/Crusher.ogg | Bin .../mekanism/sound/Elementizer.ogg | Bin .../mekanism/sound/HeatGenerator.ogg | Bin .../mekanism/sound/HydrogenGenerator.ogg | Bin .../mekanism/sound/MetallurgicInfuser.ogg | Bin .../mekanism/sound/PurificationChamber.ogg | Bin .../mekanism/sound/Smelter.ogg | Bin .../mekanism/sound/SolarGenerator.ogg | Bin .../mekanism/sound/WindTurbine.ogg | Bin .../mekanism/sound/cj/CJ_1.ogg | Bin .../mekanism/sound/cj/CJ_2.ogg | Bin .../mekanism/sound/cj/CJ_3.ogg | Bin .../blocks/AdvancedEnergyCubeFront.png | Bin .../blocks/AdvancedEnergyCubeSide.png | Bin .../textures/blocks/AdvancedFactoryFront.png | Bin .../textures/blocks/AdvancedFactorySide.png | Bin .../textures/blocks/AdvancedFactoryTop.png | Bin .../textures/blocks/BasicEnergyCubeFront.png | Bin .../textures/blocks/BasicEnergyCubeSide.png | Bin .../textures/blocks/BasicFactoryFront.png | Bin .../textures/blocks/BasicFactorySide.png | Bin .../textures/blocks/BasicFactoryTop.png | Bin .../mekanism/textures/blocks/BronzeBlock.png | Bin .../mekanism/textures/blocks/CoalBlock.png | Bin .../textures/blocks/CombinerFrontOff.png | Bin .../textures/blocks/CombinerFrontOn.png | Bin .../blocks/CombinerFrontOn.png.mcmeta | 5 + .../textures/blocks/CrusherFrontOff.png | Bin .../textures/blocks/CrusherFrontOn.png | Bin .../textures/blocks/CrusherFrontOn.png.mcmeta | 5 + .../mekanism/textures/blocks/DynamicGlass.png | Bin .../mekanism/textures/blocks/DynamicTank.png | Bin .../mekanism/textures/blocks/DynamicValve.png | Bin .../textures/blocks/ElectricPumpFront.png | Bin .../textures/blocks/ElectricPumpSide.png | Bin .../textures/blocks/EliteEnergyCubeFront.png | Bin .../textures/blocks/EliteEnergyCubeSide.png | Bin .../textures/blocks/EliteFactoryFront.png | Bin .../textures/blocks/EliteFactorySide.png | Bin .../textures/blocks/EliteFactoryTop.png | Bin .../blocks/EnergizedSmelterFrontOff.png | Bin .../blocks/EnergizedSmelterFrontOn.png | Bin .../blocks/EnergizedSmelterFrontOn.png.mcmeta | 5 + .../blocks/EnrichmentChamberFrontOff.png | Bin .../blocks/EnrichmentChamberFrontOn.png | Bin .../mekanism/textures/blocks/GasTankFront.png | Bin .../mekanism/textures/blocks/GasTankSide.png | Bin .../mekanism/textures/blocks/GasTankTop.png | Bin .../blocks/MetallurgicInfuserBackOff.png | Bin .../blocks/MetallurgicInfuserBackOn.png | Bin .../MetallurgicInfuserBackOn.png.mcmeta | 5 + .../blocks/MetallurgicInfuserFrontOff.png | Bin .../blocks/MetallurgicInfuserFrontOn.png | Bin .../MetallurgicInfuserFrontOn.png.mcmeta | 5 + .../blocks/MetallurgicInfuserSideOff.png | Bin .../blocks/MetallurgicInfuserSideOn.png | Bin .../MetallurgicInfuserSideOn.png.mcmeta | 5 + .../blocks/MetallurgicInfuserTopOff.png | Bin .../blocks/MetallurgicInfuserTopOn.png | Bin .../textures/blocks/ObsidianTNTBottom.png | Bin .../textures/blocks/ObsidianTNTSide.png | Bin .../textures/blocks/ObsidianTNTTop.png | Bin .../mekanism/textures/blocks/OsmiumBlock.png | Bin .../blocks/OsmiumCompressorFrontOff.png | Bin .../blocks/OsmiumCompressorFrontOn.png | Bin .../blocks/OsmiumCompressorFrontOn.png.mcmeta | 5 + .../mekanism/textures/blocks/OsmiumOre.png | Bin .../mekanism/textures/blocks/OverlayAqua.png | Bin .../mekanism/textures/blocks/OverlayBlack.png | Bin .../textures/blocks/OverlayBrightGreen.png | Bin .../textures/blocks/OverlayDarkAqua.png | Bin .../textures/blocks/OverlayDarkBlue.png | Bin .../textures/blocks/OverlayDarkGreen.png | Bin .../textures/blocks/OverlayDarkGrey.png | Bin .../textures/blocks/OverlayDarkRed.png | Bin .../mekanism/textures/blocks/OverlayGrey.png | Bin .../textures/blocks/OverlayIndigo.png | Bin .../textures/blocks/OverlayOrange.png | Bin .../mekanism/textures/blocks/OverlayPink.png | Bin .../textures/blocks/OverlayPurple.png | Bin .../mekanism/textures/blocks/OverlayRed.png | Bin .../mekanism/textures/blocks/OverlayWhite.png | Bin .../textures/blocks/OverlayYellow.png | Bin .../blocks/PurificationChamberFrontOff.png | Bin .../blocks/PurificationChamberFrontOn.png | Bin .../PurificationChamberFrontOn.png.mcmeta | 5 + .../textures/blocks/RefinedGlowstone.png | Bin .../textures/blocks/RefinedObsidian.png | Bin .../textures/blocks/SolarGeneratorFront.png | Bin .../textures/blocks/SolarGeneratorSide.png | Bin .../textures/blocks/SolarGeneratorTop.png | Bin .../mekanism/textures/blocks/SteelBlock.png | Bin .../mekanism/textures/blocks/SteelCasing.png | Bin .../mekanism/textures/blocks/Teleporter.png | Bin .../textures/blocks/TeleporterFrame.png | Bin .../blocks/UltimateEnergyCubeFront.png | Bin .../blocks/UltimateEnergyCubeSide.png | Bin .../mekanism/textures/items/AtomicCore.png | Bin .../textures/items/AtomicDisassembler.png | Bin .../mekanism/textures/items/BioFuel.png | Bin .../mekanism/textures/items/BronzeAxe.png | Bin .../mekanism/textures/items/BronzeBoots.png | Bin .../textures/items/BronzeChestplate.png | Bin .../mekanism/textures/items/BronzeHelmet.png | Bin .../mekanism/textures/items/BronzeHoe.png | Bin .../mekanism/textures/items/BronzeIngot.png | Bin .../textures/items/BronzeLeggings.png | Bin .../mekanism/textures/items/BronzePaxel.png | Bin .../mekanism/textures/items/BronzePickaxe.png | Bin .../mekanism/textures/items/BronzeShovel.png | Bin .../mekanism/textures/items/BronzeSword.png | Bin .../textures/items/CompressedCarbon.png | Bin .../mekanism/textures/items/Configurator.png | Bin .../textures/items/ControlCircuit.png | Bin .../mekanism/textures/items/CopperClump.png | Bin .../mekanism/textures/items/CopperDust.png | Bin .../mekanism/textures/items/DiamondDust.png | Bin .../mekanism/textures/items/DiamondPaxel.png | Bin .../textures/items/DirtyCopperDust.png | Bin .../mekanism/textures/items/DirtyGoldDust.png | Bin .../mekanism/textures/items/DirtyIronDust.png | Bin .../textures/items/DirtyObsidianDust.png | Bin .../textures/items/DirtyOsmiumDust.png | Bin .../textures/items/DirtySilverDust.png | Bin .../mekanism/textures/items/DirtyTinDust.png | Bin .../mekanism/textures/items/ElectricBow.png | Bin .../textures/items/ElectrolyticCore.png | Bin .../mekanism/textures/items/EnergyMeter.png | Bin .../mekanism/textures/items/EnergyTablet.png | Bin .../mekanism/textures/items/EnergyUpgrade.png | Bin .../mekanism/textures/items/EnrichedAlloy.png | Bin .../mekanism/textures/items/EnrichedIron.png | Bin .../mekanism/textures/items/GlowstoneAxe.png | Bin .../textures/items/GlowstoneBoots.png | Bin .../textures/items/GlowstoneChestplate.png | Bin .../textures/items/GlowstoneHelmet.png | Bin .../mekanism/textures/items/GlowstoneHoe.png | Bin .../textures/items/GlowstoneIngot.png | Bin .../textures/items/GlowstoneLeggings.png | Bin .../textures/items/GlowstonePaxel.png | Bin .../textures/items/GlowstonePickaxe.png | Bin .../textures/items/GlowstoneShovel.png | Bin .../textures/items/GlowstoneSword.png | Bin .../mekanism/textures/items/GoldClump.png | Bin .../mekanism/textures/items/GoldDust.png | Bin .../mekanism/textures/items/GoldPaxel.png | Bin .../mekanism/textures/items/IronClump.png | Bin .../mekanism/textures/items/IronDust.png | Bin .../mekanism/textures/items/IronPaxel.png | Bin .../mekanism/textures/items/LazuliAxe.png | Bin .../mekanism/textures/items/LazuliBoots.png | Bin .../textures/items/LazuliChestplate.png | Bin .../mekanism/textures/items/LazuliHelmet.png | Bin .../mekanism/textures/items/LazuliHoe.png | Bin .../textures/items/LazuliLeggings.png | Bin .../mekanism/textures/items/LazuliPaxel.png | Bin .../mekanism/textures/items/LazuliPickaxe.png | Bin .../mekanism/textures/items/LazuliShovel.png | Bin .../mekanism/textures/items/LazuliSword.png | Bin .../mekanism/textures/items/LiquidEnergy.png | Bin .../mekanism/textures/items/LiquidEnergy.txt | 0 .../textures/items/LiquidHydrogen.png | Bin .../textures/items/LiquidHydrogen.txt | 0 .../mekanism/textures/items/LiquidOxygen.png | Bin .../mekanism/textures/items/LiquidOxygen.txt | 0 .../mekanism/textures/items/ObsidianAxe.png | Bin .../mekanism/textures/items/ObsidianBoots.png | Bin .../textures/items/ObsidianChestplate.png | Bin .../mekanism/textures/items/ObsidianDust.png | Bin .../textures/items/ObsidianHelmet.png | Bin .../mekanism/textures/items/ObsidianHoe.png | Bin .../mekanism/textures/items/ObsidianIngot.png | Bin .../textures/items/ObsidianLeggings.png | Bin .../mekanism/textures/items/ObsidianPaxel.png | Bin .../textures/items/ObsidianPickaxe.png | Bin .../textures/items/ObsidianShovel.png | Bin .../mekanism/textures/items/ObsidianSword.png | Bin .../mekanism/textures/items/OsmiumAxe.png | Bin .../mekanism/textures/items/OsmiumBoots.png | Bin .../textures/items/OsmiumChestplate.png | Bin .../mekanism/textures/items/OsmiumClump.png | Bin .../mekanism/textures/items/OsmiumDust.png | Bin .../mekanism/textures/items/OsmiumHelmet.png | Bin .../mekanism/textures/items/OsmiumHoe.png | Bin .../mekanism/textures/items/OsmiumIngot.png | Bin .../textures/items/OsmiumLeggings.png | Bin .../mekanism/textures/items/OsmiumPaxel.png | Bin .../mekanism/textures/items/OsmiumPickaxe.png | Bin .../mekanism/textures/items/OsmiumShovel.png | Bin .../mekanism/textures/items/OsmiumSword.png | Bin .../textures/items/PortableTeleporter.png | Bin .../mekanism/textures/items/SilverClump.png | Bin .../mekanism/textures/items/SilverDust.png | Bin .../mekanism/textures/items/SolarPanel.png | Bin .../mekanism/textures/items/SpeedUpgrade.png | Bin .../mekanism/textures/items/SteelAxe.png | Bin .../mekanism/textures/items/SteelBoots.png | Bin .../textures/items/SteelChestplate.png | Bin .../mekanism/textures/items/SteelDust.png | Bin .../mekanism/textures/items/SteelHelmet.png | Bin .../mekanism/textures/items/SteelHoe.png | Bin .../mekanism/textures/items/SteelIngot.png | Bin .../mekanism/textures/items/SteelLeggings.png | Bin .../mekanism/textures/items/SteelPaxel.png | Bin .../mekanism/textures/items/SteelPickaxe.png | Bin .../mekanism/textures/items/SteelShovel.png | Bin .../mekanism/textures/items/SteelSword.png | Bin .../mekanism/textures/items/StonePaxel.png | Bin .../mekanism/textures/items/Stopwatch.png | Bin .../mekanism/textures/items/StorageTank.png | Bin .../textures/items/TeleportationCore.png | Bin .../mekanism/textures/items/TinClump.png | Bin .../mekanism/textures/items/TinDust.png | Bin .../mekanism/textures/items/WeatherOrb.png | Bin .../mekanism/textures/items/WoodPaxel.png | Bin .../textures/blocks/CombinerFrontOn.txt | 0 .../textures/blocks/CrusherFrontOn.txt | 0 .../blocks/EnergizedSmelterFrontOn.txt | 0 .../blocks/MetallurgicInfuserBackOn.txt | 0 .../blocks/MetallurgicInfuserFrontOn.txt | 0 .../blocks/MetallurgicInfuserSideOn.txt | 0 .../blocks/OsmiumCompressorFrontOn.txt | 0 .../blocks/PurificationChamberFrontOn.txt | 0 462 files changed, 1473 insertions(+), 4025 deletions(-) delete mode 100644 common/buildcraft/api/fuels/IronEngineCoolant.java delete mode 100644 common/buildcraft/api/fuels/IronEngineFuel.java delete mode 100644 common/buildcraft/api/recipes/RefineryRecipe.java delete mode 100644 common/buildcraft/api/tools/IToolPipette.java rename common/mekanism/client/{LiquidClientUpdate.java => FluidClientUpdate.java} (75%) rename common/mekanism/common/{DynamicLiquidTank.java => DynamicFluidTank.java} (59%) rename common/mekanism/common/{LiquidNetwork.java => FluidNetwork.java} (71%) create mode 100644 common/mekanism/common/FluidSlot.java delete mode 100644 common/mekanism/nei/AdvancedMachineRecipeHandler.java delete mode 100644 common/mekanism/nei/CombinerRecipeHandler.java delete mode 100644 common/mekanism/nei/CrusherRecipeHandler.java delete mode 100644 common/mekanism/nei/EnrichmentChamberRecipeHandler.java delete mode 100644 common/mekanism/nei/MachineRecipeHandler.java delete mode 100644 common/mekanism/nei/MekanismRecipeHandler.java delete mode 100644 common/mekanism/nei/MetallurgicInfuserRecipeHandler.java delete mode 100644 common/mekanism/nei/NEIMekanismConfig.java delete mode 100644 common/mekanism/nei/OsmiumCompressorRecipeHandler.java delete mode 100644 common/mekanism/nei/PurificationChamberRecipeHandler.java delete mode 100644 common/universalelectricity/prefab/block/BlockAdvanced.java delete mode 100644 common/universalelectricity/prefab/block/BlockConductor.java delete mode 100644 common/universalelectricity/prefab/block/BlockRotatable.java delete mode 100644 common/universalelectricity/prefab/flag/CommandFlag.java delete mode 100644 common/universalelectricity/prefab/flag/Flag.java delete mode 100644 common/universalelectricity/prefab/flag/FlagBase.java delete mode 100644 common/universalelectricity/prefab/flag/FlagRegion.java delete mode 100644 common/universalelectricity/prefab/flag/FlagRegistry.java delete mode 100644 common/universalelectricity/prefab/flag/FlagWorld.java delete mode 100644 common/universalelectricity/prefab/flag/ModFlag.java delete mode 100644 common/universalelectricity/prefab/flag/NBTFileLoader.java rename resources/{mods => assets}/mekanism/gui/GuiBioGenerator.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiChamber.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiCombiner.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiCompressor.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiControlPanel.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiCrusher.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiDynamicTank.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiElectricChest.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiElectricPump.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiElectrolyticSeparator.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiElementizer.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiEnergizedSmelter.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiEnergyCube.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiGasTank.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiHeatGenerator.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiHydrogenGenerator.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiMetallurgicInfuser.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiPasswordEnter.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiPasswordModify.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiPortableTeleporter.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiPurificationChamber.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiRobitCrafting.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiRobitInventory.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiRobitMain.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiRobitRepair.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiRobitSmelting.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiSolarGenerator.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiStopwatch.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiTeleporter.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiWeatherOrb.png (100%) rename resources/{mods => assets}/mekanism/gui/GuiWindTurbine.png (100%) rename resources/{mods => assets}/mekanism/gui/factory/GuiAdvancedFactory.png (100%) rename resources/{mods => assets}/mekanism/gui/factory/GuiBasicFactory.png (100%) rename resources/{mods => assets}/mekanism/gui/factory/GuiEliteFactory.png (100%) rename resources/{mods => assets}/mekanism/infuse/Bio.png (100%) rename resources/{mods => assets}/mekanism/infuse/Carbon.png (100%) rename resources/{mods => assets}/mekanism/infuse/Diamond.png (100%) rename resources/{mods => assets}/mekanism/infuse/Infusions.png (100%) rename resources/{mods => assets}/mekanism/infuse/Tin.png (100%) rename resources/{mods => assets}/mekanism/render/AdvancedSolarGenerator.png (100%) rename resources/{mods => assets}/mekanism/render/BioGenerator.png (100%) rename resources/{mods => assets}/mekanism/render/Chargepad.png (100%) rename resources/{mods => assets}/mekanism/render/ElectricChest.png (100%) rename resources/{mods => assets}/mekanism/render/ElectricPump.png (100%) rename resources/{mods => assets}/mekanism/render/ElectrolyticSeparatorHydrogen.png (100%) rename resources/{mods => assets}/mekanism/render/ElectrolyticSeparatorNone.png (100%) rename resources/{mods => assets}/mekanism/render/ElectrolyticSeparatorOxygen.png (100%) rename resources/{mods => assets}/mekanism/render/HeatGenerator.png (100%) rename resources/{mods => assets}/mekanism/render/HeatGeneratorOn.png (100%) rename resources/{mods => assets}/mekanism/render/HydrogenGenerator.png (100%) rename resources/{mods => assets}/mekanism/render/MechanicalPipe.png (100%) rename resources/{mods => assets}/mekanism/render/MechanicalPipeActive.png (100%) rename resources/{mods => assets}/mekanism/render/MetallurgicInfuser.png (100%) rename resources/{mods => assets}/mekanism/render/PressurizedTube.png (100%) rename resources/{mods => assets}/mekanism/render/Robit.png (100%) rename resources/{mods => assets}/mekanism/render/SideConfigOverlay.png (100%) rename resources/{mods => assets}/mekanism/render/TheoreticalElementizer.png (100%) rename resources/{mods => assets}/mekanism/render/UniversalCable.png (100%) rename resources/{mods => assets}/mekanism/render/WindTurbine.png (100%) rename resources/{mods => assets}/mekanism/sound/BioGenerator.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Chamber.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Chargepad.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Combiner.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Compressor.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Crusher.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Elementizer.ogg (100%) rename resources/{mods => assets}/mekanism/sound/HeatGenerator.ogg (100%) rename resources/{mods => assets}/mekanism/sound/HydrogenGenerator.ogg (100%) rename resources/{mods => assets}/mekanism/sound/MetallurgicInfuser.ogg (100%) rename resources/{mods => assets}/mekanism/sound/PurificationChamber.ogg (100%) rename resources/{mods => assets}/mekanism/sound/Smelter.ogg (100%) rename resources/{mods => assets}/mekanism/sound/SolarGenerator.ogg (100%) rename resources/{mods => assets}/mekanism/sound/WindTurbine.ogg (100%) rename resources/{mods => assets}/mekanism/sound/cj/CJ_1.ogg (100%) rename resources/{mods => assets}/mekanism/sound/cj/CJ_2.ogg (100%) rename resources/{mods => assets}/mekanism/sound/cj/CJ_3.ogg (100%) rename resources/{mods => assets}/mekanism/textures/blocks/AdvancedEnergyCubeFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/AdvancedEnergyCubeSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/AdvancedFactoryFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/AdvancedFactorySide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/AdvancedFactoryTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BasicEnergyCubeFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BasicEnergyCubeSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BasicFactoryFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BasicFactorySide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BasicFactoryTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/BronzeBlock.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/CoalBlock.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/CombinerFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/CombinerFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/CrusherFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/CrusherFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/DynamicGlass.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/DynamicTank.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/DynamicValve.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/ElectricPumpFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/ElectricPumpSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EliteEnergyCubeFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EliteEnergyCubeSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EliteFactoryFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EliteFactorySide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EliteFactoryTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EnergizedSmelterFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EnergizedSmelterFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/EnrichmentChamberFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/EnrichmentChamberFrontOn.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/GasTankFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/GasTankSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/GasTankTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserBackOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserBackOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserSideOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserSideOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserTopOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/MetallurgicInfuserTopOn.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/ObsidianTNTBottom.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/ObsidianTNTSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/ObsidianTNTTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OsmiumBlock.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OsmiumCompressorFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OsmiumCompressorFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/OsmiumOre.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayAqua.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayBlack.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayBrightGreen.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayDarkAqua.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayDarkBlue.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayDarkGreen.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayDarkGrey.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayDarkRed.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayGrey.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayIndigo.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayOrange.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayPink.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayPurple.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayRed.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayWhite.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/OverlayYellow.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/PurificationChamberFrontOff.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/PurificationChamberFrontOn.png (100%) create mode 100644 resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta rename resources/{mods => assets}/mekanism/textures/blocks/RefinedGlowstone.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/RefinedObsidian.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/SolarGeneratorFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/SolarGeneratorSide.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/SolarGeneratorTop.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/SteelBlock.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/SteelCasing.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/Teleporter.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/TeleporterFrame.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/UltimateEnergyCubeFront.png (100%) rename resources/{mods => assets}/mekanism/textures/blocks/UltimateEnergyCubeSide.png (100%) rename resources/{mods => assets}/mekanism/textures/items/AtomicCore.png (100%) rename resources/{mods => assets}/mekanism/textures/items/AtomicDisassembler.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BioFuel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeIngot.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzePaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzePickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/BronzeSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/CompressedCarbon.png (100%) rename resources/{mods => assets}/mekanism/textures/items/Configurator.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ControlCircuit.png (100%) rename resources/{mods => assets}/mekanism/textures/items/CopperClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/CopperDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DiamondDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DiamondPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyCopperDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyGoldDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyIronDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyObsidianDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyOsmiumDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtySilverDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/DirtyTinDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ElectricBow.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ElectrolyticCore.png (100%) rename resources/{mods => assets}/mekanism/textures/items/EnergyMeter.png (100%) rename resources/{mods => assets}/mekanism/textures/items/EnergyTablet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/EnergyUpgrade.png (100%) rename resources/{mods => assets}/mekanism/textures/items/EnrichedAlloy.png (100%) rename resources/{mods => assets}/mekanism/textures/items/EnrichedIron.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneIngot.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstonePaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstonePickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GlowstoneSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GoldClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GoldDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/GoldPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/IronClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/IronDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/IronPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliPickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LazuliSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidEnergy.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidEnergy.txt (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidHydrogen.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidHydrogen.txt (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidOxygen.png (100%) rename resources/{mods => assets}/mekanism/textures/items/LiquidOxygen.txt (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianIngot.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianPickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/ObsidianSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumIngot.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumPickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/OsmiumSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/PortableTeleporter.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SilverClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SilverDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SolarPanel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SpeedUpgrade.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelAxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelBoots.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelChestplate.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelHelmet.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelHoe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelIngot.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelLeggings.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelPaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelPickaxe.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelShovel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/SteelSword.png (100%) rename resources/{mods => assets}/mekanism/textures/items/StonePaxel.png (100%) rename resources/{mods => assets}/mekanism/textures/items/Stopwatch.png (100%) rename resources/{mods => assets}/mekanism/textures/items/StorageTank.png (100%) rename resources/{mods => assets}/mekanism/textures/items/TeleportationCore.png (100%) rename resources/{mods => assets}/mekanism/textures/items/TinClump.png (100%) rename resources/{mods => assets}/mekanism/textures/items/TinDust.png (100%) rename resources/{mods => assets}/mekanism/textures/items/WeatherOrb.png (100%) rename resources/{mods => assets}/mekanism/textures/items/WoodPaxel.png (100%) delete mode 100644 resources/mods/mekanism/textures/blocks/CombinerFrontOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/CrusherFrontOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt delete mode 100644 resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt diff --git a/common/buildcraft/api/fuels/IronEngineCoolant.java b/common/buildcraft/api/fuels/IronEngineCoolant.java deleted file mode 100644 index 45ed04b70..000000000 --- a/common/buildcraft/api/fuels/IronEngineCoolant.java +++ /dev/null @@ -1,32 +0,0 @@ -package buildcraft.api.fuels; - -import java.util.LinkedList; - -import net.minecraftforge.liquids.LiquidStack; - -public class IronEngineCoolant { - - public static LinkedList coolants = new LinkedList(); - - public static IronEngineCoolant getCoolantForLiquid(LiquidStack liquid) { - if (liquid == null) - return null; - if (liquid.itemID <= 0) - return null; - - for (IronEngineCoolant coolant : coolants) - if (coolant.liquid.isLiquidEqual(liquid)) - return coolant; - - return null; - } - - public final LiquidStack liquid; - public final float coolingPerUnit; - - public IronEngineCoolant(LiquidStack liquid, float coolingPerUnit) { - this.liquid = liquid; - this.coolingPerUnit = coolingPerUnit; - } - -} diff --git a/common/buildcraft/api/fuels/IronEngineFuel.java b/common/buildcraft/api/fuels/IronEngineFuel.java deleted file mode 100644 index 09981e41c..000000000 --- a/common/buildcraft/api/fuels/IronEngineFuel.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.api.fuels; - -import java.util.LinkedList; - -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; - -public class IronEngineFuel { - - public static LinkedList fuels = new LinkedList(); - - public static IronEngineFuel getFuelForLiquid(LiquidStack liquid) { - if (liquid == null) - return null; - if (liquid.itemID <= 0) - return null; - - for (IronEngineFuel fuel : fuels) - if (fuel.liquid.isLiquidEqual(liquid)) - return fuel; - - return null; - } - - public final LiquidStack liquid; - public final float powerPerCycle; - public final int totalBurningTime; - - public IronEngineFuel(int liquidId, float powerPerCycle, int totalBurningTime) { - this(new LiquidStack(liquidId, LiquidContainerRegistry.BUCKET_VOLUME, 0), powerPerCycle, totalBurningTime); - } - - public IronEngineFuel(LiquidStack liquid, float powerPerCycle, int totalBurningTime) { - this.liquid = liquid; - this.powerPerCycle = powerPerCycle; - this.totalBurningTime = totalBurningTime; - } -} diff --git a/common/buildcraft/api/recipes/RefineryRecipe.java b/common/buildcraft/api/recipes/RefineryRecipe.java deleted file mode 100644 index d4039dde4..000000000 --- a/common/buildcraft/api/recipes/RefineryRecipe.java +++ /dev/null @@ -1,153 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.api.recipes; - -import java.util.Collections; -import java.util.SortedSet; -import java.util.TreeSet; - -import net.minecraftforge.liquids.LiquidStack; - -public class RefineryRecipe implements Comparable { - - private static SortedSet recipes = new TreeSet(); - - public static void registerRefineryRecipe(RefineryRecipe recipe) { - if (!recipes.contains(recipe)) { - recipes.add(recipe); - } - } - - public static SortedSet getRecipes() { - return Collections.unmodifiableSortedSet(recipes); - } - - public static RefineryRecipe findRefineryRecipe(LiquidStack liquid1, LiquidStack liquid2) { - for (RefineryRecipe recipe : recipes) - if (recipe.matches(liquid1, liquid2)) - return recipe; - - return null; - } - - public final LiquidStack ingredient1; - public final LiquidStack ingredient2; - public final LiquidStack result; - - public final int energy; - public final int delay; - - public RefineryRecipe(int ingredientId1, int ingredientQty1, int ingredientId2, int ingredientQty2, int resultId, int resultQty, int energy, int delay) { - this(new LiquidStack(ingredientId1, ingredientQty1, 0), new LiquidStack(ingredientId2, ingredientQty2, 0), new LiquidStack(resultId, resultQty, 0), - energy, delay); - } - - public RefineryRecipe(LiquidStack ingredient1, LiquidStack ingredient2, LiquidStack result, int energy, int delay) { - - // Sort starting materials. - if (ingredient1 != null && ingredient2 != null) { - if ((ingredient1.itemID > ingredient2.itemID) || (ingredient1.itemID == ingredient2.itemID && ingredient1.itemMeta > ingredient2.itemMeta)) { - this.ingredient1 = ingredient2; - this.ingredient2 = ingredient1; - } else { - this.ingredient1 = ingredient1; - this.ingredient2 = ingredient2; - } - } else if (ingredient2 != null) { - this.ingredient1 = ingredient2; - this.ingredient2 = ingredient1; - } else { - this.ingredient1 = ingredient1; - this.ingredient2 = ingredient2; - } - - this.result = result; - this.energy = energy; - this.delay = delay; - } - - public boolean matches(LiquidStack liquid1, LiquidStack liquid2) { - - // No inputs, return. - if (liquid1 == null && liquid2 == null) - return false; - - // Return if two ingredients are required but only one was supplied. - if ((ingredient1 != null && ingredient2 != null) && (liquid1 == null || liquid2 == null)) - return false; - - if (ingredient1 != null) { - - if (ingredient2 == null) - return ingredient1.isLiquidEqual(liquid1) || ingredient1.isLiquidEqual(liquid2); - else - return (ingredient1.isLiquidEqual(liquid1) && ingredient2.isLiquidEqual(liquid2)) - || (ingredient2.isLiquidEqual(liquid1) && ingredient1.isLiquidEqual(liquid2)); - - } else if (ingredient2 != null) - return ingredient2.isLiquidEqual(liquid1) || ingredient2.isLiquidEqual(liquid2); - else - return false; - - } - - // Compares to only the types of source materials. - // We consider non-null < null in order that one-ingredient recipe is checked after - // the failure of matching two-ingredient recipes which include that liquid. - @Override - public int compareTo(RefineryRecipe other) { - - if (other == null) - return -1; - else if (ingredient1 == null) { - if (other.ingredient1 == null) - return 0; - else - return 1; - } else if (other.ingredient1 == null) - return -1; - else if (ingredient1.itemID != other.ingredient1.itemID) - return ingredient1.itemID - other.ingredient1.itemID; - else if (ingredient1.itemMeta != other.ingredient1.itemMeta) - return ingredient1.itemMeta - other.ingredient1.itemMeta; - else if (ingredient2 == null) { - if (other.ingredient2 == null) - return 0; - else - return 1; - } else if (other.ingredient2 == null) - return -1; - else if (ingredient2.itemID != other.ingredient2.itemID) - return ingredient2.itemID - other.ingredient2.itemID; - else if (ingredient2.itemMeta != other.ingredient2.itemMeta) - return ingredient2.itemMeta - other.ingredient2.itemMeta; - - return 0; - } - - // equals() should be consistent with compareTo(). - @Override - public boolean equals(Object obj) { - if (obj != null && obj instanceof RefineryRecipe) - return this.compareTo((RefineryRecipe) obj) == 0; - return false; - } - - // hashCode() should be overridden because equals() was overridden. - @Override - public int hashCode() { - if (ingredient1 == null) - return 0; - else if (ingredient2 == null) - return ingredient1.itemID ^ ingredient1.itemMeta; - - return ingredient1.itemID ^ ingredient1.itemMeta ^ ingredient2.itemID ^ ingredient2.itemMeta; - } -} diff --git a/common/buildcraft/api/tools/IToolPipette.java b/common/buildcraft/api/tools/IToolPipette.java deleted file mode 100644 index 2596aa070..000000000 --- a/common/buildcraft/api/tools/IToolPipette.java +++ /dev/null @@ -1,40 +0,0 @@ -package buildcraft.api.tools; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; - -public interface IToolPipette { - - /** - * @param pipette - * ItemStack of the pipette. - * @return Capacity of the pipette. - */ - int getCapacity(ItemStack pipette); - - /** - * @param pipette - * @return true if the pipette can pipette. - */ - boolean canPipette(ItemStack pipette); - - /** - * Fills the pipette with the given liquid stack. - * - * @param pipette - * @param liquid - * @param doFill - * @return Amount of liquid used in filling the pipette. - */ - int fill(ItemStack pipette, LiquidStack liquid, boolean doFill); - - /** - * Drains liquid from the pipette - * - * @param pipette - * @param maxDrain - * @param doDrain - * @return Liquid stack representing the liquid and amount drained from the pipette. - */ - LiquidStack drain(ItemStack pipette, int maxDrain, boolean doDrain); -} diff --git a/common/ic2/api/Direction.java b/common/ic2/api/Direction.java index 751375ab7..ee5e536f2 100644 --- a/common/ic2/api/Direction.java +++ b/common/ic2/api/Direction.java @@ -1,6 +1,7 @@ package ic2.api; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.ForgeDirection; /** @@ -15,7 +16,7 @@ public enum Direction { * +X */ XP(1), - + /** * -Y */ @@ -24,7 +25,7 @@ public enum Direction { * +Y */ YP(3), // 1... - + /** * -Z */ @@ -33,19 +34,19 @@ public enum Direction { * +Z */ ZP(5); - + Direction(int dir) { this.dir = dir; } - + /*public CoordinateTuple ApplyToCoordinates(CoordinateTuple coordinates) { CoordinateTuple ret = new CoordinateTuple(coordinates); - + ret.coords[dir/2] += GetSign(); - + return ret; }*/ - + /** * Get the tile entity next to a tile entity following this direction. * @@ -54,16 +55,16 @@ public enum Direction { */ public TileEntity applyToTileEntity(TileEntity tileEntity) { int coords[] = { tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord }; - + coords[dir/2] += getSign(); - + if (tileEntity.worldObj != null && tileEntity.worldObj.blockExists(coords[0], coords[1], coords[2])) { return tileEntity.worldObj.getBlockTileEntity(coords[0], coords[1], coords[2]); } else { return null; } } - + /** * Get the inverse of this direction (XN -> XP, XP -> XN, etc.) * @@ -71,14 +72,14 @@ public enum Direction { */ public Direction getInverse() { int inverseDir = dir - getSign(); - + for (Direction direction : directions) { if (direction.dir == inverseDir) return direction; } - + return this; } - + /** * Convert this direction to a Minecraft side value. * @@ -87,7 +88,7 @@ public enum Direction { public int toSideValue() { return (dir + 4) % 6; } - + /** * Determine direction sign (N for negative or P for positive). * @@ -96,12 +97,12 @@ public enum Direction { private int getSign() { return (dir % 2) * 2 - 1; } - + public ForgeDirection toForgeDirection() { return ForgeDirection.getOrientation(toSideValue()); } - + private int dir; - private static final Direction[] directions = Direction.values(); + public static final Direction[] directions = Direction.values(); } diff --git a/common/ic2/api/crops/CropCard.java b/common/ic2/api/crops/CropCard.java index 8214f02ea..c03456450 100644 --- a/common/ic2/api/crops/CropCard.java +++ b/common/ic2/api/crops/CropCard.java @@ -2,7 +2,7 @@ package ic2.api.crops; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; @@ -323,9 +323,9 @@ public abstract class CropCard */ public boolean onEntityCollision(ICropTile crop, Entity entity) { - if (entity instanceof EntityLiving) + if (entity instanceof EntityLivingBase) { - return ((EntityLiving)entity).isSprinting(); + return ((EntityLivingBase)entity).isSprinting(); } return false; } diff --git a/common/ic2/api/item/IElectricItemManager.java b/common/ic2/api/item/IElectricItemManager.java index 6f08be3bd..88eab750b 100644 --- a/common/ic2/api/item/IElectricItemManager.java +++ b/common/ic2/api/item/IElectricItemManager.java @@ -1,6 +1,6 @@ package ic2.api.item; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; /** @@ -70,7 +70,7 @@ public interface IElectricItemManager { * @param entity entity holding the item * @return true if the operation succeeded */ - boolean use(ItemStack itemStack, int amount, EntityLiving entity); + boolean use(ItemStack itemStack, int amount, EntityLivingBase entity); /** * Charge an item from the BatPack a player is wearing. @@ -80,7 +80,7 @@ public interface IElectricItemManager { * @param itemStack electric item's stack * @param entity entity holding the item */ - void chargeFromArmor(ItemStack itemStack, EntityLiving entity); + void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity); /** * Get the tool tip to display for electric items. diff --git a/common/ic2/api/network/NetworkHelper.java b/common/ic2/api/network/NetworkHelper.java index 0981dafbe..48ecc2ad2 100644 --- a/common/ic2/api/network/NetworkHelper.java +++ b/common/ic2/api/network/NetworkHelper.java @@ -149,16 +149,11 @@ public final class NetworkHelper { * This method doesn't do anything if executed on the server. * * @param dataProvider Object implementing the INetworkDataProvider interface + * + * @deprecated no need to call this anymore, IC2 initiates it automatically */ + @Deprecated public static void requestInitialData(INetworkDataProvider dataProvider) { - try { - if (NetworkManager_requestInitialData == null) NetworkManager_requestInitialData = Class.forName(getPackage() + ".core.network.NetworkManager").getMethod("requestInitialData", INetworkDataProvider.class); - if (instance == null) instance = getInstance(); - - NetworkManager_requestInitialData.invoke(instance, dataProvider); - } catch (Exception e) { - throw new RuntimeException(e); - } } /** @@ -236,7 +231,6 @@ public final class NetworkHelper { private static Method NetworkManager_initiateTileEntityEvent; private static Method NetworkManager_initiateItemEvent; private static Method NetworkManager_announceBlockUpdate; - private static Method NetworkManager_requestInitialData; private static Method NetworkManager_initiateClientTileEntityEvent; private static Method NetworkManager_initiateClientItemEvent; } diff --git a/common/mekanism/api/EnumGas.java b/common/mekanism/api/EnumGas.java index acdb40f9a..5a78b24e4 100644 --- a/common/mekanism/api/EnumGas.java +++ b/common/mekanism/api/EnumGas.java @@ -1,6 +1,7 @@ package mekanism.api; import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; /** * The gasses currently available in Mekanism. @@ -15,7 +16,7 @@ public enum EnumGas public String name; public Icon gasIcon; - public String texturePath; + public ResourceLocation texturePath; public static EnumGas getFromName(String gasName) { @@ -36,7 +37,7 @@ public enum EnumGas return gasIcon != null && texturePath != null; } - private EnumGas(String s, Icon icon, String path) + private EnumGas(String s, Icon icon, ResourceLocation path) { name = s; gasIcon = icon; diff --git a/common/mekanism/api/InfuseType.java b/common/mekanism/api/InfuseType.java index 717b64a04..8edb1b7a2 100644 --- a/common/mekanism/api/InfuseType.java +++ b/common/mekanism/api/InfuseType.java @@ -1,5 +1,7 @@ package mekanism.api; +import net.minecraft.util.ResourceLocation; + /** * The types of infuse currently available in Mekanism. * @author AidanBrady @@ -11,7 +13,7 @@ public final class InfuseType public String name; /** The location of this infuse's GUI texture */ - public String texture; + public ResourceLocation texture; /** The infuse's GUI texture X offset. */ public int texX; @@ -19,10 +21,10 @@ public final class InfuseType /** The infuse's GUI texture Y offset. */ public int texY; - public InfuseType(String s, String s1, int x, int y) + public InfuseType(String s, ResourceLocation location, int x, int y) { name = s; - texture = s1; + texture = location; texX = x; texY = y; } diff --git a/common/mekanism/api/SideData.java b/common/mekanism/api/SideData.java index 527e8f60d..700fd684b 100644 --- a/common/mekanism/api/SideData.java +++ b/common/mekanism/api/SideData.java @@ -5,20 +5,12 @@ public class SideData /** The color of this SideData */ public EnumColor color; - /** When the side's slot IDs start */ - public int slotStart; - - /** How many slots this side contains */ - public int slotAmount; - /** Int[] of available side slots */ public int[] availableSlots; - public SideData(EnumColor colour, int start, int amount, int[] slots) + public SideData(EnumColor colour, int[] slots) { color = colour; - slotStart = start; - slotAmount = amount; availableSlots = slots; } } diff --git a/common/mekanism/client/ClientPlayerTickHandler.java b/common/mekanism/client/ClientPlayerTickHandler.java index 0dd24f929..e018db39b 100644 --- a/common/mekanism/client/ClientPlayerTickHandler.java +++ b/common/mekanism/client/ClientPlayerTickHandler.java @@ -11,6 +11,7 @@ import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketElectricBowState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatMessageComponent; import org.lwjgl.input.Keyboard; @@ -49,7 +50,7 @@ public class ClientPlayerTickHandler implements ITickHandler { item.setState(stack, (byte)(item.getState(stack) < 2 ? item.getState(stack)+1 : 0)); PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState().setParams(item.getState(stack))); - entityPlayer.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getState(item.getState(stack))); + entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getState(item.getState(stack)))); lastTickConfiguratorChange = true; } } @@ -67,7 +68,7 @@ public class ClientPlayerTickHandler implements ITickHandler { item.setFireState(stack, !item.getFireState(stack)); PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState().setParams(item.getFireState(stack))); - entityPlayer.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF"))); + entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF")))); lastTickElectricBowChange = true; } } diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 9e56f54ca..b977636be 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -1,6 +1,7 @@ package mekanism.client; +import java.io.File; import java.util.HashMap; import mekanism.api.EnumGas; @@ -11,6 +12,8 @@ import mekanism.common.IElectricChest; import mekanism.common.InventoryElectricChest; import mekanism.common.ItemPortableTeleporter; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.TileEntityAdvancedFactory; import mekanism.common.TileEntityChargepad; @@ -36,7 +39,7 @@ import mekanism.common.TileEntityPurificationChamber; import mekanism.common.TileEntityTeleporter; import mekanism.common.TileEntityTheoreticalElementizer; import mekanism.common.TileEntityUniversalCable; -import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -84,7 +87,7 @@ public class ClientProxy extends CommonProxy @Override public void registerSound(TileEntity tileEntity) { - if(Mekanism.enableSounds && SoundManager.sndSystem != null) + if(Mekanism.enableSounds && Minecraft.getMinecraft().sndManager.sndSystem != null) { synchronized(Mekanism.audioHandler.sounds) { @@ -96,7 +99,7 @@ public class ClientProxy extends CommonProxy @Override public void unregisterSound(TileEntity tileEntity) { - if(Mekanism.enableSounds && SoundManager.sndSystem != null) + if(Mekanism.enableSounds && Minecraft.getMinecraft().sndManager.sndSystem != null) { synchronized(Mekanism.audioHandler.sounds) { @@ -205,14 +208,14 @@ public class ClientProxy extends CommonProxy if(!EnumGas.HYDROGEN.hasTexture()) { - EnumGas.HYDROGEN.gasIcon = FMLClientHandler.instance().getClient().renderEngine.textureMapItems.registerIcon("mekanism:LiquidHydrogen"); - EnumGas.HYDROGEN.texturePath = "/mods/mekanism/textures/items/LiquidHydrogen.png"; + EnumGas.HYDROGEN.gasIcon = MekanismRenderer.getTextureMap(1).registerIcon("mekanism:LiquidHydrogen"); + EnumGas.HYDROGEN.texturePath = MekanismUtils.getResource(ResourceType.TEXTURE_ITEMS, "LiquidHydrogen.png"); } if(!EnumGas.OXYGEN.hasTexture()) { - EnumGas.OXYGEN.gasIcon = FMLClientHandler.instance().getClient().renderEngine.textureMapItems.registerIcon("mekanism:LiquidOxygen"); - EnumGas.OXYGEN.texturePath = "/mods/mekanism/textures/items/LiquidOxygen.png"; + EnumGas.OXYGEN.gasIcon = MekanismRenderer.getTextureMap(1).registerIcon("mekanism:LiquidOxygen"); + EnumGas.OXYGEN.texturePath = MekanismUtils.getResource(ResourceType.TEXTURE_ITEMS, "LiquidOxygen.png"); } System.out.println("[Mekanism] Render registrations complete."); @@ -364,4 +367,10 @@ public class ClientProxy extends CommonProxy return false; } + + @Override + public File getMinecraftDir() + { + return Minecraft.getMinecraft().mcDataDir; + } } diff --git a/common/mekanism/client/ClientTickHandler.java b/common/mekanism/client/ClientTickHandler.java index 9fa437c9b..9e1576537 100644 --- a/common/mekanism/client/ClientTickHandler.java +++ b/common/mekanism/client/ClientTickHandler.java @@ -1,12 +1,20 @@ package mekanism.client; +import java.lang.reflect.Method; import java.util.EnumSet; +import java.util.HashMap; import java.util.List; +import java.util.Map; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureObject; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.ITickHandler; @@ -26,9 +34,53 @@ public class ClientTickHandler implements ITickHandler public Minecraft mc = FMLClientHandler.instance().getClient(); - public static String MIKE_CAPE = "https://dl.dropboxusercontent.com/s/ji06yflixnszcby/cape.png"; - public static String DONATE_CAPE = "https://dl.dropboxusercontent.com/u/90411166/donate.png"; - public static String AIDAN_CAPE = "https://dl.dropboxusercontent.com/u/90411166/aidan.png"; + public static final String MIKE_CAPE = "https://dl.dropboxusercontent.com/s/ji06yflixnszcby/cape.png"; + public static final String DONATE_CAPE = "https://dl.dropboxusercontent.com/u/90411166/donate.png"; + public static final String AIDAN_CAPE = "https://dl.dropboxusercontent.com/u/90411166/aidan.png"; + + private Map mikeDownload = new HashMap(); + private Map donateDownload = new HashMap(); + private Map aidanDownload = new HashMap(); + + private void updateCape(EntityPlayer player, ThreadDownloadImageData newCape) + { + if(player.getHideCape()) + { + try { + Method m = EntityPlayer.class.getDeclaredMethod("setHideCape", Integer.class, Boolean.class); + m.invoke(player, 1, false); + } catch(Exception e) {} + } + + if(MekanismUtils.getPrivateValue(player, AbstractClientPlayer.class, "field_110315_c") != newCape) + { + MekanismUtils.setPrivateValue(player, newCape, AbstractClientPlayer.class, "field_110315_c"); + } + } + + private ResourceLocation getCapeResource(EntityPlayer player) + { + if(player instanceof AbstractClientPlayer) + { + return (ResourceLocation)MekanismUtils.getPrivateValue(player, AbstractClientPlayer.class, "field_110313_e"); + } + + return null; + } + + private ThreadDownloadImageData getCape(EntityPlayer player, String cape) + { + TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K(); + Object object = texturemanager.func_110581_b(getCapeResource(player)); + + if(object == null) + { + object = new ThreadDownloadImageData(cape, getCapeResource(player), new CapeBufferDownload()); + texturemanager.func_110579_a(getCapeResource(player), (TextureObject)object); + } + + return (ThreadDownloadImageData)object; + } @Override public void tickStart(EnumSet type, Object... tickData) @@ -41,32 +93,42 @@ public class ClientTickHandler implements ITickHandler if(mc.theWorld != null) { - for(EntityPlayer player : (List)mc.theWorld.playerEntities) + for(EntityPlayer entityPlayer : (List)mc.theWorld.playerEntities) { - String oldCloak = player.cloakUrl; - - if(player != null && player.cloakUrl != null) + if(entityPlayer instanceof AbstractClientPlayer) { - if(player.cloakUrl.startsWith("http://skins.minecraft.net/MinecraftCloaks/")) - { + AbstractClientPlayer player = (AbstractClientPlayer)entityPlayer; + + if(player != null) + { if(StringUtils.stripControlCodes(player.username).equals("mikeacttck")) { - player.cloakUrl = MIKE_CAPE; + if(mikeDownload.get(player.username) == null) + { + mikeDownload.put(player.username, getCape(player, MIKE_CAPE)); + } + + updateCape(player, mikeDownload.get(player.username)); } else if(StringUtils.stripControlCodes(player.username).equals("aidancbrady")) { - player.cloakUrl = AIDAN_CAPE; + if(aidanDownload.get(player.username) == null) + { + aidanDownload.put(player.username, getCape(player, AIDAN_CAPE)); + } + + updateCape(player, aidanDownload.get(player.username)); } - else if(Mekanism.donators.contains(StringUtils.stripControlCodes(player.username))) + else if(Mekanism.donators.contains(StringUtils.stripControlCodes(player.username)) || player.username.contains("Player")) { - player.cloakUrl = DONATE_CAPE; + if(donateDownload.get(player.username) == null) + { + donateDownload.put(player.username, getCape(player, DONATE_CAPE)); + } + + updateCape(player, donateDownload.get(player.username)); } - - if(!oldCloak.equals(player.cloakUrl)) - { - mc.renderEngine.obtainImageData(player.cloakUrl, new CapeBufferDownload()); - } - } + } } } } diff --git a/common/mekanism/client/LiquidClientUpdate.java b/common/mekanism/client/FluidClientUpdate.java similarity index 75% rename from common/mekanism/client/LiquidClientUpdate.java rename to common/mekanism/client/FluidClientUpdate.java index 94b0f493c..173e9bb5f 100644 --- a/common/mekanism/client/LiquidClientUpdate.java +++ b/common/mekanism/client/FluidClientUpdate.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import mekanism.common.IMechanicalPipe; import mekanism.common.PipeUtils; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; -public class LiquidClientUpdate +public class FluidClientUpdate { /** List of iterated pipes, to prevent infinite loops. */ public ArrayList iteratedPipes = new ArrayList(); @@ -15,13 +15,13 @@ public class LiquidClientUpdate /** Pointer pipe of this calculation */ public TileEntity pointer; - /** Type of liquid to distribute */ - public LiquidStack liquidToSend; + /** Type of fluid to distribute */ + public FluidStack fluidToSend; - public LiquidClientUpdate(TileEntity head, LiquidStack liquid) + public FluidClientUpdate(TileEntity head, FluidStack fluid) { pointer = head; - liquidToSend = liquid; + fluidToSend = fluid; } public void loopThrough(TileEntity tile) @@ -53,7 +53,7 @@ public class LiquidClientUpdate { if(tileEntity instanceof IMechanicalPipe) { - ((IMechanicalPipe)tileEntity).onTransfer(liquidToSend); + ((IMechanicalPipe)tileEntity).onTransfer(fluidToSend); } } } diff --git a/common/mekanism/client/GuiAdvancedElectricMachine.java b/common/mekanism/client/GuiAdvancedElectricMachine.java index be2f85ec2..5b9bde74b 100644 --- a/common/mekanism/client/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/GuiAdvancedElectricMachine.java @@ -58,7 +58,7 @@ public class GuiAdvancedElectricMachine extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture(tileEntity.guiTexturePath); + mc.renderEngine.func_110577_a(tileEntity.guiLocation); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiControlPanel.java b/common/mekanism/client/GuiControlPanel.java index 263646f3f..deeaeae16 100644 --- a/common/mekanism/client/GuiControlPanel.java +++ b/common/mekanism/client/GuiControlPanel.java @@ -3,7 +3,9 @@ package mekanism.client; import mekanism.api.EnumColor; import mekanism.api.IAccessibleGui; import mekanism.api.Object3D; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileEntityControlPanel; import mekanism.common.network.PacketControlPanel; @@ -11,6 +13,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -63,7 +66,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); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiControlPanel.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiControlPanel.png")); drawTexturedModalRect(width / 2 - 100, height / 2 - 100, 0, 0, 176, 166); xField.drawTextBox(); yField.drawTextBox(); diff --git a/common/mekanism/client/GuiDynamicTank.java b/common/mekanism/client/GuiDynamicTank.java index 3c0a3cdb1..688dbf8e6 100644 --- a/common/mekanism/client/GuiDynamicTank.java +++ b/common/mekanism/client/GuiDynamicTank.java @@ -1,11 +1,14 @@ package mekanism.client; import mekanism.common.ContainerDynamicTank; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.TileEntityDynamicTank; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.liquids.LiquidDictionary; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -35,42 +38,42 @@ public class GuiDynamicTank extends GuiContainer fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 94) + 2, 0x404040); fontRenderer.drawString("Volume: " + tileEntity.clientCapacity/16000, 53, 26, 0x00CD00); - fontRenderer.drawString(tileEntity.structure.liquidStored != null ? LiquidDictionary.findLiquidName(tileEntity.structure.liquidStored) + ":" : "No liquid.", 53, 44, 0x00CD00); + fontRenderer.drawString(tileEntity.structure.fluidStored != null ? FluidRegistry.getFluidName(tileEntity.structure.fluidStored) + ":" : "No fluid.", 53, 44, 0x00CD00); - if(tileEntity.structure.liquidStored != null) + if(tileEntity.structure.fluidStored != null) { - fontRenderer.drawString(tileEntity.structure.liquidStored.amount + "mB", 53, 53, 0x00CD00); + fontRenderer.drawString(tileEntity.structure.fluidStored.amount + "mB", 53, 53, 0x00CD00); } if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.structure.liquidStored != null ? LiquidDictionary.findLiquidName(tileEntity.structure.liquidStored) + ": " + tileEntity.structure.liquidStored.amount + "mB" : "Empty", xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? FluidRegistry.getFluidName(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : "Empty", xAxis, yAxis); } } @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiDynamicTank.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiDynamicTank.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - if(tileEntity.getScaledLiquidLevel(58) > 0) + if(tileEntity.getScaledFluidLevel(58) > 0) { - displayGauge(guiWidth, guiHeight, 7, 14, tileEntity.getScaledLiquidLevel(58), tileEntity.structure.liquidStored, 0); - displayGauge(guiWidth, guiHeight, 23, 14, tileEntity.getScaledLiquidLevel(58), tileEntity.structure.liquidStored, 1); + displayGauge(guiWidth, guiHeight, 7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); + displayGauge(guiWidth, guiHeight, 23, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 1); } } /* * Credit to BuildCraft for both the gauge texture and parts of the code. */ - public void displayGauge(int width, int height, int xPos, int yPos, int scale, LiquidStack liquid, int side /*0-left, 1-right*/) + public void displayGauge(int width, int height, int xPos, int yPos, int scale, FluidStack fluid, int side /*0-left, 1-right*/) { - if(liquid == null) + if(fluid == null) { return; } @@ -91,8 +94,8 @@ public class GuiDynamicTank extends GuiContainer scale = 0; } - mc.renderEngine.bindTexture(liquid.canonical().getTextureSheet()); - drawTexturedModelRectFromIcon(width + xPos, height + yPos + 58 - renderRemaining - start, liquid.canonical().getRenderingIcon(), 16, 16 - (16 - renderRemaining)); + mc.renderEngine.func_110577_a(MekanismRenderer.getLiquidTexture()); + drawTexturedModelRectFromIcon(width + xPos, height + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) @@ -101,7 +104,7 @@ public class GuiDynamicTank extends GuiContainer } } - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiDynamicTank.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiDynamicTank.png")); drawTexturedModalRect(width + xPos, height + yPos, 176, side == 0 ? 0 : 54, 16, 54); } diff --git a/common/mekanism/client/GuiElectricChest.java b/common/mekanism/client/GuiElectricChest.java index 3f01bd95c..77aaaaa74 100644 --- a/common/mekanism/client/GuiElectricChest.java +++ b/common/mekanism/client/GuiElectricChest.java @@ -6,6 +6,8 @@ import mekanism.api.Object3D; import mekanism.common.ContainerElectricChest; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileEntityElectricChest; @@ -127,7 +129,7 @@ public class GuiElectricChest extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiElectricChest.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiElectricChest.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiElectricMachine.java b/common/mekanism/client/GuiElectricMachine.java index 78a175504..57842978c 100644 --- a/common/mekanism/client/GuiElectricMachine.java +++ b/common/mekanism/client/GuiElectricMachine.java @@ -58,7 +58,7 @@ public class GuiElectricMachine extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture(tileEntity.guiTexturePath); + mc.renderEngine.func_110577_a(tileEntity.guiLocation); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiElectricPump.java b/common/mekanism/client/GuiElectricPump.java index c557f6db6..082206e20 100644 --- a/common/mekanism/client/GuiElectricPump.java +++ b/common/mekanism/client/GuiElectricPump.java @@ -1,10 +1,14 @@ package mekanism.client; import mekanism.common.ContainerElectricPump; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.TileEntityElectricPump; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -36,12 +40,12 @@ public class GuiElectricPump extends GuiContainer fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 94) + 2, 0x404040); fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); - fontRenderer.drawString(tileEntity.liquidTank.getLiquid() != null ? tileEntity.liquidTank.getLiquidName() + ": " + tileEntity.liquidTank.getLiquid().amount : "No liquid.", 51, 35, 0x00CD00); + fontRenderer.drawString(tileEntity.fluidTank.getFluid() != null ? FluidRegistry.getFluidName(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : "No fluid.", 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.liquidTank.getLiquid() != null ? tileEntity.liquidTank.getLiquidName() + ": " + tileEntity.liquidTank.getLiquid().amount + "mB" : "Empty", xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? FluidRegistry.getFluidName(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount + "mB" : "Empty", xAxis, yAxis); } if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) @@ -53,7 +57,7 @@ public class GuiElectricPump extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiElectricPump.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiElectricPump.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; @@ -63,18 +67,18 @@ public class GuiElectricPump extends GuiContainer displayInt = tileEntity.getScaledEnergyLevel(52); drawTexturedModalRect(guiWidth + 165, guiHeight + 17 + 52 - displayInt, 176, 52 - displayInt, 4, displayInt); - if(tileEntity.getScaledLiquidLevel(58) > 0) + if(tileEntity.getScaledFluidLevel(58) > 0) { - displayGauge(guiWidth, guiHeight, 14, 7, tileEntity.getScaledLiquidLevel(58), tileEntity.liquidTank.getLiquid()); + displayGauge(guiWidth, guiHeight, 14, 7, tileEntity.getScaledFluidLevel(58), tileEntity.fluidTank.getFluid()); } } /* * Credit to BuildCraft for both the gauge texture and parts of the code. */ - public void displayGauge(int width, int height, int xPos, int yPos, int scale, LiquidStack liquid) + public void displayGauge(int width, int height, int xPos, int yPos, int scale, FluidStack fluid) { - if(liquid == null) + if(fluid == null) { return; } @@ -95,8 +99,8 @@ public class GuiElectricPump extends GuiContainer scale = 0; } - mc.renderEngine.bindTexture(liquid.canonical().getTextureSheet()); - drawTexturedModelRectFromIcon(width + yPos, height + xPos + 58 - renderRemaining - start, liquid.canonical().getRenderingIcon(), 16, 16 - (16 - renderRemaining)); + mc.renderEngine.func_110577_a(MekanismRenderer.getLiquidTexture()); + drawTexturedModelRectFromIcon(width + yPos, height + xPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) @@ -105,7 +109,7 @@ public class GuiElectricPump extends GuiContainer } } - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiElectricPump.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiElectricPump.png")); drawTexturedModalRect(width + yPos, height + xPos, 176, 52, 16, 60); } } diff --git a/common/mekanism/client/GuiEnergyCube.java b/common/mekanism/client/GuiEnergyCube.java index 4ff68809b..d599f3e59 100644 --- a/common/mekanism/client/GuiEnergyCube.java +++ b/common/mekanism/client/GuiEnergyCube.java @@ -1,9 +1,12 @@ package mekanism.client; import mekanism.common.ContainerEnergyCube; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityEnergyCube; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @@ -42,7 +45,7 @@ public class GuiEnergyCube extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiEnergyCube.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; diff --git a/common/mekanism/client/GuiFactory.java b/common/mekanism/client/GuiFactory.java index 47bdcdc03..17080f611 100644 --- a/common/mekanism/client/GuiFactory.java +++ b/common/mekanism/client/GuiFactory.java @@ -61,7 +61,7 @@ public class GuiFactory extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/factory/" + tileEntity.tier.guiTexturePath); + mc.renderEngine.func_110577_a(tileEntity.tier.guiLocation); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiGasTank.java b/common/mekanism/client/GuiGasTank.java index 0e0fbe784..17a7e07d0 100644 --- a/common/mekanism/client/GuiGasTank.java +++ b/common/mekanism/client/GuiGasTank.java @@ -1,9 +1,12 @@ package mekanism.client; import mekanism.common.ContainerGasTank; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityGasTank; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @@ -38,7 +41,7 @@ public class GuiGasTank extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiGasTank.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; diff --git a/common/mekanism/client/GuiMetallurgicInfuser.java b/common/mekanism/client/GuiMetallurgicInfuser.java index 9b6e42ce2..9e852ffee 100644 --- a/common/mekanism/client/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/GuiMetallurgicInfuser.java @@ -4,12 +4,15 @@ import java.util.ArrayList; import mekanism.api.Object3D; import mekanism.common.ContainerMetallurgicInfuser; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileEntityMetallurgicInfuser; import mekanism.common.network.PacketTileEntity; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -74,7 +77,7 @@ public class GuiMetallurgicInfuser extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiMetallurgicInfuser.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; @@ -94,7 +97,7 @@ public class GuiMetallurgicInfuser extends GuiContainer if(tileEntity.type != null) { displayInt = tileEntity.getScaledInfuseLevel(52); - mc.renderEngine.bindTexture(tileEntity.type.texture); + mc.renderEngine.func_110577_a(tileEntity.type.texture); drawTexturedModalRect(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.type.texX, tileEntity.type.texY + 52 - displayInt, 4, displayInt); } } diff --git a/common/mekanism/client/GuiPasswordEnter.java b/common/mekanism/client/GuiPasswordEnter.java index aa7cd34ec..83c480c8a 100644 --- a/common/mekanism/client/GuiPasswordEnter.java +++ b/common/mekanism/client/GuiPasswordEnter.java @@ -4,7 +4,9 @@ import mekanism.api.EnumColor; import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; import mekanism.common.IElectricChest; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileEntityElectricChest; import mekanism.common.network.PacketElectricChest; @@ -13,6 +15,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -156,7 +159,7 @@ public class GuiPasswordEnter extends GuiScreen public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiPasswordEnter.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordEnter.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiPasswordModify.java b/common/mekanism/client/GuiPasswordModify.java index b7b99fafa..4d264c00c 100644 --- a/common/mekanism/client/GuiPasswordModify.java +++ b/common/mekanism/client/GuiPasswordModify.java @@ -3,7 +3,9 @@ package mekanism.client; import mekanism.api.EnumColor; import mekanism.api.Object3D; import mekanism.common.IElectricChest; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileEntityElectricChest; import mekanism.common.network.PacketElectricChest; @@ -12,6 +14,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -187,7 +190,7 @@ public class GuiPasswordModify extends GuiScreen public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiPasswordEnter.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordModify.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiPortableTeleporter.java b/common/mekanism/client/GuiPortableTeleporter.java index 484f2b58f..05eba9b2c 100644 --- a/common/mekanism/client/GuiPortableTeleporter.java +++ b/common/mekanism/client/GuiPortableTeleporter.java @@ -1,7 +1,9 @@ package mekanism.client; import mekanism.common.ItemPortableTeleporter; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDigitUpdate; import mekanism.common.network.PacketPortableTeleport; @@ -9,6 +11,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -45,7 +48,7 @@ public class GuiPortableTeleporter extends GuiScreen itemStack = mc.thePlayer.getCurrentEquippedItem(); } - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiPortableTeleporter.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiPortableTeleporter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiRobitCrafting.java b/common/mekanism/client/GuiRobitCrafting.java index 376afda91..25072dcfb 100644 --- a/common/mekanism/client/GuiRobitCrafting.java +++ b/common/mekanism/client/GuiRobitCrafting.java @@ -2,12 +2,15 @@ package mekanism.client; import mekanism.common.ContainerRobitCrafting; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -38,7 +41,7 @@ public class GuiRobitCrafting extends GuiContainer protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiRobitCrafting.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiRobitCrafting.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/common/mekanism/client/GuiRobitInventory.java b/common/mekanism/client/GuiRobitInventory.java index 5dfec0852..9e6ed31b6 100644 --- a/common/mekanism/client/GuiRobitInventory.java +++ b/common/mekanism/client/GuiRobitInventory.java @@ -3,12 +3,15 @@ package mekanism.client; import mekanism.common.ContainerRobitInventory; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -38,7 +41,7 @@ public class GuiRobitInventory extends GuiContainer protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiRobitInventory.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiRobitInventory.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/common/mekanism/client/GuiRobitMain.java b/common/mekanism/client/GuiRobitMain.java index fe665a3fb..1cd3092e9 100644 --- a/common/mekanism/client/GuiRobitMain.java +++ b/common/mekanism/client/GuiRobitMain.java @@ -3,7 +3,9 @@ package mekanism.client; import mekanism.common.ContainerRobitMain; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -11,6 +13,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -143,7 +146,7 @@ public class GuiRobitMain extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiRobitMain.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiRobitMain.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiRobitRepair.java b/common/mekanism/client/GuiRobitRepair.java index de6244b64..063d044cb 100644 --- a/common/mekanism/client/GuiRobitRepair.java +++ b/common/mekanism/client/GuiRobitRepair.java @@ -4,7 +4,9 @@ import java.util.List; import mekanism.common.ContainerRobitRepair; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -16,6 +18,7 @@ import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -183,7 +186,7 @@ public class GuiRobitRepair extends GuiContainer implements ICrafting protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiRobitRepair.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiRobitRepair.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/common/mekanism/client/GuiRobitSmelting.java b/common/mekanism/client/GuiRobitSmelting.java index 784fb96ff..c3b016632 100644 --- a/common/mekanism/client/GuiRobitSmelting.java +++ b/common/mekanism/client/GuiRobitSmelting.java @@ -3,12 +3,15 @@ package mekanism.client; import mekanism.common.ContainerRobitSmelting; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -34,7 +37,7 @@ public class GuiRobitSmelting extends GuiContainer protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiRobitSmelting.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiRobitSmelting.png")); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); diff --git a/common/mekanism/client/GuiStopwatch.java b/common/mekanism/client/GuiStopwatch.java index 702737e2f..549b89ee2 100644 --- a/common/mekanism/client/GuiStopwatch.java +++ b/common/mekanism/client/GuiStopwatch.java @@ -2,11 +2,13 @@ package mekanism.client; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTime; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -39,7 +41,7 @@ public class GuiStopwatch extends GuiScreen public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiStopwatch.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.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/common/mekanism/client/GuiTeleporter.java b/common/mekanism/client/GuiTeleporter.java index 2107ca91b..4958b9c20 100644 --- a/common/mekanism/client/GuiTeleporter.java +++ b/common/mekanism/client/GuiTeleporter.java @@ -4,12 +4,15 @@ import java.util.ArrayList; import mekanism.api.Object3D; import mekanism.common.ContainerTeleporter; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.TileEntityTeleporter; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -97,7 +100,7 @@ public class GuiTeleporter extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiTeleporter.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/client/GuiWeatherOrb.java b/common/mekanism/client/GuiWeatherOrb.java index 896ab3781..1b095126d 100644 --- a/common/mekanism/client/GuiWeatherOrb.java +++ b/common/mekanism/client/GuiWeatherOrb.java @@ -2,12 +2,14 @@ package mekanism.client; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketWeather; import mekanism.common.network.PacketWeather.WeatherType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -40,7 +42,7 @@ public class GuiWeatherOrb extends GuiScreen public void drawScreen(int i, int j, float f) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiWeatherOrb.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.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/common/mekanism/client/ItemRenderingHandler.java b/common/mekanism/client/ItemRenderingHandler.java index 92eb9f98d..2cec249a5 100644 --- a/common/mekanism/client/ItemRenderingHandler.java +++ b/common/mekanism/client/ItemRenderingHandler.java @@ -6,6 +6,8 @@ import mekanism.common.IEnergyCube; import mekanism.common.ItemBlockMachine; import mekanism.common.ItemRobit; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.Tier.EnergyCubeTier; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -63,9 +65,10 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glTranslatef(-0.5F, -0.5F, -0.5F); GL11.glTranslatef(0, 1.0F, 1.0F); GL11.glScalef(1.0F, -1F, -1F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/ElectricChest.png")); + + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); - float lidangle = chest.getPrevLidAngle(item) + (chest.getLidAngle(item) - chest.getPrevLidAngle(item)) * Minecraft.getMinecraft().timer.renderPartialTicks; + float lidangle = chest.getPrevLidAngle(item) + (chest.getLidAngle(item) - chest.getPrevLidAngle(item)) * MekanismRenderer.getPartialTicks(); lidangle = 1.0F - lidangle; lidangle = 1.0F - lidangle * lidangle * lidangle; electricChest.chestLid.rotateAngleX = -((lidangle * 3.141593F) / 2.0F); @@ -77,7 +80,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.5F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/Robit.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); robit.render(0.08F); } else { diff --git a/common/mekanism/client/MachineRenderingHandler.java b/common/mekanism/client/MachineRenderingHandler.java index 24c564dbb..8737bd150 100644 --- a/common/mekanism/client/MachineRenderingHandler.java +++ b/common/mekanism/client/MachineRenderingHandler.java @@ -1,8 +1,11 @@ package mekanism.client; import mekanism.common.BlockMachine.MachineType; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -41,7 +44,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.8F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/TheoreticalElementizer.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "TheoreticalElementizer.png")); theoreticalElementizer.render(0.0560F); } else if(metadata == MachineType.ELECTRIC_PUMP.meta) @@ -49,7 +52,7 @@ public class MachineRenderingHandler 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.85F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/ElectricPump.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); } else if(metadata == MachineType.METALLURGIC_INFUSER.meta) @@ -57,22 +60,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.3F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/MetallurgicInfuser.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); } - else if(metadata == MachineType.ELECTRIC_CHEST.meta) - { - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glTranslatef(0, 1.0F, 1.0F); - GL11.glScalef(1.0F, -1F, -1F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/ElectricChest.png")); - electricChest.renderAll(); - } else if(metadata == MachineType.CHARGEPAD.meta) { GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -1.1F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/Chargepad.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); chargepad.render(0.0625F); } else { diff --git a/common/mekanism/client/MekanismRenderer.java b/common/mekanism/client/MekanismRenderer.java index 359745d62..c29eff632 100644 --- a/common/mekanism/client/MekanismRenderer.java +++ b/common/mekanism/client/MekanismRenderer.java @@ -1,16 +1,23 @@ package mekanism.client; import java.util.Arrays; +import java.util.List; import mekanism.common.ISpecialBounds; +import mekanism.common.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Timer; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; @@ -215,9 +222,9 @@ public class MekanismRenderer GL11.glTranslatef(0.5F, 0.5F, 0.5F); } - public static void colorLiquid(LiquidStack liquidStack) + public static void colorFluid(Fluid fluid) { - int color = liquidStack.asItemStack().getItem().getColorFromItemStack(liquidStack.asItemStack(), 0); + int color = fluid.getColor(); float cR = (color >> 16 & 0xFF) / 255.0F; float cG = (color >> 8 & 0xFF) / 255.0F; @@ -244,4 +251,39 @@ public class MekanismRenderer return obj instanceof DisplayInteger && ((DisplayInteger)obj).display == display; } } + + public static TextureMap getTextureMap(int type) + { + try { + List l = (List)MekanismUtils.getPrivateValue(Minecraft.getMinecraft().renderEngine, TextureManager.class, "field_110583_b"); + + for(Object obj : l) + { + if(obj instanceof TextureMap) + { + if(((TextureMap)obj).textureType == type) + { + return (TextureMap)obj; + } + } + } + } catch(Exception e) {} + + return null; + } + + public static float getPartialTicks() + { + try { + Timer t = (Timer)MekanismUtils.getPrivateValue(Minecraft.getMinecraft(), Minecraft.class, "timer"); + return t.renderPartialTicks; + } catch(Exception e) {} + + return 0; + } + + public static ResourceLocation getLiquidTexture() + { + return TextureMap.field_110575_b; + } } diff --git a/common/mekanism/client/RenderChargepad.java b/common/mekanism/client/RenderChargepad.java index ed6f6a042..45c72a3e4 100644 --- a/common/mekanism/client/RenderChargepad.java +++ b/common/mekanism/client/RenderChargepad.java @@ -5,7 +5,9 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityChargepad; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderChargepad extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/Chargepad.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/client/RenderConfigurableMachine.java b/common/mekanism/client/RenderConfigurableMachine.java index af13c67f3..be859c3a3 100644 --- a/common/mekanism/client/RenderConfigurableMachine.java +++ b/common/mekanism/client/RenderConfigurableMachine.java @@ -9,6 +9,7 @@ import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; import mekanism.common.ItemConfigurator; import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -44,7 +45,7 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer { coloredOverlays = new Icon[16]; - TextureMap registrar = mc.renderEngine.textureMapBlocks; + TextureMap registrar = MekanismRenderer.getTextureMap(0); coloredOverlays[0] = registrar.registerIcon("mekanism:OverlayBlack"); coloredOverlays[1] = registrar.registerIcon("mekanism:OverlayDarkBlue"); @@ -95,7 +96,7 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); - bindTextureByName("/mods/mekanism/textures/blocks/Overlay" + color.friendlyName.replace(" ", "") + ".png"); + func_110628_a(MekanismUtils.getResource(ResourceType.TEXTURE_BLOCKS, "Overlay" + color.friendlyName.replace(" ", "") + ".png")); GL11.glTranslatef((float)x, (float)y, (float)z); int display = getOverlayDisplay(world, ForgeDirection.getOrientation(pos.sideHit), color).display; diff --git a/common/mekanism/client/RenderDynamicTank.java b/common/mekanism/client/RenderDynamicTank.java index 39def8e55..6b05c7806 100644 --- a/common/mekanism/client/RenderDynamicTank.java +++ b/common/mekanism/client/RenderDynamicTank.java @@ -12,14 +12,11 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; @@ -29,8 +26,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { - private static Map> cachedCenterLiquids = new HashMap>(); - private static Map> cachedValveLiquids = new HashMap>(); + private static Map> cachedCenterFluids = new HashMap>(); + private static Map> cachedValveFluids = new HashMap>(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) @@ -40,7 +37,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick) { - if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.liquidStored != null && tileEntity.structure.liquidStored.amount != 0) + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0) { RenderData data = new RenderData(); @@ -49,16 +46,16 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; - bindTextureByName(tileEntity.structure.liquidStored.canonical().getTextureSheet()); + func_110628_a(MekanismRenderer.getLiquidTexture()); - if(data.location != null && data.height > 0 && Item.itemsList[tileEntity.structure.liquidStored.itemID] != null) + if(data.location != null && data.height > 0 && tileEntity.structure.fluidStored.getFluid() != null) { push(); GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); - int[] displayList = getListAndRender(data, tileEntity.structure.liquidStored.canonical(), tileEntity.worldObj); - GL11.glCallList(displayList[(int)(((float)tileEntity.structure.liquidStored.amount/(float)tileEntity.clientCapacity)*((float)getStages(data.height)-1))]); + int[] displayList = getListAndRender(data, tileEntity.structure.fluidStored.getFluid(), tileEntity.worldObj); + GL11.glCallList(displayList[(int)(((float)tileEntity.structure.fluidStored.amount/(float)tileEntity.clientCapacity)*((float)getStages(data.height)-1))]); pop(); @@ -70,7 +67,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer GL11.glTranslated(getX(valveData.location.xCoord), getY(valveData.location.yCoord), getZ(valveData.location.zCoord)); - int display = getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.liquidStored, tileEntity.worldObj).display; + int display = getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.fluidStored.getFluid(), tileEntity.worldObj).display; GL11.glCallList(display); pop(); @@ -96,36 +93,31 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); } - private int[] getListAndRender(RenderData data, LiquidStack stack, World world) + private int[] getListAndRender(RenderData data, Fluid fluid, World world) { - if(cachedCenterLiquids.containsKey(data) && cachedCenterLiquids.get(data).containsKey(stack)) + if(cachedCenterFluids.containsKey(data) && cachedCenterFluids.get(data).containsKey(fluid)) { - return cachedCenterLiquids.get(data).get(stack); + return cachedCenterFluids.get(data).get(fluid); } Model3D toReturn = new Model3D(); toReturn.baseBlock = Block.waterStill; - toReturn.setTexture(stack.getRenderingIcon()); - - if(stack.itemID < Block.blocksList.length && Block.blocksList[stack.itemID] != null) - { - toReturn.baseBlock = Block.blocksList[stack.itemID]; - } + toReturn.setTexture(fluid.getIcon()); final int stages = getStages(data.height); int[] displays = new int[stages]; - if(cachedCenterLiquids.containsKey(data)) + if(cachedCenterFluids.containsKey(data)) { - cachedCenterLiquids.get(data).put(stack, displays); + cachedCenterFluids.get(data).put(fluid, displays); } else { - HashMap map = new HashMap(); - map.put(stack, displays); - cachedCenterLiquids.put(data, map); + HashMap map = new HashMap(); + map.put(fluid, displays); + cachedCenterFluids.put(data, map); } - MekanismRenderer.colorLiquid(stack); + MekanismRenderer.colorFluid(fluid); for(int i = 0; i < stages; i++) { @@ -149,60 +141,30 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer return displays; } - private void setFlowingTexture(LiquidStack liquidStack, Model3D model) + private DisplayInteger getValveDisplay(ValveRenderData data, Fluid fluid, World world) { - if((liquidStack == null) || (liquidStack.amount <= 0) || (liquidStack.itemID <= 0)) + if(cachedValveFluids.containsKey(data) && cachedValveFluids.get(data).containsKey(fluid)) { - return; - } - - ItemStack itemStack = liquidStack.asItemStack(); - String texturePath = liquidStack.canonical().getTextureSheet(); - - Icon flatIcon = liquidStack.canonical().getRenderingIcon(); - Icon sideIcon = flatIcon; - - if((itemStack.getItem() instanceof ItemBlock)) - { - flatIcon = Block.blocksList[itemStack.itemID].getIcon(0, 0); - sideIcon = Block.blocksList[itemStack.itemID].getIcon(2, 0); - texturePath = "/terrain.png"; - } - - model.setTextures(flatIcon, flatIcon, sideIcon, sideIcon, sideIcon, sideIcon); - - bindTextureByName(texturePath); - } - - private DisplayInteger getValveDisplay(ValveRenderData data, LiquidStack stack, World world) - { - if(cachedValveLiquids.containsKey(data) && cachedValveLiquids.get(data).containsKey(stack)) - { - return cachedValveLiquids.get(data).get(stack); + return cachedValveFluids.get(data).get(fluid); } Model3D toReturn = new Model3D(); toReturn.baseBlock = Block.waterStill; - setFlowingTexture(stack, toReturn); - - if(stack.itemID < Block.blocksList.length && Block.blocksList[stack.itemID] != null) - { - toReturn.baseBlock = Block.blocksList[stack.itemID]; - } + toReturn.setTexture(fluid.getFlowingIcon()); DisplayInteger display = new DisplayInteger(); - if(cachedValveLiquids.containsKey(data)) + if(cachedValveFluids.containsKey(data)) { - cachedValveLiquids.get(data).put(stack, display); + cachedValveFluids.get(data).put(fluid, display); } else { - HashMap map = new HashMap(); - map.put(stack, display); - cachedValveLiquids.put(data, map); + HashMap map = new HashMap(); + map.put(fluid, display); + cachedValveFluids.put(data, map); } - MekanismRenderer.colorLiquid(stack); + MekanismRenderer.colorFluid(fluid); display.display = GLAllocation.generateDisplayLists(1); GL11.glNewList(display.display, 4864); @@ -234,7 +196,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer case NORTH: { toReturn.minX = .3; - toReturn.minY = -(getValveLiquidHeight(data)) + .01; + toReturn.minY = -(getValveFluidHeight(data)) + .01; toReturn.minZ = 1 + .02; toReturn.maxX = .7; @@ -245,7 +207,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer case SOUTH: { toReturn.minX = .3; - toReturn.minY = -(getValveLiquidHeight(data)) + .01; + toReturn.minY = -(getValveFluidHeight(data)) + .01; toReturn.minZ = -.4; toReturn.maxX = .7; @@ -256,7 +218,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer case WEST: { toReturn.minX = 1 + .02; - toReturn.minY = -(getValveLiquidHeight(data)) + .01; + toReturn.minY = -(getValveFluidHeight(data)) + .01; toReturn.minZ = .3; toReturn.maxX = 1.4; @@ -267,7 +229,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer case EAST: { toReturn.minX = -.4; - toReturn.minY = -(getValveLiquidHeight(data)) + .01; + toReturn.minY = -(getValveFluidHeight(data)) + .01; toReturn.minZ = .3; toReturn.maxX = -.02; @@ -289,7 +251,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer return display; } - private int getValveLiquidHeight(ValveRenderData data) + private int getValveFluidHeight(ValveRenderData data) { return data.valveLocation.yCoord - data.location.yCoord; } diff --git a/common/mekanism/client/RenderElectricChest.java b/common/mekanism/client/RenderElectricChest.java index 5791e4994..94526223b 100644 --- a/common/mekanism/client/RenderElectricChest.java +++ b/common/mekanism/client/RenderElectricChest.java @@ -1,5 +1,7 @@ package mekanism.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.TileEntityElectricChest; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -26,7 +28,7 @@ public class RenderElectricChest extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y + 1.0F, (float)z); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); - bindTextureByName("/mods/mekanism/render/ElectricChest.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/client/RenderElectricPump.java b/common/mekanism/client/RenderElectricPump.java index 4a27290f9..901b4a5dd 100644 --- a/common/mekanism/client/RenderElectricPump.java +++ b/common/mekanism/client/RenderElectricPump.java @@ -5,7 +5,9 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityElectricPump; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,8 @@ public class RenderElectricPump extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/ElectricPump.png"); + + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); model.render(0.0625F); diff --git a/common/mekanism/client/RenderMechanicalPipe.java b/common/mekanism/client/RenderMechanicalPipe.java index e7a725181..4ae1fa2c2 100644 --- a/common/mekanism/client/RenderMechanicalPipe.java +++ b/common/mekanism/client/RenderMechanicalPipe.java @@ -3,14 +3,18 @@ package mekanism.client; import java.util.HashMap; import mekanism.client.MekanismRenderer.Model3D; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PipeUtils; import mekanism.common.TileEntityMechanicalPipe; import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; @@ -22,7 +26,7 @@ public class RenderMechanicalPipe extends TileEntitySpecialRenderer { private ModelTransmitter model = new ModelTransmitter(); - private HashMap> cachedLiquids = new HashMap>(); + private HashMap> cachedLiquids = new HashMap>(); private static final int stages = 40; @@ -36,7 +40,7 @@ public class RenderMechanicalPipe extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityMechanicalPipe tileEntity, double x, double y, double z, float partialTick) { - bindTextureByName("/mods/mekanism/render/MechanicalPipe" + (tileEntity.isActive ? "Active" : "") + ".png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "MechanicalPipe" + (tileEntity.isActive ? "Active" : "") + ".png")); GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -50,39 +54,39 @@ public class RenderMechanicalPipe extends TileEntitySpecialRenderer GL11.glPopMatrix(); - if(tileEntity.liquidScale > 0 && tileEntity.refLiquid != null) + if(tileEntity.fluidScale > 0 && tileEntity.refFluid != null) { push(); - if(tileEntity.refLiquid.itemID == Block.lavaStill.blockID) + if(tileEntity.refFluid.getFluid() == FluidRegistry.LAVA) { MekanismRenderer.glowOn(); } - bindTextureByName(tileEntity.refLiquid.getTextureSheet()); + func_110628_a(MekanismRenderer.getLiquidTexture()); GL11.glTranslatef((float)x, (float)y, (float)z); for(int i = 0; i < 6; i++) { if(connectable[i]) { - int[] displayList = getListAndRender(ForgeDirection.getOrientation(i), tileEntity.refLiquid); + int[] displayList = getListAndRender(ForgeDirection.getOrientation(i), tileEntity.refFluid.getFluid()); if(displayList != null) { - GL11.glCallList(displayList[Math.max(3, (int)((float)tileEntity.liquidScale*(stages-1)))]); + GL11.glCallList(displayList[Math.max(3, (int)((float)tileEntity.fluidScale*(stages-1)))]); } } } - int[] displayList = getListAndRender(ForgeDirection.UNKNOWN, tileEntity.refLiquid); + int[] displayList = getListAndRender(ForgeDirection.UNKNOWN, tileEntity.refFluid.getFluid()); if(displayList != null) { - GL11.glCallList(displayList[Math.max(3, (int)((float)tileEntity.liquidScale*(stages-1)))]); + GL11.glCallList(displayList[Math.max(3, (int)((float)tileEntity.fluidScale*(stages-1)))]); } - if(tileEntity.refLiquid.itemID == Block.lavaStill.blockID) + if(tileEntity.refFluid.getFluid() == FluidRegistry.LAVA) { MekanismRenderer.glowOff(); } @@ -107,40 +111,35 @@ public class RenderMechanicalPipe extends TileEntitySpecialRenderer GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); } - private int[] getListAndRender(ForgeDirection side, LiquidStack stack) + private int[] getListAndRender(ForgeDirection side, Fluid fluid) { - if(side == null || stack == null || stack.getRenderingIcon() == null) + if(side == null || fluid == null || fluid.getIcon() == null) { return null; } - if(cachedLiquids.containsKey(side) && cachedLiquids.get(side).containsKey(stack)) + if(cachedLiquids.containsKey(side) && cachedLiquids.get(side).containsKey(fluid)) { - return cachedLiquids.get(side).get(stack); + return cachedLiquids.get(side).get(fluid); } Model3D toReturn = new Model3D(); toReturn.baseBlock = Block.waterStill; - toReturn.setTexture(stack.getRenderingIcon()); - - if(stack.itemID < Block.blocksList.length && Block.blocksList[stack.itemID] != null) - { - toReturn.baseBlock = Block.blocksList[stack.itemID]; - } + toReturn.setTexture(fluid.getIcon()); int[] displays = new int[stages]; if(cachedLiquids.containsKey(side)) { - cachedLiquids.get(side).put(stack, displays); + cachedLiquids.get(side).put(fluid, displays); } else { - HashMap map = new HashMap(); - map.put(stack, displays); + HashMap map = new HashMap(); + map.put(fluid, displays); cachedLiquids.put(side, map); } - MekanismRenderer.colorLiquid(stack); + MekanismRenderer.colorFluid(fluid); for(int i = 0; i < stages; i++) { diff --git a/common/mekanism/client/RenderMetallurgicInfuser.java b/common/mekanism/client/RenderMetallurgicInfuser.java index 4b50741a1..fe127bc23 100644 --- a/common/mekanism/client/RenderMetallurgicInfuser.java +++ b/common/mekanism/client/RenderMetallurgicInfuser.java @@ -1,6 +1,8 @@ package mekanism.client; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityMetallurgicInfuser; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/MetallurgicInfuser.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/client/RenderObsidianTNT.java b/common/mekanism/client/RenderObsidianTNT.java index 57da37fae..c1a03a481 100644 --- a/common/mekanism/client/RenderObsidianTNT.java +++ b/common/mekanism/client/RenderObsidianTNT.java @@ -4,7 +4,9 @@ import mekanism.common.EntityObsidianTNT; import mekanism.common.Mekanism; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -54,7 +56,7 @@ public class RenderObsidianTNT extends Render } float f3 = (1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 100F) * 0.8F; - loadTexture("/terrain.png"); + func_110777_b(entityobsidiantnt); blockRenderer.renderBlockAsItem(Mekanism.ObsidianTNT, 0, entityobsidiantnt.getBrightness(f1)); if(entityobsidiantnt.fuse / 5 % 2 == 0) @@ -73,4 +75,10 @@ public class RenderObsidianTNT extends Render GL11.glPopMatrix(); } + + @Override + protected ResourceLocation func_110775_a(Entity entity) + { + return TextureMap.field_110575_b; + } } diff --git a/common/mekanism/client/RenderPressurizedTube.java b/common/mekanism/client/RenderPressurizedTube.java index d132a5d05..2804113db 100644 --- a/common/mekanism/client/RenderPressurizedTube.java +++ b/common/mekanism/client/RenderPressurizedTube.java @@ -9,8 +9,10 @@ import mekanism.api.ITubeConnection; import mekanism.api.Object3D; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityGasTank; import mekanism.common.TileEntityPressurizedTube; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -40,7 +42,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer @SuppressWarnings("incomplete-switch") public void renderAModelAt(TileEntityPressurizedTube tileEntity, double x, double y, double z, float partialTick) { - bindTextureByName("/mods/mekanism/render/PressurizedTube.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedTube.png")); GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -109,7 +111,7 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer push(); GL11.glColor4f(1.0F, 1.0F, 1.0F, tileEntity.gasScale); - bindTextureByName(tileEntity.refGas.texturePath); + func_110628_a(tileEntity.refGas.texturePath); GL11.glTranslatef((float)x, (float)y, (float)z); if(tileEntity.canTransferGas()) diff --git a/common/mekanism/client/RenderRobit.java b/common/mekanism/client/RenderRobit.java index 7d7fc3b3e..609e8167d 100644 --- a/common/mekanism/client/RenderRobit.java +++ b/common/mekanism/client/RenderRobit.java @@ -1,6 +1,10 @@ package mekanism.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,4 +15,10 @@ public class RenderRobit extends RenderLiving { super(new ModelRobit(), 0.5F); } + + @Override + protected ResourceLocation func_110775_a(Entity entity) + { + return MekanismUtils.getResource(ResourceType.RENDER, "Robit.png"); + } } diff --git a/common/mekanism/client/RenderTheoreticalElementizer.java b/common/mekanism/client/RenderTheoreticalElementizer.java index 0c80d49cd..4a8d8346f 100644 --- a/common/mekanism/client/RenderTheoreticalElementizer.java +++ b/common/mekanism/client/RenderTheoreticalElementizer.java @@ -1,6 +1,8 @@ package mekanism.client; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityTheoreticalElementizer; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderTheoreticalElementizer extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/TheoreticalElementizer.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "TheoreticalElementizer.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/client/RenderUniversalCable.java b/common/mekanism/client/RenderUniversalCable.java index 4dfdf32b1..061c347dc 100644 --- a/common/mekanism/client/RenderUniversalCable.java +++ b/common/mekanism/client/RenderUniversalCable.java @@ -3,7 +3,9 @@ package mekanism.client; import mekanism.client.MekanismRenderer.Model3D; import mekanism.common.CableUtils; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; import mekanism.common.TileEntityUniversalCable; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -21,7 +23,7 @@ public class RenderUniversalCable extends TileEntitySpecialRenderer { private ModelTransmitter model = new ModelTransmitter(); - private Icon renderIcon = FMLClientHandler.instance().getClient().renderEngine.textureMapItems.registerIcon("mekanism:LiquidEnergy"); + private Icon renderIcon = MekanismRenderer.getTextureMap(1).registerIcon("mekanism:LiquidEnergy"); private static final double offset = 0.015; @@ -33,7 +35,7 @@ public class RenderUniversalCable extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityUniversalCable tileEntity, double x, double y, double z, float partialTick) { - bindTextureByName("/mods/mekanism/render/UniversalCable.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "UniversalCable.png")); GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -52,7 +54,7 @@ public class RenderUniversalCable extends TileEntitySpecialRenderer push(); MekanismRenderer.glowOn(); - bindTextureByName("/mods/mekanism/textures/items/LiquidEnergy.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.TEXTURE_ITEMS, "LiquidEnergy.png")); GL11.glTranslatef((float)x, (float)y, (float)z); for(int i = 0; i < 6; i++) diff --git a/common/mekanism/client/Sound.java b/common/mekanism/client/Sound.java index f9c0ff8c4..475014411 100644 --- a/common/mekanism/client/Sound.java +++ b/common/mekanism/client/Sound.java @@ -3,6 +3,7 @@ package mekanism.client; import java.net.URL; import mekanism.common.Mekanism; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.client.FMLClientHandler; @@ -46,18 +47,18 @@ public class Sound identifier = id; tileEntity = tileentity; - URL url = getClass().getClassLoader().getResource("mods/mekanism/sound/" + sound); + URL url = getClass().getClassLoader().getResource("assets/mekanism/sound/" + sound); if(url == null) { System.out.println("[Mekanism] Invalid sound file: " + sound); } - if(Mekanism.audioHandler.soundSystem != null) + if(SoundHandler.getSoundSystem() != null) { - Mekanism.audioHandler.soundSystem.newSource(false, id, url, sound, true, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, 0, 16F); - updateVolume(FMLClientHandler.instance().getClient().thePlayer); - Mekanism.audioHandler.soundSystem.activate(id); + SoundHandler.getSoundSystem().newSource(false, id, url, sound, true, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, 0, 16F); + updateVolume(Minecraft.getMinecraft().thePlayer); + SoundHandler.getSoundSystem().activate(id); } Mekanism.audioHandler.sounds.put(tileEntity, this); @@ -76,10 +77,10 @@ public class Sound return; } - if(Mekanism.audioHandler.soundSystem != null) + if(SoundHandler.getSoundSystem() != null) { - updateVolume(FMLClientHandler.instance().getClient().thePlayer); - Mekanism.audioHandler.soundSystem.play(identifier); + updateVolume(Minecraft.getMinecraft().thePlayer); + SoundHandler.getSoundSystem().play(identifier); } isPlaying = true; @@ -98,10 +99,10 @@ public class Sound return; } - if(Mekanism.audioHandler.soundSystem != null) + if(SoundHandler.getSoundSystem() != null) { - updateVolume(FMLClientHandler.instance().getClient().thePlayer); - Mekanism.audioHandler.soundSystem.stop(identifier); + updateVolume(Minecraft.getMinecraft().thePlayer); + SoundHandler.getSoundSystem().stop(identifier); } isPlaying = false; @@ -122,10 +123,10 @@ public class Sound Mekanism.audioHandler.sounds.remove(tileEntity); - if(Mekanism.audioHandler.soundSystem != null) + if(SoundHandler.getSoundSystem() != null) { - updateVolume(FMLClientHandler.instance().getClient().thePlayer); - Mekanism.audioHandler.soundSystem.removeSource(identifier); + updateVolume(Minecraft.getMinecraft().thePlayer); + SoundHandler.getSoundSystem().removeSource(identifier); } } } @@ -147,9 +148,9 @@ public class Sound double distance = entityplayer.getDistance(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); volume = (float)Math.min(Math.max(masterVolume-((distance*.08F)*masterVolume), 0)*multiplier, 1); - if(Mekanism.audioHandler.soundSystem != null) + if(SoundHandler.getSoundSystem() != null) { - Mekanism.audioHandler.soundSystem.setVolume(identifier, volume); + SoundHandler.getSoundSystem().setVolume(identifier, volume); } } } diff --git a/common/mekanism/client/SoundHandler.java b/common/mekanism/client/SoundHandler.java index 75b517ab7..2bbb3a551 100644 --- a/common/mekanism/client/SoundHandler.java +++ b/common/mekanism/client/SoundHandler.java @@ -10,6 +10,7 @@ import java.util.Random; import mekanism.api.Object3D; import mekanism.common.IActiveState; import mekanism.common.Mekanism; +import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -17,6 +18,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.ChunkEvent; import paulscode.sound.SoundSystem; +import paulscode.sound.SoundSystemConfig; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,9 +32,6 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class SoundHandler { - /** The PaulsCode SoundSystem */ - public SoundSystem soundSystem; - /** All the sound references in the Minecraft game. */ public Map sounds = Collections.synchronizedMap(new HashMap()); @@ -44,7 +43,6 @@ public class SoundHandler */ public SoundHandler() { - soundSystem = SoundManager.sndSystem; MinecraftForge.EVENT_BUS.register(this); System.out.println("[Mekanism] Successfully set up SoundHandler."); } @@ -56,12 +54,7 @@ public class SoundHandler { synchronized(sounds) { - if(soundSystem == null) - { - soundSystem = SoundManager.sndSystem; - } - - if(soundSystem != null) + if(getSoundSystem() != null) { if(!Mekanism.proxy.isPaused()) { @@ -196,15 +189,20 @@ public class SoundHandler */ public void quickPlay(String soundPath, World world, Object3D object) { - URL url = getClass().getClassLoader().getResource("mods/mekanism/sound/" + soundPath); + URL url = getClass().getClassLoader().getResource("assets/mekanism/sound/" + soundPath); if(url == null) { System.out.println("[Mekanism] Invalid sound file: " + soundPath); } - String s = soundSystem.quickPlay(false, url, soundPath, false, object.xCoord, object.yCoord, object.zCoord, 0, 16F); - soundSystem.setVolume(s, masterVolume); + String s = getSoundSystem().quickPlay(false, url, soundPath, false, object.xCoord, object.yCoord, object.zCoord, 0, 16F); + getSoundSystem().setVolume(s, masterVolume); + } + + public static SoundSystem getSoundSystem() + { + return Minecraft.getMinecraft().sndManager.sndSystem; } @ForgeSubscribe diff --git a/common/mekanism/client/ThreadClientUpdate.java b/common/mekanism/client/ThreadClientUpdate.java index 30fd1b44e..da7a3a8ba 100644 --- a/common/mekanism/client/ThreadClientUpdate.java +++ b/common/mekanism/client/ThreadClientUpdate.java @@ -45,7 +45,7 @@ public class ThreadClientUpdate extends Thread @Override public void run() { - File download = new File(new StringBuilder().append(Minecraft.getMinecraftDir()).append(File.separator + "mods" + File.separator + "Mekanism" + moduleName + "-v" + Mekanism.latestVersionNumber + ".jar").toString()); + File download = new File(new StringBuilder().append(Mekanism.proxy.getMinecraftDir()).append(File.separator + "mods" + File.separator + "Mekanism" + moduleName + "-v" + Mekanism.latestVersionNumber + ".jar").toString()); try { prepareForDownload(); download.createNewFile(); @@ -82,7 +82,7 @@ public class ThreadClientUpdate extends Thread */ public void prepareForDownload() { - File[] modsList = new File(new StringBuilder().append(Minecraft.getMinecraftDir()).append(File.separator + "mods").toString()).listFiles(); + File[] modsList = new File(new StringBuilder().append(Mekanism.proxy.getMinecraftDir()).append(File.separator + "mods").toString()).listFiles(); for(File file : modsList) { diff --git a/common/mekanism/client/TransmitterRenderer.java b/common/mekanism/client/TransmitterRenderer.java index 6917af144..44f6e69f5 100644 --- a/common/mekanism/client/TransmitterRenderer.java +++ b/common/mekanism/client/TransmitterRenderer.java @@ -1,6 +1,9 @@ package mekanism.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -26,13 +29,13 @@ public class TransmitterRenderer implements ISimpleBlockRenderingHandler switch(metadata) { case 0: - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/PressurizedTube.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedTube.png")); break; case 1: - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/UniversalCable.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "UniversalCable.png")); break; case 2: - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/MechanicalPipe.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "MechanicalPipe.png")); break; } diff --git a/common/mekanism/common/BlockBasic.java b/common/mekanism/common/BlockBasic.java index 636add725..29ec636a7 100644 --- a/common/mekanism/common/BlockBasic.java +++ b/common/mekanism/common/BlockBasic.java @@ -11,7 +11,7 @@ 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.EntityLivingBase; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,8 +21,8 @@ import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -203,11 +203,11 @@ public class BlockBasic extends Block if(itemStack != null && tileEntity.structure != null) { - if(LiquidContainerRegistry.isEmptyContainer(itemStack)) + if(FluidContainerRegistry.isEmptyContainer(itemStack)) { - if(tileEntity.structure.liquidStored != null && tileEntity.structure.liquidStored.amount >= LiquidContainerRegistry.BUCKET_VOLUME) + if(tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount >= FluidContainerRegistry.BUCKET_VOLUME) { - ItemStack filled = LiquidContainerRegistry.fillLiquidContainer(tileEntity.structure.liquidStored, itemStack); + ItemStack filled = FluidContainerRegistry.fillFluidContainer(tileEntity.structure.fluidStored, itemStack); if(filled != null) { @@ -220,11 +220,11 @@ public class BlockBasic extends Block player.inventory.mainInventory[i] = filled; itemStack.stackSize--; - tileEntity.structure.liquidStored.amount -= LiquidContainerRegistry.getLiquidForFilledItem(filled).amount; + tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - if(tileEntity.structure.liquidStored.amount == 0) + if(tileEntity.structure.fluidStored.amount == 0) { - tileEntity.structure.liquidStored = null; + tileEntity.structure.fluidStored = null; } return true; @@ -236,11 +236,11 @@ public class BlockBasic extends Block player.inventory.mainInventory[i].stackSize++; itemStack.stackSize--; - tileEntity.structure.liquidStored.amount -= LiquidContainerRegistry.getLiquidForFilledItem(filled).amount; + tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - if(tileEntity.structure.liquidStored.amount == 0) + if(tileEntity.structure.fluidStored.amount == 0) { - tileEntity.structure.liquidStored = null; + tileEntity.structure.fluidStored = null; } return true; @@ -252,11 +252,11 @@ public class BlockBasic extends Block { player.setCurrentItemOrArmor(0, filled); - tileEntity.structure.liquidStored.amount -= LiquidContainerRegistry.getLiquidForFilledItem(filled).amount; + tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - if(tileEntity.structure.liquidStored.amount == 0) + if(tileEntity.structure.fluidStored.amount == 0) { - tileEntity.structure.liquidStored = null; + tileEntity.structure.fluidStored = null; } return true; @@ -264,21 +264,21 @@ public class BlockBasic extends Block } } } - else if(LiquidContainerRegistry.isFilledContainer(itemStack)) + else if(FluidContainerRegistry.isFilledContainer(itemStack)) { - LiquidStack itemLiquid = LiquidContainerRegistry.getLiquidForFilledItem(itemStack); + FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(itemStack); int max = tileEntity.structure.volume*16000; - if(tileEntity.structure.liquidStored == null || (tileEntity.structure.liquidStored.amount+itemLiquid.amount <= max)) + if(tileEntity.structure.fluidStored == null || (tileEntity.structure.fluidStored.amount+itemFluid.amount <= max)) { - if(LiquidContainerRegistry.isBucket(itemStack)) + if(FluidContainerRegistry.isBucket(itemStack)) { - if(tileEntity.structure.liquidStored == null) + if(tileEntity.structure.fluidStored == null) { - tileEntity.structure.liquidStored = itemLiquid; + tileEntity.structure.fluidStored = itemFluid; } else { - tileEntity.structure.liquidStored.amount += itemLiquid.amount; + tileEntity.structure.fluidStored.amount += itemFluid.amount; } player.setCurrentItemOrArmor(0, new ItemStack(Item.bucketEmpty)); @@ -292,12 +292,12 @@ public class BlockBasic extends Block player.setCurrentItemOrArmor(0, null); } - if(tileEntity.structure.liquidStored == null) + if(tileEntity.structure.fluidStored == null) { - tileEntity.structure.liquidStored = itemLiquid; + tileEntity.structure.fluidStored = itemFluid; } else { - tileEntity.structure.liquidStored.amount += itemLiquid.amount; + tileEntity.structure.fluidStored.amount += itemFluid.amount; } return true; @@ -371,7 +371,7 @@ public class BlockBasic extends Block } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) { world.markBlockForRenderUpdate(x, y, z); world.updateAllLightTypes(x, y, z); diff --git a/common/mekanism/common/BlockEnergyCube.java b/common/mekanism/common/BlockEnergyCube.java index eea14b464..c8702bfe8 100644 --- a/common/mekanism/common/BlockEnergyCube.java +++ b/common/mekanism/common/BlockEnergyCube.java @@ -9,7 +9,7 @@ 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.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -82,7 +82,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase 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; diff --git a/common/mekanism/common/BlockGasTank.java b/common/mekanism/common/BlockGasTank.java index ef18ae1f3..2d627b345 100644 --- a/common/mekanism/common/BlockGasTank.java +++ b/common/mekanism/common/BlockGasTank.java @@ -2,13 +2,10 @@ package mekanism.common; import java.util.Random; -import universalelectricity.prefab.implement.IToolConfigurator; -import buildcraft.api.tools.IToolWrench; - 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.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +16,8 @@ import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import universalelectricity.prefab.implement.IToolConfigurator; +import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -46,7 +45,7 @@ public class BlockGasTank extends BlockContainer } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); diff --git a/common/mekanism/common/BlockMachine.java b/common/mekanism/common/BlockMachine.java index 1e42aa1d3..77d5159b2 100644 --- a/common/mekanism/common/BlockMachine.java +++ b/common/mekanism/common/BlockMachine.java @@ -16,7 +16,7 @@ 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.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -111,7 +111,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase 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; @@ -722,9 +722,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds { if(tileEntity instanceof ISustainedTank) { - if(((ISustainedTank)tileEntity).getLiquidStack() != null) + if(((ISustainedTank)tileEntity).getFluidStack() != null) { - ((ISustainedTank)itemStack.getItem()).setLiquidStack(((ISustainedTank)tileEntity).getLiquidStack(), itemStack); + ((ISustainedTank)itemStack.getItem()).setFluidStack(((ISustainedTank)tileEntity).getFluidStack(), itemStack); } } } diff --git a/common/mekanism/common/CommandMekanism.java b/common/mekanism/common/CommandMekanism.java index 10830cddd..785461876 100644 --- a/common/mekanism/common/CommandMekanism.java +++ b/common/mekanism/common/CommandMekanism.java @@ -7,6 +7,7 @@ import mekanism.api.EnumColor; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatMessageComponent; public class CommandMekanism extends CommandBase { @@ -33,26 +34,26 @@ public class CommandMekanism extends CommandBase { if(params.length < 1) { - sender.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"); - sender.sendChatToPlayer(EnumColor.GREY + " *Version: " + EnumColor.DARK_GREY + Mekanism.versionNumber); - sender.sendChatToPlayer(EnumColor.GREY + " *Latest Version: " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber); - sender.sendChatToPlayer(EnumColor.GREY + " *Developed on Mac OS X 10.8 Mountain Lion"); - sender.sendChatToPlayer(EnumColor.GREY + " *Code, textures, and ideas by aidancbrady"); - sender.sendChatToPlayer(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews); - sender.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Version: " + EnumColor.DARK_GREY + Mekanism.versionNumber)); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Latest Version: " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Developed on Mac OS X 10.8 Mountain Lion")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Code, textures, and ideas by aidancbrady")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews)); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } else if(params.length == 1) { if(params[0].equalsIgnoreCase("help")) { - sender.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk" + EnumColor.GREY + " -- displays the main page."); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk help" + EnumColor.GREY + " -- displays this guide."); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk version" + EnumColor.GREY + " -- displays the version number."); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk latest" + EnumColor.GREY + " -- displays the latest version number."); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk news" + EnumColor.GREY + " -- displays most recent recent news."); - sender.sendChatToPlayer(EnumColor.INDIGO + " /mk debug" + EnumColor.GREY + " -- toggles Mekanism's debug mode."); - sender.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk" + EnumColor.GREY + " -- displays the main page.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk help" + EnumColor.GREY + " -- displays this guide.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk version" + EnumColor.GREY + " -- displays the version number.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk latest" + EnumColor.GREY + " -- displays the latest version number.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk news" + EnumColor.GREY + " -- displays most recent recent news.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.INDIGO + " /mk debug" + EnumColor.GREY + " -- toggles Mekanism's debug mode.")); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } else if(params[0].equalsIgnoreCase("version")) { @@ -60,28 +61,28 @@ public class CommandMekanism extends CommandBase { if(Mekanism.updateNotifications || Mekanism.latestVersionNumber == null || Mekanism.recentNews == null || Mekanism.latestVersionNumber.equals("null")) { - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates."); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates.")); } else { - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Your client is up to date."); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Your client is up to date.")); } } } else if(params[0].equalsIgnoreCase("news")) { - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Most recent news: " + EnumColor.INDIGO + Mekanism.recentNews); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Most recent news: " + EnumColor.INDIGO + Mekanism.recentNews)); } else if(params[0].equalsIgnoreCase("latest")) { - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " The latest version for this mod is " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber + EnumColor.GREY + "."); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " The latest version for this mod is " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber + EnumColor.GREY + ".")); } else if(params[0].equalsIgnoreCase("debug")) { Mekanism.debug = !Mekanism.debug; - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + Mekanism.debug); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + Mekanism.debug)); } else { - sender.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help."); + sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); } } } diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index f6e2daa05..635e73416 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -1,5 +1,7 @@ package mekanism.common; +import java.io.File; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -241,4 +243,13 @@ public class CommonProxy return null; } + + /** + * Gets the Minecraft base directory. + * @return base directory + */ + public File getMinecraftDir() + { + return null; + } } diff --git a/common/mekanism/common/CommonWorldTickHandler.java b/common/mekanism/common/CommonWorldTickHandler.java index 1b7c2b414..3f49e3922 100644 --- a/common/mekanism/common/CommonWorldTickHandler.java +++ b/common/mekanism/common/CommonWorldTickHandler.java @@ -76,7 +76,7 @@ public class CommonWorldTickHandler implements ITickHandler if(dynamicTank != null) { - dynamicTank.cachedLiquid = null; + dynamicTank.cachedFluid = null; dynamicTank.inventory = new ItemStack[2]; dynamicTank.inventoryID = -1; } diff --git a/common/mekanism/common/ContainerAdvancedElectricMachine.java b/common/mekanism/common/ContainerAdvancedElectricMachine.java index 11879745d..dd1e0a708 100644 --- a/common/mekanism/common/ContainerAdvancedElectricMachine.java +++ b/common/mekanism/common/ContainerAdvancedElectricMachine.java @@ -43,9 +43,9 @@ public class ContainerAdvancedElectricMachine extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerDynamicTank.java b/common/mekanism/common/ContainerDynamicTank.java index 71a8e1bef..deec1a0f1 100644 --- a/common/mekanism/common/ContainerDynamicTank.java +++ b/common/mekanism/common/ContainerDynamicTank.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry; import universalelectricity.core.item.IItemElectric; public class ContainerDynamicTank extends Container @@ -39,9 +39,9 @@ public class ContainerDynamicTank extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.playersUsing.remove(entityplayer); tileEntity.closeChest(); } @@ -80,7 +80,7 @@ public class ContainerDynamicTank extends Container } } } - else if(LiquidContainerRegistry.isEmptyContainer(slotStack) || LiquidContainerRegistry.isFilledContainer(slotStack)) + else if(FluidContainerRegistry.isEmptyContainer(slotStack) || FluidContainerRegistry.isFilledContainer(slotStack)) { if(slotID != 0 && slotID != 1) { diff --git a/common/mekanism/common/ContainerElectricChest.java b/common/mekanism/common/ContainerElectricChest.java index 53a4c3393..f409f668c 100644 --- a/common/mekanism/common/ContainerElectricChest.java +++ b/common/mekanism/common/ContainerElectricChest.java @@ -70,9 +70,9 @@ public class ContainerElectricChest extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); if(isBlock) { diff --git a/common/mekanism/common/ContainerElectricMachine.java b/common/mekanism/common/ContainerElectricMachine.java index 86e11dabe..66289536b 100644 --- a/common/mekanism/common/ContainerElectricMachine.java +++ b/common/mekanism/common/ContainerElectricMachine.java @@ -41,9 +41,9 @@ public class ContainerElectricMachine extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerElectricPump.java b/common/mekanism/common/ContainerElectricPump.java index d9dfa8c67..1415f4bbc 100644 --- a/common/mekanism/common/ContainerElectricPump.java +++ b/common/mekanism/common/ContainerElectricPump.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 net.minecraftforge.liquids.LiquidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry; import universalelectricity.core.item.IItemElectric; public class ContainerElectricPump extends Container @@ -41,9 +41,9 @@ public class ContainerElectricPump extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } @@ -82,7 +82,7 @@ public class ContainerElectricPump extends Container } } } - else if(LiquidContainerRegistry.isEmptyContainer(slotStack)) + else if(FluidContainerRegistry.isEmptyContainer(slotStack)) { if(slotID != 0) { diff --git a/common/mekanism/common/ContainerEnergyCube.java b/common/mekanism/common/ContainerEnergyCube.java index 9b9f3d048..19380556c 100644 --- a/common/mekanism/common/ContainerEnergyCube.java +++ b/common/mekanism/common/ContainerEnergyCube.java @@ -41,9 +41,9 @@ public class ContainerEnergyCube extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerFactory.java b/common/mekanism/common/ContainerFactory.java index e826cbcf4..c5b1e73a7 100644 --- a/common/mekanism/common/ContainerFactory.java +++ b/common/mekanism/common/ContainerFactory.java @@ -95,9 +95,9 @@ public class ContainerFactory extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerGasTank.java b/common/mekanism/common/ContainerGasTank.java index a72f93eae..b706442eb 100644 --- a/common/mekanism/common/ContainerGasTank.java +++ b/common/mekanism/common/ContainerGasTank.java @@ -38,9 +38,9 @@ public class ContainerGasTank extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerMetallurgicInfuser.java b/common/mekanism/common/ContainerMetallurgicInfuser.java index 011ee1356..b252dab8e 100644 --- a/common/mekanism/common/ContainerMetallurgicInfuser.java +++ b/common/mekanism/common/ContainerMetallurgicInfuser.java @@ -45,9 +45,9 @@ public class ContainerMetallurgicInfuser extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/ContainerRobitInventory.java b/common/mekanism/common/ContainerRobitInventory.java index 02c1bdc3c..408100196 100644 --- a/common/mekanism/common/ContainerRobitInventory.java +++ b/common/mekanism/common/ContainerRobitInventory.java @@ -88,9 +88,9 @@ public class ContainerRobitInventory extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); robit.closeChest(); } } diff --git a/common/mekanism/common/ContainerRobitMain.java b/common/mekanism/common/ContainerRobitMain.java index c1717a1dd..9cb30230d 100644 --- a/common/mekanism/common/ContainerRobitMain.java +++ b/common/mekanism/common/ContainerRobitMain.java @@ -35,9 +35,9 @@ public class ContainerRobitMain extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); robit.closeChest(); } diff --git a/common/mekanism/common/ContainerRobitSmelting.java b/common/mekanism/common/ContainerRobitSmelting.java index 02b2494c3..a85289f16 100644 --- a/common/mekanism/common/ContainerRobitSmelting.java +++ b/common/mekanism/common/ContainerRobitSmelting.java @@ -178,9 +178,9 @@ public class ContainerRobitSmelting extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); robit.closeChest(); } } diff --git a/common/mekanism/common/ContainerTeleporter.java b/common/mekanism/common/ContainerTeleporter.java index a850c4e9c..68c9ca2b1 100644 --- a/common/mekanism/common/ContainerTeleporter.java +++ b/common/mekanism/common/ContainerTeleporter.java @@ -38,9 +38,9 @@ public class ContainerTeleporter extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/common/DynamicLiquidTank.java b/common/mekanism/common/DynamicFluidTank.java similarity index 59% rename from common/mekanism/common/DynamicLiquidTank.java rename to common/mekanism/common/DynamicFluidTank.java index ffb1423a9..87b5e58bd 100644 --- a/common/mekanism/common/DynamicLiquidTank.java +++ b/common/mekanism/common/DynamicFluidTank.java @@ -2,22 +2,23 @@ package mekanism.common; import mekanism.api.Object3D; import mekanism.common.SynchronizedTankData.ValveData; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; -public class DynamicLiquidTank implements ILiquidTank +public class DynamicFluidTank implements IFluidTank { public TileEntityDynamicTank dynamicTank; - public DynamicLiquidTank(TileEntityDynamicTank tileEntity) + public DynamicFluidTank(TileEntityDynamicTank tileEntity) { dynamicTank = tileEntity; } @Override - public LiquidStack getLiquid() + public FluidStack getFluid() { - return dynamicTank.structure != null ? dynamicTank.structure.liquidStored : null; + return dynamicTank.structure != null ? dynamicTank.structure.fluidStored : null; } @Override @@ -27,22 +28,22 @@ public class DynamicLiquidTank implements ILiquidTank } @Override - public int fill(LiquidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { if(dynamicTank.structure != null && !dynamicTank.worldObj.isRemote) { - if(resource == null || resource.itemID <= 0) + if(resource == null || resource.fluidID <= 0) { return 0; } - if(dynamicTank.structure.liquidStored == null || dynamicTank.structure.liquidStored.itemID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { if(resource.amount <= getCapacity()) { if(doFill) { - dynamicTank.structure.liquidStored = resource.copy(); + dynamicTank.structure.fluidStored = resource.copy(); } if(resource.amount > 0 && doFill) @@ -57,8 +58,8 @@ public class DynamicLiquidTank implements ILiquidTank else { if(doFill) { - dynamicTank.structure.liquidStored = resource.copy(); - dynamicTank.structure.liquidStored.amount = getCapacity(); + dynamicTank.structure.fluidStored = resource.copy(); + dynamicTank.structure.fluidStored.amount = getCapacity(); } if(getCapacity() > 0 && doFill) @@ -72,18 +73,18 @@ public class DynamicLiquidTank implements ILiquidTank } } - if(!dynamicTank.structure.liquidStored.isLiquidEqual(resource)) + if(!dynamicTank.structure.fluidStored.isFluidEqual(resource)) { return 0; } - int space = getCapacity() - dynamicTank.structure.liquidStored.amount; + int space = getCapacity() - dynamicTank.structure.fluidStored.amount; if(resource.amount <= space) { if(doFill) { - dynamicTank.structure.liquidStored.amount += resource.amount; + dynamicTank.structure.fluidStored.amount += resource.amount; } if(resource.amount > 0 && doFill) @@ -98,7 +99,7 @@ public class DynamicLiquidTank implements ILiquidTank else { if(doFill) { - dynamicTank.structure.liquidStored.amount = getCapacity(); + dynamicTank.structure.fluidStored.amount = getCapacity(); } if(space > 0 && doFill) @@ -123,44 +124,44 @@ public class DynamicLiquidTank implements ILiquidTank { if(data.location.equals(Object3D.get(dynamicTank))) { - data.serverLiquid = value; + data.serverFluid = value; } } } } @Override - public LiquidStack drain(int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { if(dynamicTank.structure != null && !dynamicTank.worldObj.isRemote) { - if(dynamicTank.structure.liquidStored == null || dynamicTank.structure.liquidStored.itemID <= 0) + if(dynamicTank.structure.fluidStored == null || dynamicTank.structure.fluidStored.fluidID <= 0) { return null; } - if(dynamicTank.structure.liquidStored.amount <= 0) + if(dynamicTank.structure.fluidStored.amount <= 0) { return null; } int used = maxDrain; - if(dynamicTank.structure.liquidStored.amount < used) + if(dynamicTank.structure.fluidStored.amount < used) { - used = dynamicTank.structure.liquidStored.amount; + used = dynamicTank.structure.fluidStored.amount; } if(doDrain) { - dynamicTank.structure.liquidStored.amount -= used; + dynamicTank.structure.fluidStored.amount -= used; } - LiquidStack drained = new LiquidStack(dynamicTank.structure.liquidStored.itemID, used, dynamicTank.structure.liquidStored.itemMeta); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.fluidID, used); - if(dynamicTank.structure.liquidStored.amount <= 0) + if(dynamicTank.structure.fluidStored.amount <= 0) { - dynamicTank.structure.liquidStored = null; + dynamicTank.structure.fluidStored = null; } if(drained.amount > 0 && doDrain) @@ -175,8 +176,19 @@ public class DynamicLiquidTank implements ILiquidTank } @Override - public int getTankPressure() + public int getFluidAmount() { + if(dynamicTank.structure != null) + { + return dynamicTank.structure.fluidStored.amount; + } + return 0; } + + @Override + public FluidTankInfo getInfo() + { + return new FluidTankInfo(this); + } } diff --git a/common/mekanism/common/DynamicTankCache.java b/common/mekanism/common/DynamicTankCache.java index 0cd410b33..4df194a30 100644 --- a/common/mekanism/common/DynamicTankCache.java +++ b/common/mekanism/common/DynamicTankCache.java @@ -4,12 +4,12 @@ import java.util.HashSet; import mekanism.api.Object3D; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; public class DynamicTankCache { public ItemStack[] inventory = new ItemStack[2]; - public LiquidStack liquid; + public FluidStack fluid; public HashSet locations = new HashSet(); } diff --git a/common/mekanism/common/EntityRobit.java b/common/mekanism/common/EntityRobit.java index aaead5099..850c93bc7 100644 --- a/common/mekanism/common/EntityRobit.java +++ b/common/mekanism/common/EntityRobit.java @@ -12,6 +12,7 @@ import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; import micdoodle8.mods.galacticraft.API.IEntityBreathable; import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWatchClosest; @@ -49,17 +50,15 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine super(world); setSize(0.5F, 0.5F); - moveSpeed = 0.3F; - texture = "/mods/mekanism/render/Robit.png"; getNavigator().setAvoidsWater(true); - tasks.addTask(1, new RobitAIFollow(this, moveSpeed, 5.0F, 2.0F)); + tasks.addTask(1, new RobitAIFollow(this, 0.3F, 5.0F, 2.0F)); tasks.addTask(2, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); tasks.addTask(2, new EntityAILookIdle(this)); tasks.addTask(3, new EntityAISwimming(this)); - func_94061_f(true); + setAlwaysRenderNameTag(true); } public EntityRobit(World world, double x, double y, double z) @@ -73,6 +72,15 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine prevPosZ = z; } + @Override + protected void func_110147_ax() + { + super.func_110147_ax(); + + func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a(0.3); + func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(1); + } + @Override public boolean isAIEnabled() { @@ -461,7 +469,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine } @Override - protected void damageEntity(DamageSource damageSource, int amount) + protected void damageEntity(DamageSource damageSource, float amount) { amount = ForgeHooks.onLivingHurt(this, damageSource, amount); @@ -472,10 +480,10 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine amount = applyArmorCalculations(damageSource, amount); amount = applyPotionDamageCalculations(damageSource, amount); - int j = getHealth(); + float j = func_110143_aJ(); setEnergy(Math.max(0, getEnergy() - (amount*1000))); - field_94063_bt.func_94547_a(damageSource, j, amount); + func_110142_aN().func_94547_a(damageSource, j, amount); } @Override @@ -547,12 +555,6 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine dataWatcher.updateObject(15, pickup ? (byte)1 : (byte)0); } - @Override - public int getMaxHealth() - { - return 1; - } - @Override public int getSizeInventory() { @@ -653,7 +655,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public void closeChest() {} @Override - public boolean isStackValidForSlot(int i, ItemStack itemstack) + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } diff --git a/common/mekanism/common/LiquidNetwork.java b/common/mekanism/common/FluidNetwork.java similarity index 71% rename from common/mekanism/common/LiquidNetwork.java rename to common/mekanism/common/FluidNetwork.java index 4493c3cb6..c41bcdeb3 100644 --- a/common/mekanism/common/LiquidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import cpw.mods.fml.common.FMLCommonHandler; - import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -20,40 +18,41 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; +import cpw.mods.fml.common.FMLCommonHandler; -public class LiquidNetwork +public class FluidNetwork { public Set pipes = new HashSet(); - public Set possibleAcceptors = new HashSet(); - public Map acceptorDirections = new HashMap(); + public Set possibleAcceptors = new HashSet(); + public Map acceptorDirections = new HashMap(); - public LiquidNetwork(IMechanicalPipe... varPipes) + public FluidNetwork(IMechanicalPipe... varPipes) { pipes.addAll(Arrays.asList(varPipes)); } - public int emit(LiquidStack liquidToSend, boolean doTransfer, TileEntity emitter) + public int emit(FluidStack fluidToSend, boolean doTransfer, TileEntity emitter) { - List availableAcceptors = Arrays.asList(getLiquidAcceptors(liquidToSend).toArray()); + List availableAcceptors = Arrays.asList(getFluidAcceptors(fluidToSend).toArray()); Collections.shuffle(availableAcceptors); - int liquidSent = 0; + int fluidSent = 0; if(!availableAcceptors.isEmpty()) { int divider = availableAcceptors.size(); - int remaining = liquidToSend.amount % divider; - int sending = (liquidToSend.amount-remaining)/divider; + int remaining = fluidToSend.amount % divider; + int sending = (fluidToSend.amount-remaining)/divider; for(Object obj : availableAcceptors) { - if(obj instanceof ITankContainer && obj != emitter) + if(obj instanceof IFluidHandler && obj != emitter) { - ITankContainer acceptor = (ITankContainer)obj; + IFluidHandler acceptor = (IFluidHandler)obj; int currentSending = sending; if(remaining > 0) @@ -62,30 +61,33 @@ public class LiquidNetwork remaining--; } - liquidSent += acceptor.fill(acceptorDirections.get(acceptor), new LiquidStack(liquidToSend.itemID, currentSending, liquidToSend.itemMeta), doTransfer); + fluidSent += acceptor.fill(acceptorDirections.get(acceptor), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); } } } - if(doTransfer && liquidSent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer()) + if(doTransfer && fluidSent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer()) { - LiquidStack sendStack = liquidToSend.copy(); - sendStack.amount = liquidSent; - MinecraftForge.EVENT_BUS.post(new LiquidTransferEvent(this, sendStack)); + FluidStack sendStack = fluidToSend.copy(); + sendStack.amount = fluidSent; + MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, sendStack)); } - return liquidSent; + return fluidSent; } - public Set getLiquidAcceptors(LiquidStack liquidToSend) + public Set getFluidAcceptors(FluidStack fluidToSend) { - Set toReturn = new HashSet(); + Set toReturn = new HashSet(); - for(ITankContainer acceptor : possibleAcceptors) + for(IFluidHandler acceptor : possibleAcceptors) { - if(acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), liquidToSend, false) > 0) + if(acceptor.canFill(acceptorDirections.get(acceptor).getOpposite(), fluidToSend.getFluid())) { - toReturn.add(acceptor); + if(acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), fluidToSend, false) > 0) + { + toReturn.add(acceptor); + } } } @@ -118,9 +120,9 @@ public class LiquidNetwork for(IMechanicalPipe pipe : pipes) { - ITankContainer[] acceptors = PipeUtils.getConnectedAcceptors((TileEntity)pipe); + IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors((TileEntity)pipe); - for(ITankContainer acceptor : acceptors) + for(IFluidHandler acceptor : acceptors) { if(acceptor != null && !(acceptor instanceof IMechanicalPipe)) { @@ -131,11 +133,11 @@ public class LiquidNetwork } } - public void merge(LiquidNetwork network) + public void merge(FluidNetwork network) { if(network != null && network != this) { - LiquidNetwork newNetwork = new LiquidNetwork(); + FluidNetwork newNetwork = new FluidNetwork(); newNetwork.pipes.addAll(pipes); newNetwork.pipes.addAll(network.pipes); newNetwork.refresh(); @@ -190,7 +192,7 @@ public class LiquidNetwork } } else { - LiquidNetwork newNetwork = new LiquidNetwork(); + FluidNetwork newNetwork = new FluidNetwork(); for(Object3D node : finder.iterated) { @@ -266,16 +268,16 @@ public class LiquidNetwork } } - public static class LiquidTransferEvent extends Event + public static class FluidTransferEvent extends Event { - public final LiquidNetwork liquidNetwork; + public final FluidNetwork fluidNetwork; - public final LiquidStack liquidSent; + public final FluidStack fluidSent; - public LiquidTransferEvent(LiquidNetwork network, LiquidStack liquid) + public FluidTransferEvent(FluidNetwork network, FluidStack fluid) { - liquidNetwork = network; - liquidSent = liquid; + fluidNetwork = network; + fluidSent = fluid; } } @@ -305,6 +307,6 @@ public class LiquidNetwork @Override public String toString() { - return "[LiquidNetwork] " + pipes.size() + " pipes, " + possibleAcceptors.size() + " acceptors."; + return "[FluidNetwork] " + pipes.size() + " pipes, " + possibleAcceptors.size() + " acceptors."; } } diff --git a/common/mekanism/common/FluidSlot.java b/common/mekanism/common/FluidSlot.java new file mode 100644 index 000000000..1863d551c --- /dev/null +++ b/common/mekanism/common/FluidSlot.java @@ -0,0 +1,39 @@ +package mekanism.common; + +/** + * Used to manage a slot that stores fluid. Has 3 main values: a stored amount of fluid, + * maximum fluid, and fluid ID. + * @author AidanBrady + * + */ +public class FluidSlot +{ + /** The amount of fluid this slot is currently holding. */ + public int fluidStored; + + /** The maximum amount of fluid this slot can handle. */ + public int MAX_FLUID; + + /** The fluid's ID. */ + public int fluidID; + + /** + * Creates a FluidSlot with a defined fluid ID and max fluid. The fluid stored starts at 0. + * @param max - max fluid + * @param id - fluid id + */ + public FluidSlot(int max, int id) + { + MAX_FLUID = max; + fluidID = id; + } + + /** + * Sets the fluid to a new amount. + * @param fluid - amount to store + */ + public void setFluid(int amount) + { + fluidStored = Math.max(Math.min(amount, MAX_FLUID), 0); + } +} diff --git a/common/mekanism/common/IMechanicalPipe.java b/common/mekanism/common/IMechanicalPipe.java index e0bfed3c2..cc8ce3f88 100644 --- a/common/mekanism/common/IMechanicalPipe.java +++ b/common/mekanism/common/IMechanicalPipe.java @@ -1,34 +1,34 @@ package mekanism.common; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; /** - * Implement this in your TileEntity class if the block can transfer liquid as a Mechanical Pipe. + * Implement this in your TileEntity class if the block can transfer fluid as a Mechanical Pipe. * @author AidanBrady * */ public interface IMechanicalPipe { /** - * Called when liquid is transferred through this pipe. - * @param liquidStack - the liquid transferred + * Called when fluid is transferred through this pipe. + * @param fluidStack - the fluid transferred */ - public void onTransfer(LiquidStack liquidStack); + public void onTransfer(FluidStack fluidStack); /** - * Gets the LiquidNetwork currently in use by this cable segment. - * @return LiquidNetwork this cable is using + * Gets the FluidNetwork currently in use by this cable segment. + * @return FluidNetwork this cable is using */ - public LiquidNetwork getNetwork(); + public FluidNetwork getNetwork(); /** - * Sets this cable segment's LiquidNetwork to a new value. - * @param network - LiquidNetwork to set to + * Sets this cable segment's FluidNetwork to a new value. + * @param network - FluidNetwork to set to */ - public void setNetwork(LiquidNetwork network); + public void setNetwork(FluidNetwork network); /** - * Refreshes the cable's LiquidNetwork. + * Refreshes the cable's FluidNetwork. */ public void refreshNetwork(); } diff --git a/common/mekanism/common/ISustainedTank.java b/common/mekanism/common/ISustainedTank.java index 89e118171..f33907f94 100644 --- a/common/mekanism/common/ISustainedTank.java +++ b/common/mekanism/common/ISustainedTank.java @@ -1,6 +1,6 @@ package mekanism.common; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; /** * Internal interface used in blocks and items that are capable of storing sustained tanks. @@ -14,14 +14,14 @@ public interface ISustainedTank * @param nbtTags - NBTTagList value to set * @param data - ItemStack parameter if using on item */ - public void setLiquidStack(LiquidStack liquidStack, Object... data); + public void setFluidStack(FluidStack fluidStack, Object... data); /** * Gets the tank tag list from an item or block. * @param data - ItemStack parameter if using on item * @return inventory tag list */ - public LiquidStack getLiquidStack(Object... data); + public FluidStack getFluidStack(Object... data); /** * Whether or not this block or item has an internal tank. diff --git a/common/mekanism/common/ItemAtomicDisassembler.java b/common/mekanism/common/ItemAtomicDisassembler.java index 65bf83486..971d3c60e 100644 --- a/common/mekanism/common/ItemAtomicDisassembler.java +++ b/common/mekanism/common/ItemAtomicDisassembler.java @@ -4,7 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import net.minecraft.block.Block; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -34,7 +34,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } @Override - public boolean hitEntity(ItemStack itemstack, EntityLiving hitEntity, EntityLiving player) + public boolean hitEntity(ItemStack itemstack, EntityLivingBase hitEntity, EntityLivingBase player) { if(getEnergy(itemstack) > 0) { @@ -54,7 +54,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } @Override - public boolean onBlockDestroyed(ItemStack itemstack, World world, int id, int x, int y, int z, EntityLiving entityliving) + public boolean onBlockDestroyed(ItemStack itemstack, World world, int id, int x, int y, int z, EntityLivingBase entityliving) { if(Block.blocksList[id].getBlockHardness(world, x, y, z) != 0.0D) { diff --git a/common/mekanism/common/ItemBlockEnergyCube.java b/common/mekanism/common/ItemBlockEnergyCube.java index 1f8e1b4e8..d279b6479 100644 --- a/common/mekanism/common/ItemBlockEnergyCube.java +++ b/common/mekanism/common/ItemBlockEnergyCube.java @@ -54,7 +54,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, II else { list.add(EnumColor.BRIGHT_GREEN + "Stored Energy: " + EnumColor.GREY + ElectricityDisplay.getDisplayShort(getJoules(itemstack), ElectricUnit.JOULES)); list.add(EnumColor.BRIGHT_GREEN + "Voltage: " + EnumColor.GREY + getVoltage(itemstack) + "v"); - list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagList != null && !getInventory(itemstack).tagList.isEmpty())); + list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } diff --git a/common/mekanism/common/ItemBlockMachine.java b/common/mekanism/common/ItemBlockMachine.java index 178d9f9a9..72e2f6d93 100644 --- a/common/mekanism/common/ItemBlockMachine.java +++ b/common/mekanism/common/ItemBlockMachine.java @@ -21,8 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import net.minecraftforge.liquids.LiquidDictionary; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.input.Keyboard; @@ -156,9 +156,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem if(hasTank(itemstack)) { - if(getLiquidStack(itemstack) != null) + if(getFluidStack(itemstack) != null) { - list.add(EnumColor.PINK + LiquidDictionary.findLiquidName(getLiquidStack(itemstack)) + ": " + EnumColor.GREY + getLiquidStack(itemstack).amount + "mB"); + list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); } } @@ -253,9 +253,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem if(tileEntity instanceof ISustainedTank) { - if(hasTank(stack) && getLiquidStack(stack) != null) + if(hasTank(stack) && getFluidStack(stack) != null) { - ((ISustainedTank)tileEntity).setLiquidStack(getLiquidStack(stack)); + ((ISustainedTank)tileEntity).setFluidStack(getFluidStack(stack)); } } @@ -554,9 +554,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem } @Override - public void setLiquidStack(LiquidStack liquidStack, Object... data) + public void setFluidStack(FluidStack fluidStack, Object... data) { - if(liquidStack == null || liquidStack.amount == 0 || liquidStack.itemID == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 0) { return; } @@ -570,12 +570,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem itemStack.setTagCompound(new NBTTagCompound()); } - itemStack.stackTagCompound.setTag("liquidTank", liquidStack.writeToNBT(new NBTTagCompound())); + itemStack.stackTagCompound.setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } @Override - public LiquidStack getLiquidStack(Object... data) + public FluidStack getFluidStack(Object... data) { if(data[0] instanceof ItemStack) { @@ -586,9 +586,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem return null; } - if(itemStack.stackTagCompound.hasKey("liquidTank")) + if(itemStack.stackTagCompound.hasKey("fluidTank")) { - return LiquidStack.loadLiquidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("liquidTank")); + return FluidStack.loadFluidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("fluidTank")); } } diff --git a/common/mekanism/common/ItemBlockTransmitter.java b/common/mekanism/common/ItemBlockTransmitter.java index a4f8b89eb..39314b8bc 100644 --- a/common/mekanism/common/ItemBlockTransmitter.java +++ b/common/mekanism/common/ItemBlockTransmitter.java @@ -58,7 +58,7 @@ public class ItemBlockTransmitter extends ItemBlock else if(itemstack.getItemDamage() == 2) { list.add(EnumColor.DARK_GREY + "Capable of transferring:"); - list.add("- " + EnumColor.PURPLE + "mB " + EnumColor.GREY + "(Liquid Dictionary)"); + list.add("- " + EnumColor.PURPLE + "mB " + EnumColor.GREY + "(FluidRegistry)"); } } } diff --git a/common/mekanism/common/ItemConfigurator.java b/common/mekanism/common/ItemConfigurator.java index 460e4d087..ec78524c6 100644 --- a/common/mekanism/common/ItemConfigurator.java +++ b/common/mekanism/common/ItemConfigurator.java @@ -14,6 +14,7 @@ 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.ChatMessageComponent; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.electricity.ElectricityPack; @@ -55,7 +56,7 @@ public class ItemConfigurator extends ItemEnergized tileEntity.recurringNodes.clear(); tileEntity.cleaningNodes.clear(); - player.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Reset Electric Pump calculation."); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Reset Electric Pump calculation.")); return true; } } @@ -68,7 +69,7 @@ public class ItemConfigurator extends ItemEnergized if(!player.isSneaking()) { - player.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Current color: " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName()); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Current color: " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); return true; } else { @@ -76,7 +77,7 @@ public class ItemConfigurator extends ItemEnergized { setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); 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()); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Color bumped to: " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); if(config instanceof TileEntityBasicBlock) { diff --git a/common/mekanism/common/ItemEnergyMeter.java b/common/mekanism/common/ItemEnergyMeter.java index a167edcb6..3ec63476a 100644 --- a/common/mekanism/common/ItemEnergyMeter.java +++ b/common/mekanism/common/ItemEnergyMeter.java @@ -9,6 +9,7 @@ import mekanism.api.EnumColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; public class ItemEnergyMeter extends ItemEnergized @@ -35,12 +36,12 @@ public class ItemEnergyMeter extends ItemEnergized IUniversalCable cable = (IUniversalCable)tileEntity; - player.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"); - player.sendChatToPlayer(EnumColor.GREY + " *Cables: " + EnumColor.DARK_GREY + cable.getNetwork().cables.size()); - player.sendChatToPlayer(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + cable.getNetwork().possibleAcceptors.size()); - player.sendChatToPlayer(EnumColor.GREY + " *Needed energy: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay(cable.getNetwork().getEnergyNeeded(new ArrayList()), ElectricUnit.JOULES)); - player.sendChatToPlayer(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay(cable.getNetwork().getPower(), ElectricUnit.WATT)); - player.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Cables: " + EnumColor.DARK_GREY + cable.getNetwork().cables.size())); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + cable.getNetwork().possibleAcceptors.size())); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Needed energy: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay(cable.getNetwork().getEnergyNeeded(new ArrayList()), ElectricUnit.JOULES))); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay(cable.getNetwork().getPower(), ElectricUnit.WATT))); + player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } } } diff --git a/common/mekanism/common/ItemRobit.java b/common/mekanism/common/ItemRobit.java index e6da09630..de4b38bc7 100644 --- a/common/mekanism/common/ItemRobit.java +++ b/common/mekanism/common/ItemRobit.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.Object3D; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +21,10 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory super(id, 100000, 120); } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister register) {} + @Override public ElectricityPack getProvideRequest(ItemStack itemStack) { diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 9718eb12f..e9af50a2f 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -17,8 +17,9 @@ import mekanism.api.InfuseType; import mekanism.api.InfusionInput; import mekanism.api.Object3D; import mekanism.client.SoundHandler; +import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.IFactory.RecipeType; -import mekanism.common.LiquidNetwork.LiquidTransferEvent; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; @@ -52,12 +53,8 @@ import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import thermalexpansion.api.crafting.CraftingManagers; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.Mod.ServerStarting; -import cpw.mods.fml.common.Mod.ServerStopping; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -428,7 +425,7 @@ public class Mekanism 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)); + RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Item.glowstone), new ItemStack(Ingot, 1, 3)); //Crusher Recipes RecipeHandler.addCrusherRecipe(new ItemStack(Item.diamond), new ItemStack(Dust, 1, 4)); @@ -722,7 +719,7 @@ public class Mekanism 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, 3), new ItemStack(Item.glowstone), 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); @@ -888,7 +885,7 @@ public class Mekanism for(ItemStack ore : OreDictionary.getOres("ingotRefinedGlowstone")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Item.lightStoneDust)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Item.glowstone)); } try { @@ -1095,20 +1092,20 @@ public class Mekanism proxy.registerSpecialTileEntities(); } - @ServerStarting + @EventHandler public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandMekanism()); } - @ServerStopping + @EventHandler public void serverStopping(FMLServerStoppingEvent event) { teleporters.clear(); dynamicInventories.clear(); } - @PreInit + @EventHandler public void preInit(FMLPreInitializationEvent event) { File config = event.getSuggestedConfigurationFile(); @@ -1126,12 +1123,12 @@ public class Mekanism } //Register infuses - InfuseRegistry.registerInfuseType(new InfuseType("CARBON", "/mods/mekanism/infuse/Infusions.png", 0, 0)); - InfuseRegistry.registerInfuseType(new InfuseType("TIN", "/mods/mekanism/infuse/Infusions.png", 4, 0)); - InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", "/mods/mekanism/infuse/Infusions.png", 8, 0)); + InfuseRegistry.registerInfuseType(new InfuseType("CARBON", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 0, 0)); + InfuseRegistry.registerInfuseType(new InfuseType("TIN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 4, 0)); + InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 8, 0)); } - @PostInit + @EventHandler public void postInit(FMLPostInitializationEvent event) { hooks = new MekanismHooks(); @@ -1144,7 +1141,7 @@ public class Mekanism proxy.loadSoundHandler(); } - @Init + @EventHandler public void init(FMLInitializationEvent event) { //Register the mod's ore handler @@ -1163,7 +1160,7 @@ public class Mekanism MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(new IC2EnergyHandler()); MinecraftForge.EVENT_BUS.register(new EnergyNetwork.NetworkLoader()); - MinecraftForge.EVENT_BUS.register(new LiquidNetwork.NetworkLoader()); + MinecraftForge.EVENT_BUS.register(new FluidNetwork.NetworkLoader()); //Register with GasTransmission GasTransmission.register(); @@ -1218,10 +1215,10 @@ public class Mekanism } @ForgeSubscribe - public void onLiquidTransferred(LiquidTransferEvent event) + public void onLiquidTransferred(FluidTransferEvent event) { try { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate().setParams(TransmitterTransferType.LIQUID, event.liquidNetwork.pipes.iterator().next(), event.liquidSent)); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate().setParams(TransmitterTransferType.FLUID, event.fluidNetwork.pipes.iterator().next(), event.fluidSent)); } catch(Exception e) {} } } \ No newline at end of file diff --git a/common/mekanism/common/MekanismHooks.java b/common/mekanism/common/MekanismHooks.java index 1ce3b96d3..ca7243c4c 100644 --- a/common/mekanism/common/MekanismHooks.java +++ b/common/mekanism/common/MekanismHooks.java @@ -60,7 +60,7 @@ public final class MekanismHooks Recipes.macerator.addRecipe(new ItemStack(Mekanism.Ingot, 1, 1), new ItemStack(Mekanism.Dust, 1, 2)); Recipes.macerator.addRecipe(new ItemStack(Mekanism.Ingot, 1, 0), new ItemStack(Mekanism.Dust, 1, 3)); - Recipes.macerator.addRecipe(new ItemStack(Mekanism.Ingot, 1, 3), new ItemStack(Item.lightStoneDust)); + Recipes.macerator.addRecipe(new ItemStack(Mekanism.Ingot, 1, 3), new ItemStack(Item.glowstone)); Recipes.macerator.addRecipe(new ItemStack(Mekanism.Ingot, 1, 4), new ItemStack(Mekanism.Dust, 1, 5)); Recipes.macerator.addRecipe(new ItemStack(Mekanism.Clump, 1, 0), new ItemStack(Mekanism.DirtyDust, 1, 0)); diff --git a/common/mekanism/common/MekanismRecipe.java b/common/mekanism/common/MekanismRecipe.java index ede80b347..d861bf324 100644 --- a/common/mekanism/common/MekanismRecipe.java +++ b/common/mekanism/common/MekanismRecipe.java @@ -141,8 +141,10 @@ public class MekanismRecipe implements IRecipe { double energyFound = 0; - for(ItemStack itemstack : inv.stackList) + for(int i = 0; i < 9; i++) { + ItemStack itemstack = inv.getStackInSlot(i); + if(itemstack != null) { if(itemstack.getItem() instanceof IEnergizedItem) @@ -160,8 +162,10 @@ public class MekanismRecipe implements IRecipe int speedUpgrades = 0; int energyUpgrades = 0; - for(ItemStack itemstack : inv.stackList) + for(int i = 0; i < 9; i++) { + ItemStack itemstack = inv.getStackInSlot(i); + if(itemstack != null) { if(itemstack.getItem() instanceof IUpgradeManagement && ((IUpgradeManagement)itemstack.getItem()).supportsUpgrades(toReturn)) diff --git a/common/mekanism/common/MekanismUtils.java b/common/mekanism/common/MekanismUtils.java index f2dba6465..995ec3a68 100644 --- a/common/mekanism/common/MekanismUtils.java +++ b/common/mekanism/common/MekanismUtils.java @@ -5,6 +5,7 @@ import ic2.api.Direction; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.reflect.Field; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; @@ -26,12 +27,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.network.packet.Packet3Chat; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquid; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.network.PacketDispatcher; @@ -596,27 +600,27 @@ public final class MekanismUtils } /** - * Whether or not a certain block is considered a liquid. + * Whether or not a certain block is considered a fluid. * @param world - world the block is in * @param x - x coordinate * @param y - y coordinate * @param z - z coordinate - * @return if the block is a liquid + * @return if the block is a fluid */ - public static boolean isLiquid(World world, int x, int y, int z) + public static boolean isFluid(World world, int x, int y, int z) { - return getLiquid(world, x, y, z) != null; + return getFluid(world, x, y, z) != null; } /** - * Gets a liquid from a certain location. + * Gets a fluid from a certain location. * @param world - world the block is in * @param x - x coordinate * @param y - y coordinate * @param z - z coordinate - * @return the liquid at the certain location, null if it doesn't exist + * @return the fluid at the certain location, null if it doesn't exist */ - public static LiquidStack getLiquid(World world, int x, int y, int z) + public static FluidStack getFluid(World world, int x, int y, int z) { int id = world.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); @@ -628,23 +632,19 @@ public final class MekanismUtils if((id == Block.waterStill.blockID || id == Block.waterMoving.blockID) && meta == 0) { - return new LiquidStack(Block.waterStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 0); + return new FluidStack(Block.waterStill.blockID, FluidContainerRegistry.BUCKET_VOLUME); } else if((id == Block.lavaStill.blockID || id == Block.lavaMoving.blockID) && meta == 0) { - return new LiquidStack(Block.lavaStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 0); + return new FluidStack(Block.lavaStill.blockID, FluidContainerRegistry.BUCKET_VOLUME); } - else if(Block.blocksList[id] instanceof ILiquid) + else if(Block.blocksList[id] instanceof IFluidBlock) { - ILiquid liquid = (ILiquid)Block.blocksList[id]; + IFluidBlock fluid = (IFluidBlock)Block.blocksList[id]; - if(liquid.isMetaSensitive()) + if(meta == 0) { - return new LiquidStack(liquid.stillLiquidId(), LiquidContainerRegistry.BUCKET_VOLUME, liquid.stillLiquidMeta()); - } - else if(meta == 0) - { - return new LiquidStack(liquid.stillLiquidId(), LiquidContainerRegistry.BUCKET_VOLUME, 0); + return new FluidStack(fluid.getFluid(), FluidContainerRegistry.BUCKET_VOLUME); } } @@ -652,14 +652,14 @@ public final class MekanismUtils } /** - * Gets the liquid ID at a certain location, 0 if there isn't one + * Gets the fluid ID at a certain location, 0 if there isn't one * @param world - world the block is in * @param x - x coordinate * @param y - y coordinate * @param z - z coordinate - * @return liquid ID + * @return fluid ID */ - public static int getLiquidId(World world, int x, int y, int z) + public static int getFluidId(World world, int x, int y, int z) { int id = world.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); @@ -669,33 +669,35 @@ public final class MekanismUtils return 0; } - if(id == Block.waterStill.blockID || id == Block.waterMoving.blockID) + if(id == Block.waterMoving.blockID) { - return Block.waterStill.blockID; + return FluidRegistry.WATER.getID(); } - else if(id == Block.lavaStill.blockID || id == Block.lavaMoving.blockID) + else if(id == Block.lavaMoving.blockID) { - return Block.lavaStill.blockID; + return FluidRegistry.LAVA.getID(); } - else if(Block.blocksList[id] instanceof ILiquid) - { - ILiquid liquid = (ILiquid)Block.blocksList[id]; - return liquid.stillLiquidId(); + for(Fluid fluid : FluidRegistry.getRegisteredFluids().values()) + { + if(fluid.getBlockID() == id) + { + return fluid.getID(); + } } return 0; } /** - * Whether or not a block is a dead liquid. + * Whether or not a block is a dead fluid. * @param world - world the block is in * @param x - x coordinate * @param y - y coordinate * @param z - z coordinate - * @return if the block is a dead liquid + * @return if the block is a dead fluid */ - public static boolean isDeadLiquid(World world, int x, int y, int z) + public static boolean isDeadFluid(World world, int x, int y, int z) { int id = world.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); @@ -713,15 +715,11 @@ public final class MekanismUtils { return true; } - else if(Block.blocksList[id] instanceof ILiquid) + else if(Block.blocksList[id] instanceof IFluidBlock) { - ILiquid liquid = (ILiquid)Block.blocksList[id]; + IFluidBlock fluid = (IFluidBlock)Block.blocksList[id]; - if(liquid.isMetaSensitive()) - { - return liquid.stillLiquidMeta() != meta || liquid.stillLiquidId() != id; - } - else if(meta != 0) + if(meta != 0) { return true; } @@ -741,7 +739,7 @@ public final class MekanismUtils public static void openElectricChestGui(EntityPlayerMP player, TileEntityElectricChest tileEntity, IInventory inventory, boolean isBlock) { player.incrementWindowID(); - player.closeInventory(); + player.closeContainer(); int id = player.currentWindowId; if(isBlock) @@ -773,7 +771,7 @@ public final class MekanismUtils if(tileEntity != null) { - tileEntity.cachedLiquid = null; + tileEntity.cachedFluid = null; tileEntity.inventory = new ItemStack[2]; tileEntity.inventoryID = -1; } @@ -787,17 +785,17 @@ public final class MekanismUtils /** * Updates a dynamic tank cache with the defined inventory ID with the parameterized values. * @param inventoryID - inventory ID of the dynamic tank - * @param liquid - cached liquid of the dynamic tank + * @param fluid - cached fluid of the dynamic tank * @param inventory - inventory of the dynamic tank * @param tileEntity - dynamic tank TileEntity */ - public static void updateCache(int inventoryID, LiquidStack liquid, ItemStack[] inventory, TileEntityDynamicTank tileEntity) + public static void updateCache(int inventoryID, FluidStack fluid, ItemStack[] inventory, TileEntityDynamicTank tileEntity) { if(!Mekanism.dynamicInventories.containsKey(inventoryID)) { DynamicTankCache cache = new DynamicTankCache(); cache.inventory = inventory; - cache.liquid = liquid; + cache.fluid = fluid; cache.locations.add(Object3D.get(tileEntity)); Mekanism.dynamicInventories.put(inventoryID, cache); @@ -806,7 +804,7 @@ public final class MekanismUtils } Mekanism.dynamicInventories.get(inventoryID).inventory = inventory; - Mekanism.dynamicInventories.get(inventoryID).liquid = liquid; + Mekanism.dynamicInventories.get(inventoryID).fluid = fluid; Mekanism.dynamicInventories.get(inventoryID).locations.add(Object3D.get(tileEntity)); } @@ -843,4 +841,51 @@ public final class MekanismUtils { return OreDictionary.getOreName(OreDictionary.getOreID(itemStack)); } + + public static Object getPrivateValue(Object obj, Class c, String field) + { + try { + Field f = c.getDeclaredField(field); + f.setAccessible(true); + return f.get(obj); + } catch(Exception e) { + return null; + } + } + + public static void setPrivateValue(Object obj, Object value, Class c, String field) + { + try { + Field f = c.getDeclaredField(field); + f.setAccessible(true); + f.set(obj, value); + } catch(Exception e) {} + } + + public static ResourceLocation getResource(ResourceType type, String name) + { + return new ResourceLocation("mekanism", type.getPrefix() + name); + } + + public static enum ResourceType + { + GUI("gui"), + SOUND("sound"), + RENDER("render"), + TEXTURE_BLOCKS("textures/blocks"), + TEXTURE_ITEMS("textures/items"), + INFUSE("infuse"); + + private String prefix; + + private ResourceType(String s) + { + prefix = s; + } + + public String getPrefix() + { + return prefix + "/"; + } + } } diff --git a/common/mekanism/common/PipeUtils.java b/common/mekanism/common/PipeUtils.java index a5880d394..e7f99e90a 100644 --- a/common/mekanism/common/PipeUtils.java +++ b/common/mekanism/common/PipeUtils.java @@ -5,8 +5,8 @@ import java.util.Arrays; import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidHandler; public final class PipeUtils { @@ -42,19 +42,15 @@ public final class PipeUtils boolean[] connectable = new boolean[] {false, false, false, false, false, false}; TileEntity[] connectedPipes = PipeUtils.getConnectedPipes(tileEntity); - ITankContainer[] connectedAcceptors = PipeUtils.getConnectedAcceptors(tileEntity); + IFluidHandler[] connectedAcceptors = PipeUtils.getConnectedAcceptors(tileEntity); - for(ITankContainer container : connectedAcceptors) + for(IFluidHandler container : connectedAcceptors) { if(container != null) { int side = Arrays.asList(connectedAcceptors).indexOf(container); - if(container.getTanks(ForgeDirection.getOrientation(side).getOpposite()) != null && container.getTanks(ForgeDirection.getOrientation(side).getOpposite()).length != 0) - { - connectable[side] = true; - } - else if(container.getTank(ForgeDirection.getOrientation(side).getOpposite(), new LiquidStack(-1, 1000)) != null) + if(container.getTankInfo(ForgeDirection.getOrientation(side).getOpposite()) != null && container.getTankInfo(ForgeDirection.getOrientation(side).getOpposite()).length > 0) { connectable[side] = true; } @@ -77,19 +73,19 @@ public final class PipeUtils /** * Gets all the acceptors around a tile entity. * @param tileEntity - center tile entity - * @return array of ITankContainers + * @return array of IFluidHandlers */ - public static ITankContainer[] getConnectedAcceptors(TileEntity tileEntity) + public static IFluidHandler[] getConnectedAcceptors(TileEntity tileEntity) { - ITankContainer[] acceptors = new ITankContainer[] {null, null, null, null, null, null}; + IFluidHandler[] acceptors = new IFluidHandler[] {null, null, null, null, null, null}; for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { TileEntity acceptor = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); - if(acceptor instanceof ITankContainer && !(acceptor instanceof IMechanicalPipe)) + if(acceptor instanceof IFluidHandler && !(acceptor instanceof IMechanicalPipe)) { - acceptors[orientation.ordinal()] = (ITankContainer)acceptor; + acceptors[orientation.ordinal()] = (IFluidHandler)acceptor; } } diff --git a/common/mekanism/common/SynchronizedTankData.java b/common/mekanism/common/SynchronizedTankData.java index e64cbc85b..02fe2ac5e 100644 --- a/common/mekanism/common/SynchronizedTankData.java +++ b/common/mekanism/common/SynchronizedTankData.java @@ -6,7 +6,7 @@ import java.util.Set; import mekanism.api.Object3D; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; public class SynchronizedTankData { @@ -20,7 +20,7 @@ public class SynchronizedTankData public int volume; - public LiquidStack liquidStored; + public FluidStack fluidStored; public ItemStack[] inventory = new ItemStack[2]; @@ -76,7 +76,7 @@ public class SynchronizedTankData { public ForgeDirection side; public Object3D location; - public boolean serverLiquid; + public boolean serverFluid; @Override public int hashCode() diff --git a/common/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/TankUpdateProtocol.java index 6221838b1..e35adad22 100644 --- a/common/mekanism/common/TankUpdateProtocol.java +++ b/common/mekanism/common/TankUpdateProtocol.java @@ -396,7 +396,7 @@ public class TankUpdateProtocol idFound = MekanismUtils.getUniqueInventoryID(); } - structureFound.liquidStored = cache.liquid; + structureFound.fluidStored = cache.fluid; structureFound.inventory = cache.inventory; for(Object3D obj : structureFound.locations) @@ -405,7 +405,7 @@ public class TankUpdateProtocol tileEntity.inventoryID = idFound; tileEntity.structure = structureFound; - tileEntity.cachedLiquid = cache.liquid; + tileEntity.cachedFluid = cache.fluid; tileEntity.inventory = cache.inventory; } } diff --git a/common/mekanism/common/Tier.java b/common/mekanism/common/Tier.java index 75091f58d..45bd5b30c 100644 --- a/common/mekanism/common/Tier.java +++ b/common/mekanism/common/Tier.java @@ -1,5 +1,7 @@ package mekanism.common; +import net.minecraft.util.ResourceLocation; + /** * Tier information for Mekanism. This currently includes tiers for Energy Cubes and Smelting Factories. * @author aidancbrady @@ -54,12 +56,12 @@ public final class Tier */ public static enum FactoryTier { - BASIC("Basic", 3, "GuiBasicFactory.png"), - ADVANCED("Advanced", 5, "GuiAdvancedFactory.png"), - ELITE("Elite", 7, "GuiEliteFactory.png"); + BASIC("Basic", 3, new ResourceLocation("mekanism", "gui/GuiBasicFactory.png")), + ADVANCED("Advanced", 5, new ResourceLocation("mekanism", "gui/GuiAdvancedFactory.png")), + ELITE("Elite", 7, new ResourceLocation("mekanism", "gui/GuiEliteFactory.png")); public int processes; - public String guiTexturePath; + public ResourceLocation guiLocation; public String name; public static FactoryTier getFromName(String tierName) @@ -76,11 +78,11 @@ public final class Tier return BASIC; } - private FactoryTier(String s, int process, String gui) + private FactoryTier(String s, int process, ResourceLocation gui) { name = s; processes = process; - guiTexturePath = gui; + guiLocation = gui; } } } diff --git a/common/mekanism/common/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/TileEntityAdvancedElectricMachine.java index 1ee0807b5..e4bfb15d3 100644 --- a/common/mekanism/common/TileEntityAdvancedElectricMachine.java +++ b/common/mekanism/common/TileEntityAdvancedElectricMachine.java @@ -11,6 +11,7 @@ import mekanism.api.SideData; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -35,23 +36,23 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM * * @param soundPath - location of the sound effect * @param name - full name of this machine - * @param path - GUI texture path of this machine + * @param location - GUI texture path of this machine * @param perTick - how much energy this machine uses per tick. * @param secondaryPerTick - how much secondary energy (fuel) this machine uses per tick. * @param ticksRequired - how many ticks it takes to smelt an item. * @param maxEnergy - maximum amount of energy this machine can hold. * @param maxSecondaryEnergy - maximum amount of secondary energy (fuel) this machine can hold. */ - public TileEntityAdvancedElectricMachine(String soundPath, String name, String path, double perTick, int secondaryPerTick, int ticksRequired, double maxEnergy, int maxSecondaryEnergy) + public TileEntityAdvancedElectricMachine(String soundPath, String name, ResourceLocation location, double perTick, int secondaryPerTick, int ticksRequired, double maxEnergy, int maxSecondaryEnergy) { - super(soundPath, name, path, perTick, ticksRequired, maxEnergy); + super(soundPath, name, location, perTick, ticksRequired, maxEnergy); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.PURPLE, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 2, 1, new int[] {2})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 3, 1, new int[] {3})); - sideOutputs.add(new SideData(EnumColor.ORANGE, 4, 1, new int[] {4})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.PURPLE, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {2})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {3})); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {4})); sideConfig = new byte[] {2, 1, 0, 4, 5, 3}; @@ -186,7 +187,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 2) { diff --git a/common/mekanism/common/TileEntityAdvancedFactory.java b/common/mekanism/common/TileEntityAdvancedFactory.java index 83353d79b..3dc0606fa 100644 --- a/common/mekanism/common/TileEntityAdvancedFactory.java +++ b/common/mekanism/common/TileEntityAdvancedFactory.java @@ -11,11 +11,11 @@ public class TileEntityAdvancedFactory extends TileEntityFactory { super(FactoryTier.ADVANCED, MachineType.ADVANCED_FACTORY); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.ORANGE, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 4, 5, new int[] {4, 5, 6, 7, 8})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 9, 5, new int[] {9, 10, 11, 12, 13})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {4, 5, 6, 7, 8})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {9, 10, 11, 12, 13})); sideConfig = new byte[] {4, 3, 0, 0, 2, 1}; } diff --git a/common/mekanism/common/TileEntityBasicMachine.java b/common/mekanism/common/TileEntityBasicMachine.java index 0bc28a2a0..44ced88c2 100644 --- a/common/mekanism/common/TileEntityBasicMachine.java +++ b/common/mekanism/common/TileEntityBasicMachine.java @@ -15,6 +15,7 @@ import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -61,7 +62,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp public boolean prevActive; /** The GUI texture path for this machine. */ - public String guiTexturePath; + public ResourceLocation guiLocation; /** * The foundation of all machines - a simple tile entity with a facing, active state, initialized state, sound effect, and animated texture. @@ -72,13 +73,13 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp * @param ticksRequired - how many ticks it takes to run a cycle * @param maxEnergy - how much energy this machine can store */ - public TileEntityBasicMachine(String soundPath, String name, String path, double perTick, int ticksRequired, double maxEnergy) + public TileEntityBasicMachine(String soundPath, String name, ResourceLocation location, double perTick, int ticksRequired, double maxEnergy) { super(name, maxEnergy); ENERGY_PER_TICK = perTick; TICKS_REQUIRED = ticksRequired; soundURL = soundPath; - guiTexturePath = path; + guiLocation = location; isActive = false; } @@ -212,18 +213,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp return true; } - @Override - public int getStartInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotStart; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotAmount; - } - /** * Gets the scaled energy level for the GUI. * @param i - multiplier diff --git a/common/mekanism/common/TileEntityChargepad.java b/common/mekanism/common/TileEntityChargepad.java index 3c4169823..cbe10eb9a 100644 --- a/common/mekanism/common/TileEntityChargepad.java +++ b/common/mekanism/common/TileEntityChargepad.java @@ -10,10 +10,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import thermalexpansion.api.item.IChargeableItem; -import universalelectricity.core.item.ElectricItemHelper; -import universalelectricity.core.item.IItemElectric; - import mekanism.api.EnergizedItemManager; import mekanism.api.IEnergizedItem; import mekanism.api.IStrictEnergyAcceptor; @@ -22,12 +18,16 @@ import mekanism.client.IHasSound; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; 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.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; +import thermalexpansion.api.item.IChargeableItem; +import universalelectricity.core.item.ElectricItemHelper; +import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -56,7 +56,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct List entities = worldObj.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+0.2, zCoord+1)); - for(EntityLiving entity : entities) + for(EntityLivingBase entity : entities) { if(entity instanceof EntityPlayer || entity instanceof EntityRobit) { diff --git a/common/mekanism/common/TileEntityCombiner.java b/common/mekanism/common/TileEntityCombiner.java index 5d832154d..7faf31bc6 100644 --- a/common/mekanism/common/TileEntityCombiner.java +++ b/common/mekanism/common/TileEntityCombiner.java @@ -7,12 +7,13 @@ import mekanism.common.RecipeHandler.Recipe; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; public class TileEntityCombiner extends TileEntityAdvancedElectricMachine { public TileEntityCombiner() { - super("Combiner.ogg", "Combiner", "/mods/mekanism/gui/GuiCombiner.png", Mekanism.combinerUsage, 1, 200, MachineType.COMBINER.baseEnergy, 200); + super("Combiner.ogg", "Combiner", new ResourceLocation("mekanism", "gui/GuiCombiner.png"), Mekanism.combinerUsage, 1, 200, MachineType.COMBINER.baseEnergy, 200); } @Override diff --git a/common/mekanism/common/TileEntityContainerBlock.java b/common/mekanism/common/TileEntityContainerBlock.java index ed47b4b18..6047a3cb6 100644 --- a/common/mekanism/common/TileEntityContainerBlock.java +++ b/common/mekanism/common/TileEntityContainerBlock.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.ForgeDirection; -public abstract class TileEntityContainerBlock extends TileEntityBasicBlock implements net.minecraftforge.common.ISidedInventory, ISidedInventory, IInventory, ISustainedInventory +public abstract class TileEntityContainerBlock extends TileEntityBasicBlock implements ISidedInventory, IInventory, ISustainedInventory { /** The inventory slot itemstacks used by this block. */ public ItemStack[] inventory; @@ -65,18 +65,6 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl nbtTags.setTag("Items", tagList); } - - @Override - public int getStartInventorySide(ForgeDirection side) - { - return 0; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 0; - } @Override public int getSizeInventory() @@ -175,7 +163,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { return true; } @@ -183,7 +171,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public boolean canInsertItem(int slotID, ItemStack itemstack, int side) { - return isStackValidForSlot(slotID, itemstack); + return isItemValidForSlot(slotID, itemstack); } @Override diff --git a/common/mekanism/common/TileEntityCrusher.java b/common/mekanism/common/TileEntityCrusher.java index 149bdec80..32f53b396 100644 --- a/common/mekanism/common/TileEntityCrusher.java +++ b/common/mekanism/common/TileEntityCrusher.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.Map; +import net.minecraft.util.ResourceLocation; + import mekanism.common.BlockMachine.MachineType; import mekanism.common.RecipeHandler.Recipe; @@ -9,7 +11,7 @@ public class TileEntityCrusher extends TileEntityElectricMachine { public TileEntityCrusher() { - super("Crusher.ogg", "Crusher", "/mods/mekanism/gui/GuiCrusher.png", Mekanism.crusherUsage, 200, MachineType.CRUSHER.baseEnergy); + super("Crusher.ogg", "Crusher", new ResourceLocation("mekanism", "gui/GuiCrusher.png"), Mekanism.crusherUsage, 200, MachineType.CRUSHER.baseEnergy); } @Override diff --git a/common/mekanism/common/TileEntityDynamicTank.java b/common/mekanism/common/TileEntityDynamicTank.java index cc41b9063..9f319d7d8 100644 --- a/common/mekanism/common/TileEntityDynamicTank.java +++ b/common/mekanism/common/TileEntityDynamicTank.java @@ -14,8 +14,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import com.google.common.io.ByteArrayDataInput; @@ -39,10 +40,10 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock /** Whether or not this tank has it's structure, for the client side mechanics. */ public boolean clientHasStructure; - /** The cached liquid this tank segment contains. */ - public LiquidStack cachedLiquid; + /** The cached fluid this tank segment contains. */ + public FluidStack cachedFluid; - /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering liquids. */ + /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ public Map valveViewing = new HashMap(); /** The capacity this tank has on the client-side. */ @@ -136,7 +137,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(inventoryID != -1 && structure == null) { - MekanismUtils.updateCache(inventoryID, cachedLiquid, inventory, this); + MekanismUtils.updateCache(inventoryID, cachedFluid, inventory, this); } if(structure == null && packetTick == 5) @@ -170,9 +171,9 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(inventoryID != -1) { - MekanismUtils.updateCache(inventoryID, structure.liquidStored, structure.inventory, this); + MekanismUtils.updateCache(inventoryID, structure.fluidStored, structure.inventory, this); - cachedLiquid = structure.liquidStored; + cachedFluid = structure.fluidStored; inventory = structure.inventory; } @@ -194,11 +195,11 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(structure.inventory[0] != null) { - if(LiquidContainerRegistry.isEmptyContainer(structure.inventory[0])) + if(FluidContainerRegistry.isEmptyContainer(structure.inventory[0])) { - if(structure.liquidStored != null && structure.liquidStored.amount >= LiquidContainerRegistry.BUCKET_VOLUME) + if(structure.fluidStored != null && structure.fluidStored.amount >= FluidContainerRegistry.BUCKET_VOLUME) { - ItemStack filled = LiquidContainerRegistry.fillLiquidContainer(structure.liquidStored, structure.inventory[0]); + ItemStack filled = FluidContainerRegistry.fillFluidContainer(structure.fluidStored, structure.inventory[0]); if(filled != null) { @@ -219,11 +220,11 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock structure.inventory[1].stackSize++; } - structure.liquidStored.amount -= LiquidContainerRegistry.getLiquidForFilledItem(filled).amount; + structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - if(structure.liquidStored.amount == 0) + if(structure.fluidStored.amount == 0) { - structure.liquidStored = null; + structure.fluidStored = null; } PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); @@ -231,18 +232,18 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock } } } - else if(LiquidContainerRegistry.isFilledContainer(structure.inventory[0])) + else if(FluidContainerRegistry.isFilledContainer(structure.inventory[0])) { - LiquidStack itemLiquid = LiquidContainerRegistry.getLiquidForFilledItem(structure.inventory[0]); + FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(structure.inventory[0]); - if((structure.liquidStored == null && itemLiquid.amount <= max) || structure.liquidStored.amount+itemLiquid.amount <= max) + if((structure.fluidStored == null && itemFluid.amount <= max) || structure.fluidStored.amount+itemFluid.amount <= max) { - if(structure.liquidStored != null && !structure.liquidStored.isLiquidEqual(itemLiquid)) + if(structure.fluidStored != null && !structure.fluidStored.isFluidEqual(itemFluid)) { return; } - ItemStack bucket = LiquidContainerRegistry.isBucket(structure.inventory[0]) ? new ItemStack(Item.bucketEmpty) : null; + ItemStack bucket = FluidContainerRegistry.isBucket(structure.inventory[0]) ? new ItemStack(Item.bucketEmpty) : null; boolean filled = false; @@ -276,12 +277,12 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(filled) { - if(structure.liquidStored == null) + if(structure.fluidStored == null) { - structure.liquidStored = itemLiquid.copy(); + structure.fluidStored = itemFluid.copy(); } else { - structure.liquidStored.amount += itemLiquid.amount; + structure.fluidStored.amount += itemFluid.amount; } } @@ -300,12 +301,11 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock data.add(structure != null); data.add(structure != null ? structure.volume*16000 : 0); - if(structure != null && structure.liquidStored != null) + if(structure != null && structure.fluidStored != null) { data.add(1); - data.add(structure.liquidStored.itemID); - data.add(structure.liquidStored.amount); - data.add(structure.liquidStored.itemMeta); + data.add(structure.fluidStored.fluidID); + data.add(structure.fluidStored.amount); } else { data.add(0); @@ -339,7 +339,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock data.add(valveData.location.zCoord); data.add(valveData.side.ordinal()); - data.add(valveData.serverLiquid); + data.add(valveData.serverFluid); } } @@ -363,10 +363,10 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(dataStream.readInt() == 1) { - structure.liquidStored = new LiquidStack(dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + structure.fluidStored = new FluidStack(dataStream.readInt(), dataStream.readInt()); } else { - structure.liquidStored = null; + structure.fluidStored = null; } if(clientHasStructure && isRendering) @@ -429,14 +429,14 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock } } - public int getScaledLiquidLevel(int i) + public int getScaledFluidLevel(int i) { - if(clientCapacity == 0 || structure.liquidStored == null) + if(clientCapacity == 0 || structure.fluidStored == null) { return 0; } - return structure.liquidStored.amount*i / clientCapacity; + return structure.fluidStored.amount*i / clientCapacity; } @Override @@ -470,9 +470,9 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(inventoryID != -1) { - if(nbtTags.hasKey("cachedLiquid")) + if(nbtTags.hasKey("cachedFluid")) { - cachedLiquid = LiquidStack.loadLiquidStackFromNBT(nbtTags.getCompoundTag("cachedLiquid")); + cachedFluid = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedFluid")); } } } @@ -485,9 +485,9 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock nbtTags.setInteger("inventoryID", inventoryID); - if(cachedLiquid != null) + if(cachedFluid != null) { - nbtTags.setTag("cachedLiquid", cachedLiquid.writeToNBT(new NBTTagCompound())); + nbtTags.setTag("cachedFluid", cachedFluid.writeToNBT(new NBTTagCompound())); } } diff --git a/common/mekanism/common/TileEntityDynamicValve.java b/common/mekanism/common/TileEntityDynamicValve.java index d83bb440f..f268199c6 100644 --- a/common/mekanism/common/TileEntityDynamicValve.java +++ b/common/mekanism/common/TileEntityDynamicValve.java @@ -1,73 +1,63 @@ package mekanism.common; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; -public class TileEntityDynamicValve extends TileEntityDynamicTank implements ITankContainer +public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFluidHandler { - public DynamicLiquidTank liquidTank; + public DynamicFluidTank fluidTank; public TileEntityDynamicValve() { super("Dynamic Valve"); - liquidTank = new DynamicLiquidTank(this); + fluidTank = new DynamicFluidTank(this); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return new FluidTankInfo[] {fluidTank.getInfo()}; } @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return fill(0, resource, doFill); + return fluidTank.fill(resource, doFill); } @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(tankIndex == 0) + if(fluidTank.dynamicTank.structure != null) { - return liquidTank.fill(resource, doFill); - } - - return 0; - } - - @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - return drain(0, maxDrain, doDrain); - } - - @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) - { - if(tankIndex == 0) - { - return liquidTank.drain(maxDrain, doDrain); + if(resource.getFluid() == fluidTank.dynamicTank.structure.fluidStored.getFluid()) + { + return fluidTank.drain(resource.amount, doDrain); + } } return null; } @Override - public ILiquidTank[] getTanks(ForgeDirection direction) + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) - { - return new ILiquidTank[] {liquidTank}; - } - - return null; + return fluidTank.drain(maxDrain, doDrain); } @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) + public boolean canFill(ForgeDirection from, Fluid fluid) { - if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) - { - return liquidTank; - } - - return null; + return true; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return true; } } diff --git a/common/mekanism/common/TileEntityElectricChest.java b/common/mekanism/common/TileEntityElectricChest.java index a375c47c0..94b82c614 100644 --- a/common/mekanism/common/TileEntityElectricChest.java +++ b/common/mekanism/common/TileEntityElectricChest.java @@ -122,7 +122,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 54) { @@ -174,30 +174,6 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } } - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == ForgeDirection.DOWN) - { - return 54; - } - else { - return 0; - } - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - if(side == ForgeDirection.DOWN) - { - return 1; - } - else { - return 54; - } - } - @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { diff --git a/common/mekanism/common/TileEntityElectricMachine.java b/common/mekanism/common/TileEntityElectricMachine.java index b63ea4c8e..0cd11e0be 100644 --- a/common/mekanism/common/TileEntityElectricMachine.java +++ b/common/mekanism/common/TileEntityElectricMachine.java @@ -5,6 +5,7 @@ import mekanism.api.EnumColor; import mekanism.api.SideData; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import universalelectricity.core.item.IItemElectric; import dan200.computer.api.IComputerAccess; @@ -21,15 +22,15 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine * @param ticksRequired - ticks required to operate -- or smelt an item. * @param maxEnergy - maximum energy this machine can hold. */ - public TileEntityElectricMachine(String soundPath, String name, String path, double perTick, int ticksRequired, double maxEnergy) + public TileEntityElectricMachine(String soundPath, String name, ResourceLocation location, double perTick, int ticksRequired, double maxEnergy) { - super(soundPath, name, path, perTick, ticksRequired, maxEnergy); + super(soundPath, name, location, perTick, ticksRequired, maxEnergy); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 2, 1, new int[] {2})); - sideOutputs.add(new SideData(EnumColor.ORANGE, 3, 1, new int[] {3})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {2})); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {3})); sideConfig = new byte[] {2, 1, 0, 0, 4, 3}; @@ -125,7 +126,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 2) { diff --git a/common/mekanism/common/TileEntityElectricPump.java b/common/mekanism/common/TileEntityElectricPump.java index 72553e823..4ed5245c9 100644 --- a/common/mekanism/common/TileEntityElectricPump.java +++ b/common/mekanism/common/TileEntityElectricPump.java @@ -21,19 +21,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; -import net.minecraftforge.liquids.LiquidTank; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; -public class TileEntityElectricPump extends TileEntityElectricBlock implements ITankContainer, ISustainedTank, IEnergySink, IStrictEnergyAcceptor +public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IEnergySink, IStrictEnergyAcceptor { /** This pump's tank */ - public LiquidTank liquidTank; + public FluidTank fluidTank; /** The nodes that have full sources near them or in them */ public Set recurringNodes = new HashSet(); @@ -44,7 +45,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public TileEntityElectricPump() { super("Electric Pump", 10000); - liquidTank = new LiquidTank(10000); + fluidTank = new FluidTank(10000); inventory = new ItemStack[3]; } @@ -55,17 +56,17 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(inventory[0] != null) { - if(liquidTank.getLiquid() != null && liquidTank.getLiquid().amount >= LiquidContainerRegistry.BUCKET_VOLUME) + if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) { - if(LiquidContainerRegistry.isEmptyContainer(inventory[0])) + if(FluidContainerRegistry.isEmptyContainer(inventory[0])) { - ItemStack tempStack = LiquidContainerRegistry.fillLiquidContainer(liquidTank.getLiquid(), inventory[0]); + ItemStack tempStack = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[0]); if(tempStack != null) { if(inventory[1] == null) { - liquidTank.drain(LiquidContainerRegistry.BUCKET_VOLUME, true); + fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); inventory[1] = tempStack; inventory[0].stackSize--; @@ -77,7 +78,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } else if(tempStack.isItemEqual(inventory[1]) && tempStack.getMaxStackSize() > inventory[1].stackSize) { - liquidTank.drain(LiquidContainerRegistry.BUCKET_VOLUME, true); + fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); inventory[1].stackSize++; inventory[0].stackSize--; @@ -94,7 +95,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) { - if(electricityStored >= 100 && (liquidTank.getLiquid() == null || liquidTank.getLiquid().amount+LiquidContainerRegistry.BUCKET_VOLUME <= 10000)) + if(electricityStored >= 100 && (fluidTank.getFluid() == null || fluidTank.getFluid().amount+FluidContainerRegistry.BUCKET_VOLUME <= 10000)) { if(suck(true)) { @@ -107,17 +108,17 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I super.onUpdate(); - if(liquidTank.getLiquid() != null) + if(fluidTank.getFluid() != null) { for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { TileEntity tileEntity = Object3D.get(this).getFromSide(orientation).getTileEntity(worldObj); - if(tileEntity instanceof ITankContainer) + if(tileEntity instanceof IFluidHandler) { - liquidTank.drain(((ITankContainer)tileEntity).fill(orientation.getOpposite(), liquidTank.getLiquid(), true), true); + fluidTank.drain(((IFluidHandler)tileEntity).fill(orientation.getOpposite(), fluidTank.getFluid(), true), true); - if(liquidTank.getLiquid() == null || liquidTank.getLiquid().amount <= 0) + if(fluidTank.getFluid() == null || fluidTank.getFluid().amount <= 0) { break; } @@ -135,15 +136,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { Object3D wrapper = Object3D.get(this).getFromSide(orientation); - if(MekanismUtils.isLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() == null || MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isLiquidEqual(liquidTank.getLiquid())) + if(fluidTank.getFluid() == null || MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isFluidEqual(fluidTank.getFluid())) { if(take) { setEnergy(electricityStored - 100); recurringNodes.add(new Object3D(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)); - liquidTank.fill(MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); + fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); } @@ -154,14 +155,14 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I for(Object3D wrapper : cleaningNodes) { - if(MekanismUtils.isLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() != null && MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isLiquidEqual(liquidTank.getLiquid())) + if(fluidTank.getFluid() != null && MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isFluidEqual(fluidTank.getFluid())) { if(take) { setEnergy(electricityStored - 100); - liquidTank.fill(MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); + fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); } @@ -172,14 +173,14 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I for(Object3D wrapper : tempPumpList) { - if(MekanismUtils.isLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() == null || MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isLiquidEqual(liquidTank.getLiquid())) + if(fluidTank.getFluid() == null || MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord).isFluidEqual(fluidTank.getFluid())) { if(take) { setEnergy(electricityStored - 100); - liquidTank.fill(MekanismUtils.getLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); + fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); } @@ -193,15 +194,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(Object3D.get(this).distanceTo(side) <= 80) { - if(MekanismUtils.isLiquid(worldObj, side.xCoord, side.yCoord, side.zCoord)) + if(MekanismUtils.isFluid(worldObj, side.xCoord, side.yCoord, side.zCoord)) { - if(liquidTank.getLiquid() == null || MekanismUtils.getLiquid(worldObj, side.xCoord, side.yCoord, side.zCoord).isLiquidEqual(liquidTank.getLiquid())) + if(fluidTank.getFluid() == null || MekanismUtils.getFluid(worldObj, side.xCoord, side.yCoord, side.zCoord).isFluidEqual(fluidTank.getFluid())) { if(take) { setEnergy(electricityStored - 100); recurringNodes.add(side); - liquidTank.fill(MekanismUtils.getLiquid(worldObj, side.xCoord, side.yCoord, side.zCoord), true); + fluidTank.fill(MekanismUtils.getFluid(worldObj, side.xCoord, side.yCoord, side.zCoord), true); worldObj.setBlockToAir(side.xCoord, side.yCoord, side.zCoord); } @@ -225,9 +226,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { for(Object3D wrapper : cleaningNodes) { - if(MekanismUtils.isDeadLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isDeadFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() != null && MekanismUtils.getLiquidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == liquidTank.getLiquid().itemID) + if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; if(take) @@ -240,9 +241,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I for(Object3D wrapper : recurringNodes) { - if(MekanismUtils.isDeadLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isDeadFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() != null && MekanismUtils.getLiquidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == liquidTank.getLiquid().itemID) + if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; if(take) @@ -257,9 +258,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { Object3D wrapper = Object3D.get(this).getFromSide(orientation); - if(MekanismUtils.isDeadLiquid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) + if(MekanismUtils.isDeadFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord)) { - if(liquidTank.getLiquid() != null && MekanismUtils.getLiquidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == liquidTank.getLiquid().itemID) + if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; if(take) @@ -281,10 +282,10 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(dataStream.readInt() == 1) { - liquidTank.setLiquid(new LiquidStack(dataStream.readInt(), dataStream.readInt(), dataStream.readInt())); + fluidTank.setFluid(new FluidStack(dataStream.readInt(), dataStream.readInt())); } else { - liquidTank.setLiquid(null); + fluidTank.setFluid(null); } MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); @@ -295,12 +296,11 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { super.getNetworkedData(data); - if(liquidTank.getLiquid() != null) + if(fluidTank.getFluid() != null) { data.add(1); - data.add(liquidTank.getLiquid().itemID); - data.add(liquidTank.getLiquid().amount); - data.add(liquidTank.getLiquid().itemMeta); + data.add(fluidTank.getFluid().fluidID); + data.add(fluidTank.getFluid().amount); } else { data.add(0); @@ -314,9 +314,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return (int)(electricityStored*i / MAX_ELECTRICITY); } - public int getScaledLiquidLevel(int i) + public int getScaledFluidLevel(int i) { - return liquidTank.getLiquid() != null ? liquidTank.getLiquid().amount*i / 10000 : 0; + return fluidTank.getFluid() != null ? fluidTank.getFluid().amount*i / 10000 : 0; } @Override @@ -324,9 +324,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { super.writeToNBT(nbtTags); - if(liquidTank.getLiquid() != null) + if(fluidTank.getFluid() != null) { - nbtTags.setTag("liquidTank", liquidTank.writeToNBT(new NBTTagCompound())); + nbtTags.setTag("fluidTank", fluidTank.writeToNBT(new NBTTagCompound())); } NBTTagList recurringList = new NBTTagList(); @@ -338,7 +338,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I recurringList.appendTag(tagCompound); } - if(!recurringList.tagList.isEmpty()) + if(recurringList.tagCount() != 0) { nbtTags.setTag("recurringNodes", recurringList); } @@ -352,7 +352,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I cleaningList.appendTag(tagCompound); } - if(!cleaningList.tagList.isEmpty()) + if(cleaningList.tagCount() != 0) { nbtTags.setTag("cleaningNodes", cleaningList); } @@ -363,9 +363,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("liquidTank")) + if(nbtTags.hasKey("fluidTank")) { - liquidTank.readFromNBT(nbtTags.getCompoundTag("liquidTank")); + fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank")); } if(nbtTags.hasKey("recurringNodes")) @@ -390,7 +390,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 1) { @@ -398,7 +398,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } else if(slotID == 0) { - return LiquidContainerRegistry.isEmptyContainer(itemstack); + return FluidContainerRegistry.isEmptyContainer(itemstack); } else if(slotID == 2) { @@ -486,24 +486,6 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { return direction.toForgeDirection() != ForgeDirection.getOrientation(facing); } - - @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) - { - return 0; - } - - @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) - { - return 0; - } - - @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - return drain(0, maxDrain, doDrain); - } @Override public int[] getAccessibleSlotsFromSide(int side) @@ -522,38 +504,21 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) + public FluidTankInfo[] getTankInfo(ForgeDirection direction) { - if(tankIndex == 0) - { - return liquidTank.drain(maxDrain, doDrain); - } - - return null; + return new FluidTankInfo[] {fluidTank.getInfo()}; } @Override - public ILiquidTank[] getTanks(ForgeDirection direction) + public void setFluidStack(FluidStack fluidStack, Object... data) { - return new ILiquidTank[] {liquidTank}; + fluidTank.setFluid(fluidStack); } @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) + public FluidStack getFluidStack(Object... data) { - return liquidTank; - } - - @Override - public void setLiquidStack(LiquidStack liquidStack, Object... data) - { - liquidTank.setLiquid(liquidStack); - } - - @Override - public LiquidStack getLiquidStack(Object... data) - { - return liquidTank.getLiquid(); + return fluidTank.getFluid(); } @Override @@ -561,4 +526,39 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { return true; } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() != resource.getFluid()) + { + return drain(from, resource.amount, doDrain); + } + + return null; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + return 0; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + return fluidTank.drain(maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return true; + } } diff --git a/common/mekanism/common/TileEntityEliteFactory.java b/common/mekanism/common/TileEntityEliteFactory.java index 96f89a669..d9f8c1ff4 100644 --- a/common/mekanism/common/TileEntityEliteFactory.java +++ b/common/mekanism/common/TileEntityEliteFactory.java @@ -11,11 +11,11 @@ public class TileEntityEliteFactory extends TileEntityFactory { super(FactoryTier.ELITE, MachineType.ELITE_FACTORY); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.ORANGE, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 4, 7, new int[] {4, 5, 6, 7, 8, 9, 10})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 11, 7, new int[] {11, 12, 13, 14, 15, 16, 17})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {4, 5, 6, 7, 8, 9, 10})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {11, 12, 13, 14, 15, 16, 17})); sideConfig = new byte[] {4, 3, 0, 0, 2, 1}; } diff --git a/common/mekanism/common/TileEntityEnergizedSmelter.java b/common/mekanism/common/TileEntityEnergizedSmelter.java index 545536c5f..f197f843e 100644 --- a/common/mekanism/common/TileEntityEnergizedSmelter.java +++ b/common/mekanism/common/TileEntityEnergizedSmelter.java @@ -7,12 +7,13 @@ import java.util.Map; import mekanism.common.BlockMachine.MachineType; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.util.ResourceLocation; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { public TileEntityEnergizedSmelter() { - super("Smelter.ogg", "Energized Smelter", "/mods/mekanism/gui/GuiEnergizedSmelter.png", Mekanism.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); + super("Smelter.ogg", "Energized Smelter", new ResourceLocation("mekanism", "gui/GuiEnergizedSmelter.png"), Mekanism.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); } @Override diff --git a/common/mekanism/common/TileEntityEnergyCube.java b/common/mekanism/common/TileEntityEnergyCube.java index 13382d829..d22d37cc3 100644 --- a/common/mekanism/common/TileEntityEnergyCube.java +++ b/common/mekanism/common/TileEntityEnergyCube.java @@ -136,7 +136,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { @@ -285,23 +285,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn return false; } - - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == ForgeDirection.getOrientation(1)) - { - return 0; - } - - return 1; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } @Override public double getVoltage() diff --git a/common/mekanism/common/TileEntityEnrichmentChamber.java b/common/mekanism/common/TileEntityEnrichmentChamber.java index 27fc85657..d4cc9caab 100644 --- a/common/mekanism/common/TileEntityEnrichmentChamber.java +++ b/common/mekanism/common/TileEntityEnrichmentChamber.java @@ -4,12 +4,13 @@ import java.util.Map; import mekanism.common.BlockMachine.MachineType; import mekanism.common.RecipeHandler.Recipe; +import net.minecraft.util.ResourceLocation; public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { public TileEntityEnrichmentChamber() { - super("Chamber.ogg", "Enrichment Chamber", "/mods/mekanism/gui/GuiChamber.png", Mekanism.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); + super("Chamber.ogg", "Enrichment Chamber", new ResourceLocation("mekanism", "gui/GuiChamber.png"), Mekanism.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); } @Override diff --git a/common/mekanism/common/TileEntityFactory.java b/common/mekanism/common/TileEntityFactory.java index fbf8ae90a..d74a10659 100644 --- a/common/mekanism/common/TileEntityFactory.java +++ b/common/mekanism/common/TileEntityFactory.java @@ -81,11 +81,11 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg { this(FactoryTier.BASIC, MachineType.BASIC_FACTORY); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.ORANGE, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 4, 3, new int[] {4, 5, 6})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 7, 3, new int[] {7, 8, 9})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {4, 5, 6})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {7, 8, 9})); sideConfig = new byte[] {4, 3, 0, 0, 2, 1}; } @@ -309,7 +309,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(tier == FactoryTier.BASIC) { @@ -445,18 +445,6 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg } } - @Override - public int getStartInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotStart; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotAmount; - } - @Override public void handlePacketData(ByteArrayDataInput dataStream) { diff --git a/common/mekanism/common/TileEntityGasTank.java b/common/mekanism/common/TileEntityGasTank.java index b6c86a493..6127dccd2 100644 --- a/common/mekanism/common/TileEntityGasTank.java +++ b/common/mekanism/common/TileEntityGasTank.java @@ -151,7 +151,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { @@ -169,23 +169,6 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS { return side == 1 ? new int[] {0} : new int[] {1}; } - - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == ForgeDirection.getOrientation(1)) - { - return 0; - } - - return 1; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } @Override public int getGas(EnumGas type, Object... data) diff --git a/common/mekanism/common/TileEntityMechanicalPipe.java b/common/mekanism/common/TileEntityMechanicalPipe.java index 6f3386c74..8629786e1 100644 --- a/common/mekanism/common/TileEntityMechanicalPipe.java +++ b/common/mekanism/common/TileEntityMechanicalPipe.java @@ -10,57 +10,58 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; -import net.minecraftforge.liquids.LiquidTank; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalPipe, ITankContainer, ITileNetwork +public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalPipe, IFluidHandler, ITileNetwork { - /** The fake tank used for liquid transfer calculations. */ - public LiquidTank dummyTank = new LiquidTank(LiquidContainerRegistry.BUCKET_VOLUME); + /** The fake tank used for fluid transfer calculations. */ + public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); - /** The LiquidStack displayed on this pipe. */ - public LiquidStack refLiquid = null; + /** The FluidStack displayed on this pipe. */ + public FluidStack refFluid = null; - /** The liquid network currently in use by this pipe segment. */ - public LiquidNetwork liquidNetwork; + /** The fluid network currently in use by this pipe segment. */ + public FluidNetwork fluidNetwork; /** This pipe's active state. */ public boolean isActive = false; - /** The scale (0F -> 1F) of this pipe's liquid level. */ - public float liquidScale; + /** The scale (0F -> 1F) of this pipe's fluid level. */ + public float fluidScale; @Override - public void onTransfer(LiquidStack liquidStack) + public void onTransfer(FluidStack fluidStack) { - if(liquidStack.isLiquidEqual(refLiquid)) + if(fluidStack.isFluidEqual(refFluid)) { - liquidScale = Math.min(1, liquidScale+((float)liquidStack.amount/50F)); + fluidScale = Math.min(1, fluidScale+((float)fluidStack.amount/50F)); } - else if(refLiquid == null) + else if(refFluid == null) { - refLiquid = liquidStack.copy(); - liquidScale += Math.min(1, ((float)liquidStack.amount/50F)); + refFluid = fluidStack.copy(); + fluidScale += Math.min(1, ((float)fluidStack.amount/50F)); } } @Override - public LiquidNetwork getNetwork() + public FluidNetwork getNetwork() { - if(liquidNetwork == null) + if(fluidNetwork == null) { - liquidNetwork = new LiquidNetwork(this); + fluidNetwork = new FluidNetwork(this); } - return liquidNetwork; + return fluidNetwork; } @Override @@ -75,9 +76,9 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP } @Override - public void setNetwork(LiquidNetwork network) + public void setNetwork(FluidNetwork network) { - liquidNetwork = network; + fluidNetwork = network; } @Override @@ -104,26 +105,26 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP { if(worldObj.isRemote) { - if(liquidScale > 0) + if(fluidScale > 0) { - liquidScale -= .01; + fluidScale -= .01; } else { - refLiquid = null; + refFluid = null; } } else { if(isActive) { - ITankContainer[] connectedAcceptors = PipeUtils.getConnectedAcceptors(this); + IFluidHandler[] connectedAcceptors = PipeUtils.getConnectedAcceptors(this); - for(ITankContainer container : connectedAcceptors) + for(IFluidHandler container : connectedAcceptors) { ForgeDirection side = ForgeDirection.getOrientation(Arrays.asList(connectedAcceptors).indexOf(container)); if(container != null) { - LiquidStack received = container.drain(side, 100, false); + FluidStack received = container.drain(side, 100, false); if(received != null && received.amount != 0) { @@ -189,7 +190,7 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP } @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { if(!isActive) { @@ -200,37 +201,32 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP } @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) - { - if(!isActive) - { - return getNetwork().emit(resource, doFill, null); - } - - return 0; - } - - @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return null; } @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { return null; } @Override - public ILiquidTank[] getTanks(ForgeDirection direction) + public boolean canFill(ForgeDirection from, Fluid fluid) { - return new ILiquidTank[] {dummyTank}; + return true; } @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) + public boolean canDrain(ForgeDirection from, Fluid fluid) { - return dummyTank; + return true; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return new FluidTankInfo[] {dummyTank.getInfo()}; } } diff --git a/common/mekanism/common/TileEntityMetallurgicInfuser.java b/common/mekanism/common/TileEntityMetallurgicInfuser.java index 47a476b30..e55992c8f 100644 --- a/common/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/common/mekanism/common/TileEntityMetallurgicInfuser.java @@ -82,12 +82,12 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem { super("Metallurgic Infuser", MachineType.METALLURGIC_INFUSER.baseEnergy); - sideOutputs.add(new SideData(EnumColor.GREY, 0, 0, new int[0])); - sideOutputs.add(new SideData(EnumColor.ORANGE, 0, 1, new int[] {0})); - sideOutputs.add(new SideData(EnumColor.PURPLE, 1, 1, new int[] {1})); - sideOutputs.add(new SideData(EnumColor.DARK_RED, 2, 1, new int[] {2})); - sideOutputs.add(new SideData(EnumColor.DARK_BLUE, 3, 1, new int[] {3})); - sideOutputs.add(new SideData(EnumColor.DARK_GREEN, 4, 1, new int[] {4})); + sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); + sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {0})); + sideOutputs.add(new SideData(EnumColor.PURPLE, new int[] {1})); + sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {2})); + sideOutputs.add(new SideData(EnumColor.DARK_BLUE, new int[] {3})); + sideOutputs.add(new SideData(EnumColor.DARK_GREEN, new int[] {4})); sideConfig = new byte[] {2, 1, 0, 5, 3, 4}; @@ -235,7 +235,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 3) { @@ -411,18 +411,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem { return true; } - - @Override - public int getStartInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotStart; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side.ordinal(), facing)]).slotAmount; - } @Override public void writeToNBT(NBTTagCompound nbtTags) diff --git a/common/mekanism/common/TileEntityOsmiumCompressor.java b/common/mekanism/common/TileEntityOsmiumCompressor.java index 892f7a997..dddff7459 100644 --- a/common/mekanism/common/TileEntityOsmiumCompressor.java +++ b/common/mekanism/common/TileEntityOsmiumCompressor.java @@ -5,13 +5,14 @@ import java.util.Map; import mekanism.common.BlockMachine.MachineType; import mekanism.common.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachine { public TileEntityOsmiumCompressor() { - super("Compressor.ogg", "Osmium Compressor", "/mods/mekanism/gui/GuiCompressor.png", Mekanism.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy, 200); + super("Compressor.ogg", "Osmium Compressor", new ResourceLocation("mekanism", "gui/GuiCompressor.png"), Mekanism.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy, 200); } @Override diff --git a/common/mekanism/common/TileEntityPurificationChamber.java b/common/mekanism/common/TileEntityPurificationChamber.java index c7e6cca2c..4d7879ac6 100644 --- a/common/mekanism/common/TileEntityPurificationChamber.java +++ b/common/mekanism/common/TileEntityPurificationChamber.java @@ -4,6 +4,7 @@ import java.util.Map; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import mekanism.api.EnumGas; @@ -18,7 +19,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac { public TileEntityPurificationChamber() { - super("PurificationChamber.ogg", "Purification Chamber", "/mods/mekanism/gui/GuiPurificationChamber.png", Mekanism.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy, 1200); + super("PurificationChamber.ogg", "Purification Chamber", new ResourceLocation("mekanism", "gui/GuiPurificationChamber.png"), Mekanism.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy, 1200); } @Override diff --git a/common/mekanism/common/TileEntityTeleporter.java b/common/mekanism/common/TileEntityTeleporter.java index 00ae79474..cbdb48010 100644 --- a/common/mekanism/common/TileEntityTeleporter.java +++ b/common/mekanism/common/TileEntityTeleporter.java @@ -101,7 +101,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { @@ -213,12 +213,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn } } } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } @Override public void invalidate() diff --git a/common/mekanism/common/TileEntityTheoreticalElementizer.java b/common/mekanism/common/TileEntityTheoreticalElementizer.java index 3e6ced53f..e89102401 100644 --- a/common/mekanism/common/TileEntityTheoreticalElementizer.java +++ b/common/mekanism/common/TileEntityTheoreticalElementizer.java @@ -7,6 +7,7 @@ import mekanism.common.BlockMachine.MachineType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -14,7 +15,7 @@ public class TileEntityTheoreticalElementizer extends TileEntityAdvancedElectric { public TileEntityTheoreticalElementizer() { - super("Elementizer.ogg", "Theoretical Elementizer", "/mods/mekanism/gui/GuiElementizer.png", Mekanism.theoreticalElementizerUsage, 1, 1000, MachineType.THEORETICAL_ELEMENTIZER.baseEnergy, 1000); + super("Elementizer.ogg", "Theoretical Elementizer", new ResourceLocation("mekanism", "gui/GuiElementizer.png"), Mekanism.theoreticalElementizerUsage, 1, 1000, MachineType.THEORETICAL_ELEMENTIZER.baseEnergy, 1000); } @Override diff --git a/common/mekanism/common/network/PacketTransmitterTransferUpdate.java b/common/mekanism/common/network/PacketTransmitterTransferUpdate.java index c3fabc906..6f94f7746 100644 --- a/common/mekanism/common/network/PacketTransmitterTransferUpdate.java +++ b/common/mekanism/common/network/PacketTransmitterTransferUpdate.java @@ -4,11 +4,11 @@ import java.io.DataOutputStream; import mekanism.api.EnumGas; import mekanism.client.GasClientUpdate; -import mekanism.client.LiquidClientUpdate; +import mekanism.client.FluidClientUpdate; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; import com.google.common.io.ByteArrayDataInput; @@ -20,7 +20,7 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket public String gasName; - public LiquidStack liquidStack; + public FluidStack fluidStack; @Override public String getName() @@ -39,8 +39,8 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket case GAS: gasName = ((EnumGas)data[2]).name; break; - case LIQUID: - liquidStack = (LiquidStack)data[2]; + case FLUID: + fluidStack = (FluidStack)data[2]; break; } @@ -70,11 +70,11 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket else if(transmitterType == 1) { TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - LiquidStack liquidStack = new LiquidStack(dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + FluidStack fluidStack = new FluidStack(dataStream.readInt(), dataStream.readInt()); if(tileEntity != null) { - new LiquidClientUpdate(tileEntity, liquidStack).clientUpdate(); + new FluidClientUpdate(tileEntity, fluidStack).clientUpdate(); } } } @@ -93,10 +93,9 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket case GAS: dataStream.writeUTF(gasName); break; - case LIQUID: - dataStream.writeInt(liquidStack.itemID); - dataStream.writeInt(liquidStack.amount); - dataStream.writeInt(liquidStack.itemMeta); + case FLUID: + dataStream.writeInt(fluidStack.fluidID); + dataStream.writeInt(fluidStack.amount); break; } } @@ -104,6 +103,6 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket public static enum TransmitterTransferType { GAS, - LIQUID + FLUID } } diff --git a/common/mekanism/generators/client/BlockRenderingHandler.java b/common/mekanism/generators/client/BlockRenderingHandler.java index 9fc0313df..57bbac7ca 100644 --- a/common/mekanism/generators/client/BlockRenderingHandler.java +++ b/common/mekanism/generators/client/BlockRenderingHandler.java @@ -1,9 +1,12 @@ package mekanism.generators.client; import mekanism.client.MekanismRenderer; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.BlockGenerator.GeneratorType; import mekanism.generators.common.MekanismGenerators; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -37,7 +40,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("/mods/mekanism/render/BioGenerator.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F, 0.0F); } else if(metadata == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) @@ -45,7 +48,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("/mods/mekanism/render/AdvancedSolarGenerator.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); advancedSolarGenerator.render(0.0F, 0.022F); } else if(metadata == GeneratorType.HEAT_GENERATOR.meta) @@ -53,7 +56,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("/mods/mekanism/render/HeatGenerator.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); heatGenerator.render(0.0625F); } else if(metadata == GeneratorType.HYDROGEN_GENERATOR.meta) @@ -61,14 +64,14 @@ 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("/mods/mekanism/render/HydrogenGenerator.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.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("/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparatorHydrogen.png")); electrolyticSeparator.render(0.0625F); } else if(metadata == GeneratorType.WIND_TURBINE.meta) @@ -76,7 +79,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.35F, 0.0F); - GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/WindTurbine.png")); + Minecraft.getMinecraft().renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.RENDER, "WindTurbine.png")); windTurbine.render(0.018F, 0); } else { diff --git a/common/mekanism/generators/client/GuiBioGenerator.java b/common/mekanism/generators/client/GuiBioGenerator.java index 5337c7497..09c4b0e65 100644 --- a/common/mekanism/generators/client/GuiBioGenerator.java +++ b/common/mekanism/generators/client/GuiBioGenerator.java @@ -1,17 +1,19 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.ContainerBioGenerator; import mekanism.generators.common.TileEntityBioGenerator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiContainer @@ -36,7 +38,7 @@ public class GuiBioGenerator extends GuiContainer fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); - fontRenderer.drawString("BioFuel: " + tileEntity.bioFuelSlot.liquidStored, 51, 35, 0x00CD00); + fontRenderer.drawString("BioFuel: " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) @@ -48,7 +50,7 @@ public class GuiBioGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiBioGenerator.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/GuiElectrolyticSeparator.java b/common/mekanism/generators/client/GuiElectrolyticSeparator.java index c60a47f5e..291bd5970 100644 --- a/common/mekanism/generators/client/GuiElectrolyticSeparator.java +++ b/common/mekanism/generators/client/GuiElectrolyticSeparator.java @@ -4,13 +4,16 @@ import java.util.ArrayList; import mekanism.api.EnumGas; import mekanism.api.Object3D; +import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.generators.common.ContainerElectrolyticSeparator; import mekanism.generators.common.TileEntityElectrolyticSeparator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -110,7 +113,7 @@ public class GuiElectrolyticSeparator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiElectrolyticSeparator.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/GuiHeatGenerator.java b/common/mekanism/generators/client/GuiHeatGenerator.java index ac75aa768..0773553f8 100644 --- a/common/mekanism/generators/client/GuiHeatGenerator.java +++ b/common/mekanism/generators/client/GuiHeatGenerator.java @@ -1,9 +1,12 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.ContainerHeatGenerator; import mekanism.generators.common.TileEntityHeatGenerator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -36,7 +39,7 @@ public class GuiHeatGenerator extends GuiContainer fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(ElectricityDisplay.getDisplayShort(tileEntity.electricityStored, ElectricUnit.JOULES), 51, 26, 0x00CD00); - fontRenderer.drawString("Fuel: " + (tileEntity.lavaTank.getLiquid() != null ? tileEntity.lavaTank.getLiquid().amount : 0), 51, 35, 0x00CD00); + fontRenderer.drawString("Fuel: " + (tileEntity.lavaTank.getFluid() != null ? tileEntity.lavaTank.getFluid().amount : 0), 51, 35, 0x00CD00); fontRenderer.drawString(tileEntity.getVoltage() + "v", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) @@ -48,7 +51,7 @@ public class GuiHeatGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiHeatGenerator.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/GuiHydrogenGenerator.java b/common/mekanism/generators/client/GuiHydrogenGenerator.java index 3fed744ae..d7796e197 100644 --- a/common/mekanism/generators/client/GuiHydrogenGenerator.java +++ b/common/mekanism/generators/client/GuiHydrogenGenerator.java @@ -1,9 +1,12 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.ContainerHydrogenGenerator; import mekanism.generators.common.TileEntityHydrogenGenerator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -48,7 +51,7 @@ public class GuiHydrogenGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiHydrogenGenerator.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiHydrogenGenerator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/GuiSolarGenerator.java b/common/mekanism/generators/client/GuiSolarGenerator.java index d30142e8b..31357f235 100644 --- a/common/mekanism/generators/client/GuiSolarGenerator.java +++ b/common/mekanism/generators/client/GuiSolarGenerator.java @@ -1,9 +1,12 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.ContainerSolarGenerator; import mekanism.generators.common.TileEntitySolarGenerator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -48,7 +51,7 @@ public class GuiSolarGenerator extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiSolarGenerator.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/GuiWindTurbine.java b/common/mekanism/generators/client/GuiWindTurbine.java index 284d9f42a..74d5bee3f 100644 --- a/common/mekanism/generators/client/GuiWindTurbine.java +++ b/common/mekanism/generators/client/GuiWindTurbine.java @@ -1,11 +1,14 @@ package mekanism.generators.client; import mekanism.api.EnumColor; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.ContainerWindTurbine; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.TileEntityWindTurbine; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -57,7 +60,7 @@ public class GuiWindTurbine extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - mc.renderEngine.bindTexture("/mods/mekanism/gui/GuiWindTurbine.png"); + mc.renderEngine.func_110577_a(MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); guiWidth = (width - xSize) / 2; guiHeight = (height - ySize) / 2; diff --git a/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java b/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java index c23d5c422..aeca899f1 100644 --- a/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java +++ b/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java @@ -1,5 +1,7 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityAdvancedSolarGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/AdvancedSolarGenerator.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/client/RenderBioGenerator.java b/common/mekanism/generators/client/RenderBioGenerator.java index fd68a07ce..5e03591b3 100644 --- a/common/mekanism/generators/client/RenderBioGenerator.java +++ b/common/mekanism/generators/client/RenderBioGenerator.java @@ -1,5 +1,7 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityBioGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/BioGenerator.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/client/RenderElectrolyticSeparator.java b/common/mekanism/generators/client/RenderElectrolyticSeparator.java index e275759bf..d6241ac85 100644 --- a/common/mekanism/generators/client/RenderElectrolyticSeparator.java +++ b/common/mekanism/generators/client/RenderElectrolyticSeparator.java @@ -1,6 +1,8 @@ package mekanism.generators.client; import mekanism.api.EnumGas; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityElectrolyticSeparator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -25,8 +27,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 ? "/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png" : - (tileEntity.outputType == EnumGas.OXYGEN ? "/mods/mekanism/render/ElectrolyticSeparatorOxygen.png" : "/mods/mekanism/render/ElectrolyticSeparatorNone.png")); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, tileEntity.outputType == EnumGas.HYDROGEN ? "ElectrolyticSeparatorHydrogen.png" : + (tileEntity.outputType == EnumGas.OXYGEN ? "ElectrolyticSeparatorOxygen.png" : "ElectrolyticSeparatorNone.png"))); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/client/RenderHeatGenerator.java b/common/mekanism/generators/client/RenderHeatGenerator.java index 4197b1b86..462bbf276 100644 --- a/common/mekanism/generators/client/RenderHeatGenerator.java +++ b/common/mekanism/generators/client/RenderHeatGenerator.java @@ -1,5 +1,7 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityHeatGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/" + (tileEntity.isActive ? "HeatGeneratorOn.png" : "HeatGenerator.png")); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, tileEntity.isActive ? "HeatGeneratorOn.png" : "HeatGenerator.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/client/RenderHydrogenGenerator.java b/common/mekanism/generators/client/RenderHydrogenGenerator.java index 910c7166e..7b7ce483a 100644 --- a/common/mekanism/generators/client/RenderHydrogenGenerator.java +++ b/common/mekanism/generators/client/RenderHydrogenGenerator.java @@ -1,5 +1,7 @@ package mekanism.generators.client; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityHydrogenGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -24,7 +26,7 @@ public class RenderHydrogenGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/HydrogenGenerator.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "HydrogenGenerator.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/client/RenderWindTurbine.java b/common/mekanism/generators/client/RenderWindTurbine.java index 12bc98025..770340e96 100644 --- a/common/mekanism/generators/client/RenderWindTurbine.java +++ b/common/mekanism/generators/client/RenderWindTurbine.java @@ -1,6 +1,8 @@ package mekanism.generators.client; import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.generators.common.TileEntityWindTurbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -21,7 +23,7 @@ public class RenderWindTurbine extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTextureByName("/mods/mekanism/render/WindTurbine.png"); + func_110628_a(MekanismUtils.getResource(ResourceType.RENDER, "WindTurbine.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/generators/common/BlockGenerator.java b/common/mekanism/generators/common/BlockGenerator.java index 3da616791..f83a7242a 100644 --- a/common/mekanism/generators/common/BlockGenerator.java +++ b/common/mekanism/generators/common/BlockGenerator.java @@ -19,7 +19,7 @@ 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.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -70,7 +70,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getBlockTileEntity(x, y, z); @@ -537,9 +537,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { if(tileEntity instanceof ISustainedTank) { - if(((ISustainedTank)tileEntity).getLiquidStack() != null) + if(((ISustainedTank)tileEntity).getFluidStack() != null) { - ((ISustainedTank)itemStack.getItem()).setLiquidStack(((ISustainedTank)tileEntity).getLiquidStack(), itemStack); + ((ISustainedTank)itemStack.getItem()).setFluidStack(((ISustainedTank)tileEntity).getFluidStack(), itemStack); } } } diff --git a/common/mekanism/generators/common/ContainerBioGenerator.java b/common/mekanism/generators/common/ContainerBioGenerator.java index 9fedc8cbe..afa8041f9 100644 --- a/common/mekanism/generators/common/ContainerBioGenerator.java +++ b/common/mekanism/generators/common/ContainerBioGenerator.java @@ -39,9 +39,9 @@ public class ContainerBioGenerator extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/generators/common/ContainerElectrolyticSeparator.java b/common/mekanism/generators/common/ContainerElectrolyticSeparator.java index b1f2a88fb..08e35f4a5 100644 --- a/common/mekanism/generators/common/ContainerElectrolyticSeparator.java +++ b/common/mekanism/generators/common/ContainerElectrolyticSeparator.java @@ -5,15 +5,15 @@ import mekanism.api.EnumGas; import mekanism.api.IStorageTank; import mekanism.common.SlotEnergy.SlotDischarge; import mekanism.common.SlotStorageTank; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import universalelectricity.core.item.IItemElectric; public class ContainerElectrolyticSeparator extends Container @@ -47,9 +47,9 @@ public class ContainerElectrolyticSeparator extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } @@ -165,11 +165,11 @@ public class ContainerElectrolyticSeparator extends Container public boolean isWater(ItemStack itemStack) { - LiquidStack liquid = LiquidContainerRegistry.getLiquidForFilledItem(itemStack); + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(itemStack); - if(liquid != null) + if(fluid != null) { - if(liquid.itemID == Block.waterStill.blockID) + if(fluid.getFluid() == FluidRegistry.WATER) { return true; } diff --git a/common/mekanism/generators/common/ContainerHeatGenerator.java b/common/mekanism/generators/common/ContainerHeatGenerator.java index 18cf21a2d..a13b2eda4 100644 --- a/common/mekanism/generators/common/ContainerHeatGenerator.java +++ b/common/mekanism/generators/common/ContainerHeatGenerator.java @@ -38,9 +38,9 @@ public class ContainerHeatGenerator extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/generators/common/ContainerHydrogenGenerator.java b/common/mekanism/generators/common/ContainerHydrogenGenerator.java index 87e1060c9..218e2611d 100644 --- a/common/mekanism/generators/common/ContainerHydrogenGenerator.java +++ b/common/mekanism/generators/common/ContainerHydrogenGenerator.java @@ -40,9 +40,9 @@ public class ContainerHydrogenGenerator extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/generators/common/ContainerSolarGenerator.java b/common/mekanism/generators/common/ContainerSolarGenerator.java index d253f4be7..c4b236d6c 100644 --- a/common/mekanism/generators/common/ContainerSolarGenerator.java +++ b/common/mekanism/generators/common/ContainerSolarGenerator.java @@ -37,9 +37,9 @@ public class ContainerSolarGenerator extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/generators/common/ContainerWindTurbine.java b/common/mekanism/generators/common/ContainerWindTurbine.java index 2c30cdcf0..e192f8673 100644 --- a/common/mekanism/generators/common/ContainerWindTurbine.java +++ b/common/mekanism/generators/common/ContainerWindTurbine.java @@ -37,9 +37,9 @@ public class ContainerWindTurbine extends Container } @Override - public void onCraftGuiClosed(EntityPlayer entityplayer) + public void onContainerClosed(EntityPlayer entityplayer) { - super.onCraftGuiClosed(entityplayer); + super.onContainerClosed(entityplayer); tileEntity.closeChest(); tileEntity.playersUsing.remove(entityplayer); } diff --git a/common/mekanism/generators/common/ItemBlockGenerator.java b/common/mekanism/generators/common/ItemBlockGenerator.java index d01fe3868..c701097d0 100644 --- a/common/mekanism/generators/common/ItemBlockGenerator.java +++ b/common/mekanism/generators/common/ItemBlockGenerator.java @@ -19,8 +19,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.Icon; import net.minecraft.world.World; -import net.minecraftforge.liquids.LiquidDictionary; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.input.Keyboard; @@ -116,9 +116,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, IIt if(hasTank(itemstack)) { - if(getLiquidStack(itemstack) != null) + if(getFluidStack(itemstack) != null) { - list.add(EnumColor.PINK + LiquidDictionary.findLiquidName(getLiquidStack(itemstack)) + ": " + EnumColor.GREY + getLiquidStack(itemstack).amount + "mB"); + list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); } } @@ -246,9 +246,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, IIt if(tileEntity instanceof ISustainedTank) { - if(hasTank(stack) && getLiquidStack(stack) != null) + if(hasTank(stack) && getFluidStack(stack) != null) { - ((ISustainedTank)tileEntity).setLiquidStack(getLiquidStack(stack), stack); + ((ISustainedTank)tileEntity).setFluidStack(getFluidStack(stack), stack); } } @@ -379,9 +379,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, IIt } @Override - public void setLiquidStack(LiquidStack liquidStack, Object... data) + public void setFluidStack(FluidStack fluidStack, Object... data) { - if(liquidStack == null || liquidStack.amount == 0 || liquidStack.itemID == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.fluidID == 0) { return; } @@ -395,12 +395,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, IIt itemStack.setTagCompound(new NBTTagCompound()); } - itemStack.stackTagCompound.setTag("liquidTank", liquidStack.writeToNBT(new NBTTagCompound())); + itemStack.stackTagCompound.setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } @Override - public LiquidStack getLiquidStack(Object... data) + public FluidStack getFluidStack(Object... data) { if(data[0] instanceof ItemStack) { @@ -411,9 +411,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, IIt return null; } - if(itemStack.stackTagCompound.hasKey("liquidTank")) + if(itemStack.stackTagCompound.hasKey("fluidTank")) { - return LiquidStack.loadLiquidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("liquidTank")); + return FluidStack.loadFluidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("fluidTank")); } } diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index 1a89d0954..a77239284 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -7,6 +7,8 @@ import mekanism.common.IModule; import mekanism.common.ItemMekanism; import mekanism.common.Mekanism; import mekanism.common.MekanismRecipe; +import mekanism.common.MekanismUtils; +import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler; import mekanism.common.RecipeHandler; import mekanism.common.Version; @@ -18,9 +20,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -64,14 +65,14 @@ public class MekanismGenerators implements IModule //Usage Configuration public static double electrolyticSeparatorUsage; - @PreInit + @EventHandler public void preInit(FMLPreInitializationEvent event) { //Register infuses - InfuseRegistry.registerInfuseType(new InfuseType("BIO", "/mods/mekanism/infuse/Infusions.png", 12, 0)); + InfuseRegistry.registerInfuseType(new InfuseType("BIO", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 12, 0)); } - @Init + @EventHandler public void init(FMLInitializationEvent event) { //Add this module to the core list diff --git a/common/mekanism/generators/common/TileEntityBioGenerator.java b/common/mekanism/generators/common/TileEntityBioGenerator.java index 0bb5c00f5..782961e8b 100644 --- a/common/mekanism/generators/common/TileEntityBioGenerator.java +++ b/common/mekanism/generators/common/TileEntityBioGenerator.java @@ -3,23 +3,21 @@ package mekanism.generators.common; import ic2.api.item.IElectricItem; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import mekanism.client.Sound; import mekanism.common.ChargeUtils; -import mekanism.common.LiquidSlot; +import mekanism.common.FluidSlot; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; -import net.minecraftforge.liquids.LiquidTank; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -28,7 +26,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dan200.computer.api.IComputerAccess; -public class TileEntityBioGenerator extends TileEntityGenerator implements ITankContainer +public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler { /** The Sound instance for this machine. */ @SideOnly(Side.CLIENT) @@ -37,21 +35,15 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank /** Where the crush piston should be on the model. */ public float crushMatrix = 0; - /** The LiquidSlot biofuel instance for this generator. */ - public LiquidSlot bioFuelSlot = new LiquidSlot(24000, Mekanism.hooks.ForestryBiofuelID); - - /** Which fuels work on this generator. */ - public static Map fuels = new HashMap(); + /** The FluidSlot biofuel instance for this generator. */ + public FluidSlot bioFuelSlot = new FluidSlot(24000, Mekanism.hooks.ForestryBiofuelID); + + public int FLUID_MULTIPLIER = 16; public TileEntityBioGenerator() { super("Bio-Generator", 160000, MekanismGenerators.bioGeneration*2); inventory = new ItemStack[2]; - - if(Mekanism.hooks.ForestryLoaded) - { - fuels.put(Mekanism.hooks.ForestryBiofuelID, 16); - } } public float getMatrix() @@ -87,18 +79,18 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank if(inventory[0] != null) { - LiquidStack liquid = LiquidContainerRegistry.getLiquidForFilledItem(inventory[0]); + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - if(liquid != null) + if(fluid != null) { - if(fuels.containsKey(liquid.itemID)) + if(fluid.fluidID == Mekanism.hooks.ForestryBiofuelID) { - int liquidToAdd = liquid.amount*fuels.get(liquid.itemID); + int fluidToAdd = fluid.amount*FLUID_MULTIPLIER; - if(bioFuelSlot.liquidStored+liquidToAdd <= bioFuelSlot.MAX_LIQUID) + if(bioFuelSlot.fluidStored+fluidToAdd <= bioFuelSlot.MAX_FLUID) { - bioFuelSlot.setLiquid(bioFuelSlot.liquidStored+liquidToAdd); - if(LiquidContainerRegistry.isBucket(inventory[0])) + bioFuelSlot.setFluid(bioFuelSlot.fluidStored+fluidToAdd); + if(FluidContainerRegistry.isBucket(inventory[0])) { inventory[0] = new ItemStack(Item.bucketEmpty); } @@ -118,10 +110,10 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank ItemStack prevStack = inventory[0].copy(); if(fuel > 0) { - int fuelNeeded = bioFuelSlot.MAX_LIQUID - bioFuelSlot.liquidStored; + int fuelNeeded = bioFuelSlot.MAX_FLUID - bioFuelSlot.fluidStored; if(fuel <= fuelNeeded) { - bioFuelSlot.liquidStored += fuel; + bioFuelSlot.fluidStored += fuel; inventory[0].stackSize--; if(prevStack.isItemEqual(new ItemStack(Item.bucketLava))) @@ -144,7 +136,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank { setActive(true); } - bioFuelSlot.setLiquid(bioFuelSlot.liquidStored - 1); + bioFuelSlot.setFluid(bioFuelSlot.fluidStored - 1); setEnergy(electricityStored + MekanismGenerators.bioGeneration); } else { @@ -156,11 +148,11 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { - return getFuel(itemstack) > 0 || (LiquidContainerRegistry.getLiquidForFilledItem(itemstack) != null && fuels.containsKey(LiquidContainerRegistry.getLiquidForFilledItem(itemstack).itemID)); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == Mekanism.hooks.ForestryBiofuelID); } else if(slotID == 1) { @@ -174,7 +166,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank @Override public boolean canOperate() { - return electricityStored < MAX_ELECTRICITY && bioFuelSlot.liquidStored > 0; + return electricityStored < MAX_ELECTRICITY && bioFuelSlot.fluidStored > 0; } @Override @@ -182,7 +174,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank { super.readFromNBT(nbtTags); - bioFuelSlot.liquidStored = nbtTags.getInteger("bioFuelStored"); + bioFuelSlot.fluidStored = nbtTags.getInteger("bioFuelStored"); } @Override @@ -190,7 +182,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank { super.writeToNBT(nbtTags); - nbtTags.setInteger("bioFuelStored", bioFuelSlot.liquidStored); + nbtTags.setInteger("bioFuelStored", bioFuelSlot.fluidStored); } @Override @@ -211,7 +203,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank */ public int getScaledFuelLevel(int i) { - return bioFuelSlot.liquidStored*i / bioFuelSlot.MAX_LIQUID; + return bioFuelSlot.fluidStored*i / bioFuelSlot.MAX_FLUID; } @Override @@ -220,23 +212,6 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == MekanismUtils.getRight(facing)) - { - return 1; - } - - return 0; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } - @Override public boolean canSetFacing(int facing) { @@ -247,14 +222,14 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank public void handlePacketData(ByteArrayDataInput dataStream) { super.handlePacketData(dataStream); - bioFuelSlot.liquidStored = dataStream.readInt(); + bioFuelSlot.fluidStored = dataStream.readInt(); } @Override public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); - data.add(bioFuelSlot.liquidStored); + data.add(bioFuelSlot.fluidStored); return data; } @@ -278,9 +253,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank case 3: return new Object[] {(MAX_ELECTRICITY-electricityStored)}; case 4: - return new Object[] {bioFuelSlot.liquidStored}; + return new Object[] {bioFuelSlot.fluidStored}; case 5: - return new Object[] {bioFuelSlot.MAX_LIQUID-bioFuelSlot.liquidStored}; + return new Object[] {bioFuelSlot.MAX_FLUID-bioFuelSlot.fluidStored}; default: System.err.println("[Mekanism] Attempted to call unknown method with computer ID " + computer.getID()); return null; @@ -288,14 +263,14 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank } @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { if(from != ForgeDirection.getOrientation(facing)) { - if(resource.itemID == Mekanism.hooks.ForestryBiofuelID) + if(resource.fluidID == Mekanism.hooks.ForestryBiofuelID) { int fuelTransfer = 0; - int fuelNeeded = bioFuelSlot.MAX_LIQUID - bioFuelSlot.liquidStored; + int fuelNeeded = bioFuelSlot.MAX_FLUID - bioFuelSlot.fluidStored; int attemptTransfer = resource.amount; if(attemptTransfer <= fuelNeeded) @@ -308,7 +283,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank if(doFill) { - bioFuelSlot.setLiquid(bioFuelSlot.liquidStored + fuelTransfer); + bioFuelSlot.setFluid(bioFuelSlot.fluidStored + fuelTransfer); } return fuelTransfer; @@ -319,31 +294,31 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements ITank } @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) - { - return 0; - } - - @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return null; } @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { return null; } @Override - public ILiquidTank[] getTanks(ForgeDirection direction) + public boolean canFill(ForgeDirection from, Fluid fluid) { - return new ILiquidTank[] {new LiquidTank(bioFuelSlot.liquidID, bioFuelSlot.liquidStored, bioFuelSlot.MAX_LIQUID)}; + return fluid.getID() == Mekanism.hooks.ForestryBiofuelID; } @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { return null; } diff --git a/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java index 2616084b0..2643ccd6c 100644 --- a/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java @@ -30,11 +30,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; -import net.minecraftforge.liquids.LiquidTank; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; @@ -42,10 +45,10 @@ import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; import dan200.computer.api.IPeripheral; -public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IGasStorage, IEnergySink, ITankContainer, IPeripheral, ITubeConnection, IStrictEnergyAcceptor, ISustainedTank +public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IGasStorage, IEnergySink, IFluidHandler, IPeripheral, ITubeConnection, IStrictEnergyAcceptor, ISustainedTank { /** This separator's water slot. */ - public LiquidTank waterTank = new LiquidTank(24000); + public FluidTank waterTank = new FluidTank(24000); /** The maximum amount of gas this block can store. */ public int MAX_GAS = 2400; @@ -84,13 +87,13 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(inventory[0] != null) { - LiquidStack liquid = LiquidContainerRegistry.getLiquidForFilledItem(inventory[0]); + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - if(liquid != null && liquid.itemID == Block.waterStill.blockID) + if(fluid != null && fluid.getFluid() == FluidRegistry.WATER) { - if(waterTank.getLiquid() == null || waterTank.getLiquid().amount+liquid.amount <= waterTank.getCapacity()) + if(waterTank.getFluid() == null || waterTank.getFluid().amount+fluid.amount <= waterTank.getCapacity()) { - waterTank.fill(liquid, true); + waterTank.fill(fluid, true); if(inventory[0].isItemEqual(new ItemStack(Item.bucketWater))) { @@ -167,7 +170,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } } - if(oxygenStored < MAX_GAS && hydrogenStored < MAX_GAS && waterTank.getLiquid() != null && waterTank.getLiquid().amount-2 >= 0 && electricityStored-100 > 0) + if(oxygenStored < MAX_GAS && hydrogenStored < MAX_GAS && waterTank.getFluid() != null && waterTank.getFluid().amount-2 >= 0 && electricityStored-100 > 0) { waterTank.drain(2, true); setEnergy(electricityStored - MekanismGenerators.electrolyticSeparatorUsage); @@ -245,7 +248,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } else if(slotID == 0) { - return LiquidContainerRegistry.isEmptyContainer(itemstack); + return FluidContainerRegistry.isEmptyContainer(itemstack); } else if(slotID == 1) { @@ -260,11 +263,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { - return LiquidContainerRegistry.getLiquidForFilledItem(itemstack) != null && LiquidContainerRegistry.getLiquidForFilledItem(itemstack).itemID == Block.waterStill.blockID; + return FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluid() == FluidRegistry.WATER; } else if(slotID == 1) { @@ -298,32 +301,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return new int[] {0}; } - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == MekanismUtils.getLeft(facing)) - { - return 3; - } - else if(side == ForgeDirection.getOrientation(facing) || side == ForgeDirection.getOrientation(facing).getOpposite()) - { - return 1; - } - - return 0; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - if(side == ForgeDirection.getOrientation(facing) || side == ForgeDirection.getOrientation(facing).getOpposite()) - { - return 2; - } - - return 1; - } - @Override public double transferEnergyToAcceptor(double amount) { @@ -375,7 +352,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp */ public int getScaledWaterLevel(int i) { - return waterTank.getLiquid() != null ? waterTank.getLiquid().amount*i / waterTank.getCapacity() : 0; + return waterTank.getFluid() != null ? waterTank.getFluid().amount*i / waterTank.getCapacity() : 0; } /** @@ -413,10 +390,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(amount != 0) { - waterTank.setLiquid(new LiquidStack(Block.waterStill.blockID, amount, 0)); + waterTank.setFluid(new FluidStack(FluidRegistry.WATER, amount)); } else { - waterTank.setLiquid(null); + waterTank.setFluid(null); } oxygenStored = dataStream.readInt(); @@ -430,9 +407,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { super.getNetworkedData(data); - if(waterTank.getLiquid() != null) + if(waterTank.getFluid() != null) { - data.add(waterTank.getLiquid().amount); + data.add(waterTank.getFluid().amount); } else { data.add(0); @@ -514,47 +491,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { return direction.toForgeDirection() != ForgeDirection.getOrientation(facing); } - - @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) - { - return fill(0, resource, doFill); - } - - @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) - { - if(resource.itemID == Block.waterStill.blockID && tankIndex == 0) - { - return waterTank.fill(resource, doFill); - } - - return 0; - } - - @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - return null; - } - - @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) - { - return null; - } - - @Override - public ILiquidTank[] getTanks(ForgeDirection direction) - { - return new ILiquidTank[] {waterTank}; - } - - @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) - { - return waterTank; - } @Override public void readFromNBT(NBTTagCompound nbtTags) @@ -581,7 +517,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp nbtTags.setInteger("hydrogenStored", hydrogenStored); nbtTags.setInteger("oxygenStored", oxygenStored); - if(waterTank.getLiquid() != null) + if(waterTank.getFluid() != null) { nbtTags.setTag("waterTank", waterTank.writeToNBT(new NBTTagCompound())); } @@ -616,9 +552,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp case 3: return new Object[] {(MAX_ELECTRICITY-electricityStored)}; case 4: - return new Object[] {waterTank.getLiquid() != null ? waterTank.getLiquid().amount : 0}; + return new Object[] {waterTank.getFluid() != null ? waterTank.getFluid().amount : 0}; case 5: - return new Object[] {waterTank.getLiquid() != null ? (waterTank.getCapacity()-waterTank.getLiquid().amount) : 0}; + return new Object[] {waterTank.getFluid() != null ? (waterTank.getCapacity()-waterTank.getFluid().amount) : 0}; case 6: return new Object[] {hydrogenStored}; case 7: @@ -652,15 +588,15 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public void setLiquidStack(LiquidStack liquidStack, Object... data) + public void setFluidStack(FluidStack fluidStack, Object... data) { - waterTank.setLiquid(liquidStack); + waterTank.setFluid(fluidStack); } @Override - public LiquidStack getLiquidStack(Object... data) + public FluidStack getFluidStack(Object... data) { - return waterTank.getLiquid(); + return waterTank.getFluid(); } @Override @@ -668,4 +604,45 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { return true; } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + return fluid == FluidRegistry.WATER; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return false; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + if(resource.getFluid() == FluidRegistry.WATER) + { + return waterTank.fill(resource, doFill); + } + + return 0; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + return null; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return new FluidTankInfo[] {waterTank.getInfo()}; + } } diff --git a/common/mekanism/generators/common/TileEntityHeatGenerator.java b/common/mekanism/generators/common/TileEntityHeatGenerator.java index 5500532bd..695cd2b6d 100644 --- a/common/mekanism/generators/common/TileEntityHeatGenerator.java +++ b/common/mekanism/generators/common/TileEntityHeatGenerator.java @@ -12,21 +12,24 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; -import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidStack; -import net.minecraftforge.liquids.LiquidTank; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import universalelectricity.core.item.IItemElectric; import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; -public class TileEntityHeatGenerator extends TileEntityGenerator implements ITankContainer +public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler { - /** The LiquidTank for this generator. */ - public LiquidTank lavaTank = new LiquidTank(24000); + /** The FluidTank for this generator. */ + public FluidTank lavaTank = new FluidTank(24000); public TileEntityHeatGenerator() { @@ -45,15 +48,15 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan if(inventory[0] != null) { - LiquidStack liquid = LiquidContainerRegistry.getLiquidForFilledItem(inventory[0]); + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - if(liquid != null && liquid.itemID == Block.lavaStill.blockID) + if(fluid != null && fluid.fluidID == FluidRegistry.LAVA.getID()) { - if(lavaTank.getLiquid() == null || lavaTank.getLiquid().amount+liquid.amount <= lavaTank.getCapacity()) + if(lavaTank.getFluid() == null || lavaTank.getFluid().amount+fluid.amount <= lavaTank.getCapacity()) { - lavaTank.fill(liquid, true); + lavaTank.fill(fluid, true); - if(LiquidContainerRegistry.isBucket(inventory[0])) + if(FluidContainerRegistry.isBucket(inventory[0])) { inventory[0] = new ItemStack(Item.bucketEmpty); } @@ -72,11 +75,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan if(fuel > 0) { - int fuelNeeded = lavaTank.getCapacity() - (lavaTank.getLiquid() != null ? lavaTank.getLiquid().amount : 0); + int fuelNeeded = lavaTank.getCapacity() - (lavaTank.getFluid() != null ? lavaTank.getFluid().amount : 0); if(fuel <= fuelNeeded) { - lavaTank.fill(new LiquidStack(Block.lavaStill.blockID, fuel), true); + lavaTank.fill(new FluidStack(Block.lavaStill.blockID, fuel), true); inventory[0].stackSize--; } @@ -104,11 +107,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { - return getFuel(itemstack) > 0 || (LiquidContainerRegistry.getLiquidForFilledItem(itemstack) != null && LiquidContainerRegistry.getLiquidForFilledItem(itemstack).itemID == Block.lavaStill.blockID); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).fluidID == FluidRegistry.LAVA.getID()); } else if(slotID == 1) { @@ -122,7 +125,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan @Override public boolean canOperate() { - return electricityStored < MAX_ELECTRICITY && lavaTank.getLiquid() != null && lavaTank.getLiquid().amount >= 10; + return electricityStored < MAX_ELECTRICITY && lavaTank.getFluid() != null && lavaTank.getFluid().amount >= 10; } @Override @@ -141,7 +144,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan { super.writeToNBT(nbtTags); - if(lavaTank.getLiquid() != null) + if(lavaTank.getFluid() != null) { nbtTags.setTag("lavaTank", lavaTank.writeToNBT(new NBTTagCompound())); } @@ -158,7 +161,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } else if(slotID == 0) { - return LiquidContainerRegistry.isEmptyContainer(itemstack); + return FluidContainerRegistry.isEmptyContainer(itemstack); } return false; @@ -201,23 +204,6 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == MekanismUtils.getRight(facing)) - { - return 1; - } - - return 0; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } - /** * Gets the scaled fuel level for the GUI. * @param i - multiplier @@ -225,7 +211,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan */ public int getScaledFuelLevel(int i) { - return (lavaTank.getLiquid() != null ? lavaTank.getLiquid().amount : 0)*i / lavaTank.getCapacity(); + return (lavaTank.getFluid() != null ? lavaTank.getFluid().amount : 0)*i / lavaTank.getCapacity(); } @Override @@ -237,10 +223,10 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan if(amount != 0) { - lavaTank.setLiquid(new LiquidStack(Block.lavaStill.blockID, amount, 0)); + lavaTank.setFluid(new FluidStack(Block.lavaStill.blockID, amount)); } else { - lavaTank.setLiquid(null); + lavaTank.setFluid(null); } } @@ -249,9 +235,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan { super.getNetworkedData(data); - if(lavaTank.getLiquid() != null) + if(lavaTank.getFluid() != null) { - data.add(lavaTank.getLiquid().amount); + data.add(lavaTank.getFluid().amount); } else { data.add(0); @@ -280,9 +266,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan case 3: return new Object[] {(MAX_ELECTRICITY-electricityStored)}; case 4: - return new Object[] {lavaTank.getLiquid() != null ? lavaTank.getLiquid().amount : 0}; + return new Object[] {lavaTank.getFluid() != null ? lavaTank.getFluid().amount : 0}; case 5: - return new Object[] {lavaTank.getCapacity()-(lavaTank.getLiquid() != null ? lavaTank.getLiquid().amount : 0)}; + return new Object[] {lavaTank.getCapacity()-(lavaTank.getFluid() != null ? lavaTank.getFluid().amount : 0)}; default: System.err.println("[Mekanism] Attempted to call unknown method with computer ID " + computer.getID()); return null; @@ -290,20 +276,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } @Override - public int fill(ForgeDirection from, LiquidStack resource, boolean doFill) + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(from != ForgeDirection.getOrientation(facing)) - { - return fill(0, resource, doFill); - } - - return 0; - } - - @Override - public int fill(int tankIndex, LiquidStack resource, boolean doFill) - { - if(resource.itemID == Block.lavaStill.blockID && tankIndex == 0) + if(resource.fluidID == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) { return lavaTank.fill(resource, doFill); } @@ -312,26 +287,32 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } @Override - public LiquidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return null; } @Override - public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain) + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { return null; } @Override - public ILiquidTank[] getTanks(ForgeDirection direction) + public boolean canFill(ForgeDirection from, Fluid fluid) { - return new ILiquidTank[] {lavaTank}; + return fluid == FluidRegistry.LAVA; } - + @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) + public boolean canDrain(ForgeDirection from, Fluid fluid) { - return lavaTank; + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return new FluidTankInfo[] {lavaTank.getInfo()}; } } diff --git a/common/mekanism/generators/common/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/TileEntityHydrogenGenerator.java index 89a67f67b..00eef42b7 100644 --- a/common/mekanism/generators/common/TileEntityHydrogenGenerator.java +++ b/common/mekanism/generators/common/TileEntityHydrogenGenerator.java @@ -99,7 +99,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { @@ -119,23 +119,6 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements { return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } - - @Override - public int getStartInventorySide(ForgeDirection side) - { - if(side == MekanismUtils.getRight(facing)) - { - return 1; - } - - return 0; - } - - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } @Override public void setGas(EnumGas type, int amount, Object... data) diff --git a/common/mekanism/generators/common/TileEntitySolarGenerator.java b/common/mekanism/generators/common/TileEntitySolarGenerator.java index 03189ca92..453d9d760 100644 --- a/common/mekanism/generators/common/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/TileEntitySolarGenerator.java @@ -51,12 +51,6 @@ public class TileEntitySolarGenerator extends TileEntityGenerator return 0.05F; } - @Override - public int getSizeInventorySide(ForgeDirection side) - { - return 1; - } - @Override public boolean canSetFacing(int facing) { @@ -120,7 +114,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public boolean isStackValidForSlot(int slotID, ItemStack itemstack) + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { if(slotID == 0) { diff --git a/common/mekanism/nei/AdvancedMachineRecipeHandler.java b/common/mekanism/nei/AdvancedMachineRecipeHandler.java deleted file mode 100644 index f9dc2207a..000000000 --- a/common/mekanism/nei/AdvancedMachineRecipeHandler.java +++ /dev/null @@ -1,138 +0,0 @@ -package mekanism.nei; - -import java.awt.Rectangle; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.forge.GuiContainerManager; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class AdvancedMachineRecipeHandler extends TemplateRecipeHandler -{ - int ticksPassed; - - public abstract String getRecipeId(); - - public abstract ItemStack getFuelStack(); - - public abstract Set> getRecipes(); - - @Override - public void drawBackground(GuiContainerManager guimanager, int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTexture(getGuiTexture()); - guimanager.drawTexturedModalRect(12, 0, 28, 5, 144, 68); - } - - @Override - public void drawExtras(GuiContainerManager guimanager, int i) - { - float f = ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - drawProgressBar(guimanager, 63, 34, 176 + 26, 0, 24, 7, f, 0); - - f = ticksPassed >= 20 && ticksPassed < 40 ? (ticksPassed - 20) % 20 / 20.0F : 1.0F; - if(ticksPassed < 20) f = 0.0F; - drawProgressBar(guimanager, 45, 32, 176 + 26, 7, 5, 12, f, 3); - - f = ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - drawProgressBar(guimanager, 149, 12, 176 + 26, 19, 4, 52, f, 3); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Map.Entry irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStack())); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getValue(), result)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStack())); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getKey(), ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStack())); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public PositionedStack outputStack; - public PositionedStack fuelStack; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return fuelStack; - } - - public CachedIORecipe(ItemStack input, ItemStack output, ItemStack fuel) - { - super(); - inputStack = new PositionedStack(input, 40, 12); - outputStack = new PositionedStack(output, 100, 30); - fuelStack = new PositionedStack(fuel, 40, 48); - } - - public CachedIORecipe(Map.Entry recipe, ItemStack fuel) - { - this((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue(), fuel); - } - } -} diff --git a/common/mekanism/nei/CombinerRecipeHandler.java b/common/mekanism/nei/CombinerRecipeHandler.java deleted file mode 100644 index 075fd471e..000000000 --- a/common/mekanism/nei/CombinerRecipeHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package mekanism.nei; - -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import mekanism.client.GuiCombiner; -import mekanism.common.RecipeHandler.Recipe; - -public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Combiner"; - } - - @Override - public String getRecipeId() - { - return "mekanism.combiner"; - } - - @Override - public String getOverlayIdentifier() - { - return "combiner"; - } - - @Override - public Set getRecipes() - { - return Recipe.COMBINER.get().entrySet(); - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiCombiner.png"; - } - - @Override - public ItemStack getFuelStack() - { - return new ItemStack(Block.cobblestone); - } - - @Override - public Class getGuiClass() - { - return GuiCombiner.class; - } -} diff --git a/common/mekanism/nei/CrusherRecipeHandler.java b/common/mekanism/nei/CrusherRecipeHandler.java deleted file mode 100644 index c03a0e9ab..000000000 --- a/common/mekanism/nei/CrusherRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.nei; - -import java.util.Set; - -import mekanism.client.GuiCrusher; -import mekanism.common.RecipeHandler.Recipe; - -public class CrusherRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Crusher"; - } - - @Override - public String getRecipeId() - { - return "mekanism.crusher"; - } - - @Override - public String getOverlayIdentifier() - { - return "crusher"; - } - - @Override - public Set getRecipes() - { - return Recipe.CRUSHER.get().entrySet(); - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiCrusher.png"; - } - - @Override - public Class getGuiClass() - { - return GuiCrusher.class; - } -} diff --git a/common/mekanism/nei/EnrichmentChamberRecipeHandler.java b/common/mekanism/nei/EnrichmentChamberRecipeHandler.java deleted file mode 100644 index 7545b84bc..000000000 --- a/common/mekanism/nei/EnrichmentChamberRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.nei; - -import java.util.Set; - -import mekanism.client.GuiEnrichmentChamber; -import mekanism.common.RecipeHandler.Recipe; - -public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Enrichment Chamber"; - } - - @Override - public String getRecipeId() - { - return "mekanism.chamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "chamber"; - } - - @Override - public Set getRecipes() - { - return Recipe.ENRICHMENT_CHAMBER.get().entrySet(); - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiChamber.png"; - } - - @Override - public Class getGuiClass() - { - return GuiEnrichmentChamber.class; - } -} diff --git a/common/mekanism/nei/MachineRecipeHandler.java b/common/mekanism/nei/MachineRecipeHandler.java deleted file mode 100644 index 9ee72151a..000000000 --- a/common/mekanism/nei/MachineRecipeHandler.java +++ /dev/null @@ -1,123 +0,0 @@ -package mekanism.nei; - -import java.awt.Rectangle; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.forge.GuiContainerManager; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class MachineRecipeHandler extends TemplateRecipeHandler -{ - int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Set> getRecipes(); - - @Override - public void drawBackground(GuiContainerManager guimanager, int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTexture(getGuiTexture()); - guimanager.drawTexturedModalRect(12, 0, 28, 5, 144, 68); - } - - @Override - public void drawExtras(GuiContainerManager guimanager, int i) - { - float f = ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - drawProgressBar(guimanager, 63, 34, 176 + 26, 0, 24, 7, f, 0); - f = ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - drawProgressBar(guimanager, 149, 12, 176 + 26, 7, 4, 52, f, 3); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Map.Entry irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getValue(), result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getKey(), ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack input; - public PositionedStack output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - - public CachedIORecipe(ItemStack itemstack, ItemStack itemstack1) - { - super(); - input = new PositionedStack(itemstack, 40, 12); - output = new PositionedStack(itemstack1, 100, 30); - } - - public CachedIORecipe(Map.Entry recipe) - { - this((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()); - } - } -} diff --git a/common/mekanism/nei/MekanismRecipeHandler.java b/common/mekanism/nei/MekanismRecipeHandler.java deleted file mode 100644 index e92ce6924..000000000 --- a/common/mekanism/nei/MekanismRecipeHandler.java +++ /dev/null @@ -1,193 +0,0 @@ -package mekanism.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.api.IEnergizedItem; -import mekanism.common.IEnergyCube; -import mekanism.common.IFactory; -import mekanism.common.MekanismRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; - -public class MekanismRecipeHandler extends ShapedRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Shaped Mekanism Crafting"; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals("crafting") && getClass() == MekanismRecipeHandler.class) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof MekanismRecipe) - { - MekanismRecipe energyRecipe = (MekanismRecipe)irecipe; - CachedEnergyRecipe recipe = new CachedEnergyRecipe(energyRecipe.width, energyRecipe.height, energyRecipe.getInput(), energyRecipe.getRecipeOutput()); - arecipes.add(recipe); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof MekanismRecipe && areItemsEqual(irecipe.getRecipeOutput(), result)) - { - MekanismRecipe energyRecipe = (MekanismRecipe)irecipe; - CachedEnergyRecipe recipe = new CachedEnergyRecipe(energyRecipe.width, energyRecipe.height, energyRecipe.getInput(), energyRecipe.getRecipeOutput()); - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof MekanismRecipe) - { - MekanismRecipe energyRecipe = (MekanismRecipe)irecipe; - CachedEnergyRecipe recipe = new CachedEnergyRecipe(energyRecipe.width, energyRecipe.height, energyRecipe.getInput(), energyRecipe.getRecipeOutput()); - - if(recipe.contains(recipe.ingredients, ingredient)) - { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - } - - public static boolean areItemsEqual(ItemStack stack1, ItemStack stack2) - { - if(stack1 == null && stack2 != null || stack1 != null && stack2 == null) - { - return false; - } - else if(stack1 == null && stack2 == null) - { - return true; - } - - if(stack1.itemID != stack2.itemID) - { - return false; - } - - if(!(stack1.getItem() instanceof IEnergizedItem) && !(stack2.getItem() instanceof IEnergizedItem)) - { - if(stack1.getItemDamage() != stack2.getItemDamage()) - { - return false; - } - } - else { - if(((IEnergizedItem)stack1.getItem()).isMetadataSpecific() && ((IEnergizedItem)stack2.getItem()).isMetadataSpecific()) - { - if(stack1.getItemDamage() != stack2.getItemDamage()) - { - return false; - } - } - - if(stack1.getItem() instanceof IEnergyCube && stack2.getItem() instanceof IEnergyCube) - { - if(((IEnergyCube)stack1.getItem()).getEnergyCubeTier(stack1) != ((IEnergyCube)stack2.getItem()).getEnergyCubeTier(stack2)) - { - return false; - } - } - else if(stack1.getItem() instanceof IFactory && stack2.getItem() instanceof IFactory) - { - if(((IFactory)stack1.getItem()).isFactory(stack1) && ((IFactory)stack2.getItem()).isFactory(stack2)) - { - if(((IFactory)stack1.getItem()).getRecipeType(stack1) != ((IFactory)stack2.getItem()).getRecipeType(stack2)) - { - return false; - } - } - } - } - - return true; - } - - public class CachedEnergyRecipe extends CachedRecipe - { - public ArrayList ingredients; - public PositionedStack result; - - public CachedEnergyRecipe(int width, int height, Object[] items, ItemStack out) - { - result = new PositionedStack(out, 119, 24); - ingredients = new ArrayList(); - setIngredients(width, height, items); - } - - public void setIngredients(int width, int height, Object[] items) - { - for(int x = 0; x < width; x++) - { - for(int y = 0; y < height; y++) - { - if(items[y*width+x] == null) - { - continue; - } - - PositionedStack stack = new PositionedStack(items[y*width+x], 25+x*18, 6+y*18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - } - - @Override - public ArrayList getIngredients() - { - return getCycledIngredients(MekanismRecipeHandler.this.cycleticks / 20, ingredients); - } - - @Override - public PositionedStack getResult() - { - return result; - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) - { - for(PositionedStack stack : ingredients) - { - for(ItemStack item : stack.items) - { - if(areItemsEqual(item, ingredient)) - { - return true; - } - } - } - return false; - } - } -} diff --git a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java b/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java deleted file mode 100644 index eb83785ed..000000000 --- a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java +++ /dev/null @@ -1,205 +0,0 @@ -package mekanism.nei; - -import java.awt.Rectangle; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import mekanism.api.InfuseObject; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfuseType; -import mekanism.api.InfusionInput; -import mekanism.api.InfusionOutput; -import mekanism.client.GuiMetallurgicInfuser; -import mekanism.common.RecipeHandler.Recipe; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.forge.GuiContainerManager; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler -{ - private int ticksPassed; - - @Override - public String getRecipeName() - { - return "Metallurgic Infuser"; - } - - @Override - public String getOverlayIdentifier() - { - return "infuser"; - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiMetallurgicInfuser.png"; - } - - @Override - public Class getGuiClass() - { - return GuiMetallurgicInfuser.class; - } - - public String getRecipeId() - { - return "mekanism.infuser"; - } - - public ItemStack getInfuseStack(InfuseType type) - { - for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) - { - if(obj.getValue().type == type) - { - return obj.getKey(); - } - } - - return null; - } - - public Set> getRecipes() - { - return Recipe.METALLURGIC_INFUSER.get().entrySet(); - } - - @Override - public void drawBackground(GuiContainerManager guimanager, int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - guimanager.bindTexture(getGuiTexture()); - guimanager.drawTexturedModalRect(0, 0, 5, 15, 166, 56); - } - - @Override - public void drawExtras(GuiContainerManager guimanager, int i) - { - InfuseType type = ((CachedIORecipe)arecipes.get(i)).infusionType; - - float f = ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - drawProgressBar(guimanager, 67, 32, 176 + 26, 52, 32, 8, f, 0); - - f = ticksPassed >= 20 && ticksPassed < 40 ? (ticksPassed - 20) % 20 / 20.0F : 1.0F; - if(ticksPassed < 20) f = 0.0F; - - f = ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - drawProgressBar(guimanager, 160, 2, 176 + 26, 0, 4, 52, f, 3); - - guimanager.bindTexture(type.texture); - drawProgressBar(guimanager, 2, 2, type.texX, type.texY, 4, 52, f, 3); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(67, 32, 32, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Map.Entry irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStack(((InfusionInput)irecipe.getKey()).infusionType), ((InfusionInput)irecipe.getKey()).infusionType)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(((InfusionOutput)irecipe.getValue()).resource, result)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStack(((InfusionInput)irecipe.getKey()).infusionType), ((InfusionInput)irecipe.getKey()).infusionType)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(((InfusionInput)irecipe.getKey()).inputStack, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStack(((InfusionInput)irecipe.getKey()).infusionType), ((InfusionInput)irecipe.getKey()).infusionType)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public PositionedStack outputStack; - public PositionedStack infuseStack; - - public InfuseType infusionType; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return infuseStack; - } - - public CachedIORecipe(ItemStack input, ItemStack output, ItemStack infuse, InfuseType type) - { - super(); - inputStack = new PositionedStack(input, 46, 28); - outputStack = new PositionedStack(output, 104, 28); - - if(infuse != null) - { - infuseStack = new PositionedStack(infuse, 12, 20); - } - - infusionType = type; - } - - public CachedIORecipe(Map.Entry recipe, ItemStack infuse, InfuseType type) - { - this(((InfusionInput)recipe.getKey()).inputStack, ((InfusionOutput)recipe.getValue()).resource, infuse, type); - } - } -} diff --git a/common/mekanism/nei/NEIMekanismConfig.java b/common/mekanism/nei/NEIMekanismConfig.java deleted file mode 100644 index 1b145a46a..000000000 --- a/common/mekanism/nei/NEIMekanismConfig.java +++ /dev/null @@ -1,54 +0,0 @@ -package mekanism.nei; - -import mekanism.client.GuiCombiner; -import mekanism.client.GuiCrusher; -import mekanism.client.GuiEnrichmentChamber; -import mekanism.client.GuiMetallurgicInfuser; -import mekanism.client.GuiOsmiumCompressor; -import mekanism.client.GuiPurificationChamber; -import mekanism.common.Mekanism; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; - -public class NEIMekanismConfig implements IConfigureNEI -{ - @Override - public void loadConfig() - { - API.registerRecipeHandler(new EnrichmentChamberRecipeHandler()); - API.registerUsageHandler(new EnrichmentChamberRecipeHandler()); - API.registerRecipeHandler(new OsmiumCompressorRecipeHandler()); - API.registerUsageHandler(new OsmiumCompressorRecipeHandler()); - API.registerRecipeHandler(new CrusherRecipeHandler()); - API.registerUsageHandler(new CrusherRecipeHandler()); - API.registerRecipeHandler(new CombinerRecipeHandler()); - API.registerUsageHandler(new CombinerRecipeHandler()); - API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler()); - API.registerUsageHandler(new MetallurgicInfuserRecipeHandler()); - API.registerRecipeHandler(new PurificationChamberRecipeHandler()); - API.registerUsageHandler(new PurificationChamberRecipeHandler()); - API.registerRecipeHandler(new MekanismRecipeHandler()); - API.registerUsageHandler(new MekanismRecipeHandler()); - - API.setGuiOffset(GuiEnrichmentChamber.class, 16, 5); - API.setGuiOffset(GuiOsmiumCompressor.class, 16, 5); - API.setGuiOffset(GuiCrusher.class, 16, 5); - API.setGuiOffset(GuiCombiner.class, 16, 5); - API.setGuiOffset(GuiPurificationChamber.class, 16, 5); - API.setGuiOffset(GuiMetallurgicInfuser.class, 5, 15); - - API.hideItem(Mekanism.boundingBlockID); - } - - @Override - public String getName() - { - return "Mekanism NEI Plugin"; - } - - @Override - public String getVersion() - { - return "1.0.3"; - } -} diff --git a/common/mekanism/nei/OsmiumCompressorRecipeHandler.java b/common/mekanism/nei/OsmiumCompressorRecipeHandler.java deleted file mode 100644 index 5ebddca4f..000000000 --- a/common/mekanism/nei/OsmiumCompressorRecipeHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package mekanism.nei; - -import java.util.Set; - -import net.minecraft.item.ItemStack; - -import mekanism.client.GuiOsmiumCompressor; -import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; - -public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Osmium Compressor"; - } - - @Override - public String getRecipeId() - { - return "mekanism.compressor"; - } - - @Override - public String getOverlayIdentifier() - { - return "compressor"; - } - - @Override - public Set getRecipes() - { - return Recipe.OSMIUM_COMPRESSOR.get().entrySet(); - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiCompressor.png"; - } - - @Override - public ItemStack getFuelStack() - { - return new ItemStack(Mekanism.Ingot, 1, 1); - } - - @Override - public Class getGuiClass() - { - return GuiOsmiumCompressor.class; - } -} diff --git a/common/mekanism/nei/PurificationChamberRecipeHandler.java b/common/mekanism/nei/PurificationChamberRecipeHandler.java deleted file mode 100644 index 02aa62640..000000000 --- a/common/mekanism/nei/PurificationChamberRecipeHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package mekanism.nei; - -import java.util.Set; - -import mekanism.client.GuiPurificationChamber; -import mekanism.common.RecipeHandler.Recipe; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Purification Chamber"; - } - - @Override - public String getRecipeId() - { - return "mekanism.purificationchamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "purificationchamber"; - } - - @Override - public Set getRecipes() - { - return Recipe.PURIFICATION_CHAMBER.get().entrySet(); - } - - @Override - public String getGuiTexture() - { - return "/mods/mekanism/gui/GuiPurificationChamber.png"; - } - - @Override - public ItemStack getFuelStack() - { - return new ItemStack(Item.flint); - } - - @Override - public Class getGuiClass() - { - return GuiPurificationChamber.class; - } -} diff --git a/common/thermalexpansion/api/ThermalExpansionInfo.java b/common/thermalexpansion/api/ThermalExpansionInfo.java index 70bfe91fc..d8bad91ee 100644 --- a/common/thermalexpansion/api/ThermalExpansionInfo.java +++ b/common/thermalexpansion/api/ThermalExpansionInfo.java @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; /** @@ -43,9 +43,9 @@ public class ThermalExpansionInfo { return GameRegistry.getFuelValue(theFuel) * 3 / 2; } - public static int getFuelValue(LiquidStack theFuel) { + public static int getFuelValue(FluidStack theFuel) { - if (theFuel.itemID == Block.lavaStill.blockID) { + if (theFuel.fluidID == Block.lavaStill.blockID) { return lavaFuelValue; } return 0; diff --git a/common/thermalexpansion/api/crafting/ICrucibleManager.java b/common/thermalexpansion/api/crafting/ICrucibleManager.java index db50504aa..4cc6e7527 100644 --- a/common/thermalexpansion/api/crafting/ICrucibleManager.java +++ b/common/thermalexpansion/api/crafting/ICrucibleManager.java @@ -7,7 +7,7 @@ package thermalexpansion.api.crafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; /** * Provides an interface to the recipe manager of the Crucible. Accessible via @@ -28,9 +28,9 @@ public interface ICrucibleManager { * Flag to enable recipe overwriting. This will only be allowed if enabled in the * Thermal Expansion Configuration file and will be logged for information purposes. */ - public boolean addRecipe(int energy, ItemStack input, LiquidStack output, boolean overwrite); + public boolean addRecipe(int energy, ItemStack input, FluidStack output, boolean overwrite); - public boolean addRecipe(int energy, ItemStack input, LiquidStack output); + public boolean addRecipe(int energy, ItemStack input, FluidStack output); /** * Access to the full list of recipes. diff --git a/common/thermalexpansion/api/crafting/ICrucibleRecipe.java b/common/thermalexpansion/api/crafting/ICrucibleRecipe.java index 1b82e47d2..179c1de87 100644 --- a/common/thermalexpansion/api/crafting/ICrucibleRecipe.java +++ b/common/thermalexpansion/api/crafting/ICrucibleRecipe.java @@ -7,13 +7,13 @@ package thermalexpansion.api.crafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; public interface ICrucibleRecipe { public ItemStack getInput(); - public LiquidStack getOutput(); + public FluidStack getOutput(); public int getEnergy(); } diff --git a/common/thermalexpansion/api/crafting/ITransposerManager.java b/common/thermalexpansion/api/crafting/ITransposerManager.java index 3ba61265f..8814e1da4 100644 --- a/common/thermalexpansion/api/crafting/ITransposerManager.java +++ b/common/thermalexpansion/api/crafting/ITransposerManager.java @@ -7,7 +7,7 @@ package thermalexpansion.api.crafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; /** * Provides an interface to the recipe manager of the Liquid Transposer. Accessible via @@ -25,16 +25,16 @@ public interface ITransposerManager { * @param output * ItemStack representing the output item. * @param liquid - * LiquidStack representing the required liquid. + * FluidStack representing the required liquid. * @param reversible * Flag the recipe as reversible (container can be emptied). * @param overwrite * Flag to enable recipe overwriting. This will only be allowed if enabled in the * Thermal Expansion Configuration file and will be logged for information purposes. */ - public boolean addFillRecipe(int energy, ItemStack input, ItemStack output, LiquidStack liquid, boolean reversible, boolean overwrite); + public boolean addFillRecipe(int energy, ItemStack input, ItemStack output, FluidStack liquid, boolean reversible, boolean overwrite); - public boolean addFillRecipe(int energy, ItemStack input, ItemStack output, LiquidStack liquid, boolean reversible); + public boolean addFillRecipe(int energy, ItemStack input, ItemStack output, FluidStack liquid, boolean reversible); /** * Add a recipe to the Liquid Transposer @@ -47,7 +47,7 @@ public interface ITransposerManager { * ItemStack representing the output item - this can be NULL if necessary, if the * recipe is NOT reversible. * @param liquid - * LiquidStack representing the required liquid. + * FluidStack representing the required liquid. * @param chance * Integer representing % chance (out of 100) of receiving the item - liquid will * always be extracted. If output is NULL, this MUST be set to 0. The recipe will not @@ -58,9 +58,9 @@ public interface ITransposerManager { * Flag to enable recipe overwriting. This will only be allowed if enabled in the * Thermal Expansion Configuration file and will be logged for information purposes. */ - public boolean addExtractionRecipe(int energy, ItemStack input, ItemStack output, LiquidStack liquid, int chance, boolean reversible, boolean overwrite); + public boolean addExtractionRecipe(int energy, ItemStack input, ItemStack output, FluidStack liquid, int chance, boolean reversible, boolean overwrite); - public boolean addExtractionRecipe(int energy, ItemStack input, ItemStack output, LiquidStack liquid, int chance, boolean reversible); + public boolean addExtractionRecipe(int energy, ItemStack input, ItemStack output, FluidStack liquid, int chance, boolean reversible); /** * Access to the list of recipes. diff --git a/common/thermalexpansion/api/crafting/ITransposerRecipe.java b/common/thermalexpansion/api/crafting/ITransposerRecipe.java index 53a3b3cc8..cbc60e653 100644 --- a/common/thermalexpansion/api/crafting/ITransposerRecipe.java +++ b/common/thermalexpansion/api/crafting/ITransposerRecipe.java @@ -7,7 +7,7 @@ package thermalexpansion.api.crafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidStack; +import net.minecraftforge.fluids.FluidStack; public interface ITransposerRecipe { @@ -15,7 +15,7 @@ public interface ITransposerRecipe { public ItemStack getOutput(); - public LiquidStack getLiquid(); + public FluidStack getLiquid(); public int getEnergy(); diff --git a/common/universalelectricity/prefab/block/BlockAdvanced.java b/common/universalelectricity/prefab/block/BlockAdvanced.java deleted file mode 100644 index 69496376f..000000000 --- a/common/universalelectricity/prefab/block/BlockAdvanced.java +++ /dev/null @@ -1,275 +0,0 @@ -package universalelectricity.prefab.block; - -import java.lang.reflect.Method; -import java.util.Random; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * An advanced block class that is to be extended for wrenching capabilities. - */ -public abstract class BlockAdvanced extends BlockContainer -{ - public BlockAdvanced(int id, Material material) - { - super(id, material); - this.setHardness(0.6f); - } - - /** - * DO NOT OVERRIDE THIS FUNCTION! Called when the block is right clicked by the player. This - * modified version detects electric items and wrench actions on your machine block. Do not - * override this function. Use onMachineActivated instead! (It does the same thing) - * - * @param world The World Object. - * @param x , y, z The coordinate of the block. - * @param side The side the player clicked on. - * @param hitX , hitY, hitZ The position the player clicked on relative to the block. - */ - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - int metadata = world.getBlockMetadata(x, y, z); - - /** - * Check if the player is holding a wrench or an electric item. If so, call the wrench - * event. - */ - if (this.isUsableWrench(entityPlayer, entityPlayer.inventory.getCurrentItem(), x, y, z)) - { - this.damageWrench(entityPlayer, entityPlayer.inventory.getCurrentItem(), x, y, z); - - if (entityPlayer.isSneaking()) - { - if (this.onSneakUseWrench(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ)) - { - return true; - } - } - - if (this.onUseWrench(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ)) - { - return true; - } - } - - if (entityPlayer.isSneaking()) - { - if (this.onSneakMachineActivated(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ)) - { - return true; - } - } - - return this.onMachineActivated(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ); - } - - /** - * A function that denotes if an itemStack is a wrench that can be used. Override this for more - * wrench compatibility. Compatible with Buildcraft and IC2 wrench API via reflection. - * - * @return True if it is a wrench. - */ - public boolean isUsableWrench(EntityPlayer entityPlayer, ItemStack itemStack, int x, int y, int z) - { - if (entityPlayer != null && itemStack != null) - { - Class wrenchClass = itemStack.getItem().getClass(); - - /** - * UE and Buildcraft - */ - try - { - Method methodCanWrench = wrenchClass.getMethod("canWrench", EntityPlayer.class, Integer.TYPE, Integer.TYPE, Integer.TYPE); - return (Boolean) methodCanWrench.invoke(itemStack.getItem(), entityPlayer, x, y, z); - } - catch (NoClassDefFoundError e) - { - } - catch (Exception e) - { - } - - /** - * Industrialcraft - */ - try - { - if (wrenchClass == Class.forName("ic2.core.item.tool.ItemToolWrench") || wrenchClass == Class.forName("ic2.core.item.tool.ItemToolWrenchElectric")) - { - return itemStack.getItemDamage() < itemStack.getMaxDamage(); - } - } - catch (Exception e) - { - } - } - - return false; - } - - /** - * This function damages a wrench. Works with Buildcraft and Industrialcraft wrenches. - * - * @return True if damage was successfull. - */ - public boolean damageWrench(EntityPlayer entityPlayer, ItemStack itemStack, int x, int y, int z) - { - if (this.isUsableWrench(entityPlayer, itemStack, x, y, z)) - { - Class wrenchClass = itemStack.getItem().getClass(); - - /** - * UE and Buildcraft - */ - try - { - Method methodWrenchUsed = wrenchClass.getMethod("wrenchUsed", EntityPlayer.class, Integer.TYPE, Integer.TYPE, Integer.TYPE); - methodWrenchUsed.invoke(itemStack.getItem(), entityPlayer, x, y, z); - return true; - } - catch (Exception e) - { - } - - /** - * Industrialcraft - */ - try - { - if (wrenchClass == Class.forName("ic2.core.item.tool.ItemToolWrench") || wrenchClass == Class.forName("ic2.core.item.tool.ItemToolWrenchElectric")) - { - Method methodWrenchDamage = wrenchClass.getMethod("damage", ItemStack.class, Integer.TYPE, EntityPlayer.class); - methodWrenchDamage.invoke(itemStack.getItem(), itemStack, 1, entityPlayer); - return true; - } - } - catch (Exception e) - { - } - } - - return false; - } - - /** - * Called when the machine is right clicked by the player - * - * @return True if something happens - */ - public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - return false; - } - - /** - * Called when the machine is being wrenched by a player while sneaking. - * - * @return True if something happens - */ - public boolean onSneakMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - return false; - } - - /** - * Called when a player uses a wrench on the machine - * - * @return True if some happens - */ - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - return false; - } - - /** - * Called when a player uses a wrench on the machine while sneaking. Only works with the UE - * wrench. - * - * @return True if some happens - */ - public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - return this.onUseWrench(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ); - } - - /** - * Returns the TileEntity used by this block. You should use the metadata sensitive version of - * this to get the maximum optimization! - */ - @Override - public TileEntity createNewTileEntity(World var1) - { - return null; - } - - @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) - { - this.dropEntireInventory(world, x, y, z, par5, par6); - super.breakBlock(world, x, y, z, par5, par6); - } - - /** - * Override this if you don't need it. This will eject all items out of this machine if it has - * an inventory. - */ - public void dropEntireInventory(World world, int x, int y, int z, int par5, int par6) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - if (tileEntity instanceof IInventory) - { - IInventory inventory = (IInventory) tileEntity; - - for (int var6 = 0; var6 < inventory.getSizeInventory(); ++var6) - { - ItemStack var7 = inventory.getStackInSlot(var6); - - if (var7 != null) - { - Random random = new Random(); - float var8 = random.nextFloat() * 0.8F + 0.1F; - float var9 = random.nextFloat() * 0.8F + 0.1F; - float var10 = random.nextFloat() * 0.8F + 0.1F; - - while (var7.stackSize > 0) - { - int var11 = random.nextInt(21) + 10; - - if (var11 > var7.stackSize) - { - var11 = var7.stackSize; - } - - var7.stackSize -= var11; - EntityItem var12 = new EntityItem(world, (x + var8), (y + var9), (z + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage())); - - if (var7.hasTagCompound()) - { - var12.getEntityItem().setTagCompound((NBTTagCompound) var7.getTagCompound().copy()); - } - - float var13 = 0.05F; - var12.motionX = ((float) random.nextGaussian() * var13); - var12.motionY = ((float) random.nextGaussian() * var13 + 0.2F); - var12.motionZ = ((float) random.nextGaussian() * var13); - world.spawnEntityInWorld(var12); - } - } - } - } - } - } -} diff --git a/common/universalelectricity/prefab/block/BlockConductor.java b/common/universalelectricity/prefab/block/BlockConductor.java deleted file mode 100644 index f72329387..000000000 --- a/common/universalelectricity/prefab/block/BlockConductor.java +++ /dev/null @@ -1,46 +0,0 @@ -package universalelectricity.prefab.block; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import universalelectricity.core.block.IConductor; - -public abstract class BlockConductor extends BlockContainer -{ - public BlockConductor(int id, Material material) - { - super(id, material); - } - - /** - * Called whenever the block is added into the world. Args: world, x, y, z - */ - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - super.onBlockAdded(world, x, y, z); - - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity instanceof IConductor) - { - ((IConductor) tileEntity).updateAdjacentConnections(); - } - } - - /** - * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed - * (coordinates passed are their own) Args: x, y, z, neighbor blockID - */ - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockID) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity instanceof IConductor) - { - ((IConductor) tileEntity).updateAdjacentConnections(); - } - } -} diff --git a/common/universalelectricity/prefab/block/BlockRotatable.java b/common/universalelectricity/prefab/block/BlockRotatable.java deleted file mode 100644 index bb657cae2..000000000 --- a/common/universalelectricity/prefab/block/BlockRotatable.java +++ /dev/null @@ -1,76 +0,0 @@ -package universalelectricity.prefab.block; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.prefab.implement.IRotatable; - -/** - * A block that can rotate based on placed position and wrenching. - * - * @author Calclavia - * - */ -public abstract class BlockRotatable extends BlockAdvanced implements IRotatable -{ - public BlockRotatable(int id, Material material) - { - super(id, material); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityLiving, ItemStack itemStack) - { - int angle = MathHelper.floor_double((entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int change = 3; - - switch (angle) - { - case 0: - change = 2; - break; - - case 1: - change = 5; - break; - - case 2: - change = 3; - break; - - case 3: - change = 4; - break; - } - - this.setDirection(world, x, y, z, ForgeDirection.getOrientation(change)); - } - - @Override - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ) - { - /** - * NOTE! This will rotate the block only in all 4 horizontal directions. If your block - * rotates up or down, you should override this. - */ - this.setDirection(world, x, y, z, ForgeDirection.getOrientation(ForgeDirection.ROTATION_MATRIX[0][this.getDirection(world, x, y, z).ordinal()])); - return true; - } - - @Override - public ForgeDirection getDirection(IBlockAccess world, int x, int y, int z) - { - return ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)); - } - - @Override - public void setDirection(World world, int x, int y, int z, ForgeDirection facingDirection) - { - world.setBlockMetadataWithNotify(x, y, z, facingDirection.ordinal(), 3); - } -} \ No newline at end of file diff --git a/common/universalelectricity/prefab/flag/CommandFlag.java b/common/universalelectricity/prefab/flag/CommandFlag.java deleted file mode 100644 index 1be6765f3..000000000 --- a/common/universalelectricity/prefab/flag/CommandFlag.java +++ /dev/null @@ -1,319 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.util.Iterator; -import java.util.List; - -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; -import net.minecraft.command.WrongUsageException; -import net.minecraft.entity.player.EntityPlayer; -import universalelectricity.core.vector.Vector3; - -/** - * Commands used for flags and regions. This can be used for protection for specific mod components - * that might be dangerous. - * - * @author Calclavia - * - */ -public class CommandFlag extends CommandBase -{ - public static final String[] COMMANDS = new String[] { "list", "setregion", "removeregion", "set" }; - public String commandName = "modflag"; - public ModFlag modFlagData; - - public CommandFlag(ModFlag modFlag) - { - this.modFlagData = modFlag; - } - - public CommandFlag(ModFlag modFlag, String commandName) - { - this(modFlag); - this.commandName = commandName; - } - - @Override - public String getCommandName() - { - return commandName; - } - - @Override - public String getCommandUsage(ICommandSender par1ICommandSender) - { - String returnString = ""; - - for (String command : COMMANDS) - { - returnString = returnString + "\n/" + this.getCommandName() + " " + command; - } - - return returnString; - } - - @Override - public void processCommand(ICommandSender sender, String[] args) - { - if (args.length > 0) - { - EntityPlayer entityPlayer = (EntityPlayer) sender; - - // The world data the player is on. - FlagWorld flagWorld = this.modFlagData.getFlagWorld(entityPlayer.worldObj); - - String commandName = args[0].toLowerCase(); - - if (commandName.equalsIgnoreCase("list")) - { - /** - * The list command lists out all regions in this world/region. - */ - if (args.length > 1) - { - String regionName = args[1]; - - if (regionName.equalsIgnoreCase("all")) - { - String msg = ""; - - Iterator itWorlds = this.modFlagData.getFlagWorlds().iterator(); - - while (itWorlds.hasNext()) - { - Iterator itRegion = itWorlds.next().getRegions().iterator(); - - while (itRegion.hasNext()) - { - FlagRegion flagRegion = itRegion.next(); - msg = msg + " " + flagRegion.name + " (" + flagRegion.region.min.x + "," + flagRegion.region.min.z + ")" + ","; - } - } - - if (msg != "") - { - msg = "List of regions in world:\n" + msg; - } - else - { - msg = "No regions in this world."; - } - - sender.sendChatToPlayer(msg); - } - else if (flagWorld.getRegion(regionName) != null) - { - String msg = ""; - - Iterator i = flagWorld.getRegion(regionName).getFlags().iterator(); - - while (i.hasNext()) - { - Flag flag = i.next(); - msg = msg + " " + flag.name + " => " + flag.value + ","; - } - - if (msg != "") - { - msg = "List of flags in region " + regionName + ":\n" + msg; - } - else - { - msg = "No flags in this region."; - } - - sender.sendChatToPlayer(msg); - } - else - { - String msg = "Region does not exist, but here are existing flags in the position you are standing on:\n"; - - Iterator i = flagWorld.getFlagsInPosition(new Vector3(entityPlayer)).iterator(); - - while (i.hasNext()) - { - Flag flag = i.next(); - msg = msg + " " + flag.name + "=>" + flag.value + ","; - } - - sender.sendChatToPlayer(msg); - } - - } - else - { - String msg = ""; - - Iterator i = flagWorld.getRegions().iterator(); - while (i.hasNext()) - { - FlagRegion flagRegion = i.next(); - msg = msg + " " + flagRegion.name + " (" + flagRegion.region.min.x + "," + flagRegion.region.min.z + ")" + ","; - } - - if (msg != "") - { - msg = "List of regions in this dimension:\n" + msg; - } - else - { - msg = "No regions in this dimension."; - } - - sender.sendChatToPlayer(msg); - } - - return; - } - else if (commandName.equalsIgnoreCase("setregion")) - { - if (args.length > 1) - { - String regionName = args[1]; - - if (regionName.equalsIgnoreCase(FlagWorld.GLOBAL_REGION)) - { - if (flagWorld.addRegion(regionName, new Vector3(entityPlayer), 1)) - { - sender.sendChatToPlayer("Created global dimension region setting."); - return; - } - } - else if (args.length > 2) - { - int radius = 0; - - try - { - radius = Integer.parseInt(args[2]); - } - catch (Exception e) - { - throw new WrongUsageException("Radius not a number!"); - } - - if (radius > 0) - { - FlagRegion region = flagWorld.getRegion(regionName); - if (region == null) - { - if (flagWorld.addRegion(regionName, new Vector3(entityPlayer), radius)) - { - sender.sendChatToPlayer("Region " + regionName + " added."); - } - } - else - { - region.edit(new Vector3(entityPlayer), radius); - sender.sendChatToPlayer("Region " + regionName + " already exists. Modified region to have a radius of: " + radius); - } - } - else - { - throw new WrongUsageException("Radius has to be greater than zero!"); - } - - } - else - { - throw new WrongUsageException("/" + this.getCommandName() + " addregion "); - } - } - else - { - throw new WrongUsageException("Please specify the region name."); - } - - return; - } - else if (commandName.equalsIgnoreCase("removeregion")) - - { - if (args.length > 1) - { - String regionName = args[1]; - - if (flagWorld.removeRegion(regionName)) - { - sender.sendChatToPlayer("Region with name " + regionName + " is removed."); - } - else - { - throw new WrongUsageException("The specified region does not exist in this world."); - } - } - else - { - throw new WrongUsageException("Please specify the region name."); - } - - return; - } - else if (commandName.equalsIgnoreCase("set")) - { - if (args.length > 2) - { - String regionName = args[1]; - String flagName = args[2]; - FlagRegion flagRegion = flagWorld.getRegion(regionName); - - if (flagRegion != null) - { - if (FlagRegistry.flags.contains(flagName)) - { - if (args.length > 3) - { - String flagValue = args[3]; - - flagRegion.setFlag(flagName, flagValue); - sender.sendChatToPlayer("Flag '" + flagName + "' has been set to '" + flagValue + "' in " + regionName + "."); - } - else - { - flagRegion.removeFlag(flagName); - sender.sendChatToPlayer("Removed flag '" + flagName + "'."); - } - } - else - { - String flags = "Flag does not exist. Existing flags:\n"; - - for (String registeredFlag : FlagRegistry.flags) - { - flags = flags + registeredFlag + ", "; - } - - throw new WrongUsageException(flags); - } - } - else - { - throw new WrongUsageException("The specified region '" + regionName + "' does not exist."); - } - } - else - { - throw new WrongUsageException("/" + this.getCommandName() + " set "); - } - - return; - } - } - - throw new WrongUsageException(this.getCommandUsage(sender)); - - } - - @Override - public int getRequiredPermissionLevel() - { - return 2; - } - - @Override - public List addTabCompletionOptions(ICommandSender sender, String[] args) - { - return args.length == 1 ? getListOfStringsMatchingLastWord(args, COMMANDS) : null; - } - -} diff --git a/common/universalelectricity/prefab/flag/Flag.java b/common/universalelectricity/prefab/flag/Flag.java deleted file mode 100644 index f4ce378d8..000000000 --- a/common/universalelectricity/prefab/flag/Flag.java +++ /dev/null @@ -1,43 +0,0 @@ -package universalelectricity.prefab.flag; - -import net.minecraft.nbt.NBTTagCompound; - -public class Flag extends FlagBase -{ - /** - * The region in which this flag has affect in. - */ - public FlagRegion flagRegion; - - public String name; - - public String value; - - public Flag(FlagRegion flagRegion) - { - this.flagRegion = flagRegion; - } - - public Flag(FlagRegion flagRegion, String name, String value) - { - this(flagRegion); - this.name = name; - this.value = value; - - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - this.name = nbt.getString("name"); - this.value = nbt.getString("value"); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - nbt.setString("name", this.name); - nbt.setString("value", this.value); - - } -} diff --git a/common/universalelectricity/prefab/flag/FlagBase.java b/common/universalelectricity/prefab/flag/FlagBase.java deleted file mode 100644 index 70b42bdbf..000000000 --- a/common/universalelectricity/prefab/flag/FlagBase.java +++ /dev/null @@ -1,26 +0,0 @@ -package universalelectricity.prefab.flag; - -import net.minecraft.nbt.NBTTagCompound; - -public abstract class FlagBase -{ - public abstract void readFromNBT(NBTTagCompound nbt); - - public abstract void writeToNBT(NBTTagCompound nbt); - - public NBTTagCompound getNBT() - { - NBTTagCompound nbt = new NBTTagCompound(); - try - { - this.writeToNBT(nbt); - } - catch (Exception e) - { - System.out.println("Failed to read flag"); - e.printStackTrace(); - } - - return nbt; - } -} diff --git a/common/universalelectricity/prefab/flag/FlagRegion.java b/common/universalelectricity/prefab/flag/FlagRegion.java deleted file mode 100644 index 5e11ceb96..000000000 --- a/common/universalelectricity/prefab/flag/FlagRegion.java +++ /dev/null @@ -1,184 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import universalelectricity.core.vector.Vector3; -import universalelectricity.prefab.vector.Region3; - -/** - * A defined region. - * - * @author Calclavia - * - */ -public class FlagRegion extends FlagBase -{ - /** - * The region in which this flag has affect in. - */ - public FlagWorld flagWorld; - - public String name; - public Region3 region; - private final List flags = new ArrayList(); - - public FlagRegion(FlagWorld worldFlagData) - { - this.flagWorld = worldFlagData; - } - - public FlagRegion(FlagWorld flagWorld, String name, Region3 region) - { - this.flagWorld = flagWorld; - this.name = name; - this.region = region; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - this.name = nbt.getName(); - - Vector3 startVector = Vector3.readFromNBT(nbt.getCompoundTag("min")); - Vector3 endVector = Vector3.readFromNBT(nbt.getCompoundTag("max")); - - this.region = new Region3(startVector, endVector); - - /** - * Child Data - */ - NBTTagList flagList = nbt.getTagList("flags"); - - for (int i = 0; i < flagList.tagCount(); i++) - { - NBTTagCompound childNode = (NBTTagCompound) flagList.tagAt(i); - - try - { - Flag flag = new Flag(this); - flag.readFromNBT(childNode); - this.flags.add(flag); - } - catch (Exception e) - { - System.out.println("Mod Flag: Failed to read flag data: " + childNode.getName()); - e.printStackTrace(); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - nbt.setName(this.name); - - nbt.setTag("min", this.region.min.writeToNBT(new NBTTagCompound())); - nbt.setTag("max", this.region.max.writeToNBT(new NBTTagCompound())); - - NBTTagList flagList = new NBTTagList(); - - for (Flag flag : this.getFlags()) - { - try - { - flagList.appendTag(flag.getNBT()); - } - catch (Exception e) - { - System.out.println("Failed to save world flag data: " + flag.name); - e.printStackTrace(); - } - } - - nbt.setTag("flags", flagList); - } - - public boolean containsValue(String flagName, String checkValue, Vector3 position) - { - for (Flag flag : this.flags) - { - if (flag.name.equalsIgnoreCase(flagName) && flag.value.equalsIgnoreCase(checkValue)) - { - return true; - } - } - - return false; - } - - public boolean setFlag(String flagName, String value) - { - this.removeFlag(flagName); - - if (value != null && value != "") - { - if (!containsFlag(flagName)) - { - return this.flags.add(new Flag(this, flagName, value)); - } - } - - return false; - } - - public boolean containsFlag(String flagName) - { - for (Flag region : this.flags) - { - if (region.name.equalsIgnoreCase(flagName)) - { - return true; - } - } - return false; - } - - public boolean removeFlag(String flagName) - { - for (Flag region : this.flags) - { - if (region.name.equalsIgnoreCase(flagName)) - { - this.flags.remove(region); - return true; - } - } - - return false; - } - - public List getFlags() - { - Iterator it = this.flags.iterator(); - - while (it.hasNext()) - { - Flag flag = it.next(); - - if (flag == null) - { - it.remove(); - continue; - } - - if (flag.name == null || flag.name == "") - { - it.remove(); - continue; - } - } - - return this.flags; - } - - public void edit(Vector3 position, int radius) - { - Vector3 minVec = new Vector3(position.intX() - radius, 0, position.intZ() - radius); - Vector3 maxVec = new Vector3(position.intX() + radius, this.flagWorld.world.getHeight(), position.intZ() + radius); - this.region = new Region3(minVec, maxVec); - } -} diff --git a/common/universalelectricity/prefab/flag/FlagRegistry.java b/common/universalelectricity/prefab/flag/FlagRegistry.java deleted file mode 100644 index f57203878..000000000 --- a/common/universalelectricity/prefab/flag/FlagRegistry.java +++ /dev/null @@ -1,52 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -/** - * All the different types of flags that can be registered. - * - * @author Calclavia - * - */ -public class FlagRegistry -{ - public static final String DEFAULT_NAME = "ModFlags"; - - private static final HashMap MOD_FLAGS = new HashMap(); - - public static final List flags = new ArrayList(); - public static boolean isInitiated = false; - - public static void registerModFlag(String name, ModFlag flagData) - { - MOD_FLAGS.put(name, flagData); - } - - public static ModFlag getModFlag(String name) - { - return MOD_FLAGS.get(name); - } - - /** - * Registers a flag name, allowing it to be used and called by the player. Call this in your - * mod's init function. - */ - public static String registerFlag(String name) - { - if (!isInitiated) - { - isInitiated = true; - } - - name = name.toLowerCase(); - - if (!flags.contains(name)) - { - flags.add(name); - } - - return name; - } -} diff --git a/common/universalelectricity/prefab/flag/FlagWorld.java b/common/universalelectricity/prefab/flag/FlagWorld.java deleted file mode 100644 index 560fc5a15..000000000 --- a/common/universalelectricity/prefab/flag/FlagWorld.java +++ /dev/null @@ -1,200 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; -import universalelectricity.prefab.vector.Region3; - -/** - * Data structure for world protection. - * - * @author Calclavia - * - */ -public class FlagWorld extends FlagBase -{ - public static final String GLOBAL_REGION = "dimension"; - - public World world; - private final List regions = new ArrayList(); - - public FlagWorld(World world) - { - this.world = world; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - // A list containing all flags within it for this world. - Iterator childCompounds = nbt.getTags().iterator(); - - while (childCompounds.hasNext()) - { - NBTTagCompound childCompound = childCompounds.next(); - - try - { - FlagRegion flagRegion = new FlagRegion(this); - flagRegion.readFromNBT(childCompound); - this.regions.add(flagRegion); - } - catch (Exception e) - { - System.out.println("Mod Flag: Failed to read flag data: " + childCompound.getName()); - e.printStackTrace(); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - for (FlagRegion region : this.regions) - { - try - { - NBTTagCompound flagCompound = new NBTTagCompound(); - region.writeToNBT(flagCompound); - nbt.setTag(region.name, flagCompound); - } - catch (Exception e) - { - System.out.println("Failed to save world flag data: " + region.name); - e.printStackTrace(); - } - } - } - - /** - * Gets all the flags that have an effect in this position. - * - * @param position - * @return - */ - public List getFlagsInPosition(Vector3 position) - { - List returnFlags = new ArrayList(); - - for (FlagRegion flagRegion : this.regions) - { - if (flagRegion.region.isIn(position) || flagRegion.name.equalsIgnoreCase(GLOBAL_REGION)) - { - for (Flag flag : flagRegion.getFlags()) - { - returnFlags.add(flag); - } - } - } - - return returnFlags; - } - - /** - * Gets all the values of the flags in this position. - */ - public List getValues(String flagName, Vector3 position) - { - List values = new ArrayList(); - - for (Flag flag : this.getFlagsInPosition(position)) - { - values.add(flag.value); - } - - return values; - } - - /** - * Checks if there is a flag in this position that has a specific value. - */ - public boolean containsValue(String flagName, String checkValue, Vector3 position) - { - for (Flag flag : this.getFlagsInPosition(position)) - { - if (flag.name.equalsIgnoreCase(flagName) && flag.value.equalsIgnoreCase(checkValue)) - { - return true; - } - } - - return false; - } - - public boolean addRegion(String name, Vector3 position, int radius) - { - Vector3 minVec = new Vector3(position.intX() - radius, 0, position.intZ() - radius); - Vector3 maxVec = new Vector3(position.intX() + radius, this.world.getHeight(), position.intZ() + radius); - - return this.regions.add(new FlagRegion(this, name, new Region3(minVec, maxVec))); - } - - public FlagRegion getRegion(String name) - { - for (FlagRegion region : this.regions) - { - if (region.name.equals(name)) - { - return region; - } - } - return null; - } - - /** - * Gets all regions that intersect this point. - */ - public List getRegions(Vector3 position) - { - List returnRegions = new ArrayList(); - for (FlagRegion region : this.regions) - { - if (region.region.isIn(position)) - { - returnRegions.add(region); - } - } - return returnRegions; - } - - public boolean removeRegion(String name) - { - for (FlagRegion region : this.regions) - { - if (region.name.equals(name)) - { - this.regions.remove(region); - return true; - } - } - - return false; - } - - public List getRegions() - { - Iterator it = this.regions.iterator(); - while (it.hasNext()) - { - FlagRegion region = it.next(); - - if (region == null) - { - it.remove(); - continue; - } - - if (region.name == null || region.name == "") - { - it.remove(); - continue; - } - } - - return this.regions; - } -} diff --git a/common/universalelectricity/prefab/flag/ModFlag.java b/common/universalelectricity/prefab/flag/ModFlag.java deleted file mode 100644 index 66ed573b6..000000000 --- a/common/universalelectricity/prefab/flag/ModFlag.java +++ /dev/null @@ -1,117 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import universalelectricity.core.vector.Vector3; - -public class ModFlag extends FlagBase -{ - /** - * An array of world flag data. Each representing a world. - */ - private final List flagWorlds = new ArrayList(); - - /** - * Initiates a new mod flag data and loads everything from NBT into memory. Only exists server - * side. - * - * @param nbt - */ - public ModFlag(NBTTagCompound nbt) - { - this.readFromNBT(nbt); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - if (nbt != null) - { - // A list containing all dimension ID and data within it. - Iterator dimensions = nbt.getTags().iterator(); - - while (dimensions.hasNext()) - { - NBTTagCompound dimensionCompound = (NBTTagCompound) dimensions.next(); - - try - { - int dimensionID = Integer.parseInt(dimensionCompound.getName().replace("dim_", "")); - World world = DimensionManager.getWorld(dimensionID); - FlagWorld flagWorld = new FlagWorld(world); - flagWorld.readFromNBT(dimensionCompound); - this.flagWorlds.add(flagWorld); - } - catch (Exception e) - { - System.out.println("Mod Flag: Failed to read dimension data: " + dimensionCompound.getName()); - e.printStackTrace(); - } - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - if (nbt != null) - { - for (FlagWorld worldData : this.flagWorlds) - { - try - { - nbt.setTag("dim_" + worldData.world.provider.dimensionId, worldData.getNBT()); - } - catch (Exception e) - { - System.out.println("Mod Flag: Failed to save world flag data: " + worldData.world); - e.printStackTrace(); - } - } - } - } - - public FlagWorld getFlagWorld(World world) - { - FlagWorld worldData = null; - - if (world != null) - { - for (FlagWorld data : this.flagWorlds) - { - if (data.world != null && data.world.provider != null) - { - if (data.world.provider.dimensionId == world.provider.dimensionId) - { - worldData = data; - break; - } - } - } - - // If data is null, create it. - if (worldData == null) - { - worldData = new FlagWorld(world); - this.flagWorlds.add(worldData); - } - } - - return worldData; - } - - public boolean containsValue(World world, String flagName, String checkValue, Vector3 position) - { - return this.getFlagWorld(world).containsValue(flagName, checkValue, position); - } - - public List getFlagWorlds() - { - return this.flagWorlds; - } -} diff --git a/common/universalelectricity/prefab/flag/NBTFileLoader.java b/common/universalelectricity/prefab/flag/NBTFileLoader.java deleted file mode 100644 index a4096c191..000000000 --- a/common/universalelectricity/prefab/flag/NBTFileLoader.java +++ /dev/null @@ -1,113 +0,0 @@ -package universalelectricity.prefab.flag; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -import net.minecraft.client.Minecraft; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; - -public class NBTFileLoader -{ - /** - * Saves NBT data in the world folder. - * - * @return True on success. - */ - public static boolean saveData(File saveDirectory, String filename, NBTTagCompound data) - { - try - { - File tempFile = new File(saveDirectory, filename + "_tmp.dat"); - File file = new File(saveDirectory, filename + ".dat"); - - CompressedStreamTools.writeCompressed(data, new FileOutputStream(tempFile)); - - if (file.exists()) - { - file.delete(); - } - - tempFile.renameTo(file); - - FMLLog.fine("Saved " + filename + " NBT data file successfully."); - return true; - } - catch (Exception e) - { - System.out.println("Failed to save " + filename + ".dat!"); - e.printStackTrace(); - return false; - } - } - - public static boolean saveData(String filename, NBTTagCompound data) - { - return saveData(getSaveDirectory(MinecraftServer.getServer().getFolderName()), filename, data); - } - - /** - * Reads NBT data from the world folder. - * - * @return The NBT data - */ - public static NBTTagCompound loadData(File saveDirectory, String filename) - { - try - { - File file = new File(saveDirectory, filename + ".dat"); - - if (file.exists()) - { - FMLLog.fine("Loaded " + filename + " data."); - return CompressedStreamTools.readCompressed(new FileInputStream(file)); - } - else - { - FMLLog.fine("Created new " + filename + " data."); - return new NBTTagCompound(); - } - } - catch (Exception e) - { - System.out.println("Failed to load " + filename + ".dat!"); - e.printStackTrace(); - return null; - } - } - - public static NBTTagCompound loadData(String filename) - { - return loadData(getSaveDirectory(MinecraftServer.getServer().getFolderName()), filename); - } - - public static File getSaveDirectory(String worldName) - { - File parent = getBaseDirectory(); - - if (FMLCommonHandler.instance().getSide().isClient()) - { - parent = new File(getBaseDirectory(), "saves" + File.separator); - } - - return new File(parent, worldName + File.separator); - } - - public static File getBaseDirectory() - { - if (FMLCommonHandler.instance().getSide().isClient()) - { - FMLClientHandler.instance().getClient(); - return Minecraft.getMinecraftDir(); - } - else - { - return new File("."); - } - } -} diff --git a/resources/mods/mekanism/gui/GuiBioGenerator.png b/resources/assets/mekanism/gui/GuiBioGenerator.png similarity index 100% rename from resources/mods/mekanism/gui/GuiBioGenerator.png rename to resources/assets/mekanism/gui/GuiBioGenerator.png diff --git a/resources/mods/mekanism/gui/GuiChamber.png b/resources/assets/mekanism/gui/GuiChamber.png similarity index 100% rename from resources/mods/mekanism/gui/GuiChamber.png rename to resources/assets/mekanism/gui/GuiChamber.png diff --git a/resources/mods/mekanism/gui/GuiCombiner.png b/resources/assets/mekanism/gui/GuiCombiner.png similarity index 100% rename from resources/mods/mekanism/gui/GuiCombiner.png rename to resources/assets/mekanism/gui/GuiCombiner.png diff --git a/resources/mods/mekanism/gui/GuiCompressor.png b/resources/assets/mekanism/gui/GuiCompressor.png similarity index 100% rename from resources/mods/mekanism/gui/GuiCompressor.png rename to resources/assets/mekanism/gui/GuiCompressor.png diff --git a/resources/mods/mekanism/gui/GuiControlPanel.png b/resources/assets/mekanism/gui/GuiControlPanel.png similarity index 100% rename from resources/mods/mekanism/gui/GuiControlPanel.png rename to resources/assets/mekanism/gui/GuiControlPanel.png diff --git a/resources/mods/mekanism/gui/GuiCrusher.png b/resources/assets/mekanism/gui/GuiCrusher.png similarity index 100% rename from resources/mods/mekanism/gui/GuiCrusher.png rename to resources/assets/mekanism/gui/GuiCrusher.png diff --git a/resources/mods/mekanism/gui/GuiDynamicTank.png b/resources/assets/mekanism/gui/GuiDynamicTank.png similarity index 100% rename from resources/mods/mekanism/gui/GuiDynamicTank.png rename to resources/assets/mekanism/gui/GuiDynamicTank.png diff --git a/resources/mods/mekanism/gui/GuiElectricChest.png b/resources/assets/mekanism/gui/GuiElectricChest.png similarity index 100% rename from resources/mods/mekanism/gui/GuiElectricChest.png rename to resources/assets/mekanism/gui/GuiElectricChest.png diff --git a/resources/mods/mekanism/gui/GuiElectricPump.png b/resources/assets/mekanism/gui/GuiElectricPump.png similarity index 100% rename from resources/mods/mekanism/gui/GuiElectricPump.png rename to resources/assets/mekanism/gui/GuiElectricPump.png diff --git a/resources/mods/mekanism/gui/GuiElectrolyticSeparator.png b/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png similarity index 100% rename from resources/mods/mekanism/gui/GuiElectrolyticSeparator.png rename to resources/assets/mekanism/gui/GuiElectrolyticSeparator.png diff --git a/resources/mods/mekanism/gui/GuiElementizer.png b/resources/assets/mekanism/gui/GuiElementizer.png similarity index 100% rename from resources/mods/mekanism/gui/GuiElementizer.png rename to resources/assets/mekanism/gui/GuiElementizer.png diff --git a/resources/mods/mekanism/gui/GuiEnergizedSmelter.png b/resources/assets/mekanism/gui/GuiEnergizedSmelter.png similarity index 100% rename from resources/mods/mekanism/gui/GuiEnergizedSmelter.png rename to resources/assets/mekanism/gui/GuiEnergizedSmelter.png diff --git a/resources/mods/mekanism/gui/GuiEnergyCube.png b/resources/assets/mekanism/gui/GuiEnergyCube.png similarity index 100% rename from resources/mods/mekanism/gui/GuiEnergyCube.png rename to resources/assets/mekanism/gui/GuiEnergyCube.png diff --git a/resources/mods/mekanism/gui/GuiGasTank.png b/resources/assets/mekanism/gui/GuiGasTank.png similarity index 100% rename from resources/mods/mekanism/gui/GuiGasTank.png rename to resources/assets/mekanism/gui/GuiGasTank.png diff --git a/resources/mods/mekanism/gui/GuiHeatGenerator.png b/resources/assets/mekanism/gui/GuiHeatGenerator.png similarity index 100% rename from resources/mods/mekanism/gui/GuiHeatGenerator.png rename to resources/assets/mekanism/gui/GuiHeatGenerator.png diff --git a/resources/mods/mekanism/gui/GuiHydrogenGenerator.png b/resources/assets/mekanism/gui/GuiHydrogenGenerator.png similarity index 100% rename from resources/mods/mekanism/gui/GuiHydrogenGenerator.png rename to resources/assets/mekanism/gui/GuiHydrogenGenerator.png diff --git a/resources/mods/mekanism/gui/GuiMetallurgicInfuser.png b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png similarity index 100% rename from resources/mods/mekanism/gui/GuiMetallurgicInfuser.png rename to resources/assets/mekanism/gui/GuiMetallurgicInfuser.png diff --git a/resources/mods/mekanism/gui/GuiPasswordEnter.png b/resources/assets/mekanism/gui/GuiPasswordEnter.png similarity index 100% rename from resources/mods/mekanism/gui/GuiPasswordEnter.png rename to resources/assets/mekanism/gui/GuiPasswordEnter.png diff --git a/resources/mods/mekanism/gui/GuiPasswordModify.png b/resources/assets/mekanism/gui/GuiPasswordModify.png similarity index 100% rename from resources/mods/mekanism/gui/GuiPasswordModify.png rename to resources/assets/mekanism/gui/GuiPasswordModify.png diff --git a/resources/mods/mekanism/gui/GuiPortableTeleporter.png b/resources/assets/mekanism/gui/GuiPortableTeleporter.png similarity index 100% rename from resources/mods/mekanism/gui/GuiPortableTeleporter.png rename to resources/assets/mekanism/gui/GuiPortableTeleporter.png diff --git a/resources/mods/mekanism/gui/GuiPurificationChamber.png b/resources/assets/mekanism/gui/GuiPurificationChamber.png similarity index 100% rename from resources/mods/mekanism/gui/GuiPurificationChamber.png rename to resources/assets/mekanism/gui/GuiPurificationChamber.png diff --git a/resources/mods/mekanism/gui/GuiRobitCrafting.png b/resources/assets/mekanism/gui/GuiRobitCrafting.png similarity index 100% rename from resources/mods/mekanism/gui/GuiRobitCrafting.png rename to resources/assets/mekanism/gui/GuiRobitCrafting.png diff --git a/resources/mods/mekanism/gui/GuiRobitInventory.png b/resources/assets/mekanism/gui/GuiRobitInventory.png similarity index 100% rename from resources/mods/mekanism/gui/GuiRobitInventory.png rename to resources/assets/mekanism/gui/GuiRobitInventory.png diff --git a/resources/mods/mekanism/gui/GuiRobitMain.png b/resources/assets/mekanism/gui/GuiRobitMain.png similarity index 100% rename from resources/mods/mekanism/gui/GuiRobitMain.png rename to resources/assets/mekanism/gui/GuiRobitMain.png diff --git a/resources/mods/mekanism/gui/GuiRobitRepair.png b/resources/assets/mekanism/gui/GuiRobitRepair.png similarity index 100% rename from resources/mods/mekanism/gui/GuiRobitRepair.png rename to resources/assets/mekanism/gui/GuiRobitRepair.png diff --git a/resources/mods/mekanism/gui/GuiRobitSmelting.png b/resources/assets/mekanism/gui/GuiRobitSmelting.png similarity index 100% rename from resources/mods/mekanism/gui/GuiRobitSmelting.png rename to resources/assets/mekanism/gui/GuiRobitSmelting.png diff --git a/resources/mods/mekanism/gui/GuiSolarGenerator.png b/resources/assets/mekanism/gui/GuiSolarGenerator.png similarity index 100% rename from resources/mods/mekanism/gui/GuiSolarGenerator.png rename to resources/assets/mekanism/gui/GuiSolarGenerator.png diff --git a/resources/mods/mekanism/gui/GuiStopwatch.png b/resources/assets/mekanism/gui/GuiStopwatch.png similarity index 100% rename from resources/mods/mekanism/gui/GuiStopwatch.png rename to resources/assets/mekanism/gui/GuiStopwatch.png diff --git a/resources/mods/mekanism/gui/GuiTeleporter.png b/resources/assets/mekanism/gui/GuiTeleporter.png similarity index 100% rename from resources/mods/mekanism/gui/GuiTeleporter.png rename to resources/assets/mekanism/gui/GuiTeleporter.png diff --git a/resources/mods/mekanism/gui/GuiWeatherOrb.png b/resources/assets/mekanism/gui/GuiWeatherOrb.png similarity index 100% rename from resources/mods/mekanism/gui/GuiWeatherOrb.png rename to resources/assets/mekanism/gui/GuiWeatherOrb.png diff --git a/resources/mods/mekanism/gui/GuiWindTurbine.png b/resources/assets/mekanism/gui/GuiWindTurbine.png similarity index 100% rename from resources/mods/mekanism/gui/GuiWindTurbine.png rename to resources/assets/mekanism/gui/GuiWindTurbine.png diff --git a/resources/mods/mekanism/gui/factory/GuiAdvancedFactory.png b/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png similarity index 100% rename from resources/mods/mekanism/gui/factory/GuiAdvancedFactory.png rename to resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png diff --git a/resources/mods/mekanism/gui/factory/GuiBasicFactory.png b/resources/assets/mekanism/gui/factory/GuiBasicFactory.png similarity index 100% rename from resources/mods/mekanism/gui/factory/GuiBasicFactory.png rename to resources/assets/mekanism/gui/factory/GuiBasicFactory.png diff --git a/resources/mods/mekanism/gui/factory/GuiEliteFactory.png b/resources/assets/mekanism/gui/factory/GuiEliteFactory.png similarity index 100% rename from resources/mods/mekanism/gui/factory/GuiEliteFactory.png rename to resources/assets/mekanism/gui/factory/GuiEliteFactory.png diff --git a/resources/mods/mekanism/infuse/Bio.png b/resources/assets/mekanism/infuse/Bio.png similarity index 100% rename from resources/mods/mekanism/infuse/Bio.png rename to resources/assets/mekanism/infuse/Bio.png diff --git a/resources/mods/mekanism/infuse/Carbon.png b/resources/assets/mekanism/infuse/Carbon.png similarity index 100% rename from resources/mods/mekanism/infuse/Carbon.png rename to resources/assets/mekanism/infuse/Carbon.png diff --git a/resources/mods/mekanism/infuse/Diamond.png b/resources/assets/mekanism/infuse/Diamond.png similarity index 100% rename from resources/mods/mekanism/infuse/Diamond.png rename to resources/assets/mekanism/infuse/Diamond.png diff --git a/resources/mods/mekanism/infuse/Infusions.png b/resources/assets/mekanism/infuse/Infusions.png similarity index 100% rename from resources/mods/mekanism/infuse/Infusions.png rename to resources/assets/mekanism/infuse/Infusions.png diff --git a/resources/mods/mekanism/infuse/Tin.png b/resources/assets/mekanism/infuse/Tin.png similarity index 100% rename from resources/mods/mekanism/infuse/Tin.png rename to resources/assets/mekanism/infuse/Tin.png diff --git a/resources/mods/mekanism/render/AdvancedSolarGenerator.png b/resources/assets/mekanism/render/AdvancedSolarGenerator.png similarity index 100% rename from resources/mods/mekanism/render/AdvancedSolarGenerator.png rename to resources/assets/mekanism/render/AdvancedSolarGenerator.png diff --git a/resources/mods/mekanism/render/BioGenerator.png b/resources/assets/mekanism/render/BioGenerator.png similarity index 100% rename from resources/mods/mekanism/render/BioGenerator.png rename to resources/assets/mekanism/render/BioGenerator.png diff --git a/resources/mods/mekanism/render/Chargepad.png b/resources/assets/mekanism/render/Chargepad.png similarity index 100% rename from resources/mods/mekanism/render/Chargepad.png rename to resources/assets/mekanism/render/Chargepad.png diff --git a/resources/mods/mekanism/render/ElectricChest.png b/resources/assets/mekanism/render/ElectricChest.png similarity index 100% rename from resources/mods/mekanism/render/ElectricChest.png rename to resources/assets/mekanism/render/ElectricChest.png diff --git a/resources/mods/mekanism/render/ElectricPump.png b/resources/assets/mekanism/render/ElectricPump.png similarity index 100% rename from resources/mods/mekanism/render/ElectricPump.png rename to resources/assets/mekanism/render/ElectricPump.png diff --git a/resources/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png b/resources/assets/mekanism/render/ElectrolyticSeparatorHydrogen.png similarity index 100% rename from resources/mods/mekanism/render/ElectrolyticSeparatorHydrogen.png rename to resources/assets/mekanism/render/ElectrolyticSeparatorHydrogen.png diff --git a/resources/mods/mekanism/render/ElectrolyticSeparatorNone.png b/resources/assets/mekanism/render/ElectrolyticSeparatorNone.png similarity index 100% rename from resources/mods/mekanism/render/ElectrolyticSeparatorNone.png rename to resources/assets/mekanism/render/ElectrolyticSeparatorNone.png diff --git a/resources/mods/mekanism/render/ElectrolyticSeparatorOxygen.png b/resources/assets/mekanism/render/ElectrolyticSeparatorOxygen.png similarity index 100% rename from resources/mods/mekanism/render/ElectrolyticSeparatorOxygen.png rename to resources/assets/mekanism/render/ElectrolyticSeparatorOxygen.png diff --git a/resources/mods/mekanism/render/HeatGenerator.png b/resources/assets/mekanism/render/HeatGenerator.png similarity index 100% rename from resources/mods/mekanism/render/HeatGenerator.png rename to resources/assets/mekanism/render/HeatGenerator.png diff --git a/resources/mods/mekanism/render/HeatGeneratorOn.png b/resources/assets/mekanism/render/HeatGeneratorOn.png similarity index 100% rename from resources/mods/mekanism/render/HeatGeneratorOn.png rename to resources/assets/mekanism/render/HeatGeneratorOn.png diff --git a/resources/mods/mekanism/render/HydrogenGenerator.png b/resources/assets/mekanism/render/HydrogenGenerator.png similarity index 100% rename from resources/mods/mekanism/render/HydrogenGenerator.png rename to resources/assets/mekanism/render/HydrogenGenerator.png diff --git a/resources/mods/mekanism/render/MechanicalPipe.png b/resources/assets/mekanism/render/MechanicalPipe.png similarity index 100% rename from resources/mods/mekanism/render/MechanicalPipe.png rename to resources/assets/mekanism/render/MechanicalPipe.png diff --git a/resources/mods/mekanism/render/MechanicalPipeActive.png b/resources/assets/mekanism/render/MechanicalPipeActive.png similarity index 100% rename from resources/mods/mekanism/render/MechanicalPipeActive.png rename to resources/assets/mekanism/render/MechanicalPipeActive.png diff --git a/resources/mods/mekanism/render/MetallurgicInfuser.png b/resources/assets/mekanism/render/MetallurgicInfuser.png similarity index 100% rename from resources/mods/mekanism/render/MetallurgicInfuser.png rename to resources/assets/mekanism/render/MetallurgicInfuser.png diff --git a/resources/mods/mekanism/render/PressurizedTube.png b/resources/assets/mekanism/render/PressurizedTube.png similarity index 100% rename from resources/mods/mekanism/render/PressurizedTube.png rename to resources/assets/mekanism/render/PressurizedTube.png diff --git a/resources/mods/mekanism/render/Robit.png b/resources/assets/mekanism/render/Robit.png similarity index 100% rename from resources/mods/mekanism/render/Robit.png rename to resources/assets/mekanism/render/Robit.png diff --git a/resources/mods/mekanism/render/SideConfigOverlay.png b/resources/assets/mekanism/render/SideConfigOverlay.png similarity index 100% rename from resources/mods/mekanism/render/SideConfigOverlay.png rename to resources/assets/mekanism/render/SideConfigOverlay.png diff --git a/resources/mods/mekanism/render/TheoreticalElementizer.png b/resources/assets/mekanism/render/TheoreticalElementizer.png similarity index 100% rename from resources/mods/mekanism/render/TheoreticalElementizer.png rename to resources/assets/mekanism/render/TheoreticalElementizer.png diff --git a/resources/mods/mekanism/render/UniversalCable.png b/resources/assets/mekanism/render/UniversalCable.png similarity index 100% rename from resources/mods/mekanism/render/UniversalCable.png rename to resources/assets/mekanism/render/UniversalCable.png diff --git a/resources/mods/mekanism/render/WindTurbine.png b/resources/assets/mekanism/render/WindTurbine.png similarity index 100% rename from resources/mods/mekanism/render/WindTurbine.png rename to resources/assets/mekanism/render/WindTurbine.png diff --git a/resources/mods/mekanism/sound/BioGenerator.ogg b/resources/assets/mekanism/sound/BioGenerator.ogg similarity index 100% rename from resources/mods/mekanism/sound/BioGenerator.ogg rename to resources/assets/mekanism/sound/BioGenerator.ogg diff --git a/resources/mods/mekanism/sound/Chamber.ogg b/resources/assets/mekanism/sound/Chamber.ogg similarity index 100% rename from resources/mods/mekanism/sound/Chamber.ogg rename to resources/assets/mekanism/sound/Chamber.ogg diff --git a/resources/mods/mekanism/sound/Chargepad.ogg b/resources/assets/mekanism/sound/Chargepad.ogg similarity index 100% rename from resources/mods/mekanism/sound/Chargepad.ogg rename to resources/assets/mekanism/sound/Chargepad.ogg diff --git a/resources/mods/mekanism/sound/Combiner.ogg b/resources/assets/mekanism/sound/Combiner.ogg similarity index 100% rename from resources/mods/mekanism/sound/Combiner.ogg rename to resources/assets/mekanism/sound/Combiner.ogg diff --git a/resources/mods/mekanism/sound/Compressor.ogg b/resources/assets/mekanism/sound/Compressor.ogg similarity index 100% rename from resources/mods/mekanism/sound/Compressor.ogg rename to resources/assets/mekanism/sound/Compressor.ogg diff --git a/resources/mods/mekanism/sound/Crusher.ogg b/resources/assets/mekanism/sound/Crusher.ogg similarity index 100% rename from resources/mods/mekanism/sound/Crusher.ogg rename to resources/assets/mekanism/sound/Crusher.ogg diff --git a/resources/mods/mekanism/sound/Elementizer.ogg b/resources/assets/mekanism/sound/Elementizer.ogg similarity index 100% rename from resources/mods/mekanism/sound/Elementizer.ogg rename to resources/assets/mekanism/sound/Elementizer.ogg diff --git a/resources/mods/mekanism/sound/HeatGenerator.ogg b/resources/assets/mekanism/sound/HeatGenerator.ogg similarity index 100% rename from resources/mods/mekanism/sound/HeatGenerator.ogg rename to resources/assets/mekanism/sound/HeatGenerator.ogg diff --git a/resources/mods/mekanism/sound/HydrogenGenerator.ogg b/resources/assets/mekanism/sound/HydrogenGenerator.ogg similarity index 100% rename from resources/mods/mekanism/sound/HydrogenGenerator.ogg rename to resources/assets/mekanism/sound/HydrogenGenerator.ogg diff --git a/resources/mods/mekanism/sound/MetallurgicInfuser.ogg b/resources/assets/mekanism/sound/MetallurgicInfuser.ogg similarity index 100% rename from resources/mods/mekanism/sound/MetallurgicInfuser.ogg rename to resources/assets/mekanism/sound/MetallurgicInfuser.ogg diff --git a/resources/mods/mekanism/sound/PurificationChamber.ogg b/resources/assets/mekanism/sound/PurificationChamber.ogg similarity index 100% rename from resources/mods/mekanism/sound/PurificationChamber.ogg rename to resources/assets/mekanism/sound/PurificationChamber.ogg diff --git a/resources/mods/mekanism/sound/Smelter.ogg b/resources/assets/mekanism/sound/Smelter.ogg similarity index 100% rename from resources/mods/mekanism/sound/Smelter.ogg rename to resources/assets/mekanism/sound/Smelter.ogg diff --git a/resources/mods/mekanism/sound/SolarGenerator.ogg b/resources/assets/mekanism/sound/SolarGenerator.ogg similarity index 100% rename from resources/mods/mekanism/sound/SolarGenerator.ogg rename to resources/assets/mekanism/sound/SolarGenerator.ogg diff --git a/resources/mods/mekanism/sound/WindTurbine.ogg b/resources/assets/mekanism/sound/WindTurbine.ogg similarity index 100% rename from resources/mods/mekanism/sound/WindTurbine.ogg rename to resources/assets/mekanism/sound/WindTurbine.ogg diff --git a/resources/mods/mekanism/sound/cj/CJ_1.ogg b/resources/assets/mekanism/sound/cj/CJ_1.ogg similarity index 100% rename from resources/mods/mekanism/sound/cj/CJ_1.ogg rename to resources/assets/mekanism/sound/cj/CJ_1.ogg diff --git a/resources/mods/mekanism/sound/cj/CJ_2.ogg b/resources/assets/mekanism/sound/cj/CJ_2.ogg similarity index 100% rename from resources/mods/mekanism/sound/cj/CJ_2.ogg rename to resources/assets/mekanism/sound/cj/CJ_2.ogg diff --git a/resources/mods/mekanism/sound/cj/CJ_3.ogg b/resources/assets/mekanism/sound/cj/CJ_3.ogg similarity index 100% rename from resources/mods/mekanism/sound/cj/CJ_3.ogg rename to resources/assets/mekanism/sound/cj/CJ_3.ogg diff --git a/resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png b/resources/assets/mekanism/textures/blocks/AdvancedEnergyCubeFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeFront.png rename to resources/assets/mekanism/textures/blocks/AdvancedEnergyCubeFront.png diff --git a/resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png b/resources/assets/mekanism/textures/blocks/AdvancedEnergyCubeSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/AdvancedEnergyCubeSide.png rename to resources/assets/mekanism/textures/blocks/AdvancedEnergyCubeSide.png diff --git a/resources/mods/mekanism/textures/blocks/AdvancedFactoryFront.png b/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/AdvancedFactoryFront.png rename to resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png diff --git a/resources/mods/mekanism/textures/blocks/AdvancedFactorySide.png b/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/AdvancedFactorySide.png rename to resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png diff --git a/resources/mods/mekanism/textures/blocks/AdvancedFactoryTop.png b/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/AdvancedFactoryTop.png rename to resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png diff --git a/resources/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png b/resources/assets/mekanism/textures/blocks/BasicEnergyCubeFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BasicEnergyCubeFront.png rename to resources/assets/mekanism/textures/blocks/BasicEnergyCubeFront.png diff --git a/resources/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png b/resources/assets/mekanism/textures/blocks/BasicEnergyCubeSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BasicEnergyCubeSide.png rename to resources/assets/mekanism/textures/blocks/BasicEnergyCubeSide.png diff --git a/resources/mods/mekanism/textures/blocks/BasicFactoryFront.png b/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BasicFactoryFront.png rename to resources/assets/mekanism/textures/blocks/BasicFactoryFront.png diff --git a/resources/mods/mekanism/textures/blocks/BasicFactorySide.png b/resources/assets/mekanism/textures/blocks/BasicFactorySide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BasicFactorySide.png rename to resources/assets/mekanism/textures/blocks/BasicFactorySide.png diff --git a/resources/mods/mekanism/textures/blocks/BasicFactoryTop.png b/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BasicFactoryTop.png rename to resources/assets/mekanism/textures/blocks/BasicFactoryTop.png diff --git a/resources/mods/mekanism/textures/blocks/BronzeBlock.png b/resources/assets/mekanism/textures/blocks/BronzeBlock.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/BronzeBlock.png rename to resources/assets/mekanism/textures/blocks/BronzeBlock.png diff --git a/resources/mods/mekanism/textures/blocks/CoalBlock.png b/resources/assets/mekanism/textures/blocks/CoalBlock.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/CoalBlock.png rename to resources/assets/mekanism/textures/blocks/CoalBlock.png diff --git a/resources/mods/mekanism/textures/blocks/CombinerFrontOff.png b/resources/assets/mekanism/textures/blocks/CombinerFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/CombinerFrontOff.png rename to resources/assets/mekanism/textures/blocks/CombinerFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/CombinerFrontOn.png b/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/CombinerFrontOn.png rename to resources/assets/mekanism/textures/blocks/CombinerFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/CrusherFrontOff.png b/resources/assets/mekanism/textures/blocks/CrusherFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/CrusherFrontOff.png rename to resources/assets/mekanism/textures/blocks/CrusherFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/CrusherFrontOn.png b/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/CrusherFrontOn.png rename to resources/assets/mekanism/textures/blocks/CrusherFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/DynamicGlass.png b/resources/assets/mekanism/textures/blocks/DynamicGlass.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/DynamicGlass.png rename to resources/assets/mekanism/textures/blocks/DynamicGlass.png diff --git a/resources/mods/mekanism/textures/blocks/DynamicTank.png b/resources/assets/mekanism/textures/blocks/DynamicTank.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/DynamicTank.png rename to resources/assets/mekanism/textures/blocks/DynamicTank.png diff --git a/resources/mods/mekanism/textures/blocks/DynamicValve.png b/resources/assets/mekanism/textures/blocks/DynamicValve.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/DynamicValve.png rename to resources/assets/mekanism/textures/blocks/DynamicValve.png diff --git a/resources/mods/mekanism/textures/blocks/ElectricPumpFront.png b/resources/assets/mekanism/textures/blocks/ElectricPumpFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/ElectricPumpFront.png rename to resources/assets/mekanism/textures/blocks/ElectricPumpFront.png diff --git a/resources/mods/mekanism/textures/blocks/ElectricPumpSide.png b/resources/assets/mekanism/textures/blocks/ElectricPumpSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/ElectricPumpSide.png rename to resources/assets/mekanism/textures/blocks/ElectricPumpSide.png diff --git a/resources/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png b/resources/assets/mekanism/textures/blocks/EliteEnergyCubeFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EliteEnergyCubeFront.png rename to resources/assets/mekanism/textures/blocks/EliteEnergyCubeFront.png diff --git a/resources/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png b/resources/assets/mekanism/textures/blocks/EliteEnergyCubeSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EliteEnergyCubeSide.png rename to resources/assets/mekanism/textures/blocks/EliteEnergyCubeSide.png diff --git a/resources/mods/mekanism/textures/blocks/EliteFactoryFront.png b/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EliteFactoryFront.png rename to resources/assets/mekanism/textures/blocks/EliteFactoryFront.png diff --git a/resources/mods/mekanism/textures/blocks/EliteFactorySide.png b/resources/assets/mekanism/textures/blocks/EliteFactorySide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EliteFactorySide.png rename to resources/assets/mekanism/textures/blocks/EliteFactorySide.png diff --git a/resources/mods/mekanism/textures/blocks/EliteFactoryTop.png b/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EliteFactoryTop.png rename to resources/assets/mekanism/textures/blocks/EliteFactoryTop.png diff --git a/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png b/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOff.png rename to resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png b/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.png rename to resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png b/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOff.png rename to resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/EnrichmentChamberFrontOn.png rename to resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png diff --git a/resources/mods/mekanism/textures/blocks/GasTankFront.png b/resources/assets/mekanism/textures/blocks/GasTankFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/GasTankFront.png rename to resources/assets/mekanism/textures/blocks/GasTankFront.png diff --git a/resources/mods/mekanism/textures/blocks/GasTankSide.png b/resources/assets/mekanism/textures/blocks/GasTankSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/GasTankSide.png rename to resources/assets/mekanism/textures/blocks/GasTankSide.png diff --git a/resources/mods/mekanism/textures/blocks/GasTankTop.png b/resources/assets/mekanism/textures/blocks/GasTankTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/GasTankTop.png rename to resources/assets/mekanism/textures/blocks/GasTankTop.png diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOff.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOff.png diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png diff --git a/resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserBackOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOff.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOff.png diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png diff --git a/resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserSideOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserTopOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOff.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserTopOff.png diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png b/resources/assets/mekanism/textures/blocks/MetallurgicInfuserTopOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/MetallurgicInfuserTopOn.png rename to resources/assets/mekanism/textures/blocks/MetallurgicInfuserTopOn.png diff --git a/resources/mods/mekanism/textures/blocks/ObsidianTNTBottom.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTBottom.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/ObsidianTNTBottom.png rename to resources/assets/mekanism/textures/blocks/ObsidianTNTBottom.png diff --git a/resources/mods/mekanism/textures/blocks/ObsidianTNTSide.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/ObsidianTNTSide.png rename to resources/assets/mekanism/textures/blocks/ObsidianTNTSide.png diff --git a/resources/mods/mekanism/textures/blocks/ObsidianTNTTop.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/ObsidianTNTTop.png rename to resources/assets/mekanism/textures/blocks/ObsidianTNTTop.png diff --git a/resources/mods/mekanism/textures/blocks/OsmiumBlock.png b/resources/assets/mekanism/textures/blocks/OsmiumBlock.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OsmiumBlock.png rename to resources/assets/mekanism/textures/blocks/OsmiumBlock.png diff --git a/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png b/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOff.png rename to resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png b/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.png rename to resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/OsmiumOre.png b/resources/assets/mekanism/textures/blocks/OsmiumOre.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OsmiumOre.png rename to resources/assets/mekanism/textures/blocks/OsmiumOre.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayAqua.png b/resources/assets/mekanism/textures/blocks/OverlayAqua.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayAqua.png rename to resources/assets/mekanism/textures/blocks/OverlayAqua.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayBlack.png b/resources/assets/mekanism/textures/blocks/OverlayBlack.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayBlack.png rename to resources/assets/mekanism/textures/blocks/OverlayBlack.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayBrightGreen.png b/resources/assets/mekanism/textures/blocks/OverlayBrightGreen.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayBrightGreen.png rename to resources/assets/mekanism/textures/blocks/OverlayBrightGreen.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayDarkAqua.png b/resources/assets/mekanism/textures/blocks/OverlayDarkAqua.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayDarkAqua.png rename to resources/assets/mekanism/textures/blocks/OverlayDarkAqua.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayDarkBlue.png b/resources/assets/mekanism/textures/blocks/OverlayDarkBlue.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayDarkBlue.png rename to resources/assets/mekanism/textures/blocks/OverlayDarkBlue.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayDarkGreen.png b/resources/assets/mekanism/textures/blocks/OverlayDarkGreen.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayDarkGreen.png rename to resources/assets/mekanism/textures/blocks/OverlayDarkGreen.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayDarkGrey.png b/resources/assets/mekanism/textures/blocks/OverlayDarkGrey.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayDarkGrey.png rename to resources/assets/mekanism/textures/blocks/OverlayDarkGrey.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayDarkRed.png b/resources/assets/mekanism/textures/blocks/OverlayDarkRed.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayDarkRed.png rename to resources/assets/mekanism/textures/blocks/OverlayDarkRed.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayGrey.png b/resources/assets/mekanism/textures/blocks/OverlayGrey.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayGrey.png rename to resources/assets/mekanism/textures/blocks/OverlayGrey.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayIndigo.png b/resources/assets/mekanism/textures/blocks/OverlayIndigo.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayIndigo.png rename to resources/assets/mekanism/textures/blocks/OverlayIndigo.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayOrange.png b/resources/assets/mekanism/textures/blocks/OverlayOrange.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayOrange.png rename to resources/assets/mekanism/textures/blocks/OverlayOrange.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayPink.png b/resources/assets/mekanism/textures/blocks/OverlayPink.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayPink.png rename to resources/assets/mekanism/textures/blocks/OverlayPink.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayPurple.png b/resources/assets/mekanism/textures/blocks/OverlayPurple.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayPurple.png rename to resources/assets/mekanism/textures/blocks/OverlayPurple.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayRed.png b/resources/assets/mekanism/textures/blocks/OverlayRed.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayRed.png rename to resources/assets/mekanism/textures/blocks/OverlayRed.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayWhite.png b/resources/assets/mekanism/textures/blocks/OverlayWhite.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayWhite.png rename to resources/assets/mekanism/textures/blocks/OverlayWhite.png diff --git a/resources/mods/mekanism/textures/blocks/OverlayYellow.png b/resources/assets/mekanism/textures/blocks/OverlayYellow.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/OverlayYellow.png rename to resources/assets/mekanism/textures/blocks/OverlayYellow.png diff --git a/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png b/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOff.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/PurificationChamberFrontOff.png rename to resources/assets/mekanism/textures/blocks/PurificationChamberFrontOff.png diff --git a/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png b/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.png rename to resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png diff --git a/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/resources/mods/mekanism/textures/blocks/RefinedGlowstone.png b/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/RefinedGlowstone.png rename to resources/assets/mekanism/textures/blocks/RefinedGlowstone.png diff --git a/resources/mods/mekanism/textures/blocks/RefinedObsidian.png b/resources/assets/mekanism/textures/blocks/RefinedObsidian.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/RefinedObsidian.png rename to resources/assets/mekanism/textures/blocks/RefinedObsidian.png diff --git a/resources/mods/mekanism/textures/blocks/SolarGeneratorFront.png b/resources/assets/mekanism/textures/blocks/SolarGeneratorFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/SolarGeneratorFront.png rename to resources/assets/mekanism/textures/blocks/SolarGeneratorFront.png diff --git a/resources/mods/mekanism/textures/blocks/SolarGeneratorSide.png b/resources/assets/mekanism/textures/blocks/SolarGeneratorSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/SolarGeneratorSide.png rename to resources/assets/mekanism/textures/blocks/SolarGeneratorSide.png diff --git a/resources/mods/mekanism/textures/blocks/SolarGeneratorTop.png b/resources/assets/mekanism/textures/blocks/SolarGeneratorTop.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/SolarGeneratorTop.png rename to resources/assets/mekanism/textures/blocks/SolarGeneratorTop.png diff --git a/resources/mods/mekanism/textures/blocks/SteelBlock.png b/resources/assets/mekanism/textures/blocks/SteelBlock.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/SteelBlock.png rename to resources/assets/mekanism/textures/blocks/SteelBlock.png diff --git a/resources/mods/mekanism/textures/blocks/SteelCasing.png b/resources/assets/mekanism/textures/blocks/SteelCasing.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/SteelCasing.png rename to resources/assets/mekanism/textures/blocks/SteelCasing.png diff --git a/resources/mods/mekanism/textures/blocks/Teleporter.png b/resources/assets/mekanism/textures/blocks/Teleporter.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/Teleporter.png rename to resources/assets/mekanism/textures/blocks/Teleporter.png diff --git a/resources/mods/mekanism/textures/blocks/TeleporterFrame.png b/resources/assets/mekanism/textures/blocks/TeleporterFrame.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/TeleporterFrame.png rename to resources/assets/mekanism/textures/blocks/TeleporterFrame.png diff --git a/resources/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png b/resources/assets/mekanism/textures/blocks/UltimateEnergyCubeFront.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/UltimateEnergyCubeFront.png rename to resources/assets/mekanism/textures/blocks/UltimateEnergyCubeFront.png diff --git a/resources/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png b/resources/assets/mekanism/textures/blocks/UltimateEnergyCubeSide.png similarity index 100% rename from resources/mods/mekanism/textures/blocks/UltimateEnergyCubeSide.png rename to resources/assets/mekanism/textures/blocks/UltimateEnergyCubeSide.png diff --git a/resources/mods/mekanism/textures/items/AtomicCore.png b/resources/assets/mekanism/textures/items/AtomicCore.png similarity index 100% rename from resources/mods/mekanism/textures/items/AtomicCore.png rename to resources/assets/mekanism/textures/items/AtomicCore.png diff --git a/resources/mods/mekanism/textures/items/AtomicDisassembler.png b/resources/assets/mekanism/textures/items/AtomicDisassembler.png similarity index 100% rename from resources/mods/mekanism/textures/items/AtomicDisassembler.png rename to resources/assets/mekanism/textures/items/AtomicDisassembler.png diff --git a/resources/mods/mekanism/textures/items/BioFuel.png b/resources/assets/mekanism/textures/items/BioFuel.png similarity index 100% rename from resources/mods/mekanism/textures/items/BioFuel.png rename to resources/assets/mekanism/textures/items/BioFuel.png diff --git a/resources/mods/mekanism/textures/items/BronzeAxe.png b/resources/assets/mekanism/textures/items/BronzeAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeAxe.png rename to resources/assets/mekanism/textures/items/BronzeAxe.png diff --git a/resources/mods/mekanism/textures/items/BronzeBoots.png b/resources/assets/mekanism/textures/items/BronzeBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeBoots.png rename to resources/assets/mekanism/textures/items/BronzeBoots.png diff --git a/resources/mods/mekanism/textures/items/BronzeChestplate.png b/resources/assets/mekanism/textures/items/BronzeChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeChestplate.png rename to resources/assets/mekanism/textures/items/BronzeChestplate.png diff --git a/resources/mods/mekanism/textures/items/BronzeHelmet.png b/resources/assets/mekanism/textures/items/BronzeHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeHelmet.png rename to resources/assets/mekanism/textures/items/BronzeHelmet.png diff --git a/resources/mods/mekanism/textures/items/BronzeHoe.png b/resources/assets/mekanism/textures/items/BronzeHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeHoe.png rename to resources/assets/mekanism/textures/items/BronzeHoe.png diff --git a/resources/mods/mekanism/textures/items/BronzeIngot.png b/resources/assets/mekanism/textures/items/BronzeIngot.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeIngot.png rename to resources/assets/mekanism/textures/items/BronzeIngot.png diff --git a/resources/mods/mekanism/textures/items/BronzeLeggings.png b/resources/assets/mekanism/textures/items/BronzeLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeLeggings.png rename to resources/assets/mekanism/textures/items/BronzeLeggings.png diff --git a/resources/mods/mekanism/textures/items/BronzePaxel.png b/resources/assets/mekanism/textures/items/BronzePaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzePaxel.png rename to resources/assets/mekanism/textures/items/BronzePaxel.png diff --git a/resources/mods/mekanism/textures/items/BronzePickaxe.png b/resources/assets/mekanism/textures/items/BronzePickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzePickaxe.png rename to resources/assets/mekanism/textures/items/BronzePickaxe.png diff --git a/resources/mods/mekanism/textures/items/BronzeShovel.png b/resources/assets/mekanism/textures/items/BronzeShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeShovel.png rename to resources/assets/mekanism/textures/items/BronzeShovel.png diff --git a/resources/mods/mekanism/textures/items/BronzeSword.png b/resources/assets/mekanism/textures/items/BronzeSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/BronzeSword.png rename to resources/assets/mekanism/textures/items/BronzeSword.png diff --git a/resources/mods/mekanism/textures/items/CompressedCarbon.png b/resources/assets/mekanism/textures/items/CompressedCarbon.png similarity index 100% rename from resources/mods/mekanism/textures/items/CompressedCarbon.png rename to resources/assets/mekanism/textures/items/CompressedCarbon.png diff --git a/resources/mods/mekanism/textures/items/Configurator.png b/resources/assets/mekanism/textures/items/Configurator.png similarity index 100% rename from resources/mods/mekanism/textures/items/Configurator.png rename to resources/assets/mekanism/textures/items/Configurator.png diff --git a/resources/mods/mekanism/textures/items/ControlCircuit.png b/resources/assets/mekanism/textures/items/ControlCircuit.png similarity index 100% rename from resources/mods/mekanism/textures/items/ControlCircuit.png rename to resources/assets/mekanism/textures/items/ControlCircuit.png diff --git a/resources/mods/mekanism/textures/items/CopperClump.png b/resources/assets/mekanism/textures/items/CopperClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/CopperClump.png rename to resources/assets/mekanism/textures/items/CopperClump.png diff --git a/resources/mods/mekanism/textures/items/CopperDust.png b/resources/assets/mekanism/textures/items/CopperDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/CopperDust.png rename to resources/assets/mekanism/textures/items/CopperDust.png diff --git a/resources/mods/mekanism/textures/items/DiamondDust.png b/resources/assets/mekanism/textures/items/DiamondDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DiamondDust.png rename to resources/assets/mekanism/textures/items/DiamondDust.png diff --git a/resources/mods/mekanism/textures/items/DiamondPaxel.png b/resources/assets/mekanism/textures/items/DiamondPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/DiamondPaxel.png rename to resources/assets/mekanism/textures/items/DiamondPaxel.png diff --git a/resources/mods/mekanism/textures/items/DirtyCopperDust.png b/resources/assets/mekanism/textures/items/DirtyCopperDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyCopperDust.png rename to resources/assets/mekanism/textures/items/DirtyCopperDust.png diff --git a/resources/mods/mekanism/textures/items/DirtyGoldDust.png b/resources/assets/mekanism/textures/items/DirtyGoldDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyGoldDust.png rename to resources/assets/mekanism/textures/items/DirtyGoldDust.png diff --git a/resources/mods/mekanism/textures/items/DirtyIronDust.png b/resources/assets/mekanism/textures/items/DirtyIronDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyIronDust.png rename to resources/assets/mekanism/textures/items/DirtyIronDust.png diff --git a/resources/mods/mekanism/textures/items/DirtyObsidianDust.png b/resources/assets/mekanism/textures/items/DirtyObsidianDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyObsidianDust.png rename to resources/assets/mekanism/textures/items/DirtyObsidianDust.png diff --git a/resources/mods/mekanism/textures/items/DirtyOsmiumDust.png b/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyOsmiumDust.png rename to resources/assets/mekanism/textures/items/DirtyOsmiumDust.png diff --git a/resources/mods/mekanism/textures/items/DirtySilverDust.png b/resources/assets/mekanism/textures/items/DirtySilverDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtySilverDust.png rename to resources/assets/mekanism/textures/items/DirtySilverDust.png diff --git a/resources/mods/mekanism/textures/items/DirtyTinDust.png b/resources/assets/mekanism/textures/items/DirtyTinDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/DirtyTinDust.png rename to resources/assets/mekanism/textures/items/DirtyTinDust.png diff --git a/resources/mods/mekanism/textures/items/ElectricBow.png b/resources/assets/mekanism/textures/items/ElectricBow.png similarity index 100% rename from resources/mods/mekanism/textures/items/ElectricBow.png rename to resources/assets/mekanism/textures/items/ElectricBow.png diff --git a/resources/mods/mekanism/textures/items/ElectrolyticCore.png b/resources/assets/mekanism/textures/items/ElectrolyticCore.png similarity index 100% rename from resources/mods/mekanism/textures/items/ElectrolyticCore.png rename to resources/assets/mekanism/textures/items/ElectrolyticCore.png diff --git a/resources/mods/mekanism/textures/items/EnergyMeter.png b/resources/assets/mekanism/textures/items/EnergyMeter.png similarity index 100% rename from resources/mods/mekanism/textures/items/EnergyMeter.png rename to resources/assets/mekanism/textures/items/EnergyMeter.png diff --git a/resources/mods/mekanism/textures/items/EnergyTablet.png b/resources/assets/mekanism/textures/items/EnergyTablet.png similarity index 100% rename from resources/mods/mekanism/textures/items/EnergyTablet.png rename to resources/assets/mekanism/textures/items/EnergyTablet.png diff --git a/resources/mods/mekanism/textures/items/EnergyUpgrade.png b/resources/assets/mekanism/textures/items/EnergyUpgrade.png similarity index 100% rename from resources/mods/mekanism/textures/items/EnergyUpgrade.png rename to resources/assets/mekanism/textures/items/EnergyUpgrade.png diff --git a/resources/mods/mekanism/textures/items/EnrichedAlloy.png b/resources/assets/mekanism/textures/items/EnrichedAlloy.png similarity index 100% rename from resources/mods/mekanism/textures/items/EnrichedAlloy.png rename to resources/assets/mekanism/textures/items/EnrichedAlloy.png diff --git a/resources/mods/mekanism/textures/items/EnrichedIron.png b/resources/assets/mekanism/textures/items/EnrichedIron.png similarity index 100% rename from resources/mods/mekanism/textures/items/EnrichedIron.png rename to resources/assets/mekanism/textures/items/EnrichedIron.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneAxe.png b/resources/assets/mekanism/textures/items/GlowstoneAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneAxe.png rename to resources/assets/mekanism/textures/items/GlowstoneAxe.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneBoots.png b/resources/assets/mekanism/textures/items/GlowstoneBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneBoots.png rename to resources/assets/mekanism/textures/items/GlowstoneBoots.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneChestplate.png b/resources/assets/mekanism/textures/items/GlowstoneChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneChestplate.png rename to resources/assets/mekanism/textures/items/GlowstoneChestplate.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneHelmet.png b/resources/assets/mekanism/textures/items/GlowstoneHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneHelmet.png rename to resources/assets/mekanism/textures/items/GlowstoneHelmet.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneHoe.png b/resources/assets/mekanism/textures/items/GlowstoneHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneHoe.png rename to resources/assets/mekanism/textures/items/GlowstoneHoe.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneIngot.png b/resources/assets/mekanism/textures/items/GlowstoneIngot.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneIngot.png rename to resources/assets/mekanism/textures/items/GlowstoneIngot.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneLeggings.png b/resources/assets/mekanism/textures/items/GlowstoneLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneLeggings.png rename to resources/assets/mekanism/textures/items/GlowstoneLeggings.png diff --git a/resources/mods/mekanism/textures/items/GlowstonePaxel.png b/resources/assets/mekanism/textures/items/GlowstonePaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstonePaxel.png rename to resources/assets/mekanism/textures/items/GlowstonePaxel.png diff --git a/resources/mods/mekanism/textures/items/GlowstonePickaxe.png b/resources/assets/mekanism/textures/items/GlowstonePickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstonePickaxe.png rename to resources/assets/mekanism/textures/items/GlowstonePickaxe.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneShovel.png b/resources/assets/mekanism/textures/items/GlowstoneShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneShovel.png rename to resources/assets/mekanism/textures/items/GlowstoneShovel.png diff --git a/resources/mods/mekanism/textures/items/GlowstoneSword.png b/resources/assets/mekanism/textures/items/GlowstoneSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/GlowstoneSword.png rename to resources/assets/mekanism/textures/items/GlowstoneSword.png diff --git a/resources/mods/mekanism/textures/items/GoldClump.png b/resources/assets/mekanism/textures/items/GoldClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/GoldClump.png rename to resources/assets/mekanism/textures/items/GoldClump.png diff --git a/resources/mods/mekanism/textures/items/GoldDust.png b/resources/assets/mekanism/textures/items/GoldDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/GoldDust.png rename to resources/assets/mekanism/textures/items/GoldDust.png diff --git a/resources/mods/mekanism/textures/items/GoldPaxel.png b/resources/assets/mekanism/textures/items/GoldPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/GoldPaxel.png rename to resources/assets/mekanism/textures/items/GoldPaxel.png diff --git a/resources/mods/mekanism/textures/items/IronClump.png b/resources/assets/mekanism/textures/items/IronClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/IronClump.png rename to resources/assets/mekanism/textures/items/IronClump.png diff --git a/resources/mods/mekanism/textures/items/IronDust.png b/resources/assets/mekanism/textures/items/IronDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/IronDust.png rename to resources/assets/mekanism/textures/items/IronDust.png diff --git a/resources/mods/mekanism/textures/items/IronPaxel.png b/resources/assets/mekanism/textures/items/IronPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/IronPaxel.png rename to resources/assets/mekanism/textures/items/IronPaxel.png diff --git a/resources/mods/mekanism/textures/items/LazuliAxe.png b/resources/assets/mekanism/textures/items/LazuliAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliAxe.png rename to resources/assets/mekanism/textures/items/LazuliAxe.png diff --git a/resources/mods/mekanism/textures/items/LazuliBoots.png b/resources/assets/mekanism/textures/items/LazuliBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliBoots.png rename to resources/assets/mekanism/textures/items/LazuliBoots.png diff --git a/resources/mods/mekanism/textures/items/LazuliChestplate.png b/resources/assets/mekanism/textures/items/LazuliChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliChestplate.png rename to resources/assets/mekanism/textures/items/LazuliChestplate.png diff --git a/resources/mods/mekanism/textures/items/LazuliHelmet.png b/resources/assets/mekanism/textures/items/LazuliHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliHelmet.png rename to resources/assets/mekanism/textures/items/LazuliHelmet.png diff --git a/resources/mods/mekanism/textures/items/LazuliHoe.png b/resources/assets/mekanism/textures/items/LazuliHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliHoe.png rename to resources/assets/mekanism/textures/items/LazuliHoe.png diff --git a/resources/mods/mekanism/textures/items/LazuliLeggings.png b/resources/assets/mekanism/textures/items/LazuliLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliLeggings.png rename to resources/assets/mekanism/textures/items/LazuliLeggings.png diff --git a/resources/mods/mekanism/textures/items/LazuliPaxel.png b/resources/assets/mekanism/textures/items/LazuliPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliPaxel.png rename to resources/assets/mekanism/textures/items/LazuliPaxel.png diff --git a/resources/mods/mekanism/textures/items/LazuliPickaxe.png b/resources/assets/mekanism/textures/items/LazuliPickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliPickaxe.png rename to resources/assets/mekanism/textures/items/LazuliPickaxe.png diff --git a/resources/mods/mekanism/textures/items/LazuliShovel.png b/resources/assets/mekanism/textures/items/LazuliShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliShovel.png rename to resources/assets/mekanism/textures/items/LazuliShovel.png diff --git a/resources/mods/mekanism/textures/items/LazuliSword.png b/resources/assets/mekanism/textures/items/LazuliSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/LazuliSword.png rename to resources/assets/mekanism/textures/items/LazuliSword.png diff --git a/resources/mods/mekanism/textures/items/LiquidEnergy.png b/resources/assets/mekanism/textures/items/LiquidEnergy.png similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidEnergy.png rename to resources/assets/mekanism/textures/items/LiquidEnergy.png diff --git a/resources/mods/mekanism/textures/items/LiquidEnergy.txt b/resources/assets/mekanism/textures/items/LiquidEnergy.txt similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidEnergy.txt rename to resources/assets/mekanism/textures/items/LiquidEnergy.txt diff --git a/resources/mods/mekanism/textures/items/LiquidHydrogen.png b/resources/assets/mekanism/textures/items/LiquidHydrogen.png similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidHydrogen.png rename to resources/assets/mekanism/textures/items/LiquidHydrogen.png diff --git a/resources/mods/mekanism/textures/items/LiquidHydrogen.txt b/resources/assets/mekanism/textures/items/LiquidHydrogen.txt similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidHydrogen.txt rename to resources/assets/mekanism/textures/items/LiquidHydrogen.txt diff --git a/resources/mods/mekanism/textures/items/LiquidOxygen.png b/resources/assets/mekanism/textures/items/LiquidOxygen.png similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidOxygen.png rename to resources/assets/mekanism/textures/items/LiquidOxygen.png diff --git a/resources/mods/mekanism/textures/items/LiquidOxygen.txt b/resources/assets/mekanism/textures/items/LiquidOxygen.txt similarity index 100% rename from resources/mods/mekanism/textures/items/LiquidOxygen.txt rename to resources/assets/mekanism/textures/items/LiquidOxygen.txt diff --git a/resources/mods/mekanism/textures/items/ObsidianAxe.png b/resources/assets/mekanism/textures/items/ObsidianAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianAxe.png rename to resources/assets/mekanism/textures/items/ObsidianAxe.png diff --git a/resources/mods/mekanism/textures/items/ObsidianBoots.png b/resources/assets/mekanism/textures/items/ObsidianBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianBoots.png rename to resources/assets/mekanism/textures/items/ObsidianBoots.png diff --git a/resources/mods/mekanism/textures/items/ObsidianChestplate.png b/resources/assets/mekanism/textures/items/ObsidianChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianChestplate.png rename to resources/assets/mekanism/textures/items/ObsidianChestplate.png diff --git a/resources/mods/mekanism/textures/items/ObsidianDust.png b/resources/assets/mekanism/textures/items/ObsidianDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianDust.png rename to resources/assets/mekanism/textures/items/ObsidianDust.png diff --git a/resources/mods/mekanism/textures/items/ObsidianHelmet.png b/resources/assets/mekanism/textures/items/ObsidianHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianHelmet.png rename to resources/assets/mekanism/textures/items/ObsidianHelmet.png diff --git a/resources/mods/mekanism/textures/items/ObsidianHoe.png b/resources/assets/mekanism/textures/items/ObsidianHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianHoe.png rename to resources/assets/mekanism/textures/items/ObsidianHoe.png diff --git a/resources/mods/mekanism/textures/items/ObsidianIngot.png b/resources/assets/mekanism/textures/items/ObsidianIngot.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianIngot.png rename to resources/assets/mekanism/textures/items/ObsidianIngot.png diff --git a/resources/mods/mekanism/textures/items/ObsidianLeggings.png b/resources/assets/mekanism/textures/items/ObsidianLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianLeggings.png rename to resources/assets/mekanism/textures/items/ObsidianLeggings.png diff --git a/resources/mods/mekanism/textures/items/ObsidianPaxel.png b/resources/assets/mekanism/textures/items/ObsidianPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianPaxel.png rename to resources/assets/mekanism/textures/items/ObsidianPaxel.png diff --git a/resources/mods/mekanism/textures/items/ObsidianPickaxe.png b/resources/assets/mekanism/textures/items/ObsidianPickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianPickaxe.png rename to resources/assets/mekanism/textures/items/ObsidianPickaxe.png diff --git a/resources/mods/mekanism/textures/items/ObsidianShovel.png b/resources/assets/mekanism/textures/items/ObsidianShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianShovel.png rename to resources/assets/mekanism/textures/items/ObsidianShovel.png diff --git a/resources/mods/mekanism/textures/items/ObsidianSword.png b/resources/assets/mekanism/textures/items/ObsidianSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/ObsidianSword.png rename to resources/assets/mekanism/textures/items/ObsidianSword.png diff --git a/resources/mods/mekanism/textures/items/OsmiumAxe.png b/resources/assets/mekanism/textures/items/OsmiumAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumAxe.png rename to resources/assets/mekanism/textures/items/OsmiumAxe.png diff --git a/resources/mods/mekanism/textures/items/OsmiumBoots.png b/resources/assets/mekanism/textures/items/OsmiumBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumBoots.png rename to resources/assets/mekanism/textures/items/OsmiumBoots.png diff --git a/resources/mods/mekanism/textures/items/OsmiumChestplate.png b/resources/assets/mekanism/textures/items/OsmiumChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumChestplate.png rename to resources/assets/mekanism/textures/items/OsmiumChestplate.png diff --git a/resources/mods/mekanism/textures/items/OsmiumClump.png b/resources/assets/mekanism/textures/items/OsmiumClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumClump.png rename to resources/assets/mekanism/textures/items/OsmiumClump.png diff --git a/resources/mods/mekanism/textures/items/OsmiumDust.png b/resources/assets/mekanism/textures/items/OsmiumDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumDust.png rename to resources/assets/mekanism/textures/items/OsmiumDust.png diff --git a/resources/mods/mekanism/textures/items/OsmiumHelmet.png b/resources/assets/mekanism/textures/items/OsmiumHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumHelmet.png rename to resources/assets/mekanism/textures/items/OsmiumHelmet.png diff --git a/resources/mods/mekanism/textures/items/OsmiumHoe.png b/resources/assets/mekanism/textures/items/OsmiumHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumHoe.png rename to resources/assets/mekanism/textures/items/OsmiumHoe.png diff --git a/resources/mods/mekanism/textures/items/OsmiumIngot.png b/resources/assets/mekanism/textures/items/OsmiumIngot.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumIngot.png rename to resources/assets/mekanism/textures/items/OsmiumIngot.png diff --git a/resources/mods/mekanism/textures/items/OsmiumLeggings.png b/resources/assets/mekanism/textures/items/OsmiumLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumLeggings.png rename to resources/assets/mekanism/textures/items/OsmiumLeggings.png diff --git a/resources/mods/mekanism/textures/items/OsmiumPaxel.png b/resources/assets/mekanism/textures/items/OsmiumPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumPaxel.png rename to resources/assets/mekanism/textures/items/OsmiumPaxel.png diff --git a/resources/mods/mekanism/textures/items/OsmiumPickaxe.png b/resources/assets/mekanism/textures/items/OsmiumPickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumPickaxe.png rename to resources/assets/mekanism/textures/items/OsmiumPickaxe.png diff --git a/resources/mods/mekanism/textures/items/OsmiumShovel.png b/resources/assets/mekanism/textures/items/OsmiumShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumShovel.png rename to resources/assets/mekanism/textures/items/OsmiumShovel.png diff --git a/resources/mods/mekanism/textures/items/OsmiumSword.png b/resources/assets/mekanism/textures/items/OsmiumSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/OsmiumSword.png rename to resources/assets/mekanism/textures/items/OsmiumSword.png diff --git a/resources/mods/mekanism/textures/items/PortableTeleporter.png b/resources/assets/mekanism/textures/items/PortableTeleporter.png similarity index 100% rename from resources/mods/mekanism/textures/items/PortableTeleporter.png rename to resources/assets/mekanism/textures/items/PortableTeleporter.png diff --git a/resources/mods/mekanism/textures/items/SilverClump.png b/resources/assets/mekanism/textures/items/SilverClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/SilverClump.png rename to resources/assets/mekanism/textures/items/SilverClump.png diff --git a/resources/mods/mekanism/textures/items/SilverDust.png b/resources/assets/mekanism/textures/items/SilverDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/SilverDust.png rename to resources/assets/mekanism/textures/items/SilverDust.png diff --git a/resources/mods/mekanism/textures/items/SolarPanel.png b/resources/assets/mekanism/textures/items/SolarPanel.png similarity index 100% rename from resources/mods/mekanism/textures/items/SolarPanel.png rename to resources/assets/mekanism/textures/items/SolarPanel.png diff --git a/resources/mods/mekanism/textures/items/SpeedUpgrade.png b/resources/assets/mekanism/textures/items/SpeedUpgrade.png similarity index 100% rename from resources/mods/mekanism/textures/items/SpeedUpgrade.png rename to resources/assets/mekanism/textures/items/SpeedUpgrade.png diff --git a/resources/mods/mekanism/textures/items/SteelAxe.png b/resources/assets/mekanism/textures/items/SteelAxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelAxe.png rename to resources/assets/mekanism/textures/items/SteelAxe.png diff --git a/resources/mods/mekanism/textures/items/SteelBoots.png b/resources/assets/mekanism/textures/items/SteelBoots.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelBoots.png rename to resources/assets/mekanism/textures/items/SteelBoots.png diff --git a/resources/mods/mekanism/textures/items/SteelChestplate.png b/resources/assets/mekanism/textures/items/SteelChestplate.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelChestplate.png rename to resources/assets/mekanism/textures/items/SteelChestplate.png diff --git a/resources/mods/mekanism/textures/items/SteelDust.png b/resources/assets/mekanism/textures/items/SteelDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelDust.png rename to resources/assets/mekanism/textures/items/SteelDust.png diff --git a/resources/mods/mekanism/textures/items/SteelHelmet.png b/resources/assets/mekanism/textures/items/SteelHelmet.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelHelmet.png rename to resources/assets/mekanism/textures/items/SteelHelmet.png diff --git a/resources/mods/mekanism/textures/items/SteelHoe.png b/resources/assets/mekanism/textures/items/SteelHoe.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelHoe.png rename to resources/assets/mekanism/textures/items/SteelHoe.png diff --git a/resources/mods/mekanism/textures/items/SteelIngot.png b/resources/assets/mekanism/textures/items/SteelIngot.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelIngot.png rename to resources/assets/mekanism/textures/items/SteelIngot.png diff --git a/resources/mods/mekanism/textures/items/SteelLeggings.png b/resources/assets/mekanism/textures/items/SteelLeggings.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelLeggings.png rename to resources/assets/mekanism/textures/items/SteelLeggings.png diff --git a/resources/mods/mekanism/textures/items/SteelPaxel.png b/resources/assets/mekanism/textures/items/SteelPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelPaxel.png rename to resources/assets/mekanism/textures/items/SteelPaxel.png diff --git a/resources/mods/mekanism/textures/items/SteelPickaxe.png b/resources/assets/mekanism/textures/items/SteelPickaxe.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelPickaxe.png rename to resources/assets/mekanism/textures/items/SteelPickaxe.png diff --git a/resources/mods/mekanism/textures/items/SteelShovel.png b/resources/assets/mekanism/textures/items/SteelShovel.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelShovel.png rename to resources/assets/mekanism/textures/items/SteelShovel.png diff --git a/resources/mods/mekanism/textures/items/SteelSword.png b/resources/assets/mekanism/textures/items/SteelSword.png similarity index 100% rename from resources/mods/mekanism/textures/items/SteelSword.png rename to resources/assets/mekanism/textures/items/SteelSword.png diff --git a/resources/mods/mekanism/textures/items/StonePaxel.png b/resources/assets/mekanism/textures/items/StonePaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/StonePaxel.png rename to resources/assets/mekanism/textures/items/StonePaxel.png diff --git a/resources/mods/mekanism/textures/items/Stopwatch.png b/resources/assets/mekanism/textures/items/Stopwatch.png similarity index 100% rename from resources/mods/mekanism/textures/items/Stopwatch.png rename to resources/assets/mekanism/textures/items/Stopwatch.png diff --git a/resources/mods/mekanism/textures/items/StorageTank.png b/resources/assets/mekanism/textures/items/StorageTank.png similarity index 100% rename from resources/mods/mekanism/textures/items/StorageTank.png rename to resources/assets/mekanism/textures/items/StorageTank.png diff --git a/resources/mods/mekanism/textures/items/TeleportationCore.png b/resources/assets/mekanism/textures/items/TeleportationCore.png similarity index 100% rename from resources/mods/mekanism/textures/items/TeleportationCore.png rename to resources/assets/mekanism/textures/items/TeleportationCore.png diff --git a/resources/mods/mekanism/textures/items/TinClump.png b/resources/assets/mekanism/textures/items/TinClump.png similarity index 100% rename from resources/mods/mekanism/textures/items/TinClump.png rename to resources/assets/mekanism/textures/items/TinClump.png diff --git a/resources/mods/mekanism/textures/items/TinDust.png b/resources/assets/mekanism/textures/items/TinDust.png similarity index 100% rename from resources/mods/mekanism/textures/items/TinDust.png rename to resources/assets/mekanism/textures/items/TinDust.png diff --git a/resources/mods/mekanism/textures/items/WeatherOrb.png b/resources/assets/mekanism/textures/items/WeatherOrb.png similarity index 100% rename from resources/mods/mekanism/textures/items/WeatherOrb.png rename to resources/assets/mekanism/textures/items/WeatherOrb.png diff --git a/resources/mods/mekanism/textures/items/WoodPaxel.png b/resources/assets/mekanism/textures/items/WoodPaxel.png similarity index 100% rename from resources/mods/mekanism/textures/items/WoodPaxel.png rename to resources/assets/mekanism/textures/items/WoodPaxel.png diff --git a/resources/mods/mekanism/textures/blocks/CombinerFrontOn.txt b/resources/mods/mekanism/textures/blocks/CombinerFrontOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/CrusherFrontOn.txt b/resources/mods/mekanism/textures/blocks/CrusherFrontOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt b/resources/mods/mekanism/textures/blocks/EnergizedSmelterFrontOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserBackOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserFrontOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt b/resources/mods/mekanism/textures/blocks/MetallurgicInfuserSideOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt b/resources/mods/mekanism/textures/blocks/OsmiumCompressorFrontOn.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt b/resources/mods/mekanism/textures/blocks/PurificationChamberFrontOn.txt deleted file mode 100644 index e69de29bb..000000000