From e6f410208740d7eab23b3a7228fc2c9aa703d8a8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 22 Mar 2016 19:29:18 -0400 Subject: [PATCH] New "InternalMultiblock" framework to allow for easier multiblock component management, added "hot" state to superheating elements --- .../java/mekanism/client/MekanismClient.java | 10 ++- .../java/mekanism/common/base/IModule.java | 5 ++ .../mekanism/common/block/BlockBasic.java | 15 ++++ .../content/boiler/BoilerUpdateProtocol.java | 3 + .../boiler/SynchronizedBoilerData.java | 6 ++ .../content/tank/TankUpdateProtocol.java | 6 +- .../common/multiblock/SynchronizedData.java | 2 + .../TileEntityInternalMultiblock.java | 58 +++++++++++++ .../common/multiblock/UpdateProtocol.java | 36 +++++++- .../common/tile/TileEntityBoilerCasing.java | 20 ++++- .../common/tile/TileEntityMultiblock.java | 3 + .../tile/TileEntitySuperheatingElement.java | 43 +++++++++- .../client/render/RenderTurbineRotor.java | 6 +- .../generators/common/MekanismGenerators.java | 6 ++ .../turbine/SynchronizedTurbineData.java | 8 ++ .../turbine/TurbineUpdateProtocol.java | 27 +----- .../turbine/TileEntityRotationalComplex.java | 84 +++---------------- .../tile/turbine/TileEntityTurbineCasing.java | 17 ++-- .../mekanism/tools/common/MekanismTools.java | 3 + 19 files changed, 237 insertions(+), 121 deletions(-) create mode 100644 src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 45300bf81..9b4f54141 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,8 +6,9 @@ import mekanism.api.MekanismConfig.general; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; +import mekanism.common.base.IModule; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; -import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; @@ -50,7 +51,12 @@ public class MekanismClient extends Mekanism Mekanism.flamethrowerActive.clear(); Mekanism.activeVibrators.clear(); - TileEntityRotationalComplex.clientRotationMap.clear(); + SynchronizedBoilerData.clientHotMap.clear(); + + for(IModule module : Mekanism.modulesLoaded) + { + module.resetClient(); + } SoundHandler.soundMaps.clear(); diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 41c83c629..37a7a57e6 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -37,4 +37,9 @@ public interface IModule * @param dataStream - the incoming ByteBuf of the sync packet */ public void readConfig(ByteBuf dataStream) throws IOException; + + /** + * Called when the player returns to the main menu. + */ + public void resetClient(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index e5e5c50fb..d85527227 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -18,6 +18,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.ITierItem; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; @@ -745,6 +746,20 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return 12; } } + else if(blockType == BasicBlock.BASIC_BLOCK_2) + { + if(metadata == 5) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)tileEntity; + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 15 : 0; + } + + return 0; + } + } return 0; } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index a8cc2c4af..d2440063f 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -65,6 +65,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } else if(tile instanceof TileEntitySuperheatingElement) { + structure.internalLocations.add(coord); elements.add(coord); } } @@ -221,6 +222,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override protected void onFormed() { + super.onFormed(); + if((structureFound).waterStored != null) { (structureFound).waterStored.amount = Math.min((structureFound).waterStored.amount, structureFound.waterVolume*WATER_PER_TANK); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index d90ed2aec..eda394981 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -1,6 +1,8 @@ package mekanism.common.content.boiler; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; @@ -16,6 +18,8 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { + public static Map clientHotMap = new HashMap(); + public static double CASING_INSULATION_COEFFICIENT = 1; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); @@ -29,6 +33,8 @@ public class SynchronizedBoilerData extends SynchronizedData @Override protected boolean isValidFrame(int x, int y, int z) { - return pointer.getWorldObj().getBlock(x, y, z) == MekanismBlocks.BasicBlock && pointer.getWorldObj().getBlockMetadata(x, y, z) == 9; + return BasicType.get(pointer.getWorldObj().getBlock(x, y, z), pointer.getWorldObj().getBlockMetadata(x, y, z)) == BasicType.DYNAMIC_TANK; } @Override @@ -72,6 +72,8 @@ public class TankUpdateProtocol extends UpdateProtocol @Override protected void onFormed() { + super.onFormed(); + if(structureFound.fluidStored != null) { structureFound.fluidStored.amount = Math.min(structureFound.fluidStored.amount, structureFound.volume*FLUID_PER_TANK); diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 982f65575..17d6b3cb2 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -31,6 +31,8 @@ public abstract class SynchronizedData> public boolean destroyed; + public Set internalLocations = new HashSet(); + public ItemStack[] getInventory() { return null; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java new file mode 100644 index 000000000..737f2c2d7 --- /dev/null +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -0,0 +1,58 @@ +package mekanism.common.multiblock; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.PacketHandler; +import mekanism.common.tile.TileEntityBasicBlock; + +public class TileEntityInternalMultiblock extends TileEntityBasicBlock +{ + public String multiblockUUID; + + @Override + public void onUpdate() {} + + @Override + public boolean canUpdate() + { + return false; + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + if(dataStream.readBoolean()) + { + multiblockUUID = PacketHandler.readString(dataStream); + } + else { + multiblockUUID = null; + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(multiblockUUID != null) + { + data.add(true); + data.add(multiblockUUID); + } + else { + data.add(false); + } + + return data; + } + + public void setMultiblock(String id) + { + multiblockUUID = id; + } +} diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index f537ffc4b..f33d6fb9f 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -388,13 +388,43 @@ public abstract class UpdateProtocol> protected abstract void mergeCaches(List rejectedItems, MultiblockCache cache, MultiblockCache merge); - protected void onFormed() {} + protected void onFormed() + { + for(Coord4D coord : structureFound.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(structureFound.inventoryID); + } + } + } protected void onStructureCreated(T structure, int origX, int origY, int origZ, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) {} - public void onStructureDestroyed(T structure) {} + public void onStructureDestroyed(T structure) + { + for(Coord4D coord : structure.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } + } - public void killInnerNode(Coord4D coord) {} + public void killInnerNode(Coord4D coord) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } /** * Runs the protocol and updates all nodes that make a part of the multiblock. diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 4ef947cfd..a6b73f751 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -39,7 +39,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0; } - if(needsValveUpdate || structure.needsRenderUpdate()) + boolean needsHotUpdate = false; + boolean newHot = structure.temperature >= SynchronizedBoilerData.BASE_BOIL_TEMP-0.01F; + + if(newHot != structure.clientHot) { - sendPacketToRenderer(); + needsHotUpdate = true; + structure.clientHot = newHot; } double[] d = structure.simulateHeat(); @@ -155,6 +159,11 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); for(ValveData valveData : structure.valves) @@ -298,6 +309,9 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock> extend data.add(getSynchronizedData().volLength); getSynchronizedData().renderLocation.write(data); + data.add(getSynchronizedData().inventoryID); } else { data.add(false); @@ -223,6 +225,7 @@ public abstract class TileEntityMultiblock> extend getSynchronizedData().volLength = dataStream.readInt(); getSynchronizedData().renderLocation = Coord4D.read(dataStream); + getSynchronizedData().inventoryID = PacketHandler.readString(dataStream); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index d7207cb85..6bb80ad08 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,13 +1,48 @@ package mekanism.common.tile; -public class TileEntitySuperheatingElement extends TileEntityBasicBlock +import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.multiblock.TileEntityInternalMultiblock; +import mekanism.common.util.MekanismUtils; + +public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock { + public boolean prevHot; + + @Override + public void setMultiblock(String id) + { + if(id == null && multiblockUUID != null) + { + SynchronizedBoilerData.clientHotMap.remove(multiblockUUID); + } + + super.setMultiblock(id); + } + @Override public boolean canUpdate() { - return false; + return true; } - + @Override - public void onUpdate() {} + public void onUpdate() + { + if(worldObj.isRemote) + { + boolean newHot = false; + + if(multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(multiblockUUID) != null) + { + newHot = SynchronizedBoilerData.clientHotMap.get(multiblockUUID); + } + + if(prevHot != newHot) + { + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + + prevHot = newHot; + } + } + } } diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index 285223439..6c95d1839 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -4,7 +4,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelTurbine; -import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; +import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -43,9 +43,9 @@ public class RenderTurbineRotor extends TileEntitySpecialRenderer int baseIndex = tileEntity.clientIndex*2; float rotateSpeed = 0.0F; - if(tileEntity.multiblockUUID != null && TileEntityRotationalComplex.clientRotationMap.containsKey(tileEntity.multiblockUUID)) + if(tileEntity.multiblockUUID != null && SynchronizedTurbineData.clientRotationMap.containsKey(tileEntity.multiblockUUID)) { - rotateSpeed = TileEntityRotationalComplex.clientRotationMap.get(tileEntity.multiblockUUID); + rotateSpeed = SynchronizedTurbineData.clientRotationMap.get(tileEntity.multiblockUUID); } if(!Mekanism.proxy.isPaused()) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index a4208a7de..b072d17c1 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -232,6 +232,12 @@ public class MekanismGenerators implements IModule generators.turbineVentGasFlow = dataStream.readDouble(); generators.turbineDisperserGasFlow = dataStream.readDouble(); } + + @Override + public void resetClient() + { + SynchronizedTurbineData.clientRotationMap.clear(); + } @SubscribeEvent public void onConfigChanged(OnConfigChangedEvent event) diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index edb7c7478..667324ddf 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -1,11 +1,18 @@ package mekanism.generators.common.content.turbine; +import java.util.HashMap; +import java.util.Map; + import mekanism.api.Coord4D; import mekanism.common.multiblock.SynchronizedData; import net.minecraftforge.fluids.FluidStack; public class SynchronizedTurbineData extends SynchronizedData { + public static Map clientRotationMap = new HashMap(); + + public static final float ROTATION_THRESHOLD = 0.001F; + public FluidStack fluidStored; public FluidStack prevFluid; @@ -25,6 +32,7 @@ public class SynchronizedTurbineData extends SynchronizedData clientRotationMap = new HashMap(); - - public static final float ROTATION_THRESHOLD = 0.001F; - - public String multiblockUUID; - public float rotation; - +public class TileEntityRotationalComplex extends TileEntityInternalMultiblock +{ @Override - public void onUpdate() {} - - @Override - public boolean canUpdate() - { - return false; - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - rotation = dataStream.readFloat(); - - if(dataStream.readBoolean()) - { - multiblockUUID = PacketHandler.readString(dataStream); - clientRotationMap.put(multiblockUUID, rotation); - } - else { - multiblockUUID = null; - } - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(rotation); - - if(multiblockUUID != null) - { - data.add(true); - data.add(multiblockUUID); - } - else { - data.add(false); - } - - return data; - } - public void setMultiblock(String id) { - multiblockUUID = id; + if(id == null && multiblockUUID != null) + { + SynchronizedTurbineData.clientRotationMap.remove(multiblockUUID); + } + + super.setMultiblock(id); Coord4D coord = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); TileEntity tile = coord.getTileEntity(worldObj); @@ -81,13 +26,4 @@ public class TileEntityRotationalComplex extends TileEntityBasicBlock ((TileEntityTurbineRotor)tile).updateRotors(); } } - - public void setRotation(float newRotation) - { - if(Math.abs(newRotation-rotation) > ROTATION_THRESHOLD) - { - rotation = newRotation; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 39879c3e8..698736eff 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -22,12 +22,11 @@ import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.content.turbine.TurbineCache; import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage -{ +{ public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -87,14 +86,16 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock SynchronizedTurbineData.ROTATION_THRESHOLD) { - ((TileEntityRotationalComplex)tile).setRotation((float)flowRate); + structure.clientRotation = newRotation; + needsRotationUpdate = true; } - if(structure.needsRenderUpdate()) + if(structure.needsRenderUpdate() || needsRotationUpdate) { sendPacketToRenderer(); } @@ -187,6 +188,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock