From d88f8a4606e897070f4d02c04e08a4d83aec56f7 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 25 Mar 2015 23:51:46 -0400 Subject: [PATCH] Fixed upgrades not maintaining machine dataa --- .../mekanism/common/base/IEnergyWrapper.java | 2 +- .../common/multiblock/MultiblockManager.java | 1 - .../TileEntityAdvancedElectricMachine.java | 8 +++---- .../tile/TileEntityElectricMachine.java | 13 ++++------ .../common/tile/TileEntityFactory.java | 12 +++++----- .../tile/component/TileComponentConfig.java | 24 +++++++++++++++++++ .../tile/component/TileComponentEjector.java | 10 ++++++++ .../tile/component/TileComponentUpgrade.java | 8 +++++++ 8 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index aae2cb34a..f5a342f95 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -18,7 +18,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), + @Interface(iface = "ic2.api.energy.tile.IEnergyStorage", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"), }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 32f434095..b238d8f24 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -42,7 +42,6 @@ public class MultiblockManager> if(tileEntity != null) { - System.out.println("RESET " + Coord4D.get(tileEntity)); tileEntity.cachedData = tileEntity.getNewCache(); tileEntity.cachedID = -1; } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 2cd556b34..c2636a4d1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -123,12 +123,10 @@ public abstract class TileEntityAdvancedElectricMachine getTrackedOutputs(int index, List dirs) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 46888d7c1..71aded2d2 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -43,6 +43,14 @@ public class TileComponentUpgrade implements ITileComponent tile.components.add(this); } + + public void readFrom(TileComponentUpgrade upgrade) + { + upgrades = upgrade.upgrades; + supported = upgrade.supported; + upgradeSlot = upgrade.upgradeSlot; + upgradeTicks = upgrade.upgradeTicks; + } @Override public void tick()