From 245d5ed4719626c2a8648e2845f8aa2501a89932 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 22 Jan 2016 00:20:45 +0000 Subject: [PATCH] Base fixes --- .../common/base/EnergyAcceptorWrapper.java | 33 +++++++++---------- .../java/mekanism/common/base/IEjector.java | 7 ++-- .../mekanism/common/base/IEnergyWrapper.java | 6 ++-- .../java/mekanism/common/base/IFactory.java | 6 ++-- .../common/base/ILogisticalTransporter.java | 6 ++-- .../mekanism/common/base/ITankManager.java | 8 ++--- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index becdc629d..7d9a2400a 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -6,8 +6,7 @@ import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import cofh.api.energy.IEnergyReceiver; import ic2.api.energy.tile.IEnergySink; @@ -18,7 +17,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor public static EnergyAcceptorWrapper get(TileEntity tileEntity) { - if(tileEntity != null && tileEntity.getWorldObj() == null) + if(tileEntity != null && tileEntity.getWorld() == null) { return null; } @@ -46,7 +45,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return wrapper; } - public abstract boolean needsEnergy(ForgeDirection side); + public abstract boolean needsEnergy(EnumFacing side); public static class MekanismAcceptor extends EnergyAcceptorWrapper { @@ -58,13 +57,13 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { return acceptor.transferEnergyToAcceptor(side, amount); } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return acceptor.canReceiveEnergy(side); } @@ -88,7 +87,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public boolean needsEnergy(ForgeDirection side) + public boolean needsEnergy(EnumFacing side) { return acceptor.getMaxEnergy() - acceptor.getEnergy() > 0; } @@ -104,13 +103,13 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { return fromRF(acceptor.receiveEnergy(side, toRF(amount), false)); } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return acceptor.canConnectEnergy(side); } @@ -118,25 +117,25 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double getEnergy() { - return fromRF(acceptor.getEnergyStored(ForgeDirection.UNKNOWN)); + return fromRF(acceptor.getEnergyStored(null)); } @Override public void setEnergy(double energy) { int rfToSet = toRF(energy); - int amountToReceive = rfToSet - acceptor.getEnergyStored(ForgeDirection.UNKNOWN); - acceptor.receiveEnergy(ForgeDirection.UNKNOWN, amountToReceive, false); + int amountToReceive = rfToSet - acceptor.getEnergyStored(null); + acceptor.receiveEnergy(null, amountToReceive, false); } @Override public double getMaxEnergy() { - return fromRF(acceptor.getMaxEnergyStored(ForgeDirection.UNKNOWN)); + return fromRF(acceptor.getMaxEnergyStored(null)); } @Override - public boolean needsEnergy(ForgeDirection side) + public boolean needsEnergy(EnumFacing side) { return acceptor.getMaxEnergyStored(side) - acceptor.getEnergyStored(side) > 0 || acceptor.receiveEnergy(side, 1, true) > 0; } @@ -162,13 +161,13 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0)); } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return acceptor.acceptsEnergyFrom(null, side); } @@ -192,7 +191,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public boolean needsEnergy(ForgeDirection side) + public boolean needsEnergy(EnumFacing side) { return acceptor.getDemandedEnergy() > 0; } diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java index 2509b6eb9..8c9529621 100644 --- a/src/main/java/mekanism/common/base/IEjector.java +++ b/src/main/java/mekanism/common/base/IEjector.java @@ -1,7 +1,8 @@ package mekanism.common.base; import mekanism.api.EnumColor; -import net.minecraftforge.common.util.ForgeDirection; + +import net.minecraft.util.EnumFacing; public interface IEjector { @@ -11,9 +12,9 @@ public interface IEjector public void setOutputColor(EnumColor color); - public EnumColor getInputColor(ForgeDirection side); + public EnumColor getInputColor(EnumFacing side); - public void setInputColor(ForgeDirection side, EnumColor color); + public void setInputColor(EnumFacing side, EnumColor color); public boolean hasStrictInput(); diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 556281024..c7fb8a079 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -10,7 +10,7 @@ import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.IInventory; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import java.util.EnumSet; @@ -22,9 +22,9 @@ import java.util.EnumSet; }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory { - public EnumSet getOutputtingSides(); + public EnumSet getOutputtingSides(); - public EnumSet getConsumingSides(); + public EnumSet getConsumingSides(); public double getMaxOutput(); } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index a7bf2aee2..d22a7cd42 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -17,8 +17,8 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; /** * Internal interface for managing various Factory types. @@ -109,7 +109,7 @@ public interface IFactory return 0; } - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { if(usesFuel) { @@ -119,7 +119,7 @@ public interface IFactory return false; } - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { if(usesFuel) { diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index e0dcae5a7..fe12c078c 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -11,7 +11,7 @@ import mekanism.common.tile.TileEntityLogisticalSorter; 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; public interface ILogisticalTransporter extends IGridTransmitter, IBlockableConnection { @@ -25,9 +25,9 @@ public interface ILogisticalTransporter extends IGridTransmitter