From a80f724cc23c3ec9575b1b4ed948a5a548b36ccb Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 23 Jan 2016 12:10:19 +0000 Subject: [PATCH] Apply various common one-to-one replacements More work on common too. network package now done. --- .../java/buildcraft/api/core/Position.java | 2 +- .../buildcraft/api/core/render/ICullable.java | 2 +- .../java/cofh/api/energy/IEnergyHandler.java | 2 +- .../java/cofh/api/energy/IEnergyProvider.java | 2 +- .../cofh/api/energy/TileEnergyHandler.java | 2 +- src/api/java/ic2/api/Direction.java | 2 +- src/api/java/ic2/api/energy/IEnergyNet.java | 2 +- .../java/ic2/api/energy/prefab/BasicSink.java | 2 +- .../ic2/api/energy/prefab/BasicSource.java | 2 +- .../ic2/api/energy/tile/IEnergyEmitter.java | 4 +- .../java/ic2/api/energy/tile/IHeatSource.java | 2 +- .../ic2/api/energy/tile/IKineticSource.java | 2 +- src/api/java/ic2/api/tile/IEnergyStorage.java | 2 +- .../oc/api/event/FileSystemAccessEvent.java | 8 +- .../li/cil/oc/api/event/RobotMoveEvent.java | 2 +- .../li/cil/oc/api/internal/Rotatable.java | 2 +- .../li/cil/oc/api/network/SidedComponent.java | 2 +- .../cil/oc/api/network/SidedEnvironment.java | 2 +- .../prefab/TileEntitySidedEnvironment.java | 2 +- .../waila/api/IWailaCommonAccessor.java | 2 +- .../mobius/waila/api/IWailaDataAccessor.java | 2 +- src/main/java/mekanism/api/Coord4D.java | 10 +- src/main/java/mekanism/api/Pos3D.java | 4 +- .../mekanism/client/gui/GuiElectricChest.java | 2 +- .../mekanism/client/gui/GuiRobitMain.java | 2 +- .../mekanism/client/gui/GuiRobitRepair.java | 2 +- .../client/gui/GuiSeismicVibrator.java | 2 +- .../mekanism/client/gui/GuiTeleporter.java | 2 +- .../client/gui/GuiTransporterConfig.java | 6 +- .../client/render/MekanismRenderer.java | 20 +- .../client/render/RenderPartTransmitter.java | 46 +- src/main/java/mekanism/common/CTMData.java | 5 +- .../java/mekanism/common/CommandMekanism.java | 11 +- .../common/CommonPlayerTickHandler.java | 2 +- .../mekanism/common/CommonPlayerTracker.java | 12 +- .../java/mekanism/common/CommonProxy.java | 2 +- .../common/CommonWorldTickHandler.java | 2 +- .../java/mekanism/common/CoreGuiHandler.java | 5 +- .../java/mekanism/common/EnergyNetwork.java | 10 +- .../java/mekanism/common/FluidNetwork.java | 12 +- .../mekanism/common/InventoryNetwork.java | 11 +- .../java/mekanism/common/ItemAttacher.java | 3 +- .../java/mekanism/common/LaserManager.java | 37 +- src/main/java/mekanism/common/Mekanism.java | 645 +++++++++--------- .../java/mekanism/common/MekanismBlocks.java | 36 +- .../java/mekanism/common/MekanismItems.java | 10 +- .../java/mekanism/common/PacketHandler.java | 2 +- .../java/mekanism/common/RobitAIFollow.java | 18 +- .../java/mekanism/common/RobitAIPickup.java | 14 +- src/main/java/mekanism/common/Tier.java | 29 +- .../common/base/ISideConfiguration.java | 4 +- .../mekanism/common/block/BlockBasic.java | 16 +- .../common/block/BlockEnergyCube.java | 14 +- .../mekanism/common/block/BlockGasTank.java | 12 +- .../mekanism/common/block/BlockMachine.java | 32 +- .../mekanism/common/block/BlockPlastic.java | 4 +- .../common/block/BlockPlasticFence.java | 4 +- .../common/content/boiler/BoilerManager.java | 2 +- .../boiler/SynchronizedBoilerData.java | 10 +- .../content/miner/ThreadMinerSearch.java | 14 +- .../content/tank/SynchronizedTankData.java | 2 +- .../teleportation/SharedInventory.java | 26 +- .../content/transporter/PathfinderCache.java | 10 +- .../content/transporter/StackSearcher.java | 10 +- .../content/transporter/TItemStackFilter.java | 2 +- .../content/transporter/TMaterialFilter.java | 2 +- .../content/transporter/TModIDFilter.java | 2 +- .../content/transporter/TOreDictFilter.java | 2 +- .../transporter/TransporterFilter.java | 2 +- .../transporter/TransporterManager.java | 24 +- .../transporter/TransporterPathfinder.java | 28 +- .../content/transporter/TransporterStack.java | 16 +- .../mekanism/common/entity/EntityBalloon.java | 2 +- .../mekanism/common/entity/EntityFlame.java | 4 +- .../mekanism/common/entity/EntityRobit.java | 13 +- .../common/frequency/FrequencyManager.java | 2 +- .../common/integration/WailaDataProvider.java | 2 +- .../container/ContainerRobitSmelting.java | 4 +- .../common/item/ItemAtomicDisassembler.java | 8 +- .../mekanism/common/item/ItemBalloon.java | 10 +- .../common/item/ItemBlockMachine.java | 6 +- .../common/item/ItemConfigurator.java | 6 +- .../common/item/ItemNetworkReader.java | 4 +- .../common/item/ItemPortableTeleporter.java | 2 +- .../java/mekanism/common/item/ItemRobit.java | 2 +- .../common/multiblock/MultiblockManager.java | 2 +- .../common/multiblock/UpdateProtocol.java | 22 +- .../common/network/PacketConfigSync.java | 2 +- .../network/PacketConfigurationUpdate.java | 14 +- .../network/PacketContainerEditMode.java | 5 +- .../common/network/PacketDataRequest.java | 8 +- .../common/network/PacketDigitalMinerGui.java | 72 +- .../common/network/PacketDropperUse.java | 7 +- .../common/network/PacketEditFilter.java | 8 +- .../common/network/PacketElectricChest.java | 37 +- .../network/PacketFlamethrowerData.java | 2 +- .../common/network/PacketJetpackData.java | 2 +- .../network/PacketLogisticalSorterGui.java | 49 +- .../common/network/PacketNewFilter.java | 8 +- .../network/PacketOredictionificatorGui.java | 23 +- .../network/PacketPortableTeleporter.java | 14 +- .../common/network/PacketPortalFX.java | 12 +- .../common/network/PacketRedstoneControl.java | 5 +- .../common/network/PacketRemoveUpgrade.java | 7 +- .../common/network/PacketScubaTankData.java | 2 +- .../common/network/PacketSimpleGui.java | 14 +- .../common/network/PacketTileEntity.java | 7 +- .../network/PacketTransmitterUpdate.java | 7 +- .../mekanism/common/recipe/BinRecipe.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 26 +- .../TileEntityAdvancedElectricMachine.java | 16 +- .../tile/TileEntityAmbientAccumulator.java | 20 +- .../common/tile/TileEntityBasicMachine.java | 6 +- .../mekanism/common/tile/TileEntityBin.java | 6 +- .../common/tile/TileEntityBoundingBlock.java | 51 +- .../common/tile/TileEntityChargepad.java | 6 +- .../tile/TileEntityChemicalCrystallizer.java | 18 +- .../TileEntityChemicalDissolutionChamber.java | 18 +- .../tile/TileEntityChemicalInfuser.java | 30 +- .../TileEntityChemicalInjectionChamber.java | 8 +- .../tile/TileEntityChemicalOxidizer.java | 6 +- .../common/tile/TileEntityChemicalWasher.java | 36 +- .../common/tile/TileEntityContainerBlock.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 28 +- .../common/tile/TileEntityDynamicTank.java | 4 +- .../common/tile/TileEntityDynamicValve.java | 14 +- .../common/tile/TileEntityElectricBlock.java | 36 +- .../common/tile/TileEntityElectricChest.java | 2 +- .../common/tile/TileEntityElectricPump.java | 34 +- .../tile/TileEntityElectrolyticSeparator.java | 36 +- .../common/tile/TileEntityEnergyCube.java | 12 +- .../common/tile/TileEntityEntangledBlock.java | 38 +- .../common/tile/TileEntityFactory.java | 20 +- .../tile/TileEntityFluidicPlenisher.java | 36 +- .../common/tile/TileEntityGasTank.java | 26 +- .../common/tile/TileEntityInductionPort.java | 44 +- .../mekanism/common/tile/TileEntityLaser.java | 10 +- .../common/tile/TileEntityLaserAmplifier.java | 10 +- .../tile/TileEntityLaserTractorBeam.java | 10 +- .../tile/TileEntityLogisticalSorter.java | 28 +- .../tile/TileEntityMetallurgicInfuser.java | 6 +- .../common/tile/TileEntityMultiblock.java | 4 +- .../tile/TileEntityOredictionificator.java | 2 +- .../mekanism/common/tile/TileEntityPRC.java | 28 +- .../common/tile/TileEntityPortableTank.java | 36 +- .../tile/TileEntityPurificationChamber.java | 8 +- .../tile/TileEntityRotaryCondensentrator.java | 28 +- .../tile/TileEntitySeismicVibrator.java | 6 +- .../tile/TileEntitySolarEvaporationBlock.java | 4 +- .../TileEntitySolarEvaporationController.java | 30 +- .../tile/TileEntitySolarEvaporationValve.java | 16 +- .../tile/TileEntitySolarNeutronActivator.java | 30 +- .../common/tile/TileEntityTeleporter.java | 14 +- .../tile/TileEntityThermoelectricBoiler.java | 14 +- .../tile/TileEntityThermoelectricValve.java | 14 +- .../tile/component/TileComponentConfig.java | 8 +- .../tile/component/TileComponentEjector.java | 36 +- .../tile/component/TileComponentUpgrade.java | 2 +- .../java/mekanism/common/util/CableUtils.java | 36 +- .../java/mekanism/common/util/HeatUtils.java | 4 +- .../mekanism/common/util/InventoryUtils.java | 46 +- .../mekanism/common/util/MekanismUtils.java | 184 +++-- .../java/mekanism/common/util/MinerUtils.java | 20 +- .../java/mekanism/common/util/PipeUtils.java | 14 +- .../mekanism/common/util/RecipeUtils.java | 15 +- .../common/util/TransporterUtils.java | 26 +- .../common/voice/VoiceConnection.java | 6 +- .../mekanism/common/world/GenHandler.java | 24 +- .../mekanism/common/world/WorldGenSalt.java | 20 +- .../client/gui/GuiWindGenerator.java | 2 +- .../client/render/RenderBioGenerator.java | 8 +- .../client/render/RenderWindTurbine.java | 4 +- .../generators/common/FusionReactor.java | 14 +- .../common/block/BlockGenerator.java | 14 +- .../generators/common/block/BlockReactor.java | 10 +- .../container/ContainerReactorController.java | 2 +- .../common/network/PacketGeneratorsGui.java | 2 +- .../TileEntityAdvancedSolarGenerator.java | 6 +- .../common/tile/TileEntityBioGenerator.java | 24 +- .../common/tile/TileEntityGasGenerator.java | 24 +- .../common/tile/TileEntityGenerator.java | 10 +- .../common/tile/TileEntityHeatGenerator.java | 36 +- .../common/tile/TileEntitySolarGenerator.java | 8 +- .../common/tile/TileEntityWindGenerator.java | 10 +- .../tile/reactor/TileEntityReactorBlock.java | 12 +- .../TileEntityReactorLaserFocusMatrix.java | 4 +- .../tile/reactor/TileEntityReactorPort.java | 48 +- .../turbine/TileEntityRotationalComplex.java | 4 +- .../tile/turbine/TileEntityTurbineRod.java | 14 +- 189 files changed, 1586 insertions(+), 1634 deletions(-) diff --git a/src/api/java/buildcraft/api/core/Position.java b/src/api/java/buildcraft/api/core/Position.java index 6fa0abbe7..84e0d6f1b 100755 --- a/src/api/java/buildcraft/api/core/Position.java +++ b/src/api/java/buildcraft/api/core/Position.java @@ -12,7 +12,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class Position implements ISerializable { public double x, y, z; diff --git a/src/api/java/buildcraft/api/core/render/ICullable.java b/src/api/java/buildcraft/api/core/render/ICullable.java index b800c0851..63b56e1c6 100755 --- a/src/api/java/buildcraft/api/core/render/ICullable.java +++ b/src/api/java/buildcraft/api/core/render/ICullable.java @@ -9,7 +9,7 @@ package buildcraft.api.core.render; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /* * This interface designates a block as a state machine responsible for culling diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java index 22f2dbc62..8e2493344 100644 --- a/src/api/java/cofh/api/energy/IEnergyHandler.java +++ b/src/api/java/cofh/api/energy/IEnergyHandler.java @@ -1,6 +1,6 @@ package cofh.api.energy; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects. diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java index 05287b35e..5eb709471 100644 --- a/src/api/java/cofh/api/energy/IEnergyProvider.java +++ b/src/api/java/cofh/api/energy/IEnergyProvider.java @@ -1,6 +1,6 @@ package cofh.api.energy; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects. diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/api/java/cofh/api/energy/TileEnergyHandler.java index 7cc655e92..14129845e 100644 --- a/src/api/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/api/java/cofh/api/energy/TileEnergyHandler.java @@ -2,7 +2,7 @@ package cofh.api.energy; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own. diff --git a/src/api/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java index f0c687bbf..13eb00cc7 100644 --- a/src/api/java/ic2/api/Direction.java +++ b/src/api/java/ic2/api/Direction.java @@ -3,7 +3,7 @@ package ic2.api; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Represents the 6 possible directions along the axis of a block. diff --git a/src/api/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java index 8f656e505..792cdbf6a 100644 --- a/src/api/java/ic2/api/energy/IEnergyNet.java +++ b/src/api/java/ic2/api/energy/IEnergyNet.java @@ -3,7 +3,7 @@ package ic2.api.energy; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Interface representing the methods provided by the global EnergyNet class. diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java index b1f219e1e..2b4b139b7 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSink.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSink.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java index e8d7da1f7..9a51739b3 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; diff --git a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java index 013865e31..17f56678e 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java +++ b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java @@ -2,7 +2,7 @@ package ic2.api.energy.tile; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * For internal/multi-block usage only. @@ -23,6 +23,6 @@ public interface IEnergyEmitter extends IEnergyTile { * @param direction direction the receiver is from the emitter * @return Whether energy should be emitted */ - boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction); + boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction); } diff --git a/src/api/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java index 2e5db4111..aec9b6c30 100644 --- a/src/api/java/ic2/api/energy/tile/IHeatSource.java +++ b/src/api/java/ic2/api/energy/tile/IHeatSource.java @@ -1,6 +1,6 @@ package ic2.api.energy.tile; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IHeatSource { diff --git a/src/api/java/ic2/api/energy/tile/IKineticSource.java b/src/api/java/ic2/api/energy/tile/IKineticSource.java index a65140876..56fbaea0b 100644 --- a/src/api/java/ic2/api/energy/tile/IKineticSource.java +++ b/src/api/java/ic2/api/energy/tile/IKineticSource.java @@ -1,6 +1,6 @@ package ic2.api.energy.tile; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IKineticSource { /* diff --git a/src/api/java/ic2/api/tile/IEnergyStorage.java b/src/api/java/ic2/api/tile/IEnergyStorage.java index 68f42703b..b35b0469d 100644 --- a/src/api/java/ic2/api/tile/IEnergyStorage.java +++ b/src/api/java/ic2/api/tile/IEnergyStorage.java @@ -1,6 +1,6 @@ package ic2.api.tile; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Interface implemented by the tile entity of energy storage blocks. diff --git a/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java b/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java index b80cb6891..ff9343f9d 100755 --- a/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java +++ b/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java @@ -44,10 +44,10 @@ public class FileSystemAccessEvent extends Event { */ protected FileSystemAccessEvent(String sound, TileEntity tileEntity, NBTTagCompound data) { this.sound = sound; - this.world = tileEntity.getWorldObj(); - this.x = tileEntity.xCoord + 0.5; - this.y = tileEntity.yCoord + 0.5; - this.z = tileEntity.zCoord + 0.5; + this.world = tileEntity.getWorld(); + this.x = tileEntity.getPos().getX() + 0.5; + this.y = tileEntity.getPos().getY() + 0.5; + this.z = tileEntity.getPos().getZ() + 0.5; this.tileEntity = tileEntity; this.data = data; } diff --git a/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java b/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java index 0ef239f5e..5f666b6f7 100755 --- a/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java @@ -2,7 +2,7 @@ package li.cil.oc.api.event; import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.internal.Agent; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public abstract class RobotMoveEvent extends RobotEvent { /** diff --git a/src/api/java/li/cil/oc/api/internal/Rotatable.java b/src/api/java/li/cil/oc/api/internal/Rotatable.java index 9310cfe99..89b08de8c 100755 --- a/src/api/java/li/cil/oc/api/internal/Rotatable.java +++ b/src/api/java/li/cil/oc/api/internal/Rotatable.java @@ -1,6 +1,6 @@ package li.cil.oc.api.internal; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * This interface is implemented by the computer case and robot tile entities diff --git a/src/api/java/li/cil/oc/api/network/SidedComponent.java b/src/api/java/li/cil/oc/api/network/SidedComponent.java index 68dd76866..eea95e21d 100755 --- a/src/api/java/li/cil/oc/api/network/SidedComponent.java +++ b/src/api/java/li/cil/oc/api/network/SidedComponent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.network; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * This is an extended version of {@link li.cil.oc.api.network.SimpleComponent} diff --git a/src/api/java/li/cil/oc/api/network/SidedEnvironment.java b/src/api/java/li/cil/oc/api/network/SidedEnvironment.java index 0103670cb..2e9da30c6 100755 --- a/src/api/java/li/cil/oc/api/network/SidedEnvironment.java +++ b/src/api/java/li/cil/oc/api/network/SidedEnvironment.java @@ -3,7 +3,7 @@ package li.cil.oc.api.network; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * This interface is like {@link net.minecraft.inventory.ISidedInventory} is to diff --git a/src/api/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java b/src/api/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java index 2d6c247e7..5263a92d9 100755 --- a/src/api/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java +++ b/src/api/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java @@ -5,7 +5,7 @@ import li.cil.oc.api.network.Node; import li.cil.oc.api.network.SidedEnvironment; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * TileEntities can implement the {@link li.cil.oc.api.network.SidedEnvironment} diff --git a/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java index 982f50bec..a7a7ff572 100644 --- a/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java +++ b/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.
diff --git a/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java index 7b87217ac..1f531c553 100644 --- a/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java +++ b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java @@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.
diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 191ed195e..b3eff27a4 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -177,9 +177,7 @@ public class Coord4D extends BlockPos */ public void write(ByteBuf dataStream) { - dataStream.writeInt(getX()); - dataStream.writeInt(getY()); - dataStream.writeInt(getZ()); + dataStream.writeLong(toLong()); dataStream.writeInt(dimensionId); } @@ -266,7 +264,7 @@ public class Coord4D extends BlockPos */ public static Coord4D read(ByteBuf dataStream) { - return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + return new Coord4D(BlockPos.fromLong(dataStream.readLong()), dataStream.readInt()); } /** @@ -279,10 +277,10 @@ public class Coord4D extends BlockPos return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); } /** - * A method used to find the ForgeDirection represented by the distance of the defined Coord4D. Most likely won't have many + * A method used to find the EnumFacing represented by the distance of the defined Coord4D. Most likely won't have many * applicable uses. * @param other - Coord4D to find the side difference of - * @return ForgeDirection representing the side the defined relative Coord4D is on to this + * @return EnumFacing representing the side the defined relative Coord4D is on to this */ public EnumFacing sideDifference(Coord4D other) { diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index 8196bd26b..2baf6cb9a 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -146,7 +146,7 @@ public class Pos3D extends Vec3 } /** - * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection + * Performs the same operation as translate(x, y, z), but by a set amount in a EnumFacing */ public Pos3D translate(EnumFacing direction, double amount) { @@ -154,7 +154,7 @@ public class Pos3D extends Vec3 } /** - * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection + * Performs the same operation as translate(x, y, z), but by a set amount in a EnumFacing */ public Pos3D translateExcludingSide(EnumFacing direction, double amount) { diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index d14d2aa45..3ff01b0d3 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -69,7 +69,7 @@ public class GuiElectricChest extends GuiMekanism { if(isBlock) { - mc.thePlayer.openGui(Mekanism.instance, 20, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + mc.thePlayer.openGui(Mekanism.instance, 20, mc.theWorld, tileEntity.getPos().getX(), tileEntity.getPos().getY(), tileEntity.getPos().getZ()); } else { FMLClientHandler.instance().displayGuiScreen(mc.thePlayer, new GuiPasswordModify(mc.thePlayer.getCurrentEquippedItem())); diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index cc159e4e9..2524fe124 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -107,7 +107,7 @@ public class GuiRobitMain extends GuiMekanism if(!displayNameChange) { CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName(); - fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getCommandSenderName() + "!", 29, 18, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getName() + "!", 29, 18, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index c59583b17..15cafd061 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -58,7 +58,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting itemNameField.setEnableBackgroundDrawing(false); itemNameField.setMaxStringLength(30); inventorySlots.removeCraftingFromCrafters(this); - inventorySlots.addCraftingToCrafters(this); + inventorySlots.onCraftGuiOpened(this); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 3190c0cc7..c6b3ef247 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -42,7 +42,7 @@ public class GuiSeismicVibrator extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(tileEntity.isActive ? LangUtils.localize("gui.vibrating") : LangUtils.localize("gui.idle"), 19, 26, 0x00CD00); - fontRendererObj.drawString(LangUtils.localize("gui.chunk") + ": " + (tileEntity.xCoord >> 4) + ", " + (tileEntity.zCoord >> 4), 19, 35, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.chunk") + ": " + (tileEntity.getPos().getX() >> 4) + ", " + (tileEntity.getPos().getZ() >> 4), 19, 35, 0x00CD00); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 9cff11cab..b8b5606b8 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -463,7 +463,7 @@ public class GuiTeleporter extends GuiMekanism private String getOwner() { - return tileEntity != null ? tileEntity.owner : entityPlayer.getCommandSenderName(); + return tileEntity != null ? tileEntity.owner : entityPlayer.getName(); } private byte getStatus() diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 18d33c93f..3da62d49f 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -21,7 +21,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -92,7 +92,7 @@ public class GuiTransporterConfig extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); + EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); if(color != null) { @@ -144,7 +144,7 @@ public class GuiTransporterConfig extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); + EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 281326ea1..d585f3884 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Timer; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -152,7 +152,7 @@ public class MekanismRenderer public static void loadDynamicTextures(ResourceLocationRegister register, String name, ResourceLocation[] textures, DefIcon... defaults) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { String tex = "mekanism:" + name + simpleSides[side.ordinal()]; String texOn = tex + "On"; @@ -259,12 +259,12 @@ public class MekanismRenderer maxZ = zPos; } - public void setSideRender(ForgeDirection side, boolean value) + public void setSideRender(EnumFacing side, boolean value) { renderSides[side.ordinal()] = value; } - public boolean shouldSideRender(ForgeDirection side) + public boolean shouldSideRender(EnumFacing side) { return renderSides[side.ordinal()]; } @@ -308,32 +308,32 @@ public class MekanismRenderer Tessellator.instance.startDrawingQuads(); - if(object.shouldSideRender(ForgeDirection.DOWN)) + if(object.shouldSideRender(EnumFacing.DOWN)) { renderBlocks.renderFaceYNeg(null, 0, 0, 0, object.getBlockTextureFromSide(0)); } - if(object.shouldSideRender(ForgeDirection.UP)) + if(object.shouldSideRender(EnumFacing.UP)) { renderBlocks.renderFaceYPos(null, 0, 0, 0, object.getBlockTextureFromSide(1)); } - if(object.shouldSideRender(ForgeDirection.NORTH)) + if(object.shouldSideRender(EnumFacing.NORTH)) { renderBlocks.renderFaceZNeg(null, 0, 0, 0, object.getBlockTextureFromSide(2)); } - if(object.shouldSideRender(ForgeDirection.SOUTH)) + if(object.shouldSideRender(EnumFacing.SOUTH)) { renderBlocks.renderFaceZPos(null, 0, 0, 0, object.getBlockTextureFromSide(3)); } - if(object.shouldSideRender(ForgeDirection.WEST)) + if(object.shouldSideRender(EnumFacing.WEST)) { renderBlocks.renderFaceXNeg(null, 0, 0, 0, object.getBlockTextureFromSide(4)); } - if(object.shouldSideRender(ForgeDirection.EAST)) + if(object.shouldSideRender(EnumFacing.EAST)) { renderBlocks.renderFaceXPos(null, 0, 0, 0, object.getBlockTextureFromSide(5)); } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index c7c767314..93fb0d380 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -39,7 +39,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; @@ -76,8 +76,8 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister private ModelTransporterBox modelBox = new ModelTransporterBox(); - private HashMap> cachedLiquids = new HashMap>(); - private HashMap> cachedOverlays = new HashMap>(); + private HashMap> cachedLiquids = new HashMap>(); + private HashMap> cachedOverlays = new HashMap>(); private Minecraft mc = Minecraft.getMinecraft(); @@ -147,7 +147,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.reset(); CCRenderState.startDrawing(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderSide(side, type, false); } @@ -157,7 +157,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.reset(); CCRenderState.startDrawing(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderSide(side, type, true); } @@ -223,7 +223,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister if(obj.equals(Coord4D.get(transporter.tile()))) { int mode = ((PartDiversionTransporter)transporter).modes[pos.sideHit]; - ForgeDirection side = ForgeDirection.getOrientation(pos.sideHit); + EnumFacing side = EnumFacing.getFront(pos.sideHit); pushTransporter(); @@ -258,7 +258,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.startDrawing(); GL11.glTranslated(pos.x, pos.y, pos.z); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderEnergySide(side, cable); } @@ -282,7 +282,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.startDrawing(); GL11.glTranslated(pos.x, pos.y, pos.z); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderHeatSide(side, transmitter); } @@ -342,7 +342,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister boolean gas = fluid.isGaseous(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { if(pipe.getConnectionType(side) == ConnectionType.NORMAL) { @@ -370,7 +370,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - DisplayInteger[] displayLists = getListAndRender(ForgeDirection.UNKNOWN, fluid); + DisplayInteger[] displayLists = getListAndRender(EnumFacing.null, fluid); if(displayLists != null) { @@ -391,7 +391,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - private DisplayInteger[] getListAndRender(ForgeDirection side, Fluid fluid) + private DisplayInteger[] getListAndRender(EnumFacing side, Fluid fluid) { if(side == null || fluid == null || fluid.getIcon() == null) { @@ -528,7 +528,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.startDrawing(); GL11.glTranslated(pos.x, pos.y, pos.z); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderGasSide(side, tube); } @@ -550,13 +550,13 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister CCRenderState.hasColour = true; CCRenderState.setBrightness(transmitter.world(), transmitter.x(), transmitter.y(), transmitter.z()); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { renderSide(side, transmitter, pass); } } - public void renderSide(ForgeDirection side, PartSidedPipe transmitter, int pass) + public void renderSide(EnumFacing side, PartSidedPipe transmitter, int pass) { if(pass == 1) { @@ -590,34 +590,34 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - public void renderSide(ForgeDirection side, TransmitterType type, boolean opaque) + public void renderSide(EnumFacing side, TransmitterType type, boolean opaque) { - boolean out = side == ForgeDirection.UP || side == ForgeDirection.DOWN; + boolean out = side == EnumFacing.UP || side == EnumFacing.DOWN; IIcon renderIcon = out ? type.getSideIcon(opaque) : type.getCenterIcon(opaque); renderPart(renderIcon, getItemModel(side, type), 0, 0, 0, null); } - public void renderEnergySide(ForgeDirection side, PartUniversalCable cable) + public void renderEnergySide(EnumFacing side, PartUniversalCable cable) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); renderTransparency(MekanismRenderer.energyIcon, cable.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower)); } - public void renderHeatSide(ForgeDirection side, PartHeatTransmitter cable) + public void renderHeatSide(EnumFacing side, PartHeatTransmitter cable) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); renderTransparency(MekanismRenderer.heatIcon, cable.getModelForSide(side, true), ColourTemperature.fromTemperature(cable.getTransmitter().temperature, cable.getBaseColour())); } - public void renderFluidInOut(ForgeDirection side, PartMechanicalPipe pipe) + public void renderFluidInOut(EnumFacing side, PartMechanicalPipe pipe) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); renderTransparency(pipe.getTransmitter().getTransmitterNetwork().refFluid.getIcon(), pipe.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, pipe.currentScale)); } - public void renderGasSide(ForgeDirection side, PartPressurizedTube tube) + public void renderGasSide(EnumFacing side, PartPressurizedTube tube) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); renderTransparency(tube.getTransmitter().getTransmitterNetwork().refGas.getIcon(), tube.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale)); @@ -645,10 +645,10 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - public CCModel getItemModel(ForgeDirection side, TransmitterType type) + public CCModel getItemModel(EnumFacing side, TransmitterType type) { String name = side.name().toLowerCase(); - boolean out = side == ForgeDirection.UP || side == ForgeDirection.DOWN; + boolean out = side == EnumFacing.UP || side == EnumFacing.DOWN; name += out ? "NORMAL" : "NONE"; if(type.getSize() == Size.SMALL) @@ -694,7 +694,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister MekanismRenderer.blendOn(); } - private DisplayInteger getOverlayDisplay(World world, ForgeDirection side, int mode) + private DisplayInteger getOverlayDisplay(World world, EnumFacing side, int mode) { if(cachedOverlays.containsKey(side) && cachedOverlays.get(side).containsKey(mode)) { diff --git a/src/main/java/mekanism/common/CTMData.java b/src/main/java/mekanism/common/CTMData.java index 2ced9fd9b..7d25a2a3d 100644 --- a/src/main/java/mekanism/common/CTMData.java +++ b/src/main/java/mekanism/common/CTMData.java @@ -9,9 +9,10 @@ import mekanism.client.render.block.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,7 +36,7 @@ public class CTMData acceptableBlockMetas.put(block, connectableMeta); } - public CTMData addSideOverride(ForgeDirection side, String sideTexture) + public CTMData addSideOverride(EnumFacing side, String sideTexture) { sideOverrides[side.ordinal()] = new CTMTextureData(sideTexture); diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 08b0da89f..1fccf1c36 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -12,6 +12,7 @@ import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; +import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; @@ -207,8 +208,8 @@ public class CommandMekanism extends CommandBase if (Mekanism.gameProfile != null) { - minecraftserver.getConfigurationManager().func_152605_a(Mekanism.gameProfile); - func_152373_a(sender, this, "commands.op.success", new Object[] {"[Mekanism]"}); + minecraftserver.getConfigurationManager().addOp(Mekanism.gameProfile); + notifyOperators(sender, this, "commands.op.success", new Object[] {"[Mekanism]"}); } } else if(params[0].equalsIgnoreCase("deop")) @@ -217,8 +218,8 @@ public class CommandMekanism extends CommandBase if (Mekanism.gameProfile != null) { - minecraftserver.getConfigurationManager().func_152610_b(Mekanism.gameProfile); - func_152373_a(sender, this, "commands.deop.success", new Object[] {"[Mekanism]"}); + minecraftserver.getConfigurationManager().removeOp(Mekanism.gameProfile); + notifyOperators(sender, this, "commands.deop.success", new Object[] {"[Mekanism]"}); } } else { @@ -228,7 +229,7 @@ public class CommandMekanism extends CommandBase } @Override - public int compareTo(Object obj) + public int compareTo(ICommand obj) { return 0; } diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index cd4d74bd6..be3e39137 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -169,7 +169,7 @@ public class CommonPlayerTickHandler public static boolean isFlamethrowerOn(EntityPlayer player) { - if(Mekanism.flamethrowerActive.contains(player.getCommandSenderName())) + if(Mekanism.flamethrowerActive.contains(player.getName())) { if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower) { diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index cc15776f9..0699d9e1c 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -38,17 +38,17 @@ public class CommonPlayerTracker @SubscribeEvent public void onPlayerLogoutEvent(PlayerLoggedOutEvent event) { - Mekanism.jetpackOn.remove(event.player.getCommandSenderName()); - Mekanism.gasmaskOn.remove(event.player.getCommandSenderName()); - Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName()); + Mekanism.jetpackOn.remove(event.player.getName()); + Mekanism.gasmaskOn.remove(event.player.getName()); + Mekanism.flamethrowerActive.remove(event.player.getName()); } @SubscribeEvent public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event) { - Mekanism.jetpackOn.remove(event.player.getCommandSenderName()); - Mekanism.gasmaskOn.remove(event.player.getCommandSenderName()); - Mekanism.flamethrowerActive.remove(event.player.getCommandSenderName()); + Mekanism.jetpackOn.remove(event.player.getName()); + Mekanism.gasmaskOn.remove(event.player.getName()); + Mekanism.flamethrowerActive.remove(event.player.getName()); if(!event.player.worldObj.isRemote) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 8569ae4d7..3cc343f5b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -352,7 +352,7 @@ public class CommonProxy usage.gasCentrifugeUsage = Mekanism.configuration.get("usage", "GasCentrifugeUsage", 100D).getDouble(); usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(); - Tier.loadConfig(); +//TODO: Tier.loadConfig(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index bcc6d32f9..f0956cf31 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -88,7 +88,7 @@ public class CommonWorldTickHandler return; } - int dimensionId = world.provider.dimensionId; + int dimensionId = world.provider.getDimensionId(); //Credit to E. Beef if(chunkRegenMap.containsKey(dimensionId)) diff --git a/src/main/java/mekanism/common/CoreGuiHandler.java b/src/main/java/mekanism/common/CoreGuiHandler.java index f4f9e8968..6eb0b974c 100644 --- a/src/main/java/mekanism/common/CoreGuiHandler.java +++ b/src/main/java/mekanism/common/CoreGuiHandler.java @@ -1,6 +1,7 @@ package mekanism.common; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; @@ -15,12 +16,12 @@ public class CoreGuiHandler implements IGuiHandler @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return Mekanism.proxy.getServerGui(ID, player, world, x, y, z); + return Mekanism.proxy.getServerGui(ID, player, world, new BlockPos(x, y, z)); } @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return Mekanism.proxy.getClientGui(ID, player, world, x, y, z); + return Mekanism.proxy.getClientGui(ID, player, world, new BlockPos(x, y, z)); } } diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index a8a8d149e..e51495044 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -15,8 +15,8 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; @@ -164,14 +164,14 @@ public class EnergyNetwork extends DynamicNetwork sides = acceptorDirections.get(acceptor.coord); + EnumSet sides = acceptorDirections.get(acceptor.coord); if(sides == null || sides.isEmpty()) { continue; } - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { double prev = sent; @@ -200,7 +200,7 @@ public class EnergyNetwork extends DynamicNetwork sides = acceptorDirections.get(coord); + EnumSet sides = acceptorDirections.get(coord); if(sides == null || sides.isEmpty()) { @@ -212,7 +212,7 @@ public class EnergyNetwork extends DynamicNetwork for(IFluidHandler acceptor : availableAcceptors) { int currentSending = sending; - EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); + EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); if(remaining > 0) { @@ -152,13 +152,13 @@ public class FluidNetwork extends DynamicNetwork remaining--; } - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { int prev = fluidSent; if(acceptor != null && fluidToSend != null) { - fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.getFluidID(), currentSending), doTransfer); + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.getFluid(), currentSending), doTransfer); } if(fluidSent > prev) @@ -287,7 +287,7 @@ public class FluidNetwork extends DynamicNetwork for(Coord4D coord : possibleAcceptors.keySet()) { - EnumSet sides = acceptorDirections.get(coord); + EnumSet sides = acceptorDirections.get(coord); TileEntity tile = coord.getTileEntity(getWorld()); if(sides == null || sides.isEmpty()) @@ -297,7 +297,7 @@ public class FluidNetwork extends DynamicNetwork IFluidHandler acceptor = (IFluidHandler)tile; - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { if(acceptor != null && acceptor.canFill(side, fluidToSend.getFluid())) { diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index fb67007e0..aab3e429f 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; import java.util.Set; import mekanism.api.Coord4D; @@ -17,7 +16,7 @@ import mekanism.common.content.transporter.TransporterManager; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.FMLCommonHandler; public class InventoryNetwork extends DynamicNetwork @@ -49,7 +48,7 @@ public class InventoryNetwork extends DynamicNetwork sides = acceptorDirections.get(coord); + EnumSet sides = acceptorDirections.get(coord); IInventory acceptor = (IInventory)coord.getTileEntity(getWorld()); if(sides == null || sides.isEmpty()) @@ -59,7 +58,7 @@ public class InventoryNetwork extends DynamicNetwork sides = EnumSet.noneOf(ForgeDirection.class); + public EnumSet sides = EnumSet.noneOf(EnumFacing.class); - public AcceptorData(Coord4D coord, ItemStack stack, ForgeDirection side) + public AcceptorData(Coord4D coord, ItemStack stack, EnumFacing side) { location = coord; rejected = stack; diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java index 651348d0f..ea77255a9 100644 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ b/src/main/java/mekanism/common/ItemAttacher.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.ArrayList; import java.util.List; -import mekanism.common.multipart.TransmitterType; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -15,10 +14,12 @@ public final class ItemAttacher { attachable.add(new ItemStack(Blocks.lever)); +/*TODO put this back for(TransmitterType type : TransmitterType.values()) { attachable.add(new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal())); } +*/ } public static boolean canAttach(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index b310b3e65..8c40dc3f1 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -7,6 +7,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,33 +18,33 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.event.world.BlockEvent; public class LaserManager { - public static LaserInfo fireLaser(TileEntity from, ForgeDirection direction, double energy, World world) + public static LaserInfo fireLaser(TileEntity from, EnumFacing direction, double energy, World world) { return fireLaser(new Pos3D(from).centre().translate(direction, 0.501), direction, energy, world); } - public static LaserInfo fireLaser(Pos3D from, ForgeDirection direction, double energy, World world) + public static LaserInfo fireLaser(Pos3D from, EnumFacing direction, double energy, World world) { Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); - MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); + MovingObjectPosition mop = world.rayTraceBlocks(from, to); if(mop != null) { to = new Pos3D(mop.hitVec); - Coord4D toCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ); + Coord4D toCoord = new Coord4D(mop.getBlockPos()); TileEntity tile = toCoord.getTileEntity(world); if(tile instanceof ILaserReceptor) { if(!(((ILaserReceptor)tile).canLasersDig())) { - ((ILaserReceptor)tile).receiveLaserEnergy(energy, ForgeDirection.getOrientation(mop.sideHit)); + ((ILaserReceptor)tile).receiveLaserEnergy(energy, mop.sideHit); } } } @@ -79,11 +80,11 @@ public class LaserManager } List ret = null; - Block blockHit = blockCoord.getBlock(world); - int meta = blockCoord.getBlockState(world); + IBlockState state = blockCoord.getBlockState(world); + Block blockHit = state.getBlock(); - EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord).get(); - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, world, blockHit, meta, dummy); + EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.getX(), blockCoord.getY(), blockCoord.getZ()).get(); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockCoord, state, dummy); MinecraftForge.EVENT_BUS.post(event); if(event.isCanceled()) @@ -93,28 +94,28 @@ public class LaserManager if(dropAtBlock) { - blockHit.dropBlockAsItem(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockCoord.getBlockState(world), 0); + blockHit.dropBlockAsItem(world, blockCoord, state, 0); } else { - ret = blockHit.getDrops(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockCoord.getBlockState(world), 0); + ret = blockHit.getDrops(world, blockCoord, state, 0); } - blockHit.breakBlock(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockHit, blockCoord.getBlockState(world)); - world.setBlockToAir(blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord); - world.playAuxSFX(2001, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, Block.getIdFromBlock(blockHit)); + blockHit.breakBlock(world, blockCoord, state); + world.setBlockToAir(blockCoord); + world.playAuxSFX(2001, blockCoord, Block.getIdFromBlock(blockHit)); return ret; } - public static MovingObjectPosition fireLaserClient(TileEntity from, ForgeDirection direction, double energy, World world) + public static MovingObjectPosition fireLaserClient(TileEntity from, EnumFacing direction, double energy, World world) { return fireLaserClient(new Pos3D(from).centre().translate(direction, 0.501), direction, energy, world); } - public static MovingObjectPosition fireLaserClient(Pos3D from, ForgeDirection direction, double energy, World world) + public static MovingObjectPosition fireLaserClient(Pos3D from, EnumFacing direction, double energy, World world) { Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); - MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); + MovingObjectPosition mop = world.rayTraceBlocks(from, to); if(mop != null) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 8193bf689..fe3e028f7 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -58,7 +58,6 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.OreDictManager; import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.multipart.MultipartMekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; @@ -91,6 +90,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; @@ -111,7 +111,6 @@ import org.apache.logging.log4j.Logger; import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; -import codechicken.multipart.handler.MultipartProxy; import com.mojang.authlib.GameProfile; @@ -222,491 +221,491 @@ public class Mekanism public void addRecipes() { //Storage Recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 3), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 3), "***", "***", "***", Character.valueOf('*'), new ItemStack(Items.coal, 1, 1) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.coal, 9, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.coal, 9, 1), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 3) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), "***", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 2) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 4), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 4), "***", "***", "***", Character.valueOf('*'), "ingotRefinedGlowstone" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 3), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 3), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 4) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), "XXX", "XXX", "XXX", Character.valueOf('X'), "ingotOsmium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 1), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 0) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), "***", "***", "***", Character.valueOf('*'), "ingotBronze" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 2), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 1) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 5), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 5), "***", "***", "***", Character.valueOf('*'), "ingotSteel" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 4), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 4), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 5) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 12), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 12), "***", "***", "***", Character.valueOf('*'), "ingotCopper" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 5), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 5), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 12) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 13), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 13), "***", "***", "***", Character.valueOf('*'), "ingotTin" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 6), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 6), "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 13) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.SaltBlock), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.SaltBlock), "**", "**", Character.valueOf('*'), MekanismItems.Salt - })); + )); //Base Recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1), "***", "XXX", "***", Character.valueOf('*'), Blocks.obsidian, Character.valueOf('X'), Blocks.tnt - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ElectricBow.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ElectricBow.getUnchargedItem(), " AB", "E B", " AB", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('B'), Items.string, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.EnergyTablet.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.EnergyTablet.getUnchargedItem(), "RCR", "ECE", "RCR", Character.valueOf('C'), "ingotGold", Character.valueOf('R'), "dustRedstone", Character.valueOf('E'), MekanismItems.EnrichedAlloy - })); - MachineType.ENRICHMENT_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 0), new Object[] { + )); + MachineType.ENRICHMENT_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 0), "RCR", "iIi", "RCR", Character.valueOf('i'), "ingotIron", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), "alloyBasic", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.OSMIUM_COMPRESSOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 1), new Object[] { + )); + MachineType.OSMIUM_COMPRESSOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 1), "ECE", "BIB", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('B'), Items.bucket, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.COMBINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 2), new Object[] { + )); + MachineType.COMBINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 2), "RCR", "SIS", "RCR", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.CRUSHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 3), new Object[] { + )); + MachineType.CRUSHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 3), "RCR", "LIL", "RCR", Character.valueOf('R'), "dustRedstone", Character.valueOf('L'), Items.lava_bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[]{ + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustOsmium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.EnergyUpgrade), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.EnergyUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustGold" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustTin" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasUpgrade), " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustIron" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), "PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron" - })); - MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[] { + )); + MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TeleportationCore), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TeleportationCore), "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('G'), "ingotGold", Character.valueOf('D'), Items.diamond - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.PortableTeleporter.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.PortableTeleporter.getUnchargedItem(), " E ", "CTC", " E ", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), MekanismItems.TeleportationCore - })); - MachineType.TELEPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 11), new Object[] { + )); + MachineType.TELEPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 11), "COC", "OTO", "COC", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('O'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore - })); - MachineType.PURIFICATION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 9), new Object[] { + )); + MachineType.PURIFICATION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 9), "ECE", "ORO", "ECE", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingotOsmium", Character.valueOf('R'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Configurator.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Configurator.getUnchargedItem(), " L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Items.stick - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7), "OOO", "OGO", "OOO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('G'), "ingotRefinedGlowstone" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), " S ", "SPS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingotOsmium" - })); - MachineType.ENERGIZED_SMELTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 10), new Object[] { + )); + MachineType.ENERGIZED_SMELTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 10), "RCR", "GIG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), "alloyBasic", Character.valueOf('G'), "blockGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), new Object[] { + )); + MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" - })); - MachineType.ELECTRIC_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), new Object[] { + )); + MachineType.ELECTRIC_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), "SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9), " I ", "IBI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('B'), Items.bucket - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 10), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 10), " I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), "blockGlass" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 2, 11), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 2, 11), " I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - MachineType.CHARGEPAD.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 14), new Object[] { + )); + MachineType.CHARGEPAD.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 14), "PPP", "SES", Character.valueOf('P'), Blocks.stone_pressure_plate, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Robit.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Robit.getUnchargedItem(), " S ", "ECE", "OIO", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.NetworkReader.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.NetworkReader.getUnchargedItem(), " G ", "AEA", " I ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('I'), "ingotSteel" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.WalkieTalkie), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.WalkieTalkie), " O", "SCS", " S ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - MachineType.LOGISTICAL_SORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15), new Object[] { + )); + MachineType.LOGISTICAL_SORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15), "IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 6), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 6), "SSS", "SCS", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - MachineType.DIGITAL_MINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4), new Object[] { + )); + MachineType.DIGITAL_MINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4), "ACA", "SES", "TIT", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('S'), new ItemStack(MekanismBlocks.MachineBlock, 1, 15), Character.valueOf('E'), MekanismItems.Robit.getUnchargedItem(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore - })); - MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { + )); + MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), "C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasMask), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasMask), " S ", "GCG", "S S", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ScubaTank.getEmptyItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ScubaTank.getEmptyItem(), " C ", "ATA", "SSS", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel" - })); - MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), new Object[] { + )); + MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy - })); - MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), new Object[] { + )); + MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy - })); - MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), new Object[] { + )); + MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), "RCR", "GPG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9) - })); - MachineType.ELECTROLYTIC_SEPARATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 4), new Object[] { + )); + MachineType.ELECTROLYTIC_SEPARATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 4), "IRI", "ECE", "IRI", Character.valueOf('I'), "ingotIron", Character.valueOf('R'), "dustRedstone", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismItems.ElectrolyticCore - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ElectrolyticCore), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ElectrolyticCore), "EPE", "IEG", "EPE", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "dustOsmium", Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.CardboardBox), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.CardboardBox), "SS", "SS", Character.valueOf('S'), "pulpWood" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.paper, 6), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.paper, 6), "SSS", Character.valueOf('S'), MekanismItems.Sawdust - })); - MachineType.PRECISION_SAWMILL.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 5), new Object[] { + )); + MachineType.PRECISION_SAWMILL.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 5), "ICI", "ASA", "ICI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 14), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 14), "CGC", "IBI", "CGC", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('B'), "blockCopper" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 15), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 15), "ITI", "CBC", "ITI", Character.valueOf('I'), "ingotCopper", Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 11), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), "CCC", "CTC", "CCC", Character.valueOf('C'), "ingotCopper", Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) - })); - MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), new Object[] { + )); + MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy - })); - MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), new Object[] { + )); + MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] { + )); + MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), "C C", "A A", "T T", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), "D D", "BSB", " J ", Character.valueOf('D'), "dustDiamond", Character.valueOf('B'), "ingotBronze", Character.valueOf('S'), "blockSteel", Character.valueOf('J'), MekanismItems.Jetpack.getEmptyItem() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterCard), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterCard), " A ", "ACA", " A ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(), "SLS", "STS", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() - })); - MachineType.SEISMIC_VIBRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 9), new Object[] { + )); + MachineType.SEISMIC_VIBRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 9), "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), new Object[] { + )); + MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) - })); - MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), new Object[] { + )); + MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), new Object[] { + )); + MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.rail, 24), "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), " O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass" - })); - MachineType.SOLAR_NEUTRON_ACTIVATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 1), new Object[] { + )); + MachineType.SOLAR_NEUTRON_ACTIVATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 1), "APA", "CSC", "BBB", Character.valueOf('A'), "alloyElite", Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 1), " S ", "SES", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 2), " I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 1), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 0), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 0), "RCR", "iWi", "RCR", Character.valueOf('R'), "alloyBasic", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('i'), "ingotIron", Character.valueOf('W'), "plankWood" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 1), "ECE", "oWo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('o'), "ingotOsmium", Character.valueOf('W'), "plankWood" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 2), "RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood" - })); - MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3), new Object[] { + )); + MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3), "SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.chest - })); - MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13), new Object[] { + )); + MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13), "RE ", "RCD", "RE ", Character.valueOf('R'), "alloyElite", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('D'), "gemDiamond" - })); - MachineType.LASER_AMPLIFIER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 14), new Object[] { + )); + MachineType.LASER_AMPLIFIER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 14), "SSS", "SED", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('D'), "gemDiamond" - })); - MachineType.LASER_TRACTOR_BEAM.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 15), new Object[] { + )); + MachineType.LASER_TRACTOR_BEAM.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 15), "C", "F", Character.valueOf('C'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('F'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 14) - })); + )); //Energy Cube recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), "RTR", "iIi", "RTR", Character.valueOf('R'), "alloyBasic", Character.valueOf('i'), "ingotIron", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), "ETE", "oBo", "ETE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('o'), "ingotOsmium", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), "RTR", "gAg", "RTR", Character.valueOf('R'), "alloyElite", Character.valueOf('g'), "ingotGold", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('A'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) - })); + )); //Induction Cell recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), "LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ADVANCED), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ADVANCED), "TCT", "CEC", "TCT", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), Character.valueOf('C'), MekanismUtils.getInductionCell(InductionCellTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ELITE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ELITE), "TCT", "CEC", "TCT", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), Character.valueOf('C'), MekanismUtils.getInductionCell(InductionCellTier.ADVANCED) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ULTIMATE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.ULTIMATE), "TCT", "CEC", "TCT", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), Character.valueOf('C'), MekanismUtils.getInductionCell(InductionCellTier.ELITE) - })); + )); //Induction Provider recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.BASIC), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.BASIC), "LCL", "CEC", "LCL", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ADVANCED), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ADVANCED), "CPC", "PEP", "CPC", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), Character.valueOf('P'), MekanismUtils.getInductionProvider(InductionProviderTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ELITE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ELITE), "CPC", "PEP", "CPC", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), Character.valueOf('P'), MekanismUtils.getInductionProvider(InductionProviderTier.ADVANCED) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ULTIMATE), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ULTIMATE), "CPC", "PEP", "CPC", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), Character.valueOf('P'), MekanismUtils.getInductionProvider(InductionProviderTier.ELITE) - })); + )); //Circuit recipes - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 1), "ECE", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 0), Character.valueOf('E'), "alloyAdvanced" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 2), "RCR", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 1), Character.valueOf('R'), "alloyElite" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 3), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 3), "ACA", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 2), Character.valueOf('A'), "alloyUltimate" - })); + )); //Factory recipes for(RecipeType type : RecipeType.values()) { - MachineType.BASIC_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.BASIC, type), new Object[] { + MachineType.BASIC_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.BASIC, type), "RCR", "iOi", "RCR", Character.valueOf('R'), "alloyBasic", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('i'), "ingotIron", Character.valueOf('O'), type.getStack() - })); - MachineType.ADVANCED_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ADVANCED, type), new Object[] { + )); + MachineType.ADVANCED_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ADVANCED, type), "ECE", "oOo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('o'), "ingotOsmium", Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.BASIC, type) - })); - MachineType.ELITE_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ELITE, type), new Object[] { + )); + MachineType.ELITE_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ELITE, type), "RCR", "gOg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.ADVANCED, type) - })); + )); } //Add the bin recipe system to the CraftingManager CraftingManager.getInstance().getRecipeList().add(new BinRecipe()); //Transmitters - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0), "SRS", Character.valueOf('S'), "ingotSteel", Character.valueOf('R'), "dustRedstone" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 1), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 1), "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 0) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 2), "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 1) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 3), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 3), "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 2) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 4), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 4), "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.bucket - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 5), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 5), "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 4) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 6), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 6), "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 5) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 7), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 7), "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 6) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 8), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 8), "SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 9), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 9), "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 8) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 10), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 10), "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 9) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 11), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 11), "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 10) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 12), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 12), "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 13), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 13), "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 12) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 14), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 14), "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 13) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 15), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 15), "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 14) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 16), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 16), "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 17), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 17), "RRR", "SBS", "RRR", Character.valueOf('R'), "dustRedstone", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars - })); + )); //Plastic stuff - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1), "PP", "PP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 2), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 2), "PPP", "P P", "PPP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 3), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 3), "R", "R", Character.valueOf('R'), new ItemStack(MekanismItems.Polyethene, 1, 1) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15), "SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15), "PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, 15), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, 15), "BSB", "BSB", Character.valueOf('B'), new ItemStack(MekanismBlocks.PlasticBlock, 1, 15), Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 3) - })); + )); for(int i = 0; i < EnumColor.DYES.length-1; i++) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), "PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust - })); + )); } for(int i = 0; i < EnumColor.DYES.length; i++) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.Balloon, 2, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.Balloon, 2, i), Items.leather, Items.string, "dye" + EnumColor.DYES[i].dyeName - })); + )); for(int j = 0; j < EnumColor.DYES.length; j++) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.Balloon, 1, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.Balloon, 1, i), new ItemStack(MekanismItems.Balloon, 1, j), "dye" + EnumColor.DYES[i].dyeName - })); + )); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.SlickPlasticBlock, 4, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.SlickPlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 4, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.GlowPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName - })); + )); } - CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dustOsmium" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), new Object[] { + )); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), "SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i) - })); + )); } //Furnace Recipes - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); + FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); @@ -793,12 +792,27 @@ public class Mekanism RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.trapdoor), new ItemStack(Blocks.planks, 3)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.boat), new ItemStack(Blocks.planks, 5)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.bed), new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.wool, 3), 1); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.wooden_door), new ItemStack(Blocks.planks, 6)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.oak_door), new ItemStack(Blocks.planks, 6, 0)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.spruce_door), new ItemStack(Blocks.planks, 6, 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.birch_door), new ItemStack(Blocks.planks, 6, 2)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.jungle_door), new ItemStack(Blocks.planks, 6, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.acacia_door), new ItemStack(Blocks.planks, 6, 4)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.dark_oak_door), new ItemStack(Blocks.planks, 6, 5)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jukebox), new ItemStack(Blocks.planks, 8), new ItemStack(Items.diamond), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.bookshelf), new ItemStack(Blocks.planks, 6), new ItemStack(Items.book, 3), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.wooden_pressure_plate), new ItemStack(Blocks.planks, 2)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.fence), new ItemStack(Items.stick, 3)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.fence_gate), new ItemStack(Blocks.planks, 2), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence), new ItemStack(Items.stick, 3)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence_gate), new ItemStack(Blocks.planks, 2, 0), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence_gate), new ItemStack(Blocks.planks, 2, 1), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence_gate), new ItemStack(Blocks.planks, 2, 2), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence_gate), new ItemStack(Blocks.planks, 2, 3), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence_gate), new ItemStack(Blocks.planks, 2, 4), new ItemStack(Items.stick, 4), 1); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence_gate), new ItemStack(Blocks.planks, 2, 5), new ItemStack(Items.stick, 4), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.noteblock), new ItemStack(Blocks.planks, 8), new ItemStack(Items.redstone), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.redstone_torch), new ItemStack(Items.stick), new ItemStack(Items.redstone), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ItemStack(Blocks.planks, 4)); @@ -1079,7 +1093,7 @@ public class Mekanism //Load cached furnace recipes Recipe.ENERGIZED_SMELTER.get().clear(); - for(Object obj : FurnaceRecipes.smelting().getSmeltingList().entrySet()) + for(Object obj : FurnaceRecipes.instance().getSmeltingList().entrySet()) { Map.Entry entry = (Map.Entry)obj; SmeltingRecipe recipe = new SmeltingRecipe(new ItemStackInput(entry.getKey()), new ItemStackOutput(entry.getValue())); @@ -1154,7 +1168,7 @@ public class Mekanism GasRegistry.register(new Gas("steam")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); - FluidRegistry.registerFluid(new Fluid("heavyWater")); + FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:heavy_water"), new ResourceLocation("mekanism:heavy_water"))); for(Resource resource : Resource.values()) { @@ -1224,9 +1238,9 @@ public class Mekanism { for(BiomeGenBase biome : WorldChunkManager.allowedBiomes) { - if(biome.getSpawnableList(EnumCreatureType.monster) != null && biome.getSpawnableList(EnumCreatureType.monster).size() > 0) + if(biome.getSpawnableList(EnumCreatureType.MONSTER) != null && biome.getSpawnableList(EnumCreatureType.MONSTER).size() > 0) { - EntityRegistry.addSpawn(EntityBabySkeleton.class, 40, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] {biome}); + EntityRegistry.addSpawn(EntityBabySkeleton.class, 40, 1, 3, EnumCreatureType.MONSTER, biome); } } } @@ -1239,7 +1253,7 @@ public class Mekanism registerOreDict(); //Set up multiparts - new MultipartMekanism(); +//TODO reinstate Multipart support with MCMultipart new MultipartMekanism(); //Integrate with Waila FMLInterModComms.sendMessage("Waila", "register", "mekanism.common.integration.WailaDataProvider.register"); @@ -1352,9 +1366,14 @@ public class Mekanism MekanismAPI.addBoxBlacklist(Blocks.end_portal, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.end_portal_frame, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.bed, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.wooden_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.oak_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.spruce_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.birch_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.jungle_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.acacia_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.dark_oak_door, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.iron_door, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(MultipartProxy.block(), OreDictionary.WILDCARD_VALUE); +// MekanismAPI.addBoxBlacklist(MultipartProxy.block(), OreDictionary.WILDCARD_VALUE); BoxBlacklistParser.load(); } @@ -1364,7 +1383,7 @@ public class Mekanism { if(event.getChunk() != null && !event.world.isRemote) { - Map copy = (Map)((HashMap)event.getChunk().chunkTileEntityMap).clone(); + Map copy = (Map)((HashMap)event.getChunk().getTileEntityMap()).clone(); for(Iterator iter = copy.values().iterator(); iter.hasNext();) { @@ -1414,7 +1433,7 @@ public class Mekanism } ChunkCoordIntPair coordPair = event.getChunk().getChunkCoordIntPair(); - worldTickHandler.addRegenChunk(event.world.provider.dimensionId, coordPair); + worldTickHandler.addRegenChunk(event.world.provider.getDimensionId(), coordPair); } } } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 4c49652da..63b35dd88 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -32,24 +32,24 @@ import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3; @ObjectHolder("Mekanism") public class MekanismBlocks { - public static final Block BasicBlock = new BlockBasic(BASIC_BLOCK_1).setBlockName("BasicBlock"); - public static final Block BasicBlock2 = new BlockBasic(BASIC_BLOCK_2).setBlockName("BasicBlock2"); - public static final Block MachineBlock = new BlockMachine(MACHINE_BLOCK_1).setBlockName("MachineBlock"); - public static final Block MachineBlock2 = new BlockMachine(MACHINE_BLOCK_2).setBlockName("MachineBlock2"); - public static final Block MachineBlock3 = new BlockMachine(MACHINE_BLOCK_3).setBlockName("MachineBlock3"); - public static final Block OreBlock = new BlockOre().setBlockName("OreBlock"); - public static final Block ObsidianTNT = new BlockObsidianTNT().setBlockName("ObsidianTNT").setCreativeTab(Mekanism.tabMekanism); - public static final Block EnergyCube = new BlockEnergyCube().setBlockName("EnergyCube"); - public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock"); - public static final Block GasTank = new BlockGasTank().setBlockName("GasTank"); - public static final Block CardboardBox = new BlockCardboardBox().setBlockName("CardboardBox"); - public static final Block PlasticBlock = new BlockPlastic().setBlockName("PlasticBlock"); - public static final Block SlickPlasticBlock = new BlockPlastic().setBlockName("SlickPlasticBlock"); - public static final Block GlowPlasticBlock = new BlockPlastic().setBlockName("GlowPlasticBlock"); - public static final Block ReinforcedPlasticBlock = new BlockPlastic().setBlockName("ReinforcedPlasticBlock"); - public static final Block RoadPlasticBlock = new BlockPlastic().setBlockName("RoadPlasticBlock"); - public static final Block PlasticFence = new BlockPlasticFence().setBlockName("PlasticFence"); - public static final Block SaltBlock = new BlockSalt().setBlockName("SaltBlock"); + public static final Block BasicBlock = new BlockBasic(BASIC_BLOCK_1).setUnlocalizedName("BasicBlock"); + public static final Block BasicBlock2 = new BlockBasic(BASIC_BLOCK_2).setUnlocalizedName("BasicBlock2"); + public static final Block MachineBlock = new BlockMachine(MACHINE_BLOCK_1).setUnlocalizedName("MachineBlock"); + public static final Block MachineBlock2 = new BlockMachine(MACHINE_BLOCK_2).setUnlocalizedName("MachineBlock2"); + public static final Block MachineBlock3 = new BlockMachine(MACHINE_BLOCK_3).setUnlocalizedName("MachineBlock3"); + public static final Block OreBlock = new BlockOre().setUnlocalizedName("OreBlock"); + public static final Block ObsidianTNT = new BlockObsidianTNT().setUnlocalizedName("ObsidianTNT").setCreativeTab(Mekanism.tabMekanism); + public static final Block EnergyCube = new BlockEnergyCube().setUnlocalizedName("EnergyCube"); + public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setUnlocalizedName("BoundingBlock"); + public static final Block GasTank = new BlockGasTank().setUnlocalizedName("GasTank"); + public static final Block CardboardBox = new BlockCardboardBox().setUnlocalizedName("CardboardBox"); + public static final Block PlasticBlock = new BlockPlastic().setUnlocalizedName("PlasticBlock"); + public static final Block SlickPlasticBlock = new BlockPlastic().setUnlocalizedName("SlickPlasticBlock"); + public static final Block GlowPlasticBlock = new BlockPlastic().setUnlocalizedName("GlowPlasticBlock"); + public static final Block ReinforcedPlasticBlock = new BlockPlastic().setUnlocalizedName("ReinforcedPlasticBlock"); + public static final Block RoadPlasticBlock = new BlockPlastic().setUnlocalizedName("RoadPlasticBlock"); + public static final Block PlasticFence = new BlockPlasticFence().setUnlocalizedName("PlasticFence"); + public static final Block SaltBlock = new BlockSalt().setUnlocalizedName("SaltBlock"); /** * Adds and registers all blocks. diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 389d2b738..79ba2b3f5 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -31,8 +31,6 @@ import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemShard; import mekanism.common.item.ItemUpgrade; import mekanism.common.item.ItemWalkieTalkie; -import mekanism.common.multipart.ItemGlowPanel; -import mekanism.common.multipart.ItemPartTransmitter; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -80,8 +78,8 @@ public class MekanismItems public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper"); public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); - public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); - public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); +// public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); +// public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask"); public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); @@ -106,7 +104,7 @@ public class MekanismItems */ public static void register() { - GameRegistry.registerItem(PartTransmitter, "PartTransmitter"); +// GameRegistry.registerItem(PartTransmitter, "PartTransmitter"); GameRegistry.registerItem(ElectricBow, "ElectricBow"); GameRegistry.registerItem(Dust, "Dust"); GameRegistry.registerItem(Ingot, "Ingot"); @@ -154,7 +152,7 @@ public class MekanismItems GameRegistry.registerItem(Substrate, "Substrate"); GameRegistry.registerItem(Polyethene, "Polyethene"); GameRegistry.registerItem(BioFuel, "BioFuel"); - GameRegistry.registerItem(GlowPanel, "GlowPanel"); +// GameRegistry.registerItem(GlowPanel, "GlowPanel"); GameRegistry.registerItem(Flamethrower, "Flamethrower"); GameRegistry.registerItem(GaugeDropper, "GaugeDropper"); GameRegistry.registerItem(FactoryInstaller, "FactoryInstaller"); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index e56467553..22b5b57be 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -341,7 +341,7 @@ public class PacketHandler { for(EntityPlayerMP player : (List)server.getConfigurationManager().playerEntityList) { - if(player.dimension == dimId && cuboid.isVecInside(Vec3.createVectorHelper(player.posX, player.posY, player.posZ))) + if(player.dimension == dimId && cuboid.isVecInside(new Vec3(player.posX, player.posY, player.posZ))) { sendTo(message, player); } diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index dd43c42d0..5e3fece8e 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -4,7 +4,8 @@ import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -23,7 +24,7 @@ public class RobitAIFollow extends EntityAIBase private float moveSpeed; /** The robit's pathfinder. */ - private PathNavigate thePathfinder; + private PathNavigateGround thePathfinder; /** The ticker for updates. */ private int ticker; @@ -57,7 +58,7 @@ public class RobitAIFollow extends EntityAIBase { return false; } - else if(theRobit.worldObj.provider.dimensionId != player.worldObj.provider.dimensionId) + else if(theRobit.worldObj.provider.getDimensionId() != player.worldObj.provider.getDimensionId()) { return false; } @@ -85,7 +86,7 @@ public class RobitAIFollow extends EntityAIBase @Override public boolean continueExecuting() { - return !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.worldObj.provider.dimensionId == theRobit.worldObj.provider.dimensionId; + return !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.worldObj.provider.getDimensionId() == theRobit.worldObj.provider.getDimensionId(); } @Override @@ -120,16 +121,17 @@ public class RobitAIFollow extends EntityAIBase if(theRobit.getDistanceSqToEntity(theOwner) >= 144.0D) { int x = MathHelper.floor_double(theOwner.posX) - 2; - int y = MathHelper.floor_double(theOwner.posZ) - 2; - int z = MathHelper.floor_double(theOwner.boundingBox.minY); + int y = MathHelper.floor_double(theOwner.getEntityBoundingBox().minY); + int z = MathHelper.floor_double(theOwner.posZ) - 2; for(int l = 0; l <= 4; ++l) { for(int i1 = 0; i1 <= 4; ++i1) { - if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && theWorld.doesBlockHaveSolidTopSurface(theWorld, x + l, z - 1, y + i1) && !theWorld.getBlock(x + l, z, y + i1).isNormalCube() && !theWorld.getBlock(x + l, z + 1, y + i1).isNormalCube()) + BlockPos pos = new BlockPos(x+l, y, z+i1); + if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && World.doesBlockHaveSolidTopSurface(theWorld, pos.down()) && !theWorld.getBlockState(pos).getBlock().isNormalCube() && !theWorld.getBlockState(pos.up()).getBlock().isNormalCube()) { - theRobit.setLocationAndAngles((x + l) + 0.5F, z, (y + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); + theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); thePathfinder.clearPathEntity(); return; } diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index 28f3aeaed..6cebc91b4 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -9,6 +9,7 @@ import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -58,7 +59,7 @@ public class RobitAIPickup extends EntityAIBase return true; } - List items = theRobit.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(theRobit.posX-10, theRobit.posY-10, theRobit.posZ-10, theRobit.posX+10, theRobit.posY+10, theRobit.posZ+10)); + List items = theRobit.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(theRobit.posX-10, theRobit.posY-10, theRobit.posZ-10, theRobit.posX+10, theRobit.posY+10, theRobit.posZ+10)); Iterator iter = items.iterator(); //Cached for slight performance double closestDistance = -1; @@ -95,7 +96,7 @@ public class RobitAIPickup extends EntityAIBase @Override public boolean continueExecuting() { - return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getFollowing() && theRobit.getEnergy() > 0 && closest.worldObj.provider.dimensionId == theRobit.worldObj.provider.dimensionId; + return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getFollowing() && theRobit.getEnergy() > 0 && closest.worldObj.provider.getDimensionId() == theRobit.worldObj.provider.getDimensionId(); } @Override @@ -132,16 +133,17 @@ public class RobitAIPickup extends EntityAIBase if(theRobit.getDistanceSqToEntity(closest) >= 144.0D) { int x = MathHelper.floor_double(closest.posX) - 2; - int y = MathHelper.floor_double(closest.posZ) - 2; - int z = MathHelper.floor_double(closest.boundingBox.minY); + int y = MathHelper.floor_double(closest.getEntityBoundingBox().minY); + int z = MathHelper.floor_double(closest.posZ) - 2; for(int l = 0; l <= 4; ++l) { for(int i1 = 0; i1 <= 4; ++i1) { - if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && theWorld.doesBlockHaveSolidTopSurface(theWorld, x + l, z - 1, y + i1) && !theWorld.getBlock(x + l, z, y + i1).isNormalCube() && !theWorld.getBlock(x + l, z + 1, y + i1).isNormalCube()) + BlockPos pos = new BlockPos(x+l, y, z+i1); + if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && World.doesBlockHaveSolidTopSurface(theWorld, pos.down()) && !theWorld.getBlockState(pos).getBlock().isNormalCube() && !theWorld.getBlockState(pos.up()).getBlock().isNormalCube()) { - theRobit.setLocationAndAngles((x + l) + 0.5F, z, (y + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); + theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); thePathfinder.clearPathEntity(); return; } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index a25073570..0236af31f 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -2,7 +2,6 @@ package mekanism.common; import io.netty.buffer.ByteBuf; import mekanism.api.EnumColor; -import mekanism.common.multipart.TransmitterType; import mekanism.common.util.LangUtils; import net.minecraft.util.ResourceLocation; @@ -233,6 +232,7 @@ public final class Tier * @author aidancbrady * */ +/* public static enum CableTier { BASIC(3200, TransmitterType.UNIVERSAL_CABLE_BASIC), @@ -286,11 +286,13 @@ public final class Tier } } - /** + */ +/** * The tiers used by Mechanical Pipes and their corresponding values. * @author unpairedbracket * - */ + *//* + public static enum PipeTier { BASIC(1000, 100, TransmitterType.MECHANICAL_PIPE_BASIC), @@ -351,11 +353,13 @@ public final class Tier } } - /** + */ +/** * The tiers used by Pressurized Tubes and their corresponding values. * @author AidanBrady * - */ + *//* + public static enum TubeTier { BASIC(256, 64, TransmitterType.PRESSURIZED_TUBE_BASIC), @@ -416,11 +420,13 @@ public final class Tier } } - /** + */ +/** * The tiers used by Logistical Transporters and their corresponding values. * @author AidanBrady * - */ + *//* + public static enum TransporterTier { BASIC(1, 5, TransmitterType.LOGISTICAL_TRANSPORTER_BASIC), @@ -556,14 +562,17 @@ public final class Tier tier.readConfig(dataStream); } } - +*/ + public static void writeConfig(ByteBuf dataStream) { +/* for(CableTier tier : CableTier.values()) { tier.writeConfig(dataStream); } - +*/ + for(InductionCellTier tier : InductionCellTier.values()) { tier.writeConfig(dataStream); @@ -579,6 +588,7 @@ public final class Tier tier.writeConfig(dataStream); } +/* for(PipeTier tier : PipeTier.values()) { tier.writeConfig(dataStream); @@ -593,5 +603,6 @@ public final class Tier { tier.writeConfig(dataStream); } +*/ } } diff --git a/src/main/java/mekanism/common/base/ISideConfiguration.java b/src/main/java/mekanism/common/base/ISideConfiguration.java index d1d4a5dfd..f2bdab645 100644 --- a/src/main/java/mekanism/common/base/ISideConfiguration.java +++ b/src/main/java/mekanism/common/base/ISideConfiguration.java @@ -2,6 +2,8 @@ package mekanism.common.base; import mekanism.common.tile.component.TileComponentConfig; +import net.minecraft.util.EnumFacing; + /** * Implement this if your TileEntity is capable of being modified by a Configurator in it's 'modify' mode. * @author AidanBrady @@ -19,7 +21,7 @@ public interface ISideConfiguration * Gets this machine's current orientation. * @return machine's current orientation */ - public int getOrientation(); + public EnumFacing getOrientation(); /** * Gets this machine's ejector. diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 21559da2e..720525a1a 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -43,7 +43,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -483,7 +483,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); } - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][bin.facing]; + int change = EnumFacing.ROTATION_MATRIX[EnumFacing.UP.ordinal()][bin.facing]; bin.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); @@ -571,7 +571,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, EnumFacing side) { return !(blockType == BasicBlock.BASIC_BLOCK_1 && world.getBlockMetadata(x, y, z) == 10); } @@ -991,7 +991,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - Coord4D obj = new Coord4D(x, y, z).offset(ForgeDirection.getOrientation(side).getOpposite()); + Coord4D obj = new Coord4D(x, y, z).offset(EnumFacing.getFront(side).getOpposite()); if(blockType == BasicBlock.BASIC_BLOCK_1 && obj.getBlockState(world) == 10) { @@ -1003,16 +1003,16 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } @Override - public ForgeDirection[] getValidRotations(World world, int x, int y, int z) + public EnumFacing[] getValidRotations(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - ForgeDirection[] valid = new ForgeDirection[6]; + EnumFacing[] valid = new EnumFacing[6]; if(tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock)tile; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { if(basicTile.canSetFacing(dir.ordinal())) { @@ -1025,7 +1025,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) + public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis) { TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 392ad374b..8d479b79e 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -29,7 +29,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.List; import java.util.Random; @@ -166,7 +166,7 @@ public class BlockEnergyCube extends BlockContainer ((IToolWrench) tool).wrenchUsed(entityplayer, x, y, z); } - int change = ForgeDirection.ROTATION_MATRIX[side][tileEntity.facing]; + int change = EnumFacing.ROTATION_MATRIX[side][tileEntity.facing]; tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); @@ -280,22 +280,22 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, EnumFacing side) { return true; } @Override - public ForgeDirection[] getValidRotations(World world, int x, int y, int z) + public EnumFacing[] getValidRotations(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - ForgeDirection[] valid = new ForgeDirection[6]; + EnumFacing[] valid = new EnumFacing[6]; if(tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock)tile; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { if(basicTile.canSetFacing(dir.ordinal())) { @@ -308,7 +308,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) + public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis) { TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index b9babd43a..56aaadeaa 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -24,7 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -113,7 +113,7 @@ public class BlockGasTank extends BlockContainer if(MekanismUtils.isBCWrench(tool)) ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; + int change = EnumFacing.ROTATION_MATRIX[EnumFacing.UP.ordinal()][tileEntity.facing]; tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); @@ -236,16 +236,16 @@ public class BlockGasTank extends BlockContainer } @Override - public ForgeDirection[] getValidRotations(World world, int x, int y, int z) + public EnumFacing[] getValidRotations(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - ForgeDirection[] valid = new ForgeDirection[6]; + EnumFacing[] valid = new EnumFacing[6]; if(tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock)tile; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { if(basicTile.canSetFacing(dir.ordinal())) { @@ -258,7 +258,7 @@ public class BlockGasTank extends BlockContainer } @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) + public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis) { TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ddb583baa..119be1b17 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -48,7 +48,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -234,7 +234,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(!transporter.hasInventory()) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(transporter).offset(dir).getTileEntity(world); @@ -249,7 +249,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo else if(tileEntity instanceof TileEntityTeleporter) { TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; - teleporter.owner = entityliving.getCommandSenderName(); + teleporter.owner = entityliving.getName(); } tileEntity.setFacing((short)change); @@ -292,7 +292,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(tileEntity instanceof TileEntityMetallurgicInfuser) { - side = ForgeDirection.getOrientation(side).getOpposite().ordinal(); + side = EnumFacing.getFront(side).getOpposite().ordinal(); } if(side == 4) @@ -518,13 +518,13 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); } - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; + int change = EnumFacing.ROTATION_MATRIX[EnumFacing.UP.ordinal()][tileEntity.facing]; if(tileEntity instanceof TileEntityLogisticalSorter) { if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); @@ -552,7 +552,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case ELECTRIC_CHEST: TileEntityElectricChest electricChest = (TileEntityElectricChest)tileEntity; - if(!(entityplayer.isSneaking() || world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN))) + if(!(entityplayer.isSneaking() || world.isSideSolid(x, y + 1, z, EnumFacing.DOWN))) { if(electricChest.canAccess() || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) { @@ -593,10 +593,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(teleporter.owner == null) { - teleporter.owner = entityplayer.getCommandSenderName(); + teleporter.owner = entityplayer.getName(); } - if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + if(teleporter.owner.equals(entityplayer.getName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); } @@ -835,7 +835,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(!sorter.hasInventory()) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); @@ -1004,7 +1004,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, EnumFacing side) { MachineType type = MachineType.get(blockType, world.getBlockMetadata(x, y, z)); @@ -1014,7 +1014,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case ELECTRIC_CHEST: return false; case PORTABLE_TANK: - return side == ForgeDirection.UP || side == ForgeDirection.DOWN; + return side == EnumFacing.UP || side == EnumFacing.DOWN; default: return true; } @@ -1292,16 +1292,16 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } @Override - public ForgeDirection[] getValidRotations(World world, int x, int y, int z) + public EnumFacing[] getValidRotations(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - ForgeDirection[] valid = new ForgeDirection[6]; + EnumFacing[] valid = new EnumFacing[6]; if(tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock basicTile = (TileEntityBasicBlock)tile; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { if(basicTile.canSetFacing(dir.ordinal())) { @@ -1314,7 +1314,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) + public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis) { TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index e95e92220..0a905bf7d 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -16,7 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -115,7 +115,7 @@ public class BlockPlastic extends Block } @Override - public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) + public boolean recolourBlock(World world, int x, int y, int z, EnumFacing side, int colour) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 2c9744a95..8bc416a1c 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -12,7 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -48,7 +48,7 @@ public class BlockPlasticFence extends BlockFence } - public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) + public boolean recolourBlock(World world, int x, int y, int z, EnumFacing side, int colour) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mekanism/common/content/boiler/BoilerManager.java b/src/main/java/mekanism/common/content/boiler/BoilerManager.java index 74e3efd20..f7a0ec49e 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerManager.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerManager.java @@ -36,7 +36,7 @@ public class BoilerManager extends MultiblockManager for(Coord4D obj : entry.getValue().locations) { - if(obj.dimensionId == world.provider.dimensionId && obj.exists(world)) + if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) { TileEntity tileEntity = obj.getTileEntity(world); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index a5c4491d8..a710d081a 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -9,7 +9,7 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -52,7 +52,7 @@ public class SynchronizedBoilerData extends SynchronizedData> 4, z >> 4)) + if(!tileEntity.getWorld().getChunkProvider().chunkExists(x >> 4, z >> 4)) { continue; } - TileEntity tile = tileEntity.getWorldObj().getTileEntity(x, y, z); + TileEntity tile = tileEntity.getWorld().getTileEntity(x, y, z); if(tile instanceof TileEntityBoundingBlock) { continue; } - info.block = tileEntity.getWorldObj().getBlock(x, y, z); - info.meta = tileEntity.getWorldObj().getBlockMetadata(x, y, z); + info.block = tileEntity.getWorld().getBlock(x, y, z); + info.meta = tileEntity.getWorld().getBlockMetadata(x, y, z); - if(info.block != null && !tileEntity.getWorldObj().isAirBlock(x, y, z) && info.block.getBlockHardness(tileEntity.getWorldObj(), x, y, z) >= 0) + if(info.block != null && !tileEntity.getWorld().isAirBlock(x, y, z) && info.block.getBlockHardness(tileEntity.getWorld(), x, y, z) >= 0) { MinerFilter filterFound = null; boolean canFilter = false; @@ -113,7 +113,7 @@ public class ThreadMinerSearch extends Thread if(canFilter) { - set(i, new Coord4D(x, y, z, tileEntity.getWorldObj().provider.dimensionId)); + set(i, new Coord4D(x, y, z, tileEntity.getWorld().provider.getDimensionId())); replaceMap.put(i, filterFound); found++; diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 9888029db..5ef212f12 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -8,7 +8,7 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java index 63e05acf9..2166bc572 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java @@ -7,7 +7,7 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -35,13 +35,13 @@ public class SharedInventory implements IStrictEnergyStorage, IFluidHandler, IGa } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return storedFluid.fill(resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(resource.isFluidEqual(storedFluid.getFluid())) { @@ -52,61 +52,61 @@ public class SharedInventory implements IStrictEnergyStorage, IFluidHandler, IGa } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return storedFluid.drain(maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return new FluidTankInfo[]{new FluidTankInfo(storedFluid)}; } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return storedGas.receive(stack, doTransfer); } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return storedGas.draw(amount, doTransfer); } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return storedGas.getGasType() == null || type == storedGas.getGasType(); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return storedGas.getGasType() == null || type == storedGas.getGasType(); } diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 2e8f4e015..05ff8c865 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -7,7 +7,7 @@ import java.util.Map; import mekanism.api.Coord4D; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class PathfinderCache { @@ -18,11 +18,11 @@ public class PathfinderCache reset(); } - public static List getCache(Coord4D start, Coord4D end, EnumSet sides) + public static List getCache(Coord4D start, Coord4D end, EnumSet sides) { List ret = null; - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { PathData data = new PathData(start, end, side); @@ -47,9 +47,9 @@ public class PathfinderCache public Coord4D startTransporter; public Coord4D end; - public ForgeDirection endSide; + public EnumFacing endSide; - public PathData(Coord4D s, Coord4D e, ForgeDirection es) + public PathData(Coord4D s, Coord4D e, EnumFacing es) { startTransporter = s; diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index 2110fe913..6b161e6d3 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -6,16 +6,16 @@ import mekanism.common.util.InventoryUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class StackSearcher { public int i; public int[] slots; public IInventory theInventory; - public ForgeDirection side; + public EnumFacing side; - public StackSearcher(IInventory inventory, ForgeDirection direction) + public StackSearcher(IInventory inventory, EnumFacing direction) { theInventory = InventoryUtils.checkChestInv(inventory); side = direction; @@ -25,7 +25,7 @@ public class StackSearcher } else { - slots = ((ISidedInventory)theInventory).getAccessibleSlotsFromSide(side.getOpposite().ordinal()); + slots = ((ISidedInventory)theInventory).getSlotsForFace(side.getOpposite().ordinal()); if(slots != null) { i = slots.length; @@ -101,7 +101,7 @@ public class StackSearcher } else { ISidedInventory sidedInventory = (ISidedInventory)theInventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(side.getOpposite().ordinal()); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite().ordinal()); if(slots != null && slots.length != 0) { diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index fbea5de3a..2e716dd07 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 0c0ee4503..ffb24e9a9 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -13,7 +13,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index db363e41a..92ae3b9b4 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -9,7 +9,7 @@ import mekanism.common.util.InventoryUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index ace0d5452..8f54ea554 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -9,7 +9,7 @@ import mekanism.common.util.InventoryUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 3ffbd2c19..7d927cc7c 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -12,7 +12,7 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public abstract class TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 5fbf363d2..c61619e51 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -19,7 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import net.minecraftforge.fml.common.Loader; @@ -90,7 +90,7 @@ public class TransporterManager } else { ISidedInventory sidedInventory = (ISidedInventory)inv; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal()); + int[] slots = sidedInventory.getSlotsForFace(EnumFacing.getFront(side).getOpposite().ordinal()); if(slots == null || slots.length == 0) { @@ -124,7 +124,7 @@ public class TransporterManager { ISideConfiguration config = (ISideConfiguration)inv; int tileSide = config.getOrientation(); - EnumColor configColor = config.getEjector().getInputColor(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(side, tileSide)).getOpposite()); + EnumColor configColor = config.getEjector().getInputColor(EnumFacing.getFront(MekanismUtils.getBaseOrientation(side, tileSide)).getOpposite()); if(config.getEjector().hasStrictInput() && configColor != null && configColor != stack.color) { @@ -184,20 +184,20 @@ public class TransporterManager } else { ISidedInventory sidedInventory = (ISidedInventory)inv; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal()); + int[] slots = sidedInventory.getSlotsForFace(EnumFacing.getFront(side).getOpposite().ordinal()); if(slots != null && slots.length != 0) { - if(stack.pathType != Path.HOME && sidedInventory instanceof TileEntityBin && ForgeDirection.getOrientation(side).getOpposite().ordinal() == 0) + if(stack.pathType != Path.HOME && sidedInventory instanceof TileEntityBin && EnumFacing.getFront(side).getOpposite().ordinal() == 0) { - slots = sidedInventory.getAccessibleSlotsFromSide(1); + slots = sidedInventory.getSlotsForFace(1); } if(inv instanceof TileEntityBin) { int slot = slots[0]; - if(!sidedInventory.isItemValidForSlot(slot, toInsert) || !sidedInventory.canInsertItem(slot, toInsert, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + if(!sidedInventory.isItemValidForSlot(slot, toInsert) || !sidedInventory.canInsertItem(slot, toInsert, EnumFacing.getFront(side).getOpposite().ordinal())) { return; } @@ -214,7 +214,7 @@ public class TransporterManager if(stack.pathType != Path.HOME) { - if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, EnumFacing.getFront(side).getOpposite().ordinal())) { continue; } @@ -286,7 +286,7 @@ public class TransporterManager { ISideConfiguration config = (ISideConfiguration)tileEntity; int tileSide = config.getOrientation(); - EnumColor configColor = config.getEjector().getInputColor(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(side, tileSide)).getOpposite()); + EnumColor configColor = config.getEjector().getInputColor(EnumFacing.getFront(MekanismUtils.getBaseOrientation(side, tileSide)).getOpposite()); if(config.getEjector().hasStrictInput() && configColor != null && configColor != color) { @@ -347,7 +347,7 @@ public class TransporterManager } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.getOrientation(side).getOpposite().ordinal()); + int[] slots = sidedInventory.getSlotsForFace(EnumFacing.getFront(side).getOpposite().ordinal()); if(slots != null && slots.length != 0) { @@ -355,7 +355,7 @@ public class TransporterManager { int slot = slots[0]; - if(!sidedInventory.isItemValidForSlot(slot, toInsert) || !sidedInventory.canInsertItem(slot, toInsert, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + if(!sidedInventory.isItemValidForSlot(slot, toInsert) || !sidedInventory.canInsertItem(slot, toInsert, EnumFacing.getFront(side).getOpposite().ordinal())) { return toInsert; } @@ -375,7 +375,7 @@ public class TransporterManager { int slotID = slots[get]; - if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, ForgeDirection.getOrientation(side).getOpposite().ordinal())) + if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, EnumFacing.getFront(side).getOpposite().ordinal())) { continue; } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index d82e2299a..fe89bc694 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -22,7 +22,7 @@ import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import org.apache.commons.lang3.tuple.Pair; @@ -48,9 +48,9 @@ public final class TransporterPathfinder ArrayList ret = new ArrayList(); ret.add(start); - if(transportStack.idleDir == ForgeDirection.UNKNOWN) + if(transportStack.idleDir == EnumFacing.null) { - ForgeDirection newSide = findSide(); + EnumFacing newSide = findSide(); if(newSide == null) { @@ -76,13 +76,13 @@ public final class TransporterPathfinder if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { - transportStack.idleDir = ForgeDirection.UNKNOWN; + transportStack.idleDir = EnumFacing.null; newPath.setPathType(Path.DEST); return newPath; } else { - ForgeDirection newSide = findSide(); + EnumFacing newSide = findSide(); if(newSide == null) { @@ -98,7 +98,7 @@ public final class TransporterPathfinder } } - private void loopSide(List list, ForgeDirection side) + private void loopSide(List list, EnumFacing side) { int count = 1; @@ -117,11 +117,11 @@ public final class TransporterPathfinder } } - private ForgeDirection findSide() + private EnumFacing findSide() { - if(transportStack.idleDir == ForgeDirection.UNKNOWN) + if(transportStack.idleDir == EnumFacing.null) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { TileEntity tile = start.offset(side).getTileEntity(worldObj); @@ -132,7 +132,7 @@ public final class TransporterPathfinder } } else { - for(ForgeDirection side : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, transportStack.idleDir.getOpposite()))) + for(EnumFacing side : EnumSet.complementOf(EnumSet.of(EnumFacing.null, transportStack.idleDir.getOpposite()))) { TileEntity tile = start.offset(side).getTileEntity(worldObj); @@ -286,7 +286,7 @@ public final class TransporterPathfinder return true; } - public static Destination getPath(DestChecker checker, EnumSet sides, ILogisticalTransporter start, Coord4D dest, TransporterStack stack, ItemStack rejects, int min) + public static Destination getPath(DestChecker checker, EnumSet sides, ILogisticalTransporter start, Coord4D dest, TransporterStack stack, ItemStack rejects, int min) { List test = PathfinderCache.getCache(start.coord(), dest, sides); @@ -390,7 +390,7 @@ public final class TransporterPathfinder public double finalScore; - public ForgeDirection side; + public EnumFacing side; public ArrayList results; @@ -429,7 +429,7 @@ public final class TransporterPathfinder for(int i = 0; i < 6; i++) { - ForgeDirection direction = ForgeDirection.getOrientation(i); + EnumFacing direction = EnumFacing.getFront(i); Coord4D neighbor = start.offset(direction); if(!transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction) && (!neighbor.equals(finalNode) || !destChecker.isValid(transportStack, i, neighbor.getTileEntity(worldObj)))) @@ -467,7 +467,7 @@ public final class TransporterPathfinder openSet.remove(currentNode); closedSet.add(currentNode); - for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing direction : EnumFacing.VALUES) { Coord4D neighbor = currentNode.offset(direction); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 3acf60e81..0caaf2fb5 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -16,7 +16,7 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import org.apache.commons.lang3.tuple.Pair; @@ -30,7 +30,7 @@ public class TransporterStack public boolean initiatedPath = false; - public ForgeDirection idleDir = ForgeDirection.UNKNOWN; + public EnumFacing idleDir = EnumFacing.null; private List pathToTarget = new ArrayList(); @@ -125,7 +125,7 @@ public class TransporterStack progress = nbtTags.getInteger("progress"); originalLocation = Coord4D.read(nbtTags.getCompoundTag("originalLocation")); - idleDir = ForgeDirection.values()[nbtTags.getInteger("idleDir")]; + idleDir = EnumFacing.values()[nbtTags.getInteger("idleDir")]; if(nbtTags.hasKey("homeLocation")) { @@ -188,7 +188,7 @@ public class TransporterStack return itemStack; } - idleDir = ForgeDirection.UNKNOWN; + idleDir = EnumFacing.null; setPath(newPath.path, Path.DEST); initiatedPath = true; @@ -204,7 +204,7 @@ public class TransporterStack return itemStack; } - idleDir = ForgeDirection.UNKNOWN; + idleDir = EnumFacing.null; setPath(newPath.path, Path.DEST); initiatedPath = true; @@ -222,7 +222,7 @@ public class TransporterStack if(newPath.getRight() == Path.HOME) { - idleDir = ForgeDirection.UNKNOWN; + idleDir = EnumFacing.null; } setPath(newPath.getLeft(), newPath.getRight()); @@ -302,7 +302,7 @@ public class TransporterStack return 0; } - public boolean canInsertToTransporter(TileEntity tileEntity, ForgeDirection from) + public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) { if(!(tileEntity instanceof ITransporterTile)) { @@ -319,7 +319,7 @@ public class TransporterStack return transporter.getColor() == color || transporter.getColor() == null; } - public boolean canInsertToTransporter(ILogisticalTransporter transporter, ForgeDirection side) + public boolean canInsertToTransporter(ILogisticalTransporter transporter, EnumFacing side) { if(!transporter.canConnectMutual(side)) { diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index e647a2648..208b12869 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -120,7 +120,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { if(dataWatcher.getWatchableObjectByte(2) == 1) { - latched = new Coord4D(dataWatcher.getWatchableObjectInt(3), dataWatcher.getWatchableObjectInt(4), dataWatcher.getWatchableObjectInt(5), worldObj.provider.dimensionId); + latched = new Coord4D(dataWatcher.getWatchableObjectInt(3), dataWatcher.getWatchableObjectInt(4), dataWatcher.getWatchableObjectInt(5), worldObj.provider.getDimensionId()); } else { latched = null; diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 05abdbc65..27481689f 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -18,7 +18,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.List; @@ -180,7 +180,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData int meta = worldObj.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ); boolean fluid = MekanismUtils.isFluid(worldObj, new Coord4D(mop)) || MekanismUtils.isDeadFluid(worldObj, new Coord4D(mop)); - Coord4D sideCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.dimensionId).offset(ForgeDirection.getOrientation(mop.sideHit)); + Coord4D sideCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ, worldObj.provider.getDimensionId()).offset(EnumFacing.getFront(mop.sideHit)); if(general.aestheticWorldDamage && !fluid && (sideCoord.isAirBlock(worldObj) || sideCoord.isReplaceable(worldObj))) { diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 0d9bbcd0e..5bc5896be 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.DamageSource; @@ -88,6 +89,12 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine prevPosZ = z; } + @Override + public PathNavigateGround getNavigator() + { + return (PathNavigateGround)navigator; + } + @Override protected void applyEntityAttributes() { @@ -304,7 +311,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { setFollowing(false); - if(worldObj.provider.dimensionId != homeLocation.dimensionId) + if(worldObj.provider.getDimensionId() != homeLocation.dimensionId) { travelToDimension(homeLocation.dimensionId); } @@ -404,7 +411,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine ItemRobit item = (ItemRobit)entityItem.getEntityItem().getItem(); item.setEnergy(entityItem.getEntityItem(), getEnergy()); item.setInventory(getInventory(), entityItem.getEntityItem()); - item.setName(entityItem.getEntityItem(), getCommandSenderName()); + item.setName(entityItem.getEntityItem(), getName()); float k = 0.05F; entityItem.motionX = 0; @@ -723,7 +730,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine } @Override - public String getCommandSenderName() + public String getName() { return getName().isEmpty() ? "Robit" : getName(); } diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index fdf39b848..4ac3b418d 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -238,7 +238,7 @@ public class FrequencyManager { Coord4D coord = iter.next(); - if(coord.dimensionId == world.provider.dimensionId) + if(coord.dimensionId == world.provider.getDimensionId()) { if(!coord.exists(world)) { diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index f65a68d2d..2a7412636 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -63,7 +63,7 @@ public class WailaDataProvider implements IWailaDataProvider else if(tile instanceof TileEntityBoundingBlock) { TileEntityBoundingBlock bound = (TileEntityBoundingBlock)tile; - Coord4D coord = new Coord4D(bound.mainX, bound.mainY, bound.mainZ, tile.getWorldObj().provider.dimensionId); + Coord4D coord = new Coord4D(bound.mainX, bound.mainY, bound.mainZ, tile.getWorldObj().provider.getDimensionId()); if(bound.receivedCoords && coord.getTileEntity(tile.getWorldObj()) instanceof IInventory) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 5f4bb3e90..449ad972f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -52,9 +52,9 @@ public class ContainerRobitSmelting extends Container } @Override - public void addCraftingToCrafters(ICrafting icrafting) + public void onCraftGuiOpened(ICrafting icrafting) { - super.addCraftingToCrafters(icrafting); + super.onCraftGuiOpened(icrafting); icrafting.sendProgressBarUpdate(this, 0, robit.furnaceCookTime); icrafting.sendProgressBarUpdate(this, 1, robit.furnaceBurnTime); icrafting.sendProgressBarUpdate(this, 2, robit.currentItemBurnTime); diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index be8b09412..992043bf5 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -23,7 +23,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; @@ -105,7 +105,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } ItemStack stack = new ItemStack(block, 1, meta); - Coord4D orig = new Coord4D(x, y, z, player.worldObj.provider.dimensionId); + Coord4D orig = new Coord4D(x, y, z, player.worldObj.provider.getDimensionId()); List names = MekanismUtils.getOreDictName(stack); @@ -121,7 +121,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(getMode(itemstack) == 3 && isOre && !player.capabilities.isCreativeMode) { - Set found = new Finder(player.worldObj, stack, new Coord4D(x, y, z, player.worldObj.provider.dimensionId)).calc(); + Set found = new Finder(player.worldObj, stack, new Coord4D(x, y, z, player.worldObj.provider.getDimensionId())).calc(); for(Coord4D coord : found) { @@ -350,7 +350,7 @@ public class ItemAtomicDisassembler extends ItemEnergized found.add(pointer); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pointer.offset(side); diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index a276faa19..2cfeaa43d 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.List; @@ -105,14 +105,14 @@ public class ItemBalloon extends ItemMekanism return true; } - Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); + Coord4D obj = new Coord4D(x, y, z, world.provider.getDimensionId()); if(obj.getBlock(world).isReplaceable(world, x, y, z)) { obj.yCoord--; } - if(!world.isSideSolid(x, y, z, ForgeDirection.UP)) + if(!world.isSideSolid(x, y, z, EnumFacing.UP)) { return true; } @@ -178,8 +178,8 @@ public class ItemBalloon extends ItemMekanism @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { - Coord4D coord = new Coord4D(source.getXInt(), source.getYInt(), source.getZInt(), source.getWorld().provider.dimensionId); - ForgeDirection side = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(source.getBlockMetadata()).ordinal()); + Coord4D coord = new Coord4D(source.getXInt(), source.getYInt(), source.getZInt(), source.getWorld().provider.getDimensionId()); + EnumFacing side = EnumFacing.getFront(BlockDispenser.func_149937_b(source.getBlockMetadata()).ordinal()); List entities = source.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, coord.offset(side).getBoundingBox()); boolean latched = false; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index b68271aef..288367a87 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -47,7 +47,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -524,7 +524,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec else { if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - Coord4D coord = new Coord4D(pos.blockX, pos.blockY, pos.blockZ, world.provider.dimensionId); + Coord4D coord = new Coord4D(pos.blockX, pos.blockY, pos.blockZ, world.provider.getDimensionId()); if(!world.canMineBlock(entityplayer, coord.xCoord, coord.yCoord, coord.zCoord)) { @@ -570,7 +570,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return itemstack; } - Coord4D trans = coord.offset(ForgeDirection.getOrientation(pos.sideHit)); + Coord4D trans = coord.offset(EnumFacing.getFront(pos.sideHit)); if(!entityplayer.canPlayerEdit(trans.xCoord, trans.yCoord, trans.zCoord, pos.sideHit, itemstack)) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 16b39745d..7b8e6968f 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; import net.minecraftforge.fml.common.Optional.Interface; @@ -173,8 +173,8 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } else if(getState(stack) == ConfiguratorMode.ROTATE) //Rotate { - ForgeDirection axis = ForgeDirection.getOrientation(side); - List l = Arrays.asList(block.getValidRotations(world, x, y, z)); + EnumFacing axis = EnumFacing.getFront(side); + List l = Arrays.asList(block.getValidRotations(world, x, y, z)); if(!player.isSneaking() && l.contains(axis)) { diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 072b7e69a..0d1006b8a 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class ItemNetworkReader extends ItemEnergized { @@ -72,7 +72,7 @@ public class ItemNetworkReader extends ItemEnergized Set iteratedNetworks = new HashSet<>(); - for(ForgeDirection iterSide : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing iterSide : EnumFacing.VALUES) { Coord4D coord = Coord4D.get(tileEntity).offset(iterSide); diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 84c1ca63a..0836f96a1 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -38,7 +38,7 @@ public class ItemPortableTeleporter extends ItemEnergized int neededEnergy = 1000; - if(entity.worldObj.provider.dimensionId != coords.dimensionId) + if(entity.worldObj.provider.getDimensionId() != coords.dimensionId) { neededEnergy+=10000; } diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index ac4b24dc2..c552d0dbd 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -55,7 +55,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory robit.setHome(Coord4D.get(chargepad)); robit.setEnergy(getEnergy(itemstack)); - robit.setOwner(entityplayer.getCommandSenderName()); + robit.setOwner(entityplayer.getName()); robit.setInventory(getInventory(itemstack)); robit.setName(getName(itemstack)); diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index b5c17b90d..b398f560e 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -81,7 +81,7 @@ public class MultiblockManager> for(Coord4D obj : entry.getValue().locations) { - if(obj.dimensionId == world.provider.dimensionId && obj.exists(world)) + if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) { TileEntity tileEntity = obj.getTileEntity(world); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 0437cda6e..17b4e3265 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -10,7 +10,7 @@ import mekanism.common.tile.TileEntityMultiblock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public abstract class UpdateProtocol> { @@ -157,7 +157,7 @@ public abstract class UpdateProtocol> break; } else { - innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.dimensionId)); + innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.getDimensionId())); } volume++; @@ -212,7 +212,7 @@ public abstract class UpdateProtocol> innerNodes.clear(); iteratedNodes.add(tile); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { TileEntity tileEntity = Coord4D.get(tile).offset(side).getTileEntity(tile.getWorldObj()); @@ -231,34 +231,34 @@ public abstract class UpdateProtocol> return true; } - public ForgeDirection getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) + public EnumFacing getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) { if(obj.xCoord == xmin) { - return ForgeDirection.WEST; + return EnumFacing.WEST; } else if(obj.xCoord == xmax) { - return ForgeDirection.EAST; + return EnumFacing.EAST; } else if(obj.yCoord == ymin) { - return ForgeDirection.DOWN; + return EnumFacing.DOWN; } else if(obj.yCoord == ymax) { - return ForgeDirection.UP; + return EnumFacing.UP; } else if(obj.zCoord == zmin) { - return ForgeDirection.NORTH; + return EnumFacing.NORTH; } else if(obj.zCoord == zmax) { - return ForgeDirection.SOUTH; + return EnumFacing.SOUTH; } - return ForgeDirection.UNKNOWN; + return EnumFacing.null; } /** diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 2e8ef7314..43a2644e9 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -168,7 +168,7 @@ public class PacketConfigSync implements IMessageHandler privateFreqs = new ArrayList(); - for(Frequency f : getManager(player.getCommandSenderName(), world).getFrequencies()) + for(Frequency f : getManager(player.getName(), world).getFrequencies()) { privateFreqs.add(f); } @@ -148,7 +148,7 @@ public class PacketPortableTeleporter implements IMessageHandler, } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @@ -228,7 +228,7 @@ public abstract class TileEntityBasicMachine, } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 7d5e788cb..811517f02 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -24,7 +24,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional.Interface; import io.netty.buffer.ByteBuf; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @@ -191,7 +191,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { if(bottomStack != null && isActive) { - TileEntity tile = Coord4D.get(this).offset(ForgeDirection.getOrientation(0)).getTileEntity(worldObj); + TileEntity tile = Coord4D.get(this).offset(EnumFacing.getFront(0)).getTileEntity(worldObj); if(tile instanceof ITransporterTile) { @@ -457,7 +457,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == 1) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 60b590d10..8a8473e55 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -12,28 +12,25 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import io.netty.buffer.ByteBuf; public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { - public int mainX; - public int mainY; - public int mainZ; + public BlockPos mainPos; public boolean receivedCoords; - public boolean prevPower; + public int prevPower; - public void setMainLocation(int x, int y, int z) + public void setMainLocation(BlockPos pos) { receivedCoords = true; if(!worldObj.isRemote) { - mainX = x; - mainY = y; - mainZ = z; + mainPos = pos; Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } @@ -50,25 +47,19 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } } - @Override - public boolean canUpdate() - { - return false; - } - public void onNeighborChange(Block block) { - TileEntity tile = worldObj.getTileEntity(mainX, mainY, mainZ); + TileEntity tile = worldObj.getTileEntity(mainPos); if(tile instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)tile; - boolean power = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + int power = worldObj.isBlockIndirectlyGettingPowered(getPos()); if(prevPower != power) { - if(power) + if(power > 0) { onPower(); } @@ -89,10 +80,8 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork @Override public void handlePacketData(ByteBuf dataStream) { - mainX = dataStream.readInt(); - mainY = dataStream.readInt(); - mainZ = dataStream.readInt(); - prevPower = dataStream.readBoolean(); + mainPos = new BlockPos(dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + prevPower = dataStream.readInt(); } @Override @@ -100,10 +89,8 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { super.readFromNBT(nbtTags); - mainX = nbtTags.getInteger("mainX"); - mainY = nbtTags.getInteger("mainY"); - mainZ = nbtTags.getInteger("mainZ"); - prevPower = nbtTags.getBoolean("prevPower"); + mainPos = new BlockPos(nbtTags.getInteger("mainX"), nbtTags.getInteger("mainY"), nbtTags.getInteger("mainZ")); + prevPower = nbtTags.getInteger("prevPower"); receivedCoords = nbtTags.getBoolean("receivedCoords"); } @@ -112,19 +99,19 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { super.writeToNBT(nbtTags); - nbtTags.setInteger("mainX", mainX); - nbtTags.setInteger("mainY", mainY); - nbtTags.setInteger("mainZ", mainZ); - nbtTags.setBoolean("prevPower", prevPower); + nbtTags.setInteger("mainX", mainPos.getX()); + nbtTags.setInteger("mainY", mainPos.getY()); + nbtTags.setInteger("mainZ", mainPos.getZ()); + nbtTags.setInteger("prevPower", prevPower); nbtTags.setBoolean("receivedCoords", receivedCoords); } @Override public ArrayList getNetworkedData(ArrayList data) { - data.add(mainX); - data.add(mainY); - data.add(mainZ); + data.add(mainPos.getX()); + data.add(mainPos.getY()); + data.add(mainPos.getZ()); data.add(prevPower); return data; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 68318100f..3d346eef5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -142,9 +142,9 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.DOWN, ForgeDirection.getOrientation(facing).getOpposite()); + return EnumSet.of(EnumFacing.DOWN, EnumFacing.getFront(facing).getOpposite()); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 9c7acc0ea..16b9116cd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -24,7 +24,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; @@ -302,13 +302,13 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).hasSlot(0); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).hasSlot(0) && inputTank.canReceive(type) && RecipeHandler.Recipe.CHEMICAL_CRYSTALLIZER.containsRecipe(type); @@ -334,7 +334,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack.getGas())) { @@ -345,25 +345,25 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return null; } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return false; } @@ -404,7 +404,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index be9d72a24..3afb9ea7c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -35,7 +35,7 @@ import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IUpgradeTile, ISustainedData, ITankManager { @@ -200,7 +200,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == MekanismUtils.getLeft(facing).ordinal() || side == 1) { @@ -380,7 +380,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing); } @@ -405,7 +405,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack.getGas())) { @@ -416,31 +416,31 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return null; } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return side == MekanismUtils.getLeft(facing) && type == GasRegistry.getGas("sulfuricAcid"); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 696ef932f..a2ba1d690 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -36,7 +36,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISustainedData, IUpgradeTile, IUpgradeInfoHandler, ITankManager { @@ -143,13 +143,13 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl { GasStack toSend = new GasStack(centerTank.getGas().getGas(), Math.min(centerTank.getStored(), gasOutput)); - TileEntity tileEntity = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); + TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.getFront(facing)).getTileEntity(worldObj); if(tileEntity instanceof IGasHandler) { - if(((IGasHandler)tileEntity).canReceiveGas(ForgeDirection.getOrientation(facing).getOpposite(), centerTank.getGas().getGas())) + if(((IGasHandler)tileEntity).canReceiveGas(EnumFacing.getFront(facing).getOpposite(), centerTank.getGas().getGas())) { - centerTank.draw(((IGasHandler)tileEntity).receiveGas(ForgeDirection.getOrientation(facing).getOpposite(), toSend, true), true); + centerTank.draw(((IGasHandler)tileEntity).receiveGas(EnumFacing.getFront(facing).getOpposite(), toSend, true), true); } } } @@ -322,7 +322,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl return i != 0 && i != 1; } - public GasTank getTank(ForgeDirection side) + public GasTank getTank(EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { @@ -332,7 +332,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl { return rightTank; } - else if(side == ForgeDirection.getOrientation(facing)) + else if(side == EnumFacing.getFront(facing)) { return centerTank; } @@ -373,13 +373,13 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { - return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == ForgeDirection.getOrientation(facing); + return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.getFront(facing); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return getTank(side) != null && getTank(side) != centerTank ? getTank(side).canReceive(type) : false; } @@ -404,7 +404,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack != null ? stack.getGas() : null)) { @@ -415,13 +415,13 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { if(canDrawGas(side, null)) { @@ -432,13 +432,13 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return getTank(side) != null && getTank(side) == centerTank ? getTank(side).canDraw(type) : false; } @@ -474,7 +474,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == MekanismUtils.getLeft(facing).ordinal()) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 60920346f..4bba0d5c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -21,7 +21,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectricMachine { @@ -54,7 +54,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack.getGas())) { @@ -65,7 +65,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { if(configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).hasSlot(0)) { @@ -95,7 +95,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).hasSlot(0); } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index ce0c66ccd..8bfcda42a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -32,7 +32,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData, ITankManager { @@ -178,7 +178,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == MekanismUtils.getLeft(facing).ordinal()) { @@ -333,7 +333,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return side == MekanismUtils.getRight(facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 1012df4cc..4f777f81f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -22,7 +22,7 @@ import mekanism.common.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -364,7 +364,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple return i != 0 && i != 1; } - public GasTank getTank(ForgeDirection side) + public GasTank getTank(EnumFacing side) { if(side == MekanismUtils.getLeft(facing)) { @@ -411,13 +411,13 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return getTank(side) != null; } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { if(getTank(side) == inputTank) { @@ -447,7 +447,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack != null ? stack.getGas() : null)) { @@ -458,13 +458,13 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { if(canDrawGas(side, null)) { @@ -475,13 +475,13 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return getTank(side) == outputTank ? getTank(side).canDraw(type) : false; } @@ -517,7 +517,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == MekanismUtils.getLeft(facing).ordinal()) { @@ -536,7 +536,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { if(canFill(from, resource.getFluid())) { @@ -547,33 +547,33 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return null; } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return null; } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { - return from == ForgeDirection.UP && fluid == FluidRegistry.WATER; + return from == EnumFacing.UP && fluid == FluidRegistry.WATER; } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { - if(from == ForgeDirection.UP) + if(from == EnumFacing.UP) { return new FluidTankInfo[] {fluidTank.getInfo()}; } diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 478cfaa08..f70c2f9f1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -184,7 +184,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return InventoryUtils.EMPTY; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 2afb93957..fafe19fb7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -37,7 +37,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.event.world.BlockEvent; import java.util.*; @@ -273,7 +273,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { if(getEjectInv() instanceof IInventory) { - ItemStack remains = InventoryUtils.putStackInInventory((IInventory)getEjectInv(), getTopEject(false, null), ForgeDirection.getOrientation(facing).getOpposite().ordinal(), false); + ItemStack remains = InventoryUtils.putStackInInventory((IInventory)getEjectInv(), getTopEject(false, null), EnumFacing.getFront(facing).getOpposite().ordinal(), false); getTopEject(true, remains); } @@ -509,9 +509,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public TileEntity getEjectInv() { - ForgeDirection side = ForgeDirection.getOrientation(facing).getOpposite(); + EnumFacing side = EnumFacing.getFront(facing).getOpposite(); - return new Coord4D(xCoord+(side.offsetX*2), yCoord+1, zCoord+(side.offsetZ*2), worldObj.provider.dimensionId).getTileEntity(worldObj); + return new Coord4D(xCoord+(side.offsetX*2), yCoord+1, zCoord+(side.offsetZ*2), worldObj.provider.getDimensionId()).getTileEntity(worldObj); } public void add(List stacks) @@ -1000,7 +1000,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public Coord4D getStartingCoord() { - return new Coord4D(xCoord-radius, minY, zCoord-radius, worldObj.provider.dimensionId); + return new Coord4D(xCoord-radius, minY, zCoord-radius, worldObj.provider.getDimensionId()); } public Coord4D getCoordFromIndex(int index) @@ -1012,7 +1012,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I int z = start.zCoord+(index/diameter)%diameter; int y = start.yCoord+(index/diameter/diameter); - return new Coord4D(x, y, z, worldObj.provider.dimensionId); + return new Coord4D(x, y, z, worldObj.provider.getDimensionId()); } @Override @@ -1127,21 +1127,21 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return InventoryUtils.EMPTY; } public TileEntity getEjectTile() { - ForgeDirection side = ForgeDirection.getOrientation(facing).getOpposite(); - return new Coord4D(xCoord+side.offsetX, yCoord+1, zCoord+side.offsetZ, worldObj.provider.dimensionId).getTileEntity(worldObj); + EnumFacing side = EnumFacing.getFront(facing).getOpposite(); + return new Coord4D(xCoord+side.offsetX, yCoord+1, zCoord+side.offsetZ, worldObj.provider.getDimensionId()).getTileEntity(worldObj); } @Override public int[] getBoundSlots(Coord4D location, int side) { - ForgeDirection dir = ForgeDirection.getOrientation(facing).getOpposite(); + EnumFacing dir = EnumFacing.getFront(facing).getOpposite(); Coord4D eject = Coord4D.get(this).translate(dir.offsetX, 1, dir.offsetZ); Coord4D pull = Coord4D.get(this).translate(0, 1, 0); @@ -1167,7 +1167,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public boolean canBoundInsert(Coord4D location, int i, ItemStack itemstack) { - ForgeDirection side = ForgeDirection.getOrientation(facing).getOpposite(); + EnumFacing side = EnumFacing.getFront(facing).getOpposite(); Coord4D eject = Coord4D.get(this).translate(side.offsetX, 1, side.offsetZ); Coord4D pull = Coord4D.get(this).translate(0, 1, 0); @@ -1190,10 +1190,10 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public boolean canBoundExtract(Coord4D location, int i, ItemStack itemstack, int j) { - ForgeDirection side = ForgeDirection.getOrientation(facing).getOpposite(); + EnumFacing side = EnumFacing.getFront(facing).getOpposite(); - Coord4D eject = new Coord4D(xCoord+side.offsetX, yCoord+1, zCoord+side.offsetZ, worldObj.provider.dimensionId); - Coord4D pull = new Coord4D(xCoord, yCoord+1, zCoord, worldObj.provider.dimensionId); + Coord4D eject = new Coord4D(xCoord+side.offsetX, yCoord+1, zCoord+side.offsetZ, worldObj.provider.getDimensionId()); + Coord4D pull = new Coord4D(xCoord, yCoord+1, zCoord, worldObj.provider.getDimensionId()); if(location.equals(eject)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 5f2f6cf76..b4c5ce293 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -19,7 +19,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; @@ -377,7 +377,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.allOf(ForgeDirection.class); + return EnumSet.allOf(EnumFacing.class); } @Override @@ -209,7 +209,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override @Method(modid = "CoFHCore") - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { if(getConsumingSides().contains(from)) { @@ -228,7 +228,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override @Method(modid = "CoFHCore") - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if(getOutputtingSides().contains(from)) { @@ -247,21 +247,21 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override @Method(modid = "CoFHCore") - public boolean canConnectEnergy(ForgeDirection from) + public boolean canConnectEnergy(EnumFacing from) { return getConsumingSides().contains(from) || getOutputtingSides().contains(from); } @Override @Method(modid = "CoFHCore") - public int getEnergyStored(ForgeDirection from) + public int getEnergyStored(EnumFacing from) { return (int)Math.round(getEnergy()* general.TO_TE); } @Override @Method(modid = "CoFHCore") - public int getMaxEnergyStored(ForgeDirection from) + public int getMaxEnergyStored(EnumFacing from) { return (int)Math.round(getMaxEnergy()* general.TO_TE); } @@ -297,27 +297,27 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override @Method(modid = "IC2") - public boolean isTeleporterCompatible(ForgeDirection side) + public boolean isTeleporterCompatible(EnumFacing side) { return getOutputtingSides().contains(side); } @Override - public boolean canOutputTo(ForgeDirection side) + public boolean canOutputTo(EnumFacing side) { return getOutputtingSides().contains(side); } @Override @Method(modid = "IC2") - public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) + public boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction) { return getConsumingSides().contains(direction); } @Override @Method(modid = "IC2") - public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) + public boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction) { return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; } @@ -358,7 +358,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return getConsumingSides().contains(side); } @@ -372,7 +372,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override @Method(modid = "IC2") - public double injectEnergy(ForgeDirection direction, double amount, double voltage) + public double injectEnergy(EnumFacing direction, double amount, double voltage) { if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile) { @@ -390,9 +390,9 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { - if(!(getConsumingSides().contains(side) || side == ForgeDirection.UNKNOWN)) + if(!(getConsumingSides().contains(side) || side == EnumFacing.null)) { return 0; } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index 827de3ce2..c73c465e4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -138,7 +138,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == 0 || !canAccess()) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 4b23e8712..91a3ea8c2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -33,7 +33,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -157,7 +157,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(fluidTank.getFluid() != null) { - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { TileEntity tileEntity = Coord4D.get(this).offset(orientation).getTileEntity(worldObj); @@ -186,7 +186,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I Collections.shuffle(tempPumpList); //First see if there are any fluid blocks touching the pump - if so, sucks and adds the location to the recurring list - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { Coord4D wrapper = Coord4D.get(this).offset(orientation); @@ -233,7 +233,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } //Add all the blocks surrounding this recurring node to the recurring node list - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { Coord4D side = wrapper.offset(orientation); @@ -413,9 +413,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); + return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); } @Override @@ -425,7 +425,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == 1) { @@ -441,9 +441,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection direction) + public FluidTankInfo[] getTankInfo(EnumFacing direction) { - if(direction == ForgeDirection.getOrientation(1)) + if(direction == EnumFacing.getFront(1)) { return new FluidTankInfo[] {fluidTank.getInfo()}; } @@ -470,9 +470,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == ForgeDirection.getOrientation(1)) + if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing.getFront(1)) { return drain(from, resource.amount, doDrain); } @@ -481,15 +481,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return 0; } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { - if(from == ForgeDirection.getOrientation(1)) + if(from == EnumFacing.getFront(1)) { return fluidTank.drain(maxDrain, doDrain); } @@ -498,15 +498,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return false; } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { - return from == ForgeDirection.getOrientation(1); + return from == EnumFacing.getFront(1); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 016175cab..884f1715a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -26,7 +26,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -338,7 +338,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { if(type == 0) { - ForgeDirection side = ForgeDirection.getOrientation(facing); + EnumFacing side = EnumFacing.getFront(facing); double x = xCoord + (side.offsetX == 0 ? 0.5 : Math.max(side.offsetX, 0)); double z = zCoord + (side.offsetZ == 0 ? 0.5 : Math.max(side.offsetZ, 0)); @@ -409,13 +409,13 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { - if(ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing)) + if(EnumFacing.getFront(side) == MekanismUtils.getRight(facing)) { return new int[] {3}; } - else if(side == facing || ForgeDirection.getOrientation(side) == ForgeDirection.getOrientation(facing).getOpposite()) + else if(side == facing || EnumFacing.getFront(side) == EnumFacing.getFront(facing).getOpposite()) { return new int[] {1, 2}; } @@ -615,7 +615,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing); } @@ -648,25 +648,25 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { if(Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(resource.getFluid())) { @@ -677,31 +677,31 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return null; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return new FluidTankInfo[] {fluidTank.getInfo()}; } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return 0; } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { if(side == MekanismUtils.getLeft(facing)) { @@ -716,19 +716,19 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return false; } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { if(side == MekanismUtils.getLeft(facing)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 5949f4235..85a6fab6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -15,7 +15,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; import java.util.EnumSet; @@ -98,18 +98,18 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - EnumSet set = EnumSet.allOf(ForgeDirection.class); + EnumSet set = EnumSet.allOf(EnumFacing.class); set.removeAll(getOutputtingSides()); return set; } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing)); + return EnumSet.of(EnumFacing.getFront(facing)); } @Override @@ -125,7 +125,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return side <= 1 ? new int[] {0} : new int[] {1}; } diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 62aca60d2..c9c4e517f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -13,7 +13,7 @@ import mekanism.common.content.teleportation.SharedInventoryManager; import mekanism.common.util.CableUtils; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -25,7 +25,7 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements { public SharedInventory sharedInventory; - public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); + public static final EnumSet nothing = EnumSet.noneOf(EnumFacing.class); public TileEntityEntangledBlock() { @@ -73,15 +73,15 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return sharedInventory == null ? nothing : EnumSet.of(ForgeDirection.UP); + return sharedInventory == null ? nothing : EnumSet.of(EnumFacing.UP); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return sharedInventory == null ? nothing : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, ForgeDirection.UP)); + return sharedInventory == null ? nothing : EnumSet.complementOf(EnumSet.of(EnumFacing.null, EnumFacing.UP)); } @Override @@ -112,13 +112,13 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return sharedInventory == null ? 0 : sharedInventory.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(sharedInventory == null) { @@ -128,7 +128,7 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(sharedInventory == null) { @@ -138,61 +138,61 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return sharedInventory == null ? false : sharedInventory.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return sharedInventory == null ? false : sharedInventory.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return sharedInventory == null ? new FluidTankInfo[0] : sharedInventory.getTankInfo(from); } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return sharedInventory == null ? 0 : sharedInventory.receiveGas(side, stack, doTransfer); } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return sharedInventory == null ? null : sharedInventory.drawGas(side, amount, doTransfer); } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return sharedInventory == null ? false : sharedInventory.canReceiveGas(side, type); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return sharedInventory == null ? false : sharedInventory.canDrawGas(side, type); } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return sharedInventory == null ? false : true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 6201061b5..6113c1a4c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -48,7 +48,7 @@ import mekanism.common.util.StatUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -373,7 +373,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @@ -874,7 +874,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @@ -960,7 +960,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack.getGas())) { @@ -971,13 +971,13 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { if(configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).hasSlot(0)) { @@ -988,7 +988,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { if(recipeType.canTubeConnect(side)) { @@ -999,19 +999,19 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return null; } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 773ff176b..008874065 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -32,7 +32,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen public FluidTank fluidTank = new FluidTank(10000); - private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(ForgeDirection.UP, ForgeDirection.UNKNOWN)); + private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(EnumFacing.UP, EnumFacing.null)); private static int MAX_NODES = 4000; public TileEntityFluidicPlenisher() @@ -129,7 +129,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen doPlenish(); } else { - Coord4D below = Coord4D.get(this).offset(ForgeDirection.DOWN); + Coord4D below = Coord4D.get(this).offset(EnumFacing.DOWN); if(canReplace(below, false, false) && getEnergy() >= usage.fluidicPlenisherUsage && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME) { @@ -159,7 +159,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { if(usedNodes.isEmpty()) { - Coord4D below = Coord4D.get(this).offset(ForgeDirection.DOWN); + Coord4D below = Coord4D.get(this).offset(EnumFacing.DOWN); if(!canReplace(below, true, true)) { @@ -190,7 +190,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } - for(ForgeDirection dir : dirs) + for(EnumFacing dir : dirs) { Coord4D sideCoord = coord.offset(dir); @@ -385,9 +385,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); + return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); } @Override @@ -397,7 +397,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == 1) { @@ -413,9 +413,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection direction) + public FluidTankInfo[] getTankInfo(EnumFacing direction) { - if(direction == ForgeDirection.UP) + if(direction == EnumFacing.UP) { return new FluidTankInfo[] {fluidTank.getInfo()}; } @@ -442,9 +442,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == ForgeDirection.UP) + if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing.UP) { return drain(from, resource.amount, doDrain); } @@ -453,9 +453,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(from == ForgeDirection.UP && resource.getFluid().canBePlacedInWorld()) + if(from == EnumFacing.UP && resource.getFluid().canBePlacedInWorld()) { return fluidTank.fill(resource, true); } @@ -464,19 +464,19 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return null; } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { - return from == ForgeDirection.UP && fluid.canBePlacedInWorld(); + return from == EnumFacing.UP && fluid.canBePlacedInWorld(); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 190a94f02..002a813da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; @@ -67,13 +67,13 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), output)); - TileEntity tileEntity = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); + TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.getFront(facing)).getTileEntity(worldObj); if(tileEntity instanceof IGasHandler) { - if(((IGasHandler)tileEntity).canReceiveGas(ForgeDirection.getOrientation(facing).getOpposite(), gasTank.getGas().getGas())) + if(((IGasHandler)tileEntity).canReceiveGas(EnumFacing.getFront(facing).getOpposite(), gasTank.getGas().getGas())) { - gasTank.draw(((IGasHandler)tileEntity).receiveGas(ForgeDirection.getOrientation(facing).getOpposite(), toSend, true), true); + gasTank.draw(((IGasHandler)tileEntity).receiveGas(EnumFacing.getFront(facing).getOpposite(), toSend, true), true); } } } @@ -132,45 +132,45 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return side == 1 ? new int[]{0} : new int[]{1}; } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return gasTank.receive(stack, doTransfer); } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return null; } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return gasTank.canDraw(type); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { - if(side != ForgeDirection.getOrientation(facing)) + if(side != EnumFacing.getFront(facing)) { return gasTank.canReceive(type); } @@ -264,7 +264,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 1f08e0f88..d99904ea0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -28,7 +28,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -73,14 +73,14 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { if(structure != null && mode == true) { - EnumSet set = EnumSet.allOf(ForgeDirection.class); - set.remove(ForgeDirection.UNKNOWN); + EnumSet set = EnumSet.allOf(EnumFacing.class); + set.remove(EnumFacing.null); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { if(structure.locations.contains(Coord4D.get(this).offset(side))) { @@ -91,20 +91,20 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return set; } - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { if(structure != null && mode == false) { - EnumSet set = EnumSet.allOf(ForgeDirection.class); - set.remove(ForgeDirection.UNKNOWN); + EnumSet set = EnumSet.allOf(EnumFacing.class); + set.remove(EnumFacing.null); return set; } - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override @@ -231,7 +231,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override @Method(modid = "CoFHCore") - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { if(getConsumingSides().contains(from)) { @@ -251,7 +251,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override @Method(modid = "CoFHCore") - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if(getOutputtingSides().contains(from)) { @@ -271,21 +271,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override @Method(modid = "CoFHCore") - public boolean canConnectEnergy(ForgeDirection from) + public boolean canConnectEnergy(EnumFacing from) { return structure != null; } @Override @Method(modid = "CoFHCore") - public int getEnergyStored(ForgeDirection from) + public int getEnergyStored(EnumFacing from) { return (int)Math.round(getEnergy()*general.TO_TE); } @Override @Method(modid = "CoFHCore") - public int getMaxEnergyStored(ForgeDirection from) + public int getMaxEnergyStored(EnumFacing from) { return (int)Math.round(getMaxEnergy()*general.TO_TE); } @@ -323,27 +323,27 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override @Method(modid = "IC2") - public boolean isTeleporterCompatible(ForgeDirection side) + public boolean isTeleporterCompatible(EnumFacing side) { return canOutputTo(side); } @Override - public boolean canOutputTo(ForgeDirection side) + public boolean canOutputTo(EnumFacing side) { return getOutputtingSides().contains(side); } @Override @Method(modid = "IC2") - public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) + public boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction) { return getConsumingSides().contains(direction); } @Override @Method(modid = "IC2") - public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) + public boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction) { return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; } @@ -384,7 +384,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return getConsumingSides().contains(side); } @@ -398,7 +398,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override @Method(modid = "IC2") - public double injectEnergy(ForgeDirection direction, double amount, double voltage) + public double injectEnergy(EnumFacing direction, double amount, double voltage) { if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile) { @@ -421,7 +421,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { if(!getConsumingSides().contains(side)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index ad331ced4..8df29f548 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IActiveState { @@ -47,7 +47,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc { if(isActive) { - MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), usage.laserUsage, worldObj); + MovingObjectPosition mop = LaserManager.fireLaserClient(this, EnumFacing.getFront(facing), usage.laserUsage, worldObj); Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -79,7 +79,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc { setActive(true); - LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), usage.laserUsage, worldObj); + LaserInfo info = LaserManager.fireLaser(this, EnumFacing.getFront(facing), usage.laserUsage, worldObj); Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -116,9 +116,9 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); + return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 342fbaff4..bf70c7d8d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; @@ -50,7 +50,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public void receiveLaserEnergy(double energy, ForgeDirection side) + public void receiveLaserEnergy(double energy, EnumFacing side) { setEnergy(getEnergy() + energy); } @@ -68,7 +68,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { if(on) { - MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); + MovingObjectPosition mop = LaserManager.fireLaserClient(this, EnumFacing.getFront(facing), lastFired, worldObj); Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -120,7 +120,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); } - LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); + LaserInfo info = LaserManager.fireLaser(this, EnumFacing.getFront(facing), firing, worldObj); Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -299,7 +299,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public boolean canOutputTo(ForgeDirection side) + public boolean canOutputTo(EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 48d0599d9..bc7469610 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -19,7 +19,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor { @@ -41,7 +41,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } @Override - public void receiveLaserEnergy(double energy, ForgeDirection side) + public void receiveLaserEnergy(double energy, EnumFacing side) { setEnergy(getEnergy() + energy); } @@ -59,7 +59,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { if(on) { - MovingObjectPosition mop = LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); + MovingObjectPosition mop = LaserManager.fireLaserClient(this, EnumFacing.getFront(facing), lastFired, worldObj); Coord4D hitCoord = mop == null ? null : new Coord4D(mop.blockX, mop.blockY, mop.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -99,7 +99,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); } - LaserInfo info = LaserManager.fireLaser(this, ForgeDirection.getOrientation(facing), firing, worldObj); + LaserInfo info = LaserManager.fireLaser(this, EnumFacing.getFront(facing), firing, worldObj); Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos.blockX, info.movingPos.blockY, info.movingPos.blockZ); if(hitCoord == null || !hitCoord.equals(digging)) @@ -187,7 +187,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme return false; } - public int[] getAccessibleSlotsFromSide(int p_94128_1_) + public int[] getSlotsForFace(int p_94128_1_) { return availableSlotIDs; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index ab16e4550..968000d11 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -23,7 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; import java.util.EnumSet; @@ -75,8 +75,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(MekanismUtils.canFunction(this) && delayTicks == 0) { - TileEntity back = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj); - TileEntity front = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); + TileEntity back = Coord4D.get(this).offset(EnumFacing.getFront(facing).getOpposite()).getTileEntity(worldObj); + TileEntity front = Coord4D.get(this).offset(EnumFacing.getFront(facing)).getTileEntity(worldObj); if(back instanceof IInventory && (front instanceof ITransporterTile || front instanceof IInventory)) { @@ -89,7 +89,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen for(TransporterFilter filter : filters) { inner: - for(StackSearcher search = new StackSearcher(inventory, ForgeDirection.getOrientation(facing).getOpposite()); search.i >= 0;) + for(StackSearcher search = new StackSearcher(inventory, EnumFacing.getFront(facing).getOpposite()); search.i >= 0;) { InvStack invStack = filter.getStackFromInventory(search); @@ -128,7 +128,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(!sentItems && autoEject) { - InvStack invStack = InventoryUtils.takeTopStack(inventory, ForgeDirection.getOrientation(facing).getOpposite().ordinal(), new FirstFinder()); + InvStack invStack = InventoryUtils.takeTopStack(inventory, EnumFacing.getFront(facing).getOpposite().ordinal(), new FirstFinder()); if(invStack != null && invStack.getStack() != null) { @@ -448,11 +448,11 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen public boolean canSendHome(ItemStack stack) { - TileEntity back = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj); + TileEntity back = Coord4D.get(this).offset(EnumFacing.getFront(facing).getOpposite()).getTileEntity(worldObj); if(back instanceof IInventory) { - return InventoryUtils.canInsert(back, null, stack, ForgeDirection.getOrientation(facing).getOpposite().ordinal(), true); + return InventoryUtils.canInsert(back, null, stack, EnumFacing.getFront(facing).getOpposite().ordinal(), true); } return false; @@ -460,16 +460,16 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen public boolean hasInventory() { - return Coord4D.get(this).offset(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj) instanceof IInventory; + return Coord4D.get(this).offset(EnumFacing.getFront(facing).getOpposite()).getTileEntity(worldObj) instanceof IInventory; } public ItemStack sendHome(ItemStack stack) { - TileEntity back = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing).getOpposite()).getTileEntity(worldObj); + TileEntity back = Coord4D.get(this).offset(EnumFacing.getFront(facing).getOpposite()).getTileEntity(worldObj); if(back instanceof IInventory) { - return InventoryUtils.putStackInInventory((IInventory)back, stack, ForgeDirection.getOrientation(facing).getOpposite().ordinal(), true); + return InventoryUtils.putStackInInventory((IInventory)back, stack, EnumFacing.getFront(facing).getOpposite().ordinal(), true); } return stack; @@ -494,9 +494,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { - if(side == ForgeDirection.getOrientation(facing).ordinal() || side == ForgeDirection.getOrientation(facing).getOpposite().ordinal()) + if(side == EnumFacing.getFront(facing).ordinal() || side == EnumFacing.getFront(facing).getOpposite().ordinal()) { return new int[] {0}; } @@ -568,9 +568,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 9054bc8cc..30c17e58a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -29,7 +29,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; import java.util.EnumSet; @@ -188,7 +188,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @@ -394,7 +394,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index fc092bc86..0c969d173 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -104,7 +104,7 @@ public abstract class TileEntityMultiblock> extend sendStructure = true; } - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D obj = Coord4D.get(this).offset(side); diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 88f478d09..7abae1e94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -152,7 +152,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { if(side == MekanismUtils.getLeft(facing).ordinal()) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 51dfd0a94..8e40b0840 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -25,7 +25,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -330,7 +330,7 @@ public class TileEntityPRC extends TileEntityBasicMachine 0 && from == ForgeDirection.UP) + if(filled > 0 && from == EnumFacing.UP) { if(valve == 0) { @@ -516,7 +516,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(resource != null && canDrain(from, resource.getFluid())) { @@ -527,7 +527,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(canDrain(from, null)) { @@ -538,11 +538,11 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { - if(from == ForgeDirection.DOWN) + if(from == EnumFacing.DOWN) { - TileEntity tile = Coord4D.get(this).offset(ForgeDirection.DOWN).getTileEntity(worldObj); + TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); if(isActive && !(tile instanceof TileEntityPortableTank)) { @@ -554,7 +554,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { if(fluidTank != null) { @@ -562,7 +562,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { if(isActive) { - return from != ForgeDirection.DOWN; + return from != EnumFacing.DOWN; } return true; @@ -573,7 +573,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return new FluidTankInfo[] {fluidTank.getInfo()}; } diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 59213e2b7..6a7562244 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -18,7 +18,7 @@ import mekanism.common.recipe.machines.PurificationRecipe; import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMachine { @@ -44,7 +44,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(stack.getGas() == GasRegistry.getGas("oxygen")) { @@ -55,7 +55,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return type == GasRegistry.getGas("oxygen"); } @@ -74,7 +74,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index b63b6cd94..afe53f2b5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -35,7 +35,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -516,43 +516,43 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return side == MekanismUtils.getLeft(facing); } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return gasTank.receive(stack, doTransfer); } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return gasTank.draw(amount, doTransfer); } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return mode == 1 && side == MekanismUtils.getLeft(facing) ? gasTank.canDraw(type) : false; } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return mode == 0 && side == MekanismUtils.getLeft(facing) ? gasTank.canReceive(type) : false; } @@ -579,7 +579,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { if(canFill(from, resource.getFluid())) { @@ -590,7 +590,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid()) { @@ -601,19 +601,19 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return mode == 1 && from == MekanismUtils.getRight(facing) && (fluidTank.getFluid() == null ? isValidFluid(new FluidStack(fluid, 1)) : fluidTank.getFluid().getFluid() == fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return mode == 0 && from == MekanismUtils.getRight(facing); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { if(from == MekanismUtils.getRight(facing)) { @@ -624,7 +624,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(canDrain(from, null)) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 59326e2c2..71c5de02e 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -17,7 +17,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import io.netty.buffer.ByteBuf; @@ -188,9 +188,9 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.UP); + return EnumSet.of(EnumFacing.UP); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java index a5036f46e..551af58fd 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationBlock.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock { @@ -128,7 +128,7 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock iterated.add(pos); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index e1b156fed..f86014277 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -369,8 +369,8 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public boolean buildStructure() { - ForgeDirection right = MekanismUtils.getRight(facing); - ForgeDirection left = MekanismUtils.getLeft(facing); + EnumFacing right = MekanismUtils.getRight(facing); + EnumFacing left = MekanismUtils.getLeft(facing); height = 0; controllerConflict = false; @@ -378,12 +378,12 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora Coord4D startPoint = Coord4D.get(this); - while(startPoint.offset(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock) + while(startPoint.offset(EnumFacing.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock) { - startPoint.step(ForgeDirection.UP); + startPoint.step(EnumFacing.UP); } - Coord4D test = startPoint.offset(ForgeDirection.DOWN).offset(right, 2); + Coord4D test = startPoint.offset(EnumFacing.DOWN).offset(right, 2); isLeftOnFace = test.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock; startPoint = startPoint.offset(left, isLeftOnFace ? 1 : 2); @@ -395,11 +395,11 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora height = 1; - Coord4D middlePointer = startPoint.offset(ForgeDirection.DOWN); + Coord4D middlePointer = startPoint.offset(EnumFacing.DOWN); while(scanLowerLayer(middlePointer)) { - middlePointer = middlePointer.offset(ForgeDirection.DOWN); + middlePointer = middlePointer.offset(EnumFacing.DOWN); } if(height < 3 || height > 18) @@ -417,8 +417,8 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public boolean scanTopLayer(Coord4D current) { - ForgeDirection right = MekanismUtils.getRight(facing); - ForgeDirection back = MekanismUtils.getBack(facing); + EnumFacing right = MekanismUtils.getRight(facing); + EnumFacing back = MekanismUtils.getBack(facing); for(int x = 0; x < 4; x++) { @@ -435,7 +435,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora { continue; } - else if(pointer.offset(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile)) + else if(pointer.offset(EnumFacing.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile)) { return false; } @@ -449,7 +449,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora } } else { - if(pointer.offset(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile)) + if(pointer.offset(EnumFacing.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile)) { return false; } @@ -490,8 +490,8 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora public boolean scanLowerLayer(Coord4D current) { - ForgeDirection right = MekanismUtils.getRight(facing); - ForgeDirection back = MekanismUtils.getBack(facing); + EnumFacing right = MekanismUtils.getRight(facing); + EnumFacing back = MekanismUtils.getBack(facing); boolean foundCenter = false; @@ -597,7 +597,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora return null; } - ForgeDirection right = MekanismUtils.getRight(facing); + EnumFacing right = MekanismUtils.getRight(facing); Coord4D startPoint = Coord4D.get(this).offset(right); startPoint = isLeftOnFace ? startPoint.offset(right) : startPoint; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java index 2283f1b25..a340f00ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationValve.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.common.util.PipeUtils; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -21,7 +21,7 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB { if((master != null) != prevMaster) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D obj = Coord4D.get(this).offset(side); @@ -37,14 +37,14 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { TileEntitySolarEvaporationController controller = getController(); return controller == null ? 0 : controller.inputTank.fill(resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { TileEntitySolarEvaporationController controller = getController(); @@ -57,7 +57,7 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { TileEntitySolarEvaporationController controller = getController(); @@ -70,21 +70,21 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { TileEntitySolarEvaporationController controller = getController(); return controller != null && controller.hasRecipe(fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { TileEntitySolarEvaporationController controller = getController(); return controller != null && controller.outputTank.getFluidAmount() > 0; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { TileEntitySolarEvaporationController controller = getController(); diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index bbd3fef9c..4e966818c 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -28,7 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.biome.BiomeGenDesert; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager { @@ -121,13 +121,13 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { GasStack toSend = new GasStack(outputTank.getGas().getGas(), Math.min(outputTank.getStored(), gasOutput)); - TileEntity tileEntity = Coord4D.get(this).offset(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); + TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.getFront(facing)).getTileEntity(worldObj); if(tileEntity instanceof IGasHandler) { - if(((IGasHandler)tileEntity).canReceiveGas(ForgeDirection.getOrientation(facing).getOpposite(), outputTank.getGas().getGas())) + if(((IGasHandler)tileEntity).canReceiveGas(EnumFacing.getFront(facing).getOpposite(), outputTank.getGas().getGas())) { - outputTank.draw(((IGasHandler)tileEntity).receiveGas(ForgeDirection.getOrientation(facing).getOpposite(), toSend, true), true); + outputTank.draw(((IGasHandler)tileEntity).receiveGas(EnumFacing.getFront(facing).getOpposite(), toSend, true), true); } } } @@ -261,7 +261,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im @Override public void onPlace() { - MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).offset(ForgeDirection.UP), Coord4D.get(this)); + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).offset(EnumFacing.UP), Coord4D.get(this)); } @Override @@ -272,7 +272,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(canReceiveGas(side, stack != null ? stack.getGas() : null)) { @@ -283,13 +283,13 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { if(canDrawGas(side, null)) { @@ -300,27 +300,27 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { - return side == ForgeDirection.DOWN && inputTank.canReceive(type); + return side == EnumFacing.DOWN && inputTank.canReceive(type); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { - return side == ForgeDirection.getOrientation(facing) && outputTank.canDraw(type); + return side == EnumFacing.getFront(facing) && outputTank.canDraw(type); } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { - return side == ForgeDirection.getOrientation(facing) || side == ForgeDirection.DOWN; + return side == EnumFacing.getFront(facing) || side == EnumFacing.DOWN; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index cbdf54d38..32ba17fc2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -34,7 +34,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.*; @@ -264,7 +264,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return new int[] {0}; } @@ -413,7 +413,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { WorldServer world = server.worldServerForDimension(coord.dimensionId); - if(entity.worldObj.provider.dimensionId != coord.dimensionId) + if(entity.worldObj.provider.getDimensionId() != coord.dimensionId) { entity.worldObj.removeEntity(entity); entity.isDead = false; @@ -439,11 +439,11 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public static void alignPlayer(EntityPlayerMP player, Coord4D coord) { - Coord4D upperCoord = coord.offset(ForgeDirection.UP); - ForgeDirection side = null; + Coord4D upperCoord = coord.offset(EnumFacing.UP); + EnumFacing side = null; float yaw = player.rotationYaw; - for(ForgeDirection iterSide : MekanismUtils.SIDE_DIRS) + for(EnumFacing iterSide : MekanismUtils.SIDE_DIRS) { if(upperCoord.offset(iterSide).isAirBlock(player.worldObj)) { @@ -494,7 +494,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { int energyCost = 1000; - if(entity.worldObj.provider.dimensionId != coords.dimensionId) + if(entity.worldObj.provider.getDimensionId() != coords.dimensionId) { energyCost+=10000; } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java index 9309a8ab7..bac067809 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java @@ -22,7 +22,7 @@ import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.HeatUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; @@ -39,7 +39,7 @@ public class TileEntityThermoelectricBoiler extends TileEntityMultiblock getSidesForData(TransmissionType type, int facing, int dataIndex) + public EnumSet getSidesForData(TransmissionType type, int facing, int dataIndex) { - EnumSet ret = EnumSet.noneOf(ForgeDirection.class); + EnumSet ret = EnumSet.noneOf(EnumFacing.class); for(byte b = 0; b < 6; b++) { if(getConfig(type)[b] == dataIndex) { - ret.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(b, facing))); + ret.add(EnumFacing.getFront(MekanismUtils.getBaseOrientation(b, facing))); } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index b4a5c924d..972e328db 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -29,7 +29,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -76,15 +76,15 @@ public class TileComponentEjector implements ITileComponent, IEjector sideData = ejector.sideData; } - private List getTrackedOutputs(TransmissionType type, int index, List dirs) + private List getTrackedOutputs(TransmissionType type, int index, List dirs) { - List sides = new ArrayList(); + List sides = new ArrayList(); for(int i = trackers.get(type)[index]+1; i <= trackers.get(type)[index]+6; i++) { - for(ForgeDirection side : dirs) + for(EnumFacing side : dirs) { - if(ForgeDirection.getOrientation(i%6) == side) + if(EnumFacing.getFront(i%6) == side) { sides.add(side); } @@ -108,12 +108,12 @@ public class TileComponentEjector implements ITileComponent, IEjector tickDelay--; } - if(!tileEntity.getWorldObj().isRemote) + if(!tileEntity.getWorld().isRemote) { if(sideData.get(TransmissionType.GAS) != null && getEjecting(TransmissionType.GAS)) { SideData data = sideData.get(TransmissionType.GAS); - List outputSides = getOutputSides(TransmissionType.GAS, data); + List outputSides = getOutputSides(TransmissionType.GAS, data); GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; @@ -128,7 +128,7 @@ public class TileComponentEjector implements ITileComponent, IEjector if(sideData.get(TransmissionType.FLUID) != null && getEjecting(TransmissionType.FLUID)) { SideData data = sideData.get(TransmissionType.FLUID); - List outputSides = getOutputSides(TransmissionType.FLUID, data); + List outputSides = getOutputSides(TransmissionType.FLUID, data); FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; @@ -142,9 +142,9 @@ public class TileComponentEjector implements ITileComponent, IEjector } } - public List getOutputSides(TransmissionType type, SideData data) + public List getOutputSides(TransmissionType type, SideData data) { - List outputSides = new ArrayList(); + List outputSides = new ArrayList(); ISideConfiguration configurable = (ISideConfiguration)tileEntity; @@ -152,7 +152,7 @@ public class TileComponentEjector implements ITileComponent, IEjector { if(configurable.getConfig().getConfig(type)[i] == configurable.getConfig().getOutputs(type).indexOf(data)) { - outputSides.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(i, tileEntity.facing))); + outputSides.add(EnumFacing.getFront(MekanismUtils.getBaseOrientation(i, tileEntity.facing))); } } @@ -162,13 +162,13 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void outputItems() { - if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorldObj().isRemote) + if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorld().isRemote) { return; } SideData data = sideData.get(TransmissionType.ITEM); - List outputSides = getOutputSides(TransmissionType.ITEM, data); + List outputSides = getOutputSides(TransmissionType.ITEM, data); for(int index = 0; index < sideData.get(TransmissionType.ITEM).availableSlots.length; index++) { @@ -180,11 +180,11 @@ public class TileComponentEjector implements ITileComponent, IEjector } ItemStack stack = tileEntity.inventory[slotID]; - List outputs = getTrackedOutputs(TransmissionType.ITEM, index, outputSides); + List outputs = getTrackedOutputs(TransmissionType.ITEM, index, outputSides); - for(ForgeDirection side : outputs) + for(EnumFacing side : outputs) { - TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorldObj()); + TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorld()); ItemStack prev = stack.copy(); if(tile instanceof IInventory && !(tile instanceof ITransporterTile)) @@ -246,14 +246,14 @@ public class TileComponentEjector implements ITileComponent, IEjector } @Override - public void setInputColor(ForgeDirection side, EnumColor color) + public void setInputColor(EnumFacing side, EnumColor color) { inputColors[side.ordinal()] = color; MekanismUtils.saveChunk(tileEntity); } @Override - public EnumColor getInputColor(ForgeDirection side) + public EnumColor getInputColor(EnumFacing side) { return inputColors[side.ordinal()]; } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 71aded2d2..59ef245f0 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -55,7 +55,7 @@ public class TileComponentUpgrade implements ITileComponent @Override public void tick() { - if(!tileEntity.getWorldObj().isRemote) + if(!tileEntity.getWorld().isRemote) { if(tileEntity.inventory[upgradeSlot] != null && tileEntity.inventory[upgradeSlot].getItem() instanceof IUpgradeItem) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 173cf5fea..4c1acd82c 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -17,7 +17,7 @@ import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; @@ -46,14 +46,14 @@ public final class CableUtils * @param sides - set of sides to check * @return boolean[] of adjacent connections */ - public static boolean[] getConnections(TileEntity tileEntity, Set sides) + public static boolean[] getConnections(TileEntity tileEntity, Set sides) { boolean[] connectable = new boolean[] {false, false, false, false, false, false}; Coord4D coord = Coord4D.get(tileEntity); - for(ForgeDirection side : sides) + for(EnumFacing side : sides) { - TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorldObj()); + TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld()); connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); connectable[side.ordinal()] |= isCable(tile); @@ -68,7 +68,7 @@ public final class CableUtils * @param side - side to check * @return boolean whether the acceptor is valid */ - public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, ForgeDirection side) + public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, EnumFacing side) { if(isCable(tile)) { @@ -92,9 +92,9 @@ public final class CableUtils { TileEntity[] outputters = new TileEntity[] {null, null, null, null, null, null}; - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { - TileEntity outputter = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorldObj()); + TileEntity outputter = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorld()); if(isOutputter(outputter, orientation)) { @@ -105,14 +105,14 @@ public final class CableUtils return outputters; } - public static boolean isOutputter(TileEntity tileEntity, ForgeDirection side) + public static boolean isOutputter(TileEntity tileEntity, EnumFacing side) { return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())); } - public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, ForgeDirection side) + public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side) { if(tileEntity instanceof ITransmitterTile) { @@ -153,16 +153,16 @@ public final class CableUtils public static void emit(IEnergyWrapper emitter) { - if(!((TileEntity)emitter).getWorldObj().isRemote && MekanismUtils.canFunction((TileEntity)emitter)) + if(!((TileEntity)emitter).getWorld().isRemote && MekanismUtils.canFunction((TileEntity)emitter)) { double energyToSend = Math.min(emitter.getEnergy(), emitter.getMaxOutput()); if(energyToSend > 0) { - List outputtingSides = new ArrayList(); + List outputtingSides = new ArrayList(); boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides()); - for(ForgeDirection side : emitter.getOutputtingSides()) + for(EnumFacing side : emitter.getOutputtingSides()) { if(connectable[side.ordinal()]) { @@ -191,17 +191,17 @@ public final class CableUtils } } - private static double emit_do(IEnergyWrapper emitter, List outputtingSides, double totalToSend, boolean tryAgain) + private static double emit_do(IEnergyWrapper emitter, List outputtingSides, double totalToSend, boolean tryAgain) { double remains = totalToSend%outputtingSides.size(); double splitSend = (totalToSend-remains)/outputtingSides.size(); double sent = 0; - List toRemove = new ArrayList(); + List toRemove = new ArrayList(); - for(ForgeDirection side : outputtingSides) + for(EnumFacing side : outputtingSides) { - TileEntity tileEntity = Coord4D.get((TileEntity)emitter).offset(side).getTileEntity(((TileEntity)emitter).getWorldObj()); + TileEntity tileEntity = Coord4D.get((TileEntity)emitter).offset(side).getTileEntity(((TileEntity)emitter).getWorld()); double toSend = splitSend+remains; remains = 0; @@ -214,7 +214,7 @@ public final class CableUtils } } - for(ForgeDirection side : toRemove) + for(EnumFacing side : toRemove) { outputtingSides.remove(side); } @@ -222,7 +222,7 @@ public final class CableUtils return sent; } - private static double emit_do_do(IEnergyWrapper from, TileEntity tileEntity, ForgeDirection side, double currentSending, boolean tryAgain) + private static double emit_do_do(IEnergyWrapper from, TileEntity tileEntity, EnumFacing side, double currentSending, boolean tryAgain) { double sent = 0; diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 5c7e0c87e..e7072a39e 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -6,7 +6,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterTile; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class HeatUtils { @@ -14,7 +14,7 @@ public class HeatUtils { double heatTransferred[] = new double[] {0,0}; - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { IHeatTransfer sink = source.getAdjacent(side); diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 9b3b4f88b..c45ea5770 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -14,7 +14,7 @@ import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public final class InventoryUtils { @@ -65,7 +65,7 @@ public final class InventoryUtils return inv; } - public static ItemStack putStackInInventory(IInventory inventory, ItemStack itemStack, int side, boolean force) + public static ItemStack putStackInInventory(IInventory inventory, ItemStack itemStack, EnumFacing side, boolean force) { inventory = checkChestInv(inventory); @@ -128,13 +128,13 @@ public final class InventoryUtils } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.OPPOSITES[side]); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); if(slots != null && slots.length != 0) { - if(force && sidedInventory instanceof TileEntityBin && ForgeDirection.OPPOSITES[side] == 0) + if(force && sidedInventory instanceof TileEntityBin && side == EnumFacing.UP) { - slots = sidedInventory.getAccessibleSlotsFromSide(1); + slots = sidedInventory.getSlotsForFace(EnumFacing.UP); } for(int get = 0; get <= slots.length - 1; get++) @@ -143,7 +143,7 @@ public final class InventoryUtils if(!force) { - if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, ForgeDirection.OPPOSITES[side])) + if(!sidedInventory.isItemValidForSlot(slotID, toInsert) || !sidedInventory.canInsertItem(slotID, toInsert, side.getOpposite())) { continue; } @@ -197,7 +197,7 @@ public final class InventoryUtils return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert); } - public static InvStack takeTopItem(IInventory inventory, int side, int amount) + public static InvStack takeTopItem(IInventory inventory, EnumFacing side, int amount) { inventory = checkChestInv(inventory); @@ -216,7 +216,7 @@ public final class InventoryUtils } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.OPPOSITES[side]); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); if(slots != null) { @@ -229,7 +229,7 @@ public final class InventoryUtils ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy(); toSend.stackSize = Math.min(amount, toSend.stackSize); - if(sidedInventory.canExtractItem(slotID, toSend, ForgeDirection.OPPOSITES[side])) + if(sidedInventory.canExtractItem(slotID, toSend, side.getOpposite())) { return new InvStack(inventory, slotID, toSend); } @@ -241,7 +241,7 @@ public final class InventoryUtils return null; } - public static InvStack takeDefinedItem(IInventory inventory, int side, ItemStack type, int min, int max) + public static InvStack takeDefinedItem(IInventory inventory, EnumFacing side, ItemStack type, int min, int max) { inventory = checkChestInv(inventory); @@ -275,7 +275,7 @@ public final class InventoryUtils } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.OPPOSITES[side]); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); if(slots != null && slots.length != 0) { @@ -292,7 +292,7 @@ public final class InventoryUtils { ItemStack copy = stack.copy(); - if(sidedInventory.canExtractItem(slotID, copy, ForgeDirection.OPPOSITES[side])) + if(sidedInventory.canExtractItem(slotID, copy, side.getOpposite())) { ret.appendStack(slotID, copy); } @@ -300,7 +300,7 @@ public final class InventoryUtils else { ItemStack copy = stack.copy(); - if(sidedInventory.canExtractItem(slotID, copy, ForgeDirection.OPPOSITES[side])) + if(sidedInventory.canExtractItem(slotID, copy, side.getOpposite())) { copy.stackSize = max-current; ret.appendStack(slotID, copy); @@ -324,7 +324,7 @@ public final class InventoryUtils return null; } - public static InvStack takeTopStack(IInventory inventory, int side, Finder id) + public static InvStack takeTopStack(IInventory inventory, EnumFacing side, Finder id) { inventory = checkChestInv(inventory); @@ -341,7 +341,7 @@ public final class InventoryUtils } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.OPPOSITES[side]); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); if(slots != null && slots.length != 0) { @@ -353,7 +353,7 @@ public final class InventoryUtils { ItemStack toSend = sidedInventory.getStackInSlot(slotID); - if(sidedInventory.canExtractItem(slotID, toSend, ForgeDirection.OPPOSITES[side])) + if(sidedInventory.canExtractItem(slotID, toSend, side.getOpposite())) { return new InvStack(inventory, slotID, toSend); } @@ -365,7 +365,7 @@ public final class InventoryUtils return null; } - public static boolean canInsert(TileEntity tileEntity, EnumColor color, ItemStack itemStack, int side, boolean force) + public static boolean canInsert(TileEntity tileEntity, EnumColor color, ItemStack itemStack, EnumFacing side, boolean force) { if(!(tileEntity instanceof IInventory)) { @@ -380,8 +380,8 @@ public final class InventoryUtils if(!force && tileEntity instanceof ISideConfiguration) { ISideConfiguration config = (ISideConfiguration)tileEntity; - int tileSide = config.getOrientation(); - EnumColor configColor = config.getEjector().getInputColor(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(side, tileSide)).getOpposite()); + EnumFacing tileSide = config.getOrientation(); + EnumColor configColor = config.getEjector().getInputColor(MekanismUtils.getBaseOrientation(side, tileSide).getOpposite()); if(config.getEjector().hasStrictInput() && configColor != null && configColor != color) { @@ -428,13 +428,13 @@ public final class InventoryUtils } else { ISidedInventory sidedInventory = (ISidedInventory)inventory; - int[] slots = sidedInventory.getAccessibleSlotsFromSide(ForgeDirection.OPPOSITES[side]); + int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); if(slots != null && slots.length != 0) { - if(force && sidedInventory instanceof TileEntityBin && ForgeDirection.OPPOSITES[side] == 0) + if(force && sidedInventory instanceof TileEntityBin && side == EnumFacing.UP) { - slots = sidedInventory.getAccessibleSlotsFromSide(1); + slots = sidedInventory.getSlotsForFace(EnumFacing.UP); } for(int get = 0; get <= slots.length - 1; get++) @@ -443,7 +443,7 @@ public final class InventoryUtils if(!force) { - if(!sidedInventory.isItemValidForSlot(slotID, itemStack) || !sidedInventory.canInsertItem(slotID, itemStack, ForgeDirection.OPPOSITES[side])) + if(!sidedInventory.isItemValidForSlot(slotID, itemStack) || !sidedInventory.canInsertItem(slotID, itemStack, side.getOpposite())) { continue; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 25ca516f4..29acd89de 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -31,6 +31,8 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityElectricChest; import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -41,14 +43,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing.Axis; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -69,7 +74,7 @@ import java.util.*; */ public final class MekanismUtils { - public static final ForgeDirection[] SIDE_DIRS = new ForgeDirection[] {ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.WEST, ForgeDirection.EAST}; + public static final EnumFacing[] SIDE_DIRS = new EnumFacing[] {EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST}; public static final Map> classesFound = new HashMap>(); @@ -258,7 +263,7 @@ public final class MekanismUtils public static void doFakeEntityExplosion(EntityPlayer entityplayer) { World world = entityplayer.worldObj; - world.spawnParticle("hugeexplosion", entityplayer.posX, entityplayer.posY, entityplayer.posZ, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, entityplayer.posX, entityplayer.posY, entityplayer.posZ, 0.0D, 0.0D, 0.0D); world.playSoundAtEntity(entityplayer, "random.explode", 1.0F, 1.0F); } @@ -271,7 +276,7 @@ public final class MekanismUtils */ public static void doFakeBlockExplosion(World world, int x, int y, int z) { - world.spawnParticle("hugeexplosion", x, y, z, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, x, y, z, 0.0D, 0.0D, 0.0D); world.playSound(x, y, z, "random.explode", 1.0F, 1.0F, true); } @@ -364,14 +369,12 @@ public final class MekanismUtils /** * Checks if a machine is in it's active state. * @param world - * @param x - * @param y - * @param z + * @param pos * @return if machine is active */ - public static boolean isActive(IBlockAccess world, int x, int y, int z) + public static boolean isActive(IBlockAccess world, BlockPos pos) { - TileEntity tileEntity = (TileEntity)world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if(tileEntity != null) { @@ -389,19 +392,10 @@ public final class MekanismUtils * @param orientation * @return left side */ - public static ForgeDirection getLeft(int orientation) + @Deprecated + public static EnumFacing getLeft(EnumFacing orientation) { - switch(orientation) - { - case 2: - return ForgeDirection.EAST; - case 3: - return ForgeDirection.WEST; - case 4: - return ForgeDirection.NORTH; - default: - return ForgeDirection.SOUTH; - } + return orientation.rotateY(); } /** @@ -409,9 +403,10 @@ public final class MekanismUtils * @param orientation * @return right side */ - public static ForgeDirection getRight(int orientation) + @Deprecated + public static EnumFacing getRight(EnumFacing orientation) { - return getLeft(orientation).getOpposite(); + return orientation.rotateYCCW(); } /** @@ -419,9 +414,10 @@ public final class MekanismUtils * @param orientation * @return opposite side */ - public static ForgeDirection getBack(int orientation) + @Deprecated + public static EnumFacing getBack(EnumFacing orientation) { - return ForgeDirection.getOrientation(orientation).getOpposite(); + return orientation.getOpposite(); } /** @@ -461,43 +457,43 @@ public final class MekanismUtils * @param blockFacing - what orientation the block is facing * @return machine orientation */ - public static int getBaseOrientation(int side, int blockFacing) + public static EnumFacing getBaseOrientation(EnumFacing side, EnumFacing blockFacing) { - if(blockFacing == 3 || side == 1 || side == 0) + if(blockFacing == EnumFacing.SOUTH || side.getAxis() == Axis.Y) { - if(side == 2 || side == 3) + if(side.getAxis() == Axis.Z) { - return ForgeDirection.getOrientation(side).getOpposite().ordinal(); + return side.getOpposite(); } return side; } - else if(blockFacing == 2) + else if(blockFacing == EnumFacing.NORTH) { - if(side == 2 || side == 3) + if(side.getAxis() == Axis.Z) { return side; } - return ForgeDirection.getOrientation(side).getOpposite().ordinal(); + return side.getOpposite(); } - else if(blockFacing == 4) + else if(blockFacing == EnumFacing.WEST) { - if(side == 2 || side == 3) + if(side.getAxis() == Axis.Z) { - return getRight(side).ordinal(); + return getRight(side); } - return getLeft(side).ordinal(); + return getLeft(side); } - else if(blockFacing == 5) + else if(blockFacing == EnumFacing.EAST) { - if(side == 2 || side == 3) + if(side.getAxis() == Axis.Z) { - return getLeft(side).ordinal(); + return getLeft(side); } - return getRight(side).ordinal(); + return getRight(side); } return side; @@ -625,7 +621,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(ItemStack itemStack, double def) { - Map upgrades = Upgrade.buildMap(itemStack.stackTagCompound); + Map upgrades = Upgrade.buildMap(itemStack.getTagCompound()); float numUpgrades = upgrades.get(Upgrade.ENERGY) == null ? 0 : (float)upgrades.get(Upgrade.ENERGY); return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); } @@ -638,20 +634,21 @@ public final class MekanismUtils */ public static boolean isGettingPowered(World world, Coord4D coord) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D sideCoord = coord.offset(side); if(sideCoord.exists(world) && sideCoord.offset(side).exists(world)) { - Block block = sideCoord.getBlock(world); - boolean weakPower = block.shouldCheckWeakPower(world, coord.xCoord, coord.yCoord, coord.zCoord, side.ordinal()); + IBlockState blockState = sideCoord.getBlockState(world); + Block block = blockState.getBlock(); + boolean weakPower = block.shouldCheckWeakPower(world, coord, side); if(weakPower && isDirectlyGettingPowered(world, sideCoord)) { return true; } - else if(!weakPower && block.isProvidingWeakPower(world, sideCoord.xCoord, sideCoord.yCoord, sideCoord.zCoord, side.ordinal()) > 0) + else if(!weakPower && block.getWeakPower(world, sideCoord, blockState, side) > 0) { return true; } @@ -669,13 +666,13 @@ public final class MekanismUtils */ public static boolean isDirectlyGettingPowered(World world, Coord4D coord) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D sideCoord = coord.offset(side); if(sideCoord.exists(world)) { - if(world.isBlockProvidingPowerTo(coord.xCoord, coord.yCoord, coord.zCoord, side.ordinal()) > 0) + if(world.getRedstonePower(coord, side) > 0) { return true; } @@ -692,16 +689,16 @@ public final class MekanismUtils */ public static void notifyLoadedNeighborsOfTileChange(World world, Coord4D coord) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing dir : EnumFacing.VALUES) { Coord4D offset = coord.offset(dir); if(offset.exists(world)) { Block block1 = offset.getBlock(world); - block1.onNeighborChange(world, offset.xCoord, offset.yCoord, offset.zCoord, coord.xCoord, coord.yCoord, coord.zCoord); + block1.onNeighborChange(world, offset, coord); - if(block1.isNormalCube(world, offset.xCoord, offset.yCoord, offset.zCoord)) + if(block1.isNormalCube(world, offset)) { offset = offset.offset(dir); @@ -709,9 +706,9 @@ public final class MekanismUtils { block1 = offset.getBlock(world); - if(block1.getWeakChanges(world, offset.xCoord, offset.yCoord, offset.zCoord)) + if(block1.getWeakChanges(world, offset)) { - block1.onNeighborChange(world, offset.xCoord, offset.yCoord, offset.zCoord, coord.xCoord, coord.yCoord, coord.zCoord); + block1.onNeighborChange(world, offset, coord); } } } @@ -727,11 +724,11 @@ public final class MekanismUtils */ public static void makeBoundingBlock(World world, Coord4D boundingLocation, Coord4D orig) { - world.setBlock(boundingLocation.xCoord, boundingLocation.yCoord, boundingLocation.zCoord, MekanismBlocks.BoundingBlock); + world.setBlockState(boundingLocation, MekanismBlocks.BoundingBlock.getDefaultState()); if(!world.isRemote) { - ((TileEntityBoundingBlock)boundingLocation.getTileEntity(world)).setMainLocation(orig.xCoord, orig.yCoord, orig.zCoord); + ((TileEntityBoundingBlock)boundingLocation.getTileEntity(world)).setMainLocation(orig); } } @@ -743,30 +740,27 @@ public final class MekanismUtils */ public static void makeAdvancedBoundingBlock(World world, Coord4D boundingLocation, Coord4D orig) { - world.setBlock(boundingLocation.xCoord, boundingLocation.yCoord, boundingLocation.zCoord, MekanismBlocks.BoundingBlock, 1, 0); + world.setBlockState(boundingLocation, MekanismBlocks.BoundingBlock.getStateFromMeta(1), 0); if(!world.isRemote) { - ((TileEntityAdvancedBoundingBlock)boundingLocation.getTileEntity(world)).setMainLocation(orig.xCoord, orig.yCoord, orig.zCoord); + ((TileEntityAdvancedBoundingBlock)boundingLocation.getTileEntity(world)).setMainLocation(orig); } } /** * Updates a block's light value and marks it for a render update. * @param world - world the block is in - * @param x - x coordinate - * @param y - y coordinate - * @param z - z coordinate + * @param pos */ - public static void updateBlock(World world, int x, int y, int z) + public static void updateBlock(World world, BlockPos pos) { - Coord4D pos = new Coord4D(x, y, z); - if(!(pos.getTileEntity(world) instanceof IActiveState) || ((IActiveState)pos.getTileEntity(world)).renderUpdate()) + if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).renderUpdate()) { - world.func_147479_m(pos.xCoord, pos.yCoord, pos.zCoord); + world.markBlockRangeForRenderUpdate(pos, pos); } - if(!(pos.getTileEntity(world) instanceof IActiveState) || ((IActiveState)pos.getTileEntity(world)).lightUpdate() && client.machineEffects) + if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).lightUpdate() && client.machineEffects) { updateAllLightTypes(world, pos); } @@ -777,10 +771,10 @@ public final class MekanismUtils * @param world - the world to perform the lighting update in * @param pos - coordinates of the block to update */ - public static void updateAllLightTypes(World world, Coord4D pos) + public static void updateAllLightTypes(World world, BlockPos pos) { - world.updateLightByType(EnumSkyBlock.Block, pos.xCoord, pos.yCoord, pos.zCoord); - world.updateLightByType(EnumSkyBlock.Sky, pos.xCoord, pos.yCoord, pos.zCoord); + world.checkLightFor(EnumSkyBlock.BLOCK, pos); + world.checkLightFor(EnumSkyBlock.SKY, pos); } /** @@ -802,15 +796,15 @@ public final class MekanismUtils */ public static FluidStack getFluid(World world, Coord4D pos, boolean filter) { - Block block = pos.getBlock(world); - int meta = pos.getBlockState(world); + IBlockState state = pos.getBlockState(world); + Block block = state.getBlock(); if(block == null) { return null; } - if((block == Blocks.water || block == Blocks.flowing_water) && meta == 0) + if((block == Blocks.water || block == Blocks.flowing_water) && state.getValue(BlockLiquid.LEVEL) == 0) { if(!filter) { @@ -820,7 +814,7 @@ public final class MekanismUtils return new FluidStack(FluidRegistry.getFluid("heavywater"), 10); } } - else if((block == Blocks.lava || block == Blocks.flowing_lava) && meta == 0) + else if((block == Blocks.lava || block == Blocks.flowing_lava) && state.getValue(BlockLiquid.LEVEL) == 0) { return new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME); } @@ -828,9 +822,9 @@ public final class MekanismUtils { IFluidBlock fluid = (IFluidBlock)block; - if(meta == 0) + if(state.getProperties().containsKey(BlockFluidBase.LEVEL) && state.getValue(BlockFluidBase.LEVEL) == 0) { - return fluid.drain(world, pos.xCoord, pos.yCoord, pos.zCoord, false); + return fluid.drain(world, pos, false); } } @@ -845,23 +839,15 @@ public final class MekanismUtils */ public static boolean isDeadFluid(World world, Coord4D pos) { - Block block = pos.getBlock(world); - int meta = pos.getBlockState(world); + IBlockState state = pos.getBlockState(world); + Block block = state.getBlock(); - if(block == null || meta == 0) + if(block == null || block.getMetaFromState(state) == 0) { return false; } - if((block == Blocks.water || block == Blocks.flowing_water)) - { - return true; - } - else if((block == Blocks.lava || block == Blocks.flowing_lava)) - { - return true; - } - else if(block instanceof IFluidBlock) + if(block instanceof BlockLiquid || block instanceof IFluidBlock) { return true; } @@ -917,7 +903,7 @@ public final class MekanismUtils player.openContainer = new ContainerElectricChest(player.inventory, tileEntity, inventory, isBlock); player.openContainer.windowId = id; - player.openContainer.addCraftingToCrafters(player); + player.openContainer.onCraftGuiOpened(player); } /** @@ -1034,12 +1020,12 @@ public final class MekanismUtils */ public static void saveChunk(TileEntity tileEntity) { - if(tileEntity == null || tileEntity.isInvalid() || tileEntity.getWorldObj() == null) + if(tileEntity == null || tileEntity.isInvalid() || tileEntity.getWorld() == null) { return; } - tileEntity.getWorldObj().markTileEntityChunkModified(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity); + tileEntity.getWorld().markChunkDirty(tileEntity.getPos(), tileEntity); } /** @@ -1096,19 +1082,21 @@ public final class MekanismUtils */ private static Vec3 getHeadVec(EntityPlayer player) { - Vec3 vec = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); + double posX = player.posX; + double posY = player.posY; + double posZ = player.posZ; if(!player.worldObj.isRemote) { - vec.yCoord += player.getEyeHeight(); + posY += player.getEyeHeight(); if(player instanceof EntityPlayerMP && player.isSneaking()) { - vec.yCoord -= 0.08; + posY -= 0.08; } } - return vec; + return new Vec3(posX, posY, posZ); } /** @@ -1230,7 +1218,7 @@ public final class MekanismUtils */ public static String getCoordDisplay(Coord4D obj) { - return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]"; + return "[" + obj.getX() + ", " + obj.getY() + ", " + obj.getZ() + "]"; } /** @@ -1240,7 +1228,7 @@ public final class MekanismUtils */ public static List splitLines(String s) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList(); String[] split = s.split("!n"); ret.addAll(Arrays.asList(split)); @@ -1295,8 +1283,8 @@ public final class MekanismUtils if((dmgItems[1] != null) && (dmgItems[0].getItem() == dmgItems[1].getItem()) && (dmgItems[0].stackSize == 1) && (dmgItems[1].stackSize == 1) && dmgItems[0].getItem().isRepairable()) { Item theItem = dmgItems[0].getItem(); - int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamageForDisplay(); - int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamageForDisplay(); + int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamage/*TODO:ForDisplay*/(); + int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage/*TODO:ForDisplay*/(); int value = dmgDiff0 + dmgDiff1 + theItem.getMaxDamage() * 5 / 100; int solve = Math.max(0, theItem.getMaxDamage() - value); return new ItemStack(dmgItems[0].getItem(), 1, solve); @@ -1338,7 +1326,7 @@ public final class MekanismUtils */ public static boolean isOp(EntityPlayerMP player) { - return general.opsBypassRestrictions && player.mcServer.getConfigurationManager().func_152596_g(player.getGameProfile()); + return general.opsBypassRestrictions && player.mcServer.getConfigurationManager().canSendCommands(player.getGameProfile()); } /** @@ -1349,7 +1337,7 @@ public final class MekanismUtils public static String getMod(ItemStack stack) { try { - ModContainer mod = GameData.findModOwner(GameData.getItemRegistry().getNameForObject(stack.getItem())); + ModContainer mod = null;//TODO:GameData.findModOwner(GameData.getItemRegistry().getNameForObject(stack.getItem())); return mod == null ? "Minecraft" : mod.getName(); } catch(Exception e) { return "null"; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 70d41e07d..2cec2af09 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -7,6 +7,8 @@ import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import net.minecraft.block.Block; +import net.minecraft.block.BlockSand; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -17,29 +19,23 @@ public final class MinerUtils public static List getDrops(World world, Coord4D obj, boolean silk) { - Block block = obj.getBlock(world); + IBlockState state = obj.getBlockState(world); + Block block = state.getBlock(); - if(block == null) + if(block == null || block.isAir(world, obj)) { return new ArrayList(); } - if(block.isAir(world, obj.xCoord, obj.yCoord, obj.zCoord)) - { - return new ArrayList(); - } - - int meta = obj.getBlockState(world); - if(!silk) { - return block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0); + return block.getDrops(world, obj, state, 0); } else { List ret = new ArrayList(); - ret.add(new ItemStack(block, 1, meta)); + ret.add(new ItemStack(block, 1, block.getMetaFromState(state))); - if(specialSilkIDs.contains(block) || (block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0) != null && block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0).size() > 0)) + if(specialSilkIDs.contains(block) || (block.getDrops(world, obj, state, 0) != null && block.getDrops(world, obj, state, 0).size() > 0)) { return ret; } diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index c346635e1..ccbebdca3 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -9,7 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.transmitters.ITransmitterTile; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -19,7 +19,7 @@ public final class PipeUtils { public static final FluidTankInfo[] EMPTY = new FluidTankInfo[] {}; - public static boolean isValidAcceptorOnSide(TileEntity tile, ForgeDirection side) + public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { if(tile instanceof ITransmitterTile || !(tile instanceof IFluidHandler)) return false; @@ -54,9 +54,9 @@ public final class PipeUtils { IFluidHandler[] acceptors = new IFluidHandler[] {null, null, null, null, null, null}; - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { - TileEntity acceptor = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorldObj()); + TileEntity acceptor = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorld()); if(acceptor instanceof IFluidHandler && !(acceptor instanceof ITransmitterTile)) { @@ -74,7 +74,7 @@ public final class PipeUtils * @param from - the TileEntity to output from * @return the amount of gas emitted */ - public static int emit(List sides, FluidStack stack, TileEntity from) + public static int emit(List sides, FluidStack stack, TileEntity from) { if(stack == null) { @@ -88,7 +88,7 @@ public final class PipeUtils { IFluidHandler handler = possibleAcceptors[i]; - if(handler != null && handler.canFill(ForgeDirection.getOrientation(i).getOpposite(), stack.getFluid())) + if(handler != null && handler.canFill(EnumFacing.getFront(i).getOpposite(), stack.getFluid())) { availableAcceptors.add(handler); } @@ -115,7 +115,7 @@ public final class PipeUtils remaining--; } - ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); + EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); toSend -= acceptor.fill(dir, new FluidStack(stack.getFluid(), currentSending), true); } } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 482a0e8eb..062054df0 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; public class RecipeUtils @@ -177,7 +178,7 @@ public class RecipeUtils if(itemstack != null && MachineType.get(itemstack) != null && MachineType.get(itemstack).supportsUpgrades) { - Map stackMap = Upgrade.buildMap(itemstack.stackTagCompound); + Map stackMap = Upgrade.buildMap(itemstack.getTagCompound()); for(Map.Entry entry : stackMap.entrySet()) { @@ -191,12 +192,12 @@ public class RecipeUtils } } - if(toReturn.stackTagCompound == null) + if(toReturn.getTagCompound() == null) { toReturn.setTagCompound(new NBTTagCompound()); } - Upgrade.saveMap(upgrades, toReturn.stackTagCompound); + Upgrade.saveMap(upgrades, toReturn.getTagCompound()); } return toReturn; @@ -223,18 +224,18 @@ public class RecipeUtils } else if(nbtTags.hasKey("itemname")) { - Object obj = Item.itemRegistry.getObject(nbtTags.getString("itemname")); + Object obj = Item.itemRegistry.getObject(new ResourceLocation(nbtTags.getString("itemname"))); - if(obj instanceof Item) + if(obj != null) { return new ItemStack((Item)obj, amount, meta); } } else if(nbtTags.hasKey("blockname")) { - Object obj = Block.blockRegistry.getObject(nbtTags.getString("blockname")); + Object obj = Block.blockRegistry.getObject(new ResourceLocation(nbtTags.getString("blockname"))); - if(obj instanceof Block) + if(obj != null) { return new ItemStack((Block)obj, amount, meta); } diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 88cec2122..2b4b038b9 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public final class TransporterUtils { @@ -34,7 +34,7 @@ public final class TransporterUtils { ILogisticalTransporter[] transporters = new ILogisticalTransporter[] {null, null, null, null, null, null}; - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { TileEntity tile = tileEntity.coord().offset(orientation).getTileEntity(tileEntity.world()); @@ -52,7 +52,7 @@ public final class TransporterUtils return transporters; } - public static boolean isValidAcceptorOnSide(TileEntity tile, ForgeDirection side) + public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { if(tile instanceof ITransmitterTile || !(tile instanceof IInventory)) { @@ -68,7 +68,7 @@ public final class TransporterUtils return true; } - int[] slots = ((ISidedInventory)inventory).getAccessibleSlotsFromSide(side.getOpposite().ordinal()); + int[] slots = ((ISidedInventory)inventory).getSlotsForFace(side.getOpposite()); return (slots != null && slots.length > 0); } @@ -94,12 +94,12 @@ public final class TransporterUtils { int side = Arrays.asList(connectedInventories).indexOf(inventory); - if(!transporter.canConnect(ForgeDirection.getOrientation(side))) + if(!transporter.canConnect(EnumFacing.getFront(side))) { continue; } - ForgeDirection forgeSide = ForgeDirection.getOrientation(side).getOpposite(); + EnumFacing forgeSide = EnumFacing.getFront(side).getOpposite(); if(inventory.getSizeInventory() > 0) { @@ -107,9 +107,9 @@ public final class TransporterUtils { ISidedInventory sidedInventory = (ISidedInventory)inventory; - if(sidedInventory.getAccessibleSlotsFromSide(forgeSide.ordinal()) != null) + if(sidedInventory.getSlotsForFace(forgeSide) != null) { - if(sidedInventory.getAccessibleSlotsFromSide(forgeSide.ordinal()).length > 0) + if(sidedInventory.getSlotsForFace(forgeSide).length > 0) { connectable[side] = true; } @@ -128,7 +128,7 @@ public final class TransporterUtils { int side = Arrays.asList(connectedTransporters).indexOf(trans); - if(transporter.canConnectMutual(ForgeDirection.getOrientation(side))) + if(transporter.canConnectMutual(EnumFacing.getFront(side))) { connectable[side] = true; } @@ -147,7 +147,7 @@ public final class TransporterUtils { IInventory[] inventories = new IInventory[] {null, null, null, null, null, null}; - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing orientation : EnumFacing.VALUES) { TileEntity inventory = transporter.coord().offset(orientation).getTileEntity(transporter.world()); @@ -212,7 +212,7 @@ public final class TransporterUtils TransporterManager.remove(stack); - EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().xCoord + pos[0], tileEntity.coord().yCoord + pos[1], tileEntity.coord().zCoord + pos[2], stack.itemStack); + EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().getX() + pos[0], tileEntity.coord().getY() + pos[1], tileEntity.coord().getZ() + pos[2], stack.itemStack); entityItem.motionX = 0; entityItem.motionY = 0; @@ -223,7 +223,7 @@ public final class TransporterUtils public static float[] getStackPosition(ILogisticalTransporter tileEntity, TransporterStack stack, float partial) { - Coord4D offset = new Coord4D(0, 0, 0, tileEntity.world().provider.dimensionId).step(ForgeDirection.getOrientation(stack.getSide(tileEntity))); + Coord4D offset = new Coord4D(0, 0, 0, tileEntity.world().provider.getDimensionId()).offset(EnumFacing.getFront(stack.getSide(tileEntity))); float progress = (((float)stack.progress + partial) / 100F) - 0.5F; float itemFix = 0; @@ -233,7 +233,7 @@ public final class TransporterUtils itemFix = 0.1F; } - return new float[] {0.5F + offset.xCoord*progress, 0.5F + offset.yCoord*progress - itemFix, 0.5F + offset.zCoord*progress}; + return new float[] {0.5F + offset.getX()*progress, 0.5F + offset.getY()*progress - itemFix, 0.5F + offset.getZ()*progress}; } public static void incrementColor(ILogisticalTransporter tileEntity) diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index b61e9fb22..54195ef69 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -61,12 +61,12 @@ public class VoiceConnection extends Thread if(!server.isDedicatedServer() && playerIP.equals("local") && !Mekanism.voiceManager.foundLocal) { Mekanism.voiceManager.foundLocal = true; - username = playerMP.getCommandSenderName(); + username = playerMP.getName(); break; } else if(playerIP.equals(socket.getInetAddress().getHostAddress())) { - username = playerMP.getCommandSenderName(); + username = playerMP.getName(); break; } } @@ -199,6 +199,6 @@ public class VoiceConnection extends Thread public EntityPlayerMP getPlayer() { - return server.getConfigurationManager().func_152612_a(username); //TODO getPlayerForUsername + return server.getConfigurationManager().getPlayerByUsername(username); } } diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 8d1afb319..38a834a98 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -5,7 +5,9 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismBlocks; +import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderEnd; @@ -22,34 +24,28 @@ public class GenHandler implements IWorldGenerator { for(int i = 0; i < general.osmiumPerChunk; i++) { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(MekanismBlocks.OreBlock, 0, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); + BlockPos pos = new BlockPos(chunkX*16 + random.nextInt(16), random.nextInt(60), (chunkZ*16) + random.nextInt(16)); + new WorldGenMinable(MekanismBlocks.OreBlock.getStateFromMeta(0), 8, BlockHelper.forBlock(Blocks.stone)).generate(world, random, pos); } for(int i = 0; i < general.copperPerChunk; i++) { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(MekanismBlocks.OreBlock, 1, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); + BlockPos pos = new BlockPos(chunkX*16 + random.nextInt(16), random.nextInt(60), (chunkZ*16) + random.nextInt(16)); + new WorldGenMinable(MekanismBlocks.OreBlock.getStateFromMeta(1), 8, BlockHelper.forBlock(Blocks.stone)).generate(world, random, pos); } for(int i = 0; i < general.tinPerChunk; i++) { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(MekanismBlocks.OreBlock, 2, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); + BlockPos pos = new BlockPos(chunkX*16 + random.nextInt(16), random.nextInt(60), (chunkZ*16) + random.nextInt(16)); + new WorldGenMinable(MekanismBlocks.OreBlock.getStateFromMeta(2), 8, BlockHelper.forBlock(Blocks.stone)).generate(world, random, pos); } for(int i = 0; i < general.saltPerChunk; i++) { int randPosX = (chunkX*16) + random.nextInt(16); int randPosZ = (chunkZ*16) + random.nextInt(16); - int randPosY = world.getTopSolidOrLiquidBlock(randPosX, randPosZ); - new WorldGenSalt(6).generate(world, random, randPosX, randPosY, randPosZ); + BlockPos pos = world.getTopSolidOrLiquidBlock(new BlockPos(randPosX, 60, randPosZ)); + new WorldGenSalt(6).generate(world, random, pos); } } } diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index 4793e945d..30d535c4e 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -7,6 +7,7 @@ import mekanism.common.MekanismBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -23,9 +24,9 @@ public class WorldGenSalt extends WorldGenerator } @Override - public boolean generate(World world, Random random, int x, int y, int z) + public boolean generate(World world, Random random, BlockPos pos) { - if(world.getBlock(x, y, z).getMaterial() != Material.water) + if(world.getBlockState(pos).getBlock().getMaterial() != Material.water) { return false; } @@ -33,22 +34,23 @@ public class WorldGenSalt extends WorldGenerator int toGenerate = random.nextInt(numberOfBlocks - 2) + 2; byte yOffset = 1; - for(int xPos = x - toGenerate; xPos <= x + toGenerate; xPos++) + for(int xPos = pos.getX() - toGenerate; xPos <= pos.getX() + toGenerate; xPos++) { - for(int zPos = z - toGenerate; zPos <= z + toGenerate; zPos++) + for(int zPos = pos.getZ() - toGenerate; zPos <= pos.getZ() + toGenerate; zPos++) { - int xOffset = xPos - x; - int zOffset = zPos - z; + int xOffset = xPos - pos.getX(); + int zOffset = zPos - pos.getZ(); if((xOffset*xOffset) + (zOffset*zOffset) <= toGenerate*toGenerate) { - for(int yPos = y - yOffset; yPos <= y + yOffset; yPos++) + for(int yPos = pos.getY() - yOffset; yPos <= pos.getY() + yOffset; yPos++) { - Block block = world.getBlock(xPos, yPos, zPos); + BlockPos newPos = new BlockPos(xPos, yPos, zPos); + Block block = world.getBlockState(newPos).getBlock(); if(block == Blocks.dirt || block == Blocks.clay || block == MekanismBlocks.SaltBlock) { - world.setBlock(xPos, yPos, zPos, blockGen, 0, 2); + world.setBlockState(newPos, blockGen.getDefaultState(), 2); } } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 65f8fb30d..09152ed26 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -65,7 +65,7 @@ public class GuiWindGenerator extends GuiMekanism int size = 44; - if(!tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) + if(!tileEntity.getWorld().canBlockSeeTheSky(tileEntity.getPos().getX(), tileEntity.getPos().getY()+4, tileEntity.getPos().getZ())) { size += 9; fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00); diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 5886da30f..f92c184b7 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -14,7 +14,7 @@ import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,7 +25,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer energyDisplays = new HashMap(); + private Map energyDisplays = new HashMap(); private static final int stages = 40; @@ -55,7 +55,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing)); + return EnumSet.of(EnumFacing.getFront(facing)); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 9e3d09513..5dcbce0f2 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -9,7 +9,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -179,9 +179,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { - return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @Override @@ -206,9 +206,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); + return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); } private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @@ -242,9 +242,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(FluidRegistry.isFluidRegistered("bioethanol") && from != ForgeDirection.getOrientation(facing)) + if(FluidRegistry.isFluidRegistered("bioethanol") && from != EnumFacing.getFront(facing)) { if(resource.getFluid() == FluidRegistry.getFluid("bioethanol")) { @@ -273,31 +273,31 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return null; } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return FluidRegistry.isFluidRegistered("bioethanol") && fluid == FluidRegistry.getFluid("bioethanol"); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return null; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 84ed468ea..20f7502d5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -10,7 +10,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; @@ -135,9 +135,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { - return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @Override @@ -225,7 +225,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { boolean isTankEmpty = (fuelTank.getGas() == null); @@ -245,7 +245,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @@ -275,33 +275,33 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { - return FuelHandler.getFuel(type) != null && side != ForgeDirection.getOrientation(facing); + return FuelHandler.getFuel(type) != null && side != EnumFacing.getFront(facing); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return null; } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return false; } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { - return side != ForgeDirection.getOrientation(facing); + return side != EnumFacing.getFront(facing); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index aeef8f24d..c9f8eee4c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -18,7 +18,7 @@ import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.ArrayList; import java.util.EnumSet; @@ -97,15 +97,15 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.of(ForgeDirection.getOrientation(facing)); + return EnumSet.of(EnumFacing.getFront(facing)); } /** diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 23717b2c3..90fcb57d8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.*; import java.util.ArrayList; @@ -191,7 +191,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu int lavaBoost = 0; double netherBoost = 0D; - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = Coord4D.get(this).offset(side); @@ -201,7 +201,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } } - if(worldObj.provider.dimensionId == -1) + if(worldObj.provider.getDimensionId() == -1) { netherBoost = generators.heatGenerationNether; } @@ -225,9 +225,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { - return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } /** @@ -307,9 +307,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != ForgeDirection.getOrientation(facing)) + if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != EnumFacing.getFront(facing)) { return lavaTank.fill(resource, doFill); } @@ -318,33 +318,33 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return null; } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { - return fluid == FluidRegistry.LAVA && from != ForgeDirection.getOrientation(facing); + return fluid == FluidRegistry.LAVA && from != EnumFacing.getFront(facing); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { - if(from == ForgeDirection.getOrientation(facing)) + if(from == EnumFacing.getFront(facing)) { return PipeUtils.EMPTY; } @@ -380,7 +380,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public double getInsulationCoefficient(ForgeDirection side) + public double getInsulationCoefficient(EnumFacing side) { return canConnectHeat(side) ? 0 : 10000; } @@ -415,13 +415,13 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public boolean canConnectHeat(ForgeDirection side) + public boolean canConnectHeat(EnumFacing side) { - return side == ForgeDirection.DOWN; + return side == EnumFacing.DOWN; } @Override - public IHeatTransfer getAdjacent(ForgeDirection side) + public IHeatTransfer getAdjacent(EnumFacing side) { if(canConnectHeat(side)) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index a2a9c8043..a55c47c86 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -11,7 +11,7 @@ import mekanism.common.util.MekanismUtils; import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenDesert; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,7 +36,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return new int[] {0}; } @@ -183,9 +183,9 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.of(ForgeDirection.getOrientation(0)); + return EnumSet.of(EnumFacing.getFront(0)); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 8592e5907..e8883044a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -8,7 +8,7 @@ import mekanism.common.base.IBoundingBlock; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock { @@ -109,10 +109,10 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou public void onPlace() { Coord4D pos = Coord4D.get(this); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(ForgeDirection.UP, 1), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(ForgeDirection.UP, 2), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(ForgeDirection.UP, 3), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(ForgeDirection.UP, 4), pos); + MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 1), pos); + MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 2), pos); + MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 3), pos); + MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 4), pos); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 8ce0ec756..417d1a61c 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -10,7 +10,7 @@ import mekanism.api.reactor.IReactorBlock; import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public abstract class TileEntityReactorBlock extends TileEntityElectricBlock implements IReactorBlock { @@ -78,15 +78,15 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override @@ -145,7 +145,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp iterated.add(pos); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index 84d392546..463309609 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -2,7 +2,7 @@ package mekanism.generators.common.tile.reactor; import mekanism.api.lasers.ILaserReceptor; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock implements ILaserReceptor { @@ -13,7 +13,7 @@ public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock im } @Override - public void receiveLaserEnergy(double energy, ForgeDirection side) + public void receiveLaserEnergy(double energy, EnumFacing side) { if(getReactor() != null) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 04cf5e37f..b224033df 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -16,7 +16,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.generators.common.item.ItemHohlraum; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -52,7 +52,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { if(resource.getFluid() == FluidRegistry.WATER && getReactor() != null) { @@ -63,7 +63,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(resource.getFluid() == FluidRegistry.getFluid("steam") && getReactor() != null) { @@ -74,7 +74,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(getReactor() != null) { @@ -85,19 +85,19 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { return (getReactor() != null && fluid == FluidRegistry.WATER); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return (getReactor() != null && fluid == FluidRegistry.WATER); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { if(getReactor() == null) { @@ -108,7 +108,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { if(getReactor() != null) { @@ -130,13 +130,13 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { if(getReactor() != null) { @@ -150,31 +150,31 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { return (type == GasRegistry.getGas("deuterium") || type == GasRegistry.getGas("tritium") || type == GasRegistry.getGas("fusionFuelDT")); } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { return (type == GasRegistry.getGas("steam")); } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { return getReactor() != null; } @Override - public boolean canOutputTo(ForgeDirection side) + public boolean canOutputTo(EnumFacing side) { return true; } @@ -213,18 +213,18 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { - EnumSet set = EnumSet.allOf(ForgeDirection.class); - set.remove(ForgeDirection.UNKNOWN); + EnumSet set = EnumSet.allOf(EnumFacing.class); + set.remove(EnumFacing.null); return set; } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override @@ -250,7 +250,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public double getInsulationCoefficient(ForgeDirection side) + public double getInsulationCoefficient(EnumFacing side) { if(getReactor() != null) { @@ -286,13 +286,13 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean canConnectHeat(ForgeDirection side) + public boolean canConnectHeat(EnumFacing side) { return getReactor() != null; } @Override - public IHeatTransfer getAdjacent(ForgeDirection side) + public IHeatTransfer getAdjacent(EnumFacing side) { TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); @@ -331,7 +331,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(int side) { return getReactor() != null && getReactor().isFormed() ? new int[] {0} : InventoryUtils.EMPTY; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java index 881b8a2ce..9124c4621 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java @@ -13,7 +13,7 @@ import mekanism.common.PacketHandler; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityRotationalComplex extends TileEntityBasicBlock { @@ -85,7 +85,7 @@ public class TileEntityRotationalComplex extends TileEntityBasicBlock { multiblockUUID = id; - Coord4D coord = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); + Coord4D coord = Coord4D.get(this).getFromSide(EnumFacing.DOWN); TileEntity tile = coord.getTileEntity(worldObj); if(tile instanceof TileEntityTurbineRod) diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java index 74ac9563f..91238f82a 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java @@ -14,7 +14,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -73,9 +73,9 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock //Go to bottom rod while(true) { - if(isRod(pointer.getFromSide(ForgeDirection.DOWN))) + if(isRod(pointer.getFromSide(EnumFacing.DOWN))) { - pointer.step(ForgeDirection.DOWN); + pointer.step(EnumFacing.DOWN); continue; } @@ -88,18 +88,18 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock newRods.add(pointer.clone()); newBlades += ((TileEntityTurbineRod)pointer.getTileEntity(worldObj)).getHousedBlades(); - if(isRod(pointer.getFromSide(ForgeDirection.UP))) + if(isRod(pointer.getFromSide(EnumFacing.UP))) { - pointer.step(ForgeDirection.UP); + pointer.step(EnumFacing.UP); continue; } break; } - if(isComplex(pointer.getFromSide(ForgeDirection.UP))) + if(isComplex(pointer.getFromSide(EnumFacing.UP))) { - id = ((TileEntityRotationalComplex)pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj)).multiblockUUID; + id = ((TileEntityRotationalComplex)pointer.getFromSide(EnumFacing.UP).getTileEntity(worldObj)).multiblockUUID; complex = true; }