diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 56bdc9644..b6f5e881e 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -67,7 +67,7 @@ public class MekanismRenderer public static RenderConfigurableMachine machineRenderer = new RenderConfigurableMachine(); - private static String[] simpleSides = new String[] {"Down", "Up", "Front", "Back", "Left", "Right"}; + private static String[] simpleSides = new String[] {"Bottom", "Top", "Front", "Back", "Left", "Right"}; public static void init() { diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 89d3eb86a..323f8857b 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -69,11 +69,6 @@ public class CommonWorldTickHandler { if(!world.isRemote) { - if(!MultiblockManager.loaded) - { - MultiblockManager.load(world); - } - if(!FrequencyManager.loaded) { FrequencyManager.load(world); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 034cb21ff..dad8e55f6 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -40,14 +40,11 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.BoilerManager; import mekanism.common.content.boiler.SynchronizedBoilerData; -import mekanism.common.content.matrix.MatrixCache; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.content.tank.SynchronizedTankData; -import mekanism.common.content.tank.TankCache; import mekanism.common.content.transporter.PathfinderCache; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.turbine.SynchronizedTurbineData; -import mekanism.common.content.turbine.TurbineCache; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; @@ -168,9 +165,9 @@ public class Mekanism public static Version versionNumber = new Version(8, 0, 2); /** MultiblockManagers for various structrures */ - public static MultiblockManager tankManager = new MultiblockManager("dynamicTank", TankCache.class); - public static MultiblockManager matrixManager = new MultiblockManager("inductionMatrix", MatrixCache.class); - public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine", TurbineCache.class); + public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); + public static MultiblockManager matrixManager = new MultiblockManager("inductionMatrix"); + public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); public static MultiblockManager boilerManager = new BoilerManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ diff --git a/src/main/java/mekanism/common/content/boiler/BoilerManager.java b/src/main/java/mekanism/common/content/boiler/BoilerManager.java index 5ca71930d..efef8421d 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerManager.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerManager.java @@ -1,5 +1,10 @@ package mekanism.common.content.boiler; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; @@ -8,11 +13,6 @@ import mekanism.common.tile.TileEntityMultiblock; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - /** * Created by ben on 09/01/15. */ @@ -20,7 +20,7 @@ public class BoilerManager extends MultiblockManager { public BoilerManager(String s) { - super(s, BoilerCache.class); + super(s); } public void tickSelf(World world) @@ -83,14 +83,12 @@ public class BoilerManager extends MultiblockManager for(Coord4D obj : entry.getValue()) { inventories.get(entry.getKey()).locations.remove(obj); - dataHandler.markDirty(); } } for(int inventoryID : idsToKill) { inventories.remove(inventoryID); - dataHandler.markDirty(); } } } diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index e8a83e5ae..32f434095 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -8,53 +8,22 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityMultiblock; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; -import net.minecraftforge.common.util.Constants.NBT; 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 multiblock inventory caches. */ public Map> inventories = new HashMap>(); - public MultiblockManager(String s, Class> cache) + public MultiblockManager(String s) { name = s; managers.add(this); - cacheClass = cache; - } - - public void createOrLoad(World world) - { - if(dataHandler == null) - { - dataHandler = (DataHandler)world.perWorldStorage.loadData(DataHandler.class, name); - - if(dataHandler == null) - { - dataHandler = new DataHandler(name); - dataHandler.setManager(this); - world.perWorldStorage.setData(name, dataHandler); - } - else { - dataHandler.setManager(this); - dataHandler.syncManager(); - } - } } /** @@ -65,50 +34,25 @@ public class MultiblockManager> */ public MultiblockCache pullInventory(World world, int id) { - if(!loaded) - { - load(world); - } - MultiblockCache toReturn = inventories.get(id); + for(Coord4D obj : inventories.get(id).locations) + { + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(world); + + if(tileEntity != null) + { + System.out.println("RESET " + Coord4D.get(tileEntity)); + tileEntity.cachedData = tileEntity.getNewCache(); + tileEntity.cachedID = -1; + } + } + inventories.remove(id); - dataHandler.markDirty(); return toReturn; } - /** - * Updates a multiblock cache with the defined inventory ID with the parameterized values. - * @param multiblock - multiblock TileEntity - */ - public void updateCache(IMultiblock multiblock) - { - 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(); - } - } - /** * Grabs a unique inventory ID for a multiblock. * @return unique inventory ID @@ -134,11 +78,6 @@ public class MultiblockManager> public static void tick(World world) { - if(!loaded) - { - load(world); - } - for(MultiblockManager manager : managers) { manager.tickSelf(world); @@ -183,14 +122,12 @@ public class MultiblockManager> for(Coord4D obj : entry.getValue()) { inventories.get(entry.getKey()).locations.remove(obj); - dataHandler.markDirty(); } } for(int inventoryID : idsToKill) { inventories.remove(inventoryID); - dataHandler.markDirty(); } } @@ -209,29 +146,17 @@ public class MultiblockManager> return ((TileEntityMultiblock)tile1).getManager() == ((TileEntityMultiblock)tile2).getManager(); } - public int getInventoryId(TileEntityMultiblock tile) + public void updateCache(TileEntityMultiblock tile) { - Coord4D coord = Coord4D.get(tile); - - for(Map.Entry> entry : inventories.entrySet()) + if(!inventories.containsKey(tile.cachedID)) { - if(entry.getValue().locations.contains(coord)) - { - return entry.getKey(); - } - } - - return -1; - } - - public static void load(World world) - { - loaded = true; - - for(MultiblockManager manager : managers) - { - manager.createOrLoad(world); + tile.cachedData.locations.add(Coord4D.get(tile)); + inventories.put(tile.cachedID, tile.cachedData); + + return; } + + inventories.get(tile.cachedID).locations.add(Coord4D.get(tile)); } public static void reset() @@ -239,91 +164,6 @@ public class MultiblockManager> for(MultiblockManager manager : managers) { manager.inventories.clear(); - manager.dataHandler = null; - } - - loaded = false; - } - - public static class DataHandler extends WorldSavedData - { - public MultiblockManager manager; - - public Map loadedInventories; - - public DataHandler(String tagName) - { - super(tagName); - } - - public void setManager(MultiblockManager m) - { - manager = m; - } - - public void syncManager() - { - if(loadedInventories != null) - { - manager.inventories = loadedInventories; - } - } - - @Override - public void readFromNBT(NBTTagCompound nbtTags) - { - try { - String cacheClass = nbtTags.getString("cacheClass"); - - NBTTagList list = nbtTags.getTagList("invList", NBT.TAG_COMPOUND); - - loadedInventories = new HashMap(); - - for(int i = 0; i < list.tagCount(); i++) - { - 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); - } - } 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 : ((Map)manager.inventories).entrySet()) - { - NBTTagCompound compound = new NBTTagCompound(); - compound.setInteger("id", entry.getKey()); - entry.getValue().save(compound); - - NBTTagList coordsList = new NBTTagList(); - - for(Coord4D coord : (Set)entry.getValue().locations) - { - coordsList.appendTag(coord.write(new NBTTagCompound())); - } - - compound.setTag("coordsList", coordsList); - list.appendTag(compound); - } - - nbtTags.setTag("invList", list); } } } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index b879c3f05..d1587b67d 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -402,11 +402,10 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(pointer.getWorldObj()); - int id = getManager().getInventoryId(tileEntity); - if(id != -1) + if(tileEntity.cachedID != -1) { - idsFound.add(id); + idsFound.add(tileEntity.cachedID); } } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 9f35ce10e..85ce71072 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -105,6 +105,7 @@ public class PartUniversalCable extends PartTransmitter implement { toDraw -= getTransmitterNetwork().emit(received, true); } + ((IStrictEnergyStorage)outputter).setEnergy(((IStrictEnergyStorage)outputter).getEnergy() - toDraw); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoiler.java b/src/main/java/mekanism/common/tile/TileEntityBoiler.java index fa436c977..5133c3179 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoiler.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -9,6 +11,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; +import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; @@ -17,7 +20,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.HeatUtils; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -25,8 +27,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import io.netty.buffer.ByteBuf; - public class TileEntityBoiler extends TileEntityMultiblock implements IFluidContainerManager, IHeatTransfer { /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ @@ -278,6 +278,12 @@ public class TileEntityBoiler extends TileEntityMultiblock> extend /** Whether or not this multiblock segment is rendering the structure. */ public boolean isRendering; + /** This multiblock segment's cached data */ + public MultiblockCache cachedData = getNewCache(); + + /** This multiblock segment's cached inventory ID */ + public int cachedID = -1; + public TileEntityMultiblock(String name) { super(name); @@ -75,6 +83,11 @@ public abstract class TileEntityMultiblock> extend if(structure == null) { isRendering = false; + + if(cachedID != -1) + { + getManager().updateCache(this); + } } if(structure == null && ticker == 5) @@ -112,6 +125,8 @@ public abstract class TileEntityMultiblock> extend if(getSynchronizedData().inventoryID != -1) { + cachedData.sync(getSynchronizedData()); + cachedID = getSynchronizedData().inventoryID; getManager().updateCache(this); } } @@ -149,6 +164,8 @@ public abstract class TileEntityMultiblock> extend protected abstract T getNewStructure(); + public abstract MultiblockCache getNewCache(); + protected abstract UpdateProtocol getProtocol(); public abstract MultiblockManager getManager(); @@ -209,6 +226,35 @@ public abstract class TileEntityMultiblock> extend } } + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + if(structure == null) + { + cachedID = nbtTags.getInteger("cachedID"); + + if(cachedID != -1) + { + cachedData.load(nbtTags); + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setInteger("cachedID", cachedID); + + if(cachedID != -1) + { + cachedData.save(nbtTags); + } + } + @Override public ItemStack getStackInSlot(int slotID) {