mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Fixed upgrades not maintaining machine dataa
This commit is contained in:
1 parent
1f9e6dd9cb
commit
d88f8a4606
8 files changed
+57
-21
No files matched your search
@@ -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
|
||||
|
||||
@@ -42,7 +42,6 @@ public class MultiblockManager<T extends SynchronizedData<T>>
|
||||
|
||||
if(tileEntity != null)
|
||||
{
|
||||
System.out.println("RESET " + Coord4D.get(tileEntity));
|
||||
tileEntity.cachedData = tileEntity.getNewCache();
|
||||
tileEntity.cachedID = -1;
|
||||
}
|
||||
|
||||
@@ -123,12 +123,10 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
factory.clientActive = clientActive;
|
||||
factory.controlType = controlType;
|
||||
factory.prevEnergy = prevEnergy;
|
||||
factory.upgradeComponent = upgradeComponent;
|
||||
factory.upgradeComponent.readFrom(upgradeComponent);
|
||||
factory.upgradeComponent.setUpgradeSlot(0);
|
||||
factory.upgradeComponent.tileEntity = factory;
|
||||
factory.ejectorComponent = ejectorComponent;
|
||||
factory.ejectorComponent.readFrom(ejectorComponent);
|
||||
factory.ejectorComponent.sideData = factory.configComponent.getOutputs(TransmissionType.ITEM).get(4);
|
||||
factory.ejectorComponent.tileEntity = factory;
|
||||
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
||||
factory.recipeType = type;
|
||||
factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
|
||||
@@ -142,7 +140,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
factory.inventory[1] = inventory[3];
|
||||
factory.inventory[0] = inventory[4];
|
||||
|
||||
for(Upgrade upgrade : upgradeComponent.getSupportedTypes())
|
||||
for(Upgrade upgrade : factory.upgradeComponent.getSupportedTypes())
|
||||
{
|
||||
factory.recalculateUpgradables(upgrade);
|
||||
}
|
||||
|
||||
@@ -83,21 +83,18 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
|
||||
|
||||
//Noisy
|
||||
factory.soundURL = soundURL;
|
||||
|
||||
|
||||
//Machine
|
||||
factory.progress[0] = operatingTicks;
|
||||
factory.updateDelay = updateDelay;
|
||||
factory.isActive = isActive;
|
||||
factory.clientActive = clientActive;
|
||||
factory.isActive = isActive;
|
||||
factory.updateDelay = updateDelay;
|
||||
factory.controlType = controlType;
|
||||
factory.prevEnergy = prevEnergy;
|
||||
factory.upgradeComponent = upgradeComponent;
|
||||
factory.upgradeComponent.readFrom(upgradeComponent);
|
||||
factory.upgradeComponent.setUpgradeSlot(0);
|
||||
factory.upgradeComponent.tileEntity = factory;
|
||||
factory.ejectorComponent = ejectorComponent;
|
||||
factory.ejectorComponent.readFrom(ejectorComponent);
|
||||
factory.ejectorComponent.sideData = factory.configComponent.getOutputs(TransmissionType.ITEM).get(4);
|
||||
factory.ejectorComponent.tileEntity = factory;
|
||||
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
||||
factory.recipeType = type;
|
||||
factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
|
||||
@@ -107,7 +104,7 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
|
||||
factory.inventory[5+3] = inventory[2];
|
||||
factory.inventory[0] = inventory[3];
|
||||
|
||||
for(Upgrade upgrade : upgradeComponent.getSupportedTypes())
|
||||
for(Upgrade upgrade : factory.upgradeComponent.getSupportedTypes())
|
||||
{
|
||||
factory.recalculateUpgradables(upgrade);
|
||||
}
|
||||
|
||||
@@ -188,17 +188,17 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
factory.clientActive = clientActive;
|
||||
factory.isActive = isActive;
|
||||
factory.updateDelay = updateDelay;
|
||||
factory.recipeType = recipeType;
|
||||
factory.prevEnergy = prevEnergy;
|
||||
factory.gasTank.setGas(gasTank.getGas());
|
||||
factory.sorting = sorting;
|
||||
factory.controlType = controlType;
|
||||
factory.upgradeComponent = upgradeComponent;
|
||||
factory.upgradeComponent.tileEntity = factory;
|
||||
factory.ejectorComponent = ejectorComponent;
|
||||
factory.ejectorComponent.tileEntity = factory;
|
||||
factory.upgradeComponent.readFrom(upgradeComponent);
|
||||
factory.ejectorComponent.readFrom(ejectorComponent);
|
||||
factory.configComponent.readFrom(configComponent);
|
||||
factory.ejectorComponent.sideData = factory.configComponent.getOutputs(TransmissionType.ITEM).get(4);
|
||||
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
||||
factory.recipeType = recipeType;
|
||||
factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
|
||||
|
||||
for(int i = 0; i < tier.processes+5; i++)
|
||||
{
|
||||
@@ -217,7 +217,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
}
|
||||
}
|
||||
|
||||
for(Upgrade upgrade : upgradeComponent.getSupportedTypes())
|
||||
for(Upgrade upgrade : factory.upgradeComponent.getSupportedTypes())
|
||||
{
|
||||
factory.recalculateUpgradables(upgrade);
|
||||
}
|
||||
|
||||
@@ -41,6 +41,14 @@ public class TileComponentConfig implements ITileComponent
|
||||
tile.components.add(this);
|
||||
}
|
||||
|
||||
public void readFrom(TileComponentConfig config)
|
||||
{
|
||||
sideConfigs = config.sideConfigs;
|
||||
ejecting = config.ejecting;
|
||||
canEject = config.canEject;
|
||||
transmissions = config.transmissions;
|
||||
}
|
||||
|
||||
public void addSupported(TransmissionType type)
|
||||
{
|
||||
if(!transmissions.contains(type))
|
||||
@@ -179,6 +187,15 @@ public class TileComponentConfig implements ITileComponent
|
||||
@Override
|
||||
public void read(ByteBuf dataStream)
|
||||
{
|
||||
transmissions.clear();
|
||||
|
||||
int amount = dataStream.readInt();
|
||||
|
||||
for(int i = 0; i < amount; i++)
|
||||
{
|
||||
transmissions.add(TransmissionType.values()[dataStream.readInt()]);
|
||||
}
|
||||
|
||||
for(TransmissionType type : transmissions)
|
||||
{
|
||||
byte[] array = new byte[6];
|
||||
@@ -204,6 +221,13 @@ public class TileComponentConfig implements ITileComponent
|
||||
@Override
|
||||
public void write(ArrayList data)
|
||||
{
|
||||
data.add(transmissions.size());
|
||||
|
||||
for(TransmissionType type : transmissions)
|
||||
{
|
||||
data.add(type.ordinal());
|
||||
}
|
||||
|
||||
for(TransmissionType type : transmissions)
|
||||
{
|
||||
data.add(sideConfigs.get(type.ordinal()));
|
||||
|
||||
@@ -48,6 +48,16 @@ public class TileComponentEjector implements ITileComponent, IEjector
|
||||
|
||||
tile.components.add(this);
|
||||
}
|
||||
|
||||
public void readFrom(TileComponentEjector ejector)
|
||||
{
|
||||
strictInput = ejector.strictInput;
|
||||
outputColor = ejector.outputColor;
|
||||
inputColors = ejector.inputColors;
|
||||
tickDelay = ejector.tickDelay;
|
||||
sideData = ejector.sideData;
|
||||
trackers = ejector.trackers;
|
||||
}
|
||||
|
||||
private List<ForgeDirection> getTrackedOutputs(int index, List<ForgeDirection> dirs)
|
||||
{
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user