diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 8bafa6235..2b6476513 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -310,7 +310,7 @@ public class GasNetwork extends DynamicNetwork { IGridTransmitter conductor = (IGridTransmitter)it.next(); - if(conductor == null || ((TileEntity)conductor).isInvalid()) + if(conductor == null || conductor.getTile().isInvalid()) { it.remove(); networkChanged = true; @@ -330,7 +330,7 @@ public class GasNetwork extends DynamicNetwork @Override public synchronized void refresh(IGridTransmitter transmitter) { - IGasHandler[] acceptors = GasTransmission.getConnectedAcceptors((TileEntity)transmitter); + IGasHandler[] acceptors = GasTransmission.getConnectedAcceptors(transmitter.getTile()); clearAround(transmitter); diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 8629e36fe..93393e3be 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -51,9 +51,9 @@ public abstract class DynamicNetwork> implemen { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - Coord4D coord = Coord4D.get((TileEntity)transmitter).getFromSide(side); + Coord4D coord = Coord4D.get(transmitter.getTile()).getFromSide(side); possibleAcceptors.remove(coord); - acceptorDirections.remove(coord.getTileEntity(transmitter.getWorld())); + acceptorDirections.remove(coord.getTileEntity(transmitter.getTile().getWorldObj())); } } diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index 06e9e77a6..783d5399b 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -2,7 +2,6 @@ package mekanism.api.transmitters; import mekanism.api.Coord4D; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public interface IGridTransmitter> extends ITransmitter @@ -65,5 +64,5 @@ public interface IGridTransmitter> extends ITrans public Coord4D getLocation(); - public World getWorld(); + public TileEntity getTile(); } diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 267e06b89..ad042a584 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -319,7 +319,7 @@ public class EnergyNetwork extends DynamicNetwork { IGridTransmitter conductor = (IGridTransmitter)it.next(); - if(conductor == null || ((TileEntity)conductor).isInvalid()) + if(conductor == null || conductor.getTile().isInvalid()) { it.remove(); transmitters.remove(conductor); @@ -341,7 +341,7 @@ public class EnergyNetwork extends DynamicNetwork @Override public synchronized void refresh(IGridTransmitter transmitter) { - TileEntity[] acceptors = CableUtils.getConnectedEnergyAcceptors((TileEntity)transmitter); + TileEntity[] acceptors = CableUtils.getConnectedEnergyAcceptors(transmitter.getTile()); clearAround(transmitter); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 82290bcbd..d1516b5e7 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -14,7 +14,6 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.util.CableUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; @@ -324,7 +323,7 @@ public class FluidNetwork extends DynamicNetwork { IGridTransmitter conductor = (IGridTransmitter)it.next(); - if(conductor == null || ((TileEntity)conductor).isInvalid()) + if(conductor == null || conductor.getTile().isInvalid()) { it.remove(); networkChanged = true; @@ -344,7 +343,7 @@ public class FluidNetwork extends DynamicNetwork @Override public synchronized void refresh(IGridTransmitter transmitter) { - IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors((TileEntity)transmitter); + IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors(transmitter.getTile()); clearAround(transmitter); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ed54412b3..933760b3a 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -589,6 +589,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 11), new Object[] { "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), Blocks.glass, Character.valueOf('C'), "circuitBasic" })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 12), new Object[] { + "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), "circuitBasic" + })); for(RecipeType type : RecipeType.values()) { diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 7e54c0182..3ac42404a 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -14,7 +14,6 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import codechicken.multipart.TileMultipart; @@ -226,9 +225,9 @@ public abstract class PartTransmitter> extends Pa } @Override - public World getWorld() + public TileEntity getTile() { - return world(); + return tile(); } @Override