diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 99875aeff..4a4e48911 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -9,16 +9,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mekanism.api.MekanismConfig.general; -import mekanism.api.recipe.AdvancedInput; -import mekanism.api.recipe.ChanceOutput; -import mekanism.api.recipe.ChemicalPair; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; -import mekanism.api.recipe.PressurizedProducts; -import mekanism.api.recipe.PressurizedReactants; +import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork.GasTransferEvent; import mekanism.api.gas.GasRegistry; @@ -28,6 +23,11 @@ import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.infuse.InfusionInput; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.recipe.ChanceOutput; +import mekanism.api.recipe.ChemicalPair; +import mekanism.api.recipe.PressurizedProducts; +import mekanism.api.recipe.PressurizedReactants; import mekanism.api.transmitters.DynamicNetwork.ClientTickUpdate; import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.TransmitterNetworkRegistry; @@ -60,6 +60,7 @@ import mekanism.common.recipe.BinRecipe; import mekanism.common.recipe.MekanismRecipe; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tank.DynamicTankCache; +import mekanism.common.tank.SynchronizedTankData; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; @@ -158,7 +159,7 @@ public class Mekanism public static Map> teleporters = new HashMap>(); /** The Dynamic Tank multiblock manager */ - public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); + public static MultiblockManager tankManager = new MultiblockManager("dynamicTank", DynamicTankCache.class); /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); diff --git a/src/main/java/mekanism/common/multiblock/IMultiblock.java b/src/main/java/mekanism/common/multiblock/IMultiblock.java new file mode 100644 index 000000000..1cdbbc52a --- /dev/null +++ b/src/main/java/mekanism/common/multiblock/IMultiblock.java @@ -0,0 +1,6 @@ +package mekanism.common.multiblock; + +public interface IMultiblock +{ + public SynchronizedData getSynchronizedData(); +} diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 0f152acc3..3521b7a0b 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; -import mekanism.common.tank.DynamicTankCache; import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -17,23 +15,26 @@ import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.util.Constants.NBT; -public class MultiblockManager +public class MultiblockManager { private static Set managers = new HashSet(); public static boolean loaded; + public Class> cacheClass; + public DataHandler dataHandler; public String name; /** A map containing references to all dynamic tank inventory caches. */ - public Map inventories = new HashMap(); + public Map> inventories = new HashMap>(); - public MultiblockManager(String s) + public MultiblockManager(String s, Class> cache) { name = s; managers.add(this); + cacheClass = cache; } public void createOrLoad(World world) @@ -61,14 +62,14 @@ public class MultiblockManager * @param id - inventory ID to pull * @return correct Dynamic Tank inventory cache */ - public DynamicTankCache pullInventory(World world, int id) + public MultiblockCache pullInventory(World world, int id) { if(!loaded) { load(world); } - DynamicTankCache toReturn = inventories.get(id); + MultiblockCache toReturn = inventories.get(id); inventories.remove(id); dataHandler.markDirty(); @@ -80,29 +81,33 @@ public class MultiblockManager * Updates a dynamic tank cache with the defined inventory ID with the parameterized values. * @param inventoryID - inventory ID of the dynamic tank * @param cache - cache of the dynamic tank - * @param tileEntity - dynamic tank TileEntity + * @param multiblock - dynamic tank TileEntity */ - public void updateCache(TileEntityDynamicTank tileEntity) + public void updateCache(IMultiblock multiblock) { - if(!loaded) - { - load(tileEntity.getWorldObj()); + try { + if(!loaded) + { + load(((TileEntity)multiblock).getWorldObj()); + } + + if(!inventories.containsKey(multiblock.getSynchronizedData().inventoryID)) + { + MultiblockCache cache = cacheClass.newInstance(); + cache.sync((T)multiblock.getSynchronizedData()); + cache.locations.add(Coord4D.get((TileEntity)multiblock)); + + inventories.put(multiblock.getSynchronizedData().inventoryID, cache); + + return; + } + + inventories.get(multiblock.getSynchronizedData().inventoryID).sync((T)multiblock.getSynchronizedData()); + inventories.get(multiblock.getSynchronizedData().inventoryID).locations.add(Coord4D.get((TileEntity)multiblock)); + dataHandler.markDirty(); + } catch(Exception e) { + e.printStackTrace(); } - - if(!inventories.containsKey(tileEntity.structure.inventoryID)) - { - DynamicTankCache cache = new DynamicTankCache(); - cache.sync(tileEntity.structure); - cache.locations.add(Coord4D.get(tileEntity)); - - inventories.put(tileEntity.structure.inventoryID, cache); - - return; - } - - inventories.get(tileEntity.structure.inventoryID).sync(tileEntity.structure); - inventories.get(tileEntity.structure.inventoryID).locations.add(Coord4D.get(tileEntity)); - dataHandler.markDirty(); } /** @@ -140,11 +145,11 @@ public class MultiblockManager ArrayList idsToKill = new ArrayList(); HashMap> tilesToKill = new HashMap>(); - for(Map.Entry entry : manager.inventories.entrySet()) + for(Map.Entry entry : ((Map)manager.inventories).entrySet()) { int inventoryID = entry.getKey(); - for(Coord4D obj : entry.getValue().locations) + for(Coord4D obj : (Set)entry.getValue().locations) { if(obj.dimensionId == world.provider.dimensionId && obj.exists(world)) { @@ -172,7 +177,7 @@ public class MultiblockManager { for(Coord4D obj : entry.getValue()) { - manager.inventories.get(entry.getKey()).locations.remove(obj); + ((Map)manager.inventories).get(entry.getKey()).locations.remove(obj); manager.dataHandler.markDirty(); } } @@ -194,7 +199,7 @@ public class MultiblockManager { Coord4D coord = Coord4D.get(tile); - for(Map.Entry entry : inventories.entrySet()) + for(Map.Entry> entry : inventories.entrySet()) { if(entry.getValue().locations.contains(coord)) { @@ -230,7 +235,7 @@ public class MultiblockManager { public MultiblockManager manager; - public Map loadedInventories; + public Map loadedInventories; public DataHandler(String tagName) { @@ -253,33 +258,41 @@ public class MultiblockManager @Override public void readFromNBT(NBTTagCompound nbtTags) { - NBTTagList list = nbtTags.getTagList("invList", NBT.TAG_COMPOUND); - - loadedInventories = new HashMap(); - - for(int i = 0; i < list.tagCount(); i++) - { - NBTTagCompound compound = list.getCompoundTagAt(i); - DynamicTankCache cache = new DynamicTankCache(); - cache.load(compound); + try { + String cacheClass = nbtTags.getString("cacheClass"); - NBTTagList coordsList = compound.getTagList("coordsList", NBT.TAG_COMPOUND); + NBTTagList list = nbtTags.getTagList("invList", NBT.TAG_COMPOUND); - for(int j = 0; j < coordsList.tagCount(); j++) + loadedInventories = new HashMap(); + + for(int i = 0; i < list.tagCount(); i++) { - cache.locations.add(Coord4D.read(coordsList.getCompoundTagAt(j))); + NBTTagCompound compound = list.getCompoundTagAt(i); + MultiblockCache cache = (MultiblockCache)Class.forName(cacheClass).newInstance(); + cache.load(compound); + + NBTTagList coordsList = compound.getTagList("coordsList", NBT.TAG_COMPOUND); + + for(int j = 0; j < coordsList.tagCount(); j++) + { + cache.locations.add(Coord4D.read(coordsList.getCompoundTagAt(j))); + } + + loadedInventories.put(compound.getInteger("id"), cache); } - - loadedInventories.put(compound.getInteger("id"), cache); + } catch(Exception e) { + e.printStackTrace(); } } @Override public void writeToNBT(NBTTagCompound nbtTags) { + nbtTags.setString("cacheClass", manager.cacheClass.getName()); + NBTTagList list = new NBTTagList(); - for(Map.Entry entry : manager.inventories.entrySet()) + for(Map.Entry entry : ((Map)manager.inventories).entrySet()) { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("id", entry.getKey()); @@ -287,7 +300,7 @@ public class MultiblockManager NBTTagList coordsList = new NBTTagList(); - for(Coord4D coord : entry.getValue().locations) + for(Coord4D coord : (Set)entry.getValue().locations) { coordsList.appendTag(coord.write(new NBTTagCompound())); } diff --git a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java index ee7b2a223..ff20b87df 100644 --- a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java @@ -403,7 +403,7 @@ public class TankUpdateProtocol { if(Mekanism.tankManager.inventories.get(id) != null) { - cache = Mekanism.tankManager.pullInventory(pointer.getWorldObj(), id); + cache = (DynamicTankCache)Mekanism.tankManager.pullInventory(pointer.getWorldObj(), id); idToUse = id; break; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index bc8c8f41f..386bec3ca 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,6 +9,8 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.common.IFluidContainerManager; import mekanism.common.Mekanism; +import mekanism.common.multiblock.IMultiblock; +import mekanism.common.multiblock.SynchronizedData; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tank.SynchronizedTankData; import mekanism.common.tank.SynchronizedTankData.ValveData; @@ -25,7 +27,7 @@ import net.minecraftforge.fluids.IFluidContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityDynamicTank extends TileEntityContainerBlock implements IFluidContainerManager +public class TileEntityDynamicTank extends TileEntityContainerBlock implements IFluidContainerManager, IMultiblock { /** The tank data for this structure. */ public SynchronizedTankData structure; @@ -551,4 +553,10 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock implements I { return false; } + + @Override + public SynchronizedData getSynchronizedData() + { + return structure; + } }