From 0c025e1033c2c68fe4addac6e24e5c4ecbc418ab Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 15:41:34 -0500 Subject: [PATCH 1/8] Structural Glass is now real, started on core turbine multiblock code --- .../java/mekanism/client/ClientProxy.java | 2 + .../java/mekanism/common/CommonProxy.java | 2 + src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/common/block/BlockBasic.java | 84 ++++++------- .../turbine/TurbineUpdateProtocol.java | 6 - .../mekanism/common/item/ItemBlockBasic.java | 14 +-- .../common/multiblock/IMultiblock.java | 6 + .../multiblock/IStructuralMultiblock.java | 17 +++ .../common/multiblock/UpdateProtocol.java | 88 ++++++++++---- .../common/tile/TileEntityDynamicTank.java | 23 ++++ .../tile/TileEntityInductionCasing.java | 23 +++- .../common/tile/TileEntityMultiblock.java | 8 ++ .../TileEntitySolarEvaporationController.java | 5 +- .../tile/TileEntityStructuralGlass.java | 111 ++++++++++++++++++ .../generators/common/GeneratorsItems.java | 11 +- .../generators/common/MekanismGenerators.java | 49 ++++---- .../turbine/SynchronizedTurbineData.java | 2 +- .../common/content/turbine/TurbineCache.java | 9 +- .../turbine/TurbineUpdateProtocol.java | 48 ++++++++ .../common/item/ItemBlockGenerator.java | 15 ++- .../tile/turbine/TileEntityTurbineCasing.java | 47 ++++++++ .../resources/assets/mekanism/lang/en_US.lang | 2 +- 22 files changed, 462 insertions(+), 112 deletions(-) delete mode 100644 src/main/java/mekanism/common/content/turbine/TurbineUpdateProtocol.java create mode 100644 src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java create mode 100644 src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java rename src/main/java/mekanism/{ => generators}/common/content/turbine/SynchronizedTurbineData.java (73%) rename src/main/java/mekanism/{ => generators}/common/content/turbine/TurbineCache.java (70%) create mode 100644 src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index dd6f6ddd3..04aff8781 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -167,6 +167,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -328,6 +329,7 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityInductionCell.class, "InductionCell"); GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); + GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); } @Override diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index cf63ef433..cd12536db 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -104,6 +104,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -189,6 +190,7 @@ public class CommonProxy GameRegistry.registerTileEntity(TileEntityInductionCell.class, "InductionCell"); GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); + GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 784f2db44..33f8124bc 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -47,7 +47,6 @@ import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.transporter.PathfinderCache; import mekanism.common.content.transporter.TransporterManager; -import mekanism.common.content.turbine.SynchronizedTurbineData; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; @@ -171,7 +170,6 @@ public class Mekanism /** MultiblockManagers for various structrures */ 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/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d2a115d19..9f93d6d95 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1,11 +1,10 @@ package mekanism.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.MekanismRenderer; @@ -22,8 +21,21 @@ import mekanism.common.base.IBoundingBlock; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.*; +import mekanism.common.multiblock.IMultiblock; +import mekanism.common.multiblock.IStructuralMultiblock; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicValve; +import mekanism.common.tile.TileEntityInductionCasing; +import mekanism.common.tile.TileEntityInductionCell; +import mekanism.common.tile.TileEntityInductionPort; +import mekanism.common.tile.TileEntityInductionProvider; +import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.tile.TileEntitySolarEvaporationBlock; +import mekanism.common.tile.TileEntitySolarEvaporationController; +import mekanism.common.tile.TileEntitySolarEvaporationValve; +import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -46,11 +58,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple metal block IDs. @@ -64,7 +75,7 @@ import java.util.Random; * 0:7: Teleporter Frame * 0:8: Steel Casing * 0:9: Dynamic Tank - * 0:10: Dynamic Glass + * 0:10: Structural Glass * 0:11: Dynamic Valve * 0:12: Copper Block * 0:13: Tin Block @@ -128,6 +139,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } + + if(tileEntity instanceof IStructuralMultiblock) + { + ((IStructuralMultiblock)tileEntity).update(); + } } } @@ -526,24 +542,13 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return true; } - else if(metadata == 9 || metadata == 10 || metadata == 11) + else if(metadata == 9 || metadata == 11) { - if(!entityplayer.isSneaking() && ((TileEntityDynamicTank)world.getTileEntity(x, y, z)).structure != null) - { - TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(x, y, z); - - if(!manageInventory(entityplayer, tileEntity)) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); - entityplayer.openGui(Mekanism.instance, 18, world, x, y, z); - } - else { - entityplayer.inventory.markDirty(); - tileEntity.sendPacketToRenderer(); - } - - return true; - } + return ((IMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); + } + else if(metadata == 10) + { + return ((IStructuralMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); } } else if(blockType == BasicBlock.BASIC_BLOCK_2) @@ -555,15 +560,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(metadata == 1 || metadata == 2) { - if(!entityplayer.isSneaking() && ((TileEntityInductionCasing)world.getTileEntity(x, y, z)).structure != null) - { - TileEntityInductionCasing tileEntity = (TileEntityInductionCasing)world.getTileEntity(x, y, z); - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); - entityplayer.openGui(Mekanism.instance, 49, world, x, y, z); - - return true; - } + return ((IMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); } } @@ -576,7 +573,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return !(blockType == BasicBlock.BASIC_BLOCK_1 && world.getBlockMetadata(x, y, z) == 10); } - private boolean manageInventory(EntityPlayer player, TileEntityDynamicTank tileEntity) + public static boolean manageInventory(EntityPlayer player, TileEntityDynamicTank tileEntity) { ItemStack itemStack = player.getCurrentEquippedItem(); @@ -808,7 +805,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon case 9: return new TileEntityDynamicTank(); case 10: - return new TileEntityDynamicTank(); + return new TileEntityStructuralGlass(); case 11: return new TileEntityDynamicValve(); case 14: @@ -893,6 +890,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { ((TileEntityMultiblock)tileEntity).update(); } + + if(tileEntity instanceof IStructuralMultiblock) + { + ((IStructuralMultiblock)tileEntity).update(); + } } } diff --git a/src/main/java/mekanism/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/common/content/turbine/TurbineUpdateProtocol.java deleted file mode 100644 index 81d437e28..000000000 --- a/src/main/java/mekanism/common/content/turbine/TurbineUpdateProtocol.java +++ /dev/null @@ -1,6 +0,0 @@ -package mekanism.common.content.turbine; - -public class TurbineUpdateProtocol -{ - -} diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 03f1be292..9fb8b0acf 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -1,7 +1,8 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; @@ -28,9 +29,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Item class for handling multiple metal block IDs. @@ -44,7 +44,7 @@ import java.util.List; * 0:7: Teleporter Frame * 0:8: Steel Casing * 0:9: Dynamic Tank - * 0:10: Dynamic Glass + * 0:10: Structural Glass * 0:11: Dynamic Valve * 0:12: Copper Block * 0:13: Tin Block @@ -306,7 +306,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem name = "DynamicTank"; break; case 10: - name = "DynamicGlass"; + name = "StructuralGlass"; break; case 11: name = "DynamicValve"; diff --git a/src/main/java/mekanism/common/multiblock/IMultiblock.java b/src/main/java/mekanism/common/multiblock/IMultiblock.java index dc2ae616b..97ec03128 100644 --- a/src/main/java/mekanism/common/multiblock/IMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IMultiblock.java @@ -1,6 +1,12 @@ package mekanism.common.multiblock; +import net.minecraft.entity.player.EntityPlayer; + public interface IMultiblock> { public T getSynchronizedData(); + + public boolean onActivate(EntityPlayer player); + + public void update(); } diff --git a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java new file mode 100644 index 000000000..eda5c272a --- /dev/null +++ b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java @@ -0,0 +1,17 @@ +package mekanism.common.multiblock; + +import mekanism.api.Coord4D; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + +public interface IStructuralMultiblock +{ + public boolean onActivate(EntityPlayer player); + + public boolean canInterface(TileEntity controller); + + public void setController(Coord4D coord); + + public void update(); +} diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 80e20b18a..dd400a896 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityMultiblock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -16,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection; public abstract class UpdateProtocol> { /** The multiblock nodes that have already been iterated over. */ - public Set> iteratedNodes = new HashSet>(); + public Set iteratedNodes = new HashSet(); public Set innerNodes = new HashSet(); @@ -35,7 +34,7 @@ public abstract class UpdateProtocol> * Recursively loops through each node connected to the given TileEntity. * @param tile - the TileEntity to loop over */ - public void loopThrough(TileEntityMultiblock tile) + public void loopThrough(TileEntity tile) { World worldObj = tile.getWorldObj(); @@ -200,7 +199,7 @@ public abstract class UpdateProtocol> if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin)) { - if(isInteriorValid(structure)) + if(canForm(structure)) { structureFound = structure; return; @@ -215,19 +214,20 @@ public abstract class UpdateProtocol> for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tileEntity = Coord4D.get(tile).getFromSide(side).getTileEntity(tile.getWorldObj()); + Coord4D coord = Coord4D.get(tile).getFromSide(side); + TileEntity tileEntity = coord.getTileEntity(tile.getWorldObj()); - if(MultiblockManager.areEqual(tileEntity, pointer)) + if(isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)) { if(!iteratedNodes.contains(tileEntity)) { - loopThrough((TileEntityMultiblock)tileEntity); + loopThrough(tileEntity); } } } } - public boolean isInteriorValid(T structure) + public boolean canForm(T structure) { return true; } @@ -290,6 +290,14 @@ public abstract class UpdateProtocol> { TileEntity tile = pointer.getWorldObj().getTileEntity(x, y, z); + if(tile instanceof IStructuralMultiblock) + { + if(((IStructuralMultiblock)tile).canInterface(pointer)) + { + return true; + } + } + if(MultiblockManager.areEqual(tile, pointer)) { return true; @@ -392,13 +400,20 @@ public abstract class UpdateProtocol> if(structureFound != null) { - for(TileEntityMultiblock tileEntity : iteratedNodes) + for(TileEntity tileEntity : iteratedNodes) { if(!structureFound.locations.contains(Coord4D.get(tileEntity))) { for(TileEntity tile : iteratedNodes) { - ((TileEntityMultiblock)tile).structure = null; + if(tile instanceof TileEntityMultiblock) + { + ((TileEntityMultiblock)tile).structure = null; + } + else if(tile instanceof IStructuralMultiblock) + { + ((IStructuralMultiblock)tile).setController(null); + } } return; @@ -410,11 +425,11 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(pointer.getWorldObj()); + TileEntity tileEntity = obj.getTileEntity(pointer.getWorldObj()); - if(tileEntity.cachedID != null) + if(tileEntity instanceof TileEntityMultiblock && ((TileEntityMultiblock)tileEntity).cachedID != null) { - idsFound.add(tileEntity.cachedID); + idsFound.add(((TileEntityMultiblock)tileEntity).cachedID); } } @@ -452,24 +467,55 @@ public abstract class UpdateProtocol> onFormed(); structureFound.inventoryID = idToUse; + + List structures = new ArrayList(); + Coord4D toUse = null; for(Coord4D obj : structureFound.locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(pointer.getWorldObj()); + TileEntity tileEntity = obj.getTileEntity(pointer.getWorldObj()); - tileEntity.structure = (T)structureFound; + if(tileEntity instanceof TileEntityMultiblock) + { + ((TileEntityMultiblock)tileEntity).structure = structureFound; + + if(toUse == null) + { + toUse = obj.clone(); + } + } + else if(tileEntity instanceof IStructuralMultiblock) + { + structures.add((IStructuralMultiblock)tileEntity); + } + } + + //Remove all structural multiblocks from locations, set controllers + for(IStructuralMultiblock node : structures) + { + node.setController(toUse); + structureFound.locations.remove(Coord4D.get((TileEntity)node)); } } else { - for(TileEntityMultiblock tileEntity : iteratedNodes) + for(TileEntity tile : iteratedNodes) { - if(tileEntity.structure != null && !tileEntity.structure.destroyed) + if(tile instanceof TileEntityMultiblock) { - onStructureDestroyed(tileEntity.structure); - tileEntity.structure.destroyed = true; + TileEntityMultiblock tileEntity = (TileEntityMultiblock)tile; + + if(tileEntity.structure != null && !tileEntity.structure.destroyed) + { + onStructureDestroyed(tileEntity.structure); + tileEntity.structure.destroyed = true; + } + + tileEntity.structure = null; + } + else if(tile instanceof IStructuralMultiblock) + { + ((IStructuralMultiblock)tile).setController(null); } - - tileEntity.structure = null; } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 5f2f6cf76..490e07163 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; +import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankCache; @@ -18,6 +19,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -280,6 +282,27 @@ public class TileEntityDynamicTank extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { public int clientCells; @@ -52,6 +57,20 @@ public class TileEntityInductionCasing extends TileEntityMultiblock> extend } } + @Override public void update() { if(!worldObj.isRemote && (structure == null || !getSynchronizedData().didTick)) @@ -273,6 +275,12 @@ public abstract class TileEntityMultiblock> extend } } + @Override + public boolean onActivate(EntityPlayer player) + { + return false; + } + @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index 3e46ee8c1..672bfe92a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -758,10 +758,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora } @Override - public void setActive(boolean active) - { - - } + public void setActive(boolean active) {} @Override public boolean renderUpdate() diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java new file mode 100644 index 000000000..b13dd889c --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -0,0 +1,111 @@ +package mekanism.common.tile; + +import java.util.HashSet; +import java.util.Set; + +import mekanism.api.Coord4D; +import mekanism.common.multiblock.IMultiblock; +import mekanism.common.multiblock.IStructuralMultiblock; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityStructuralGlass extends TileEntity implements IStructuralMultiblock +{ + public Coord4D master; + + @Override + public boolean onActivate(EntityPlayer player) + { + if(master != null) + { + if(master.getTileEntity(worldObj) instanceof IMultiblock) + { + return ((IMultiblock)master.getTileEntity(worldObj)).onActivate(player); + } + else { + master = null; + } + } + + return false; + } + + @Override + public void update() + { + if(master != null) + { + if(master.getTileEntity(worldObj) instanceof IMultiblock) + { + ((IMultiblock)master.getTileEntity(worldObj)).update(); + } + else { + master = null; + } + } + else { + IMultiblock multiblock = new ControllerFinder().find(); + + if(multiblock != null) + { + multiblock.update(); + } + } + } + + @Override + public boolean canInterface(TileEntity controller) + { + return true; + } + + @Override + public void setController(Coord4D coord) + { + master = coord; + } + + public class ControllerFinder + { + public IMultiblock found; + + public Set iterated = new HashSet(); + + public void loop(Coord4D pos) + { + if(iterated.size() > 512 || found != null) + { + return; + } + + iterated.add(pos); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + Coord4D coord = pos.getFromSide(side); + TileEntity tile = coord.getTileEntity(worldObj); + + if(!iterated.contains(coord)) + { + if(tile instanceof IMultiblock) + { + found = (IMultiblock)coord.getTileEntity(worldObj); + return; + } + else if(tile instanceof IStructuralMultiblock) + { + loop(coord); + } + } + } + } + + public IMultiblock find() + { + loop(Coord4D.get(TileEntityStructuralGlass.this)); + + return found; + } + } +} diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index 9eaf8ffe8..a111f5727 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -2,7 +2,10 @@ package mekanism.generators.common; import mekanism.common.item.ItemMekanism; import mekanism.generators.common.item.ItemHohlraum; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @@ -11,7 +14,13 @@ public class GeneratorsItems { public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel"); public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum().setUnlocalizedName("Hohlraum"); - public static final Item TurbineBlade = new ItemMekanism().setUnlocalizedName("TurbineBlade"); + public static final Item TurbineBlade = new ItemMekanism() { + @Override + public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) + { + return world.getTileEntity(x, y, z) instanceof TileEntityTurbineRod; + } + }.setUnlocalizedName("TurbineBlade"); public static void register() { diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index eff099f54..4dd72ec76 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,5 +1,32 @@ package mekanism.generators.common; +import io.netty.buffer.ByteBuf; + +import java.io.IOException; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.common.FuelHandler; +import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Version; +import mekanism.common.base.IModule; +import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.ShapedMekanismRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.generators.common.content.turbine.SynchronizedTurbineData; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; @@ -13,26 +40,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import io.netty.buffer.ByteBuf; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.infuse.InfuseRegistry; -import mekanism.common.*; -import mekanism.common.Tier.BaseTier; -import mekanism.common.base.IModule; -import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.oredict.OreDictionary; - -import java.io.IOException; @Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule @@ -48,6 +55,8 @@ public class MekanismGenerators implements IModule /** MekanismGenerators version number */ public static Version versionNumber = new Version(9, 0, 0); + + public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); @EventHandler public void preInit(FMLPreInitializationEvent event) diff --git a/src/main/java/mekanism/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java similarity index 73% rename from src/main/java/mekanism/common/content/turbine/SynchronizedTurbineData.java rename to src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index a7291b75a..f29539102 100644 --- a/src/main/java/mekanism/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -1,4 +1,4 @@ -package mekanism.common.content.turbine; +package mekanism.generators.common.content.turbine; import mekanism.common.multiblock.SynchronizedData; diff --git a/src/main/java/mekanism/common/content/turbine/TurbineCache.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java similarity index 70% rename from src/main/java/mekanism/common/content/turbine/TurbineCache.java rename to src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java index f2ac0a065..424828601 100644 --- a/src/main/java/mekanism/common/content/turbine/TurbineCache.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java @@ -1,13 +1,12 @@ -package mekanism.common.content.turbine; - -import mekanism.common.multiblock.MultiblockCache; +package mekanism.generators.common.content.turbine; import net.minecraft.nbt.NBTTagCompound; +import mekanism.common.multiblock.MultiblockCache; public class TurbineCache extends MultiblockCache { @Override - public void apply(SynchronizedTurbineData data) + public void apply(SynchronizedTurbineData data) { } @@ -19,7 +18,7 @@ public class TurbineCache extends MultiblockCache } @Override - public void load(NBTTagCompound nbtTags) + public void load(NBTTagCompound nbtTags) { } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java new file mode 100644 index 000000000..2edafd6ce --- /dev/null +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -0,0 +1,48 @@ +package mekanism.generators.common.content.turbine; + +import java.util.List; + +import mekanism.common.multiblock.MultiblockCache; +import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.multiblock.UpdateProtocol; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; +import net.minecraft.item.ItemStack; + +public class TurbineUpdateProtocol extends UpdateProtocol +{ + public TurbineUpdateProtocol(TileEntityTurbineCasing tileEntity) + { + super(tileEntity); + } + + @Override + protected boolean isValidFrame(int x, int y, int z) + { + return false; + } + + @Override + protected MultiblockCache getNewCache() + { + return new TurbineCache(); + } + + @Override + protected SynchronizedTurbineData getNewStructure() + { + return new SynchronizedTurbineData(); + } + + @Override + protected MultiblockManager getManager() + { + return MekanismGenerators.turbineManager; + } + + @Override + protected void mergeCaches(List rejectedItems, MultiblockCache cache, MultiblockCache merge) + { + + } +} diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 3dd6a8b13..eefe6af17 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -65,7 +65,20 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp super(block); metaBlock = block; setHasSubtypes(true); - setMaxStackSize(1); + } + + @Override + public int getItemStackLimit(ItemStack stack) + { + GeneratorType type = GeneratorType.getFromMetadata(stack.getItemDamage()); + + if(type == GeneratorType.TURBINE_ROD || type == GeneratorType.ROTATIONAL_COMPLEX) + { + return 64; + } + else { + return 1; + } } @Override diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java new file mode 100644 index 000000000..862606378 --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -0,0 +1,47 @@ +package mekanism.generators.common.tile.turbine; + +import mekanism.common.multiblock.MultiblockCache; +import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.multiblock.UpdateProtocol; +import mekanism.common.tile.TileEntityMultiblock; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.content.turbine.SynchronizedTurbineData; +import mekanism.generators.common.content.turbine.TurbineCache; +import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; + +public class TileEntityTurbineCasing extends TileEntityMultiblock +{ + public TileEntityTurbineCasing() + { + this("TurbineCasing"); + } + + public TileEntityTurbineCasing(String name) + { + super(name); + } + + @Override + protected SynchronizedTurbineData getNewStructure() + { + return new SynchronizedTurbineData(); + } + + @Override + public MultiblockCache getNewCache() + { + return new TurbineCache(); + } + + @Override + protected UpdateProtocol getProtocol() + { + return new TurbineUpdateProtocol(this); + } + + @Override + public MultiblockManager getManager() + { + return MekanismGenerators.turbineManager; + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 698be237c..203b9c6d2 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -77,7 +77,7 @@ tile.BasicBlock.Bin.name=Bin tile.BasicBlock.TeleporterFrame.name=Teleporter Frame tile.BasicBlock.SteelCasing.name=Steel Casing tile.BasicBlock.DynamicTank.name=Dynamic Tank -tile.BasicBlock.DynamicGlass.name=Dynamic Glass +tile.BasicBlock.StructuralGlass.name=Structural Glass tile.BasicBlock.DynamicValve.name=Dynamic Valve tile.BasicBlock.CopperBlock.name=Copper Block tile.BasicBlock.TinBlock.name=Tin Block From 8cab2ebe8ccda1b50a60b0317d4874a17ea82366 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 17:22:20 -0500 Subject: [PATCH 2/8] Rename Turbine Rod to Turbine Rotor, work on multiblock form code --- .../common/multiblock/UpdateProtocol.java | 19 +- .../client/GeneratorsClientProxy.java | 6 +- ...urbineRod.java => RenderTurbineRotor.java} | 8 +- .../common/GeneratorsCommonProxy.java | 4 +- .../generators/common/GeneratorsItems.java | 4 +- .../common/block/BlockGenerator.java | 25 ++- .../turbine/SynchronizedTurbineData.java | 6 +- .../turbine/TurbineUpdateProtocol.java | 194 ++++++++++++++++++ .../common/item/ItemBlockGenerator.java | 9 +- .../TileEntityElectromagneticCoil.java | 12 ++ .../turbine/TileEntityPressureDisperser.java | 12 ++ .../turbine/TileEntityRotationalComplex.java | 4 +- ...neRod.java => TileEntityTurbineRotor.java} | 78 +++---- .../tile/turbine/TileEntityTurbineVent.java | 9 + .../resources/assets/mekanism/lang/en_US.lang | 7 +- 15 files changed, 326 insertions(+), 71 deletions(-) rename src/main/java/mekanism/generators/client/render/{RenderTurbineRod.java => RenderTurbineRotor.java} (88%) create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java rename src/main/java/mekanism/generators/common/tile/turbine/{TileEntityTurbineRod.java => TileEntityTurbineRotor.java} (69%) create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index dd400a896..e7b699317 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -157,7 +157,10 @@ public abstract class UpdateProtocol> break; } else { - innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.dimensionId)); + if(!isAir(origX+x, origY+y, origZ+z)) + { + innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorldObj().provider.dimensionId)); + } } volume++; @@ -227,7 +230,7 @@ public abstract class UpdateProtocol> } } - public boolean canForm(T structure) + protected boolean canForm(T structure) { return true; } @@ -390,6 +393,8 @@ public abstract class UpdateProtocol> 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 killInnerNode(Coord4D coord) {} /** * Runs the protocol and updates all nodes that make a part of the multiblock. @@ -415,6 +420,11 @@ public abstract class UpdateProtocol> ((IStructuralMultiblock)tile).setController(null); } } + + for(Coord4D coord : innerNodes) + { + killInnerNode(coord); + } return; } @@ -517,6 +527,11 @@ public abstract class UpdateProtocol> ((IStructuralMultiblock)tile).setController(null); } } + + for(Coord4D coord : innerNodes) + { + killInnerNode(coord); + } } } } diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 98b960583..1afe0dbc2 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -17,7 +17,7 @@ import mekanism.generators.client.render.RenderGasGenerator; import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderReactor; import mekanism.generators.client.render.RenderSolarGenerator; -import mekanism.generators.client.render.RenderTurbineRod; +import mekanism.generators.client.render.RenderTurbineRotor; import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; @@ -29,7 +29,7 @@ import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; -import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -52,7 +52,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator", new RenderGasGenerator()); ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine()); ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor()); - ClientRegistry.registerTileEntity(TileEntityTurbineRod.class, "TurbineRod", new RenderTurbineRod()); + ClientRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod", new RenderTurbineRotor()); } @Override diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java similarity index 88% rename from src/main/java/mekanism/generators/client/render/RenderTurbineRod.java rename to src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index fd4ce3669..5313848f6 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -5,7 +5,7 @@ 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.tile.turbine.TileEntityTurbineRod; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderTurbineRod extends TileEntitySpecialRenderer +public class RenderTurbineRotor extends TileEntitySpecialRenderer { private ModelTurbine model = new ModelTurbine(); @@ -24,10 +24,10 @@ public class RenderTurbineRod extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityTurbineRod)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityTurbineRotor)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityTurbineRod tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityTurbineRotor tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index f6b398142..ecfb8672f 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -25,7 +25,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorPort; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; -import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -68,7 +68,7 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator"); GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine"); GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController"); - GameRegistry.registerTileEntity(TileEntityTurbineRod.class, "TurbineRod"); + GameRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod"); } /** diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index a111f5727..8fbb389cd 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -2,7 +2,7 @@ package mekanism.generators.common; import mekanism.common.item.ItemMekanism; import mekanism.generators.common.item.ItemHohlraum; -import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.world.World; @@ -18,7 +18,7 @@ public class GeneratorsItems @Override public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return world.getTileEntity(x, y, z) instanceof TileEntityTurbineRod; + return world.getTileEntity(x, y, z) instanceof TileEntityTurbineRotor; } }.setUnlocalizedName("TurbineBlade"); diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 76316d7c9..038b6f341 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -28,7 +28,7 @@ import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; -import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -59,8 +59,11 @@ import cpw.mods.fml.relauncher.SideOnly; * 4: Bio-Generator * 5: Advanced Solar Generator * 6: Wind Generator - * 7: Turbine Rod + * 7: Turbine Rotor * 8: Rotational Complex + * 9: Pressure Disperser + * 10: Turbine Casing + * 11: Turbine Valve * @author AidanBrady * */ @@ -92,7 +95,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(meta == GeneratorType.TURBINE_ROD.meta) + if(meta == GeneratorType.TURBINE_ROTOR.meta) { return icons[meta][0]; } @@ -326,9 +329,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - if(!world.isRemote && tileEntity instanceof TileEntityTurbineRod) + if(!world.isRemote && tileEntity instanceof TileEntityTurbineRotor) { - int amount = ((TileEntityTurbineRod)tileEntity).getHousedBlades(); + int amount = ((TileEntityTurbineRotor)tileEntity).getHousedBlades(); if(amount > 0) { @@ -400,9 +403,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } } - if(metadata == GeneratorType.TURBINE_ROD.meta) + if(metadata == GeneratorType.TURBINE_ROTOR.meta) { - TileEntityTurbineRod rod = (TileEntityTurbineRod)tileEntity; + TileEntityTurbineRotor rod = (TileEntityTurbineRotor)tileEntity; if(!entityplayer.isSneaking()) { @@ -531,7 +534,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F); } - else if(metadata == GeneratorType.TURBINE_ROD.meta) + else if(metadata == GeneratorType.TURBINE_ROTOR.meta) { setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); } @@ -643,7 +646,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && metadata != GeneratorType.WIND_GENERATOR.meta && - metadata != GeneratorType.TURBINE_ROD.meta) + metadata != GeneratorType.TURBINE_ROTOR.meta) { return true; } @@ -659,7 +662,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds BIO_GENERATOR(4, "BioGenerator", 4, 160000, TileEntityBioGenerator.class, true), ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true), WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true), - TURBINE_ROD(7, "TurbineRod", -1, -1, TileEntityTurbineRod.class, false), + TURBINE_ROTOR(7, "TurbineRotor", -1, -1, TileEntityTurbineRotor.class, false), ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false); public int meta; @@ -727,7 +730,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F); } - else if(metadata == GeneratorType.TURBINE_ROD.meta) + else if(metadata == GeneratorType.TURBINE_ROTOR.meta) { block.setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); } 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 f29539102..79453ad70 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -4,5 +4,9 @@ import mekanism.common.multiblock.SynchronizedData; public class SynchronizedTurbineData extends SynchronizedData { - + public int turbineBlades; + public int vents; + public int coils; + + public int lowerVolume; } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 2edafd6ce..e806140f5 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -1,13 +1,23 @@ package mekanism.generators.common.content.turbine; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; +import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; +import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TurbineUpdateProtocol extends UpdateProtocol { @@ -21,6 +31,159 @@ public class TurbineUpdateProtocol extends UpdateProtocol= Math.ceil((structure.volHeight-2)/4)) + { + int centerX = structure.minLocation.xCoord+(structure.volLength-1)/2; + int centerZ = structure.minLocation.zCoord+(structure.volWidth-1)/2; + + Coord4D complex = null; + Set turbines = new HashSet(); + Set dispersers = new HashSet(); + + //Scan for complex + for(Coord4D coord : innerNodes) + { + if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityRotationalComplex) + { + if(complex != null) + { + return false; + } + else if(coord.xCoord != centerX || coord.zCoord != centerZ) + { + return false; + } + + complex = coord; + } + else if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityTurbineRotor) + { + if(coord.xCoord != centerX || coord.zCoord != centerZ) + { + return false; + } + + turbines.add(coord); + } + else if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityPressureDisperser) + { + dispersers.add(coord); + } + } + + //Terminate if complex doesn't exist + if(complex == null) + { + return false; + } + + //Make sure a flat, horizontal plane of dispersers exists within the multiblock around the complex + for(int x = complex.xCoord-innerRadius; x <= complex.xCoord+innerRadius; x++) + { + for(int z = complex.zCoord-innerRadius; z <= complex.zCoord+innerRadius; z++) + { + if(!(x == centerX && z == centerZ)) + { + TileEntity tile = pointer.getWorldObj().getTileEntity(x, complex.yCoord, z); + + if(!(tile instanceof TileEntityPressureDisperser)) + { + return false; + } + + dispersers.remove(new Coord4D(x, complex.yCoord, z)); + } + } + } + + //If any dispersers were not processed, they're in the wrong place + if(dispersers.size() > 0) + { + return false; + } + + //Make sure a complete line of turbine rotors exist from the complex to the multiblock's base + for(int y = complex.yCoord-1; y > structure.minLocation.yCoord; y--) + { + TileEntity tile = pointer.getWorldObj().getTileEntity(centerX, y, centerZ); + + if(!(tile instanceof TileEntityTurbineRotor)) + { + return false; + } + + turbines.remove(new Coord4D(centerX, y, centerZ, pointer.getWorldObj().provider.dimensionId)); + } + + //If any turbines were not processed, they're in the wrong place + if(turbines.size() > 0) + { + return false; + } + + Coord4D startCoord = complex.getFromSide(ForgeDirection.UP); + TileEntity startTile = startCoord.getTileEntity(pointer.getWorldObj()); + + if(startTile instanceof TileEntityElectromagneticCoil) + { + structure.coils = new CoilCounter().calculate((TileEntityElectromagneticCoil)startTile); + } + + for(Coord4D coord : structure.locations) + { + if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityTurbineVent) + { + if(coord.yCoord >= complex.yCoord) + { + structure.vents++; + } + else { + return false; + } + } + } + + ((TileEntityRotationalComplex)complex.getTileEntity(pointer.getWorldObj())).setMultiblock(structure.inventoryID); + + return true; + } + } + + return false; + } @Override protected MultiblockCache getNewCache() @@ -45,4 +208,35 @@ public class TurbineUpdateProtocol extends UpdateProtocol iterated = new HashSet(); + + public void loop(Coord4D pos) + { + iterated.add(pos); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + Coord4D coord = pos.getFromSide(side); + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(!iterated.contains(coord)) + { + if(tile instanceof TileEntityElectromagneticCoil) + { + loop(coord); + } + } + } + } + + public int calculate(TileEntityElectromagneticCoil tileEntity) + { + loop(Coord4D.get(tileEntity)); + + return iterated.size(); + } + } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index eefe6af17..02becc063 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -46,8 +46,11 @@ import cpw.mods.fml.relauncher.SideOnly; * 4: Bio-Generator * 5: Advanced Solar Generator * 6: Wind Generator - * 7: Turbine Rod + * 7: Turbine Rotor * 8: Rotational Complex + * 9: Pressure Disperser + * 10: Turbine Casing + * 11: Turbine Valve * @author AidanBrady * */ @@ -72,7 +75,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { GeneratorType type = GeneratorType.getFromMetadata(stack.getItemDamage()); - if(type == GeneratorType.TURBINE_ROD || type == GeneratorType.ROTATIONAL_COMPLEX) + if(type.maxEnergy == -1) { return 64; } @@ -110,7 +113,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { GeneratorType type = GeneratorType.getFromMetadata(itemstack.getItemDamage()); - if(type != GeneratorType.TURBINE_ROD && type != GeneratorType.ROTATIONAL_COMPLEX) + if(type.maxEnergy > -1) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java new file mode 100644 index 000000000..e22b48ffb --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java @@ -0,0 +1,12 @@ +package mekanism.generators.common.tile.turbine; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityElectromagneticCoil extends TileEntity +{ + @Override + public boolean canUpdate() + { + return false; + } +} diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java new file mode 100644 index 000000000..29cf3003f --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java @@ -0,0 +1,12 @@ +package mekanism.generators.common.tile.turbine; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityPressureDisperser extends TileEntity +{ + @Override + public boolean canUpdate() + { + return false; + } +} diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java index 881b8a2ce..285cf25de 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java @@ -88,9 +88,9 @@ public class TileEntityRotationalComplex extends TileEntityBasicBlock Coord4D coord = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); TileEntity tile = coord.getTileEntity(worldObj); - if(tile instanceof TileEntityTurbineRod) + if(tile instanceof TileEntityTurbineRotor) { - ((TileEntityTurbineRod)tile).updateRods(); + ((TileEntityTurbineRotor)tile).updateRotors(); } } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java similarity index 69% rename from src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java rename to src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index 74ac9563f..c374b0153 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -18,9 +18,9 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityTurbineRod extends TileEntityBasicBlock +public class TileEntityTurbineRotor extends TileEntityBasicBlock { - public List rods = new ArrayList(); + public List rotors = new ArrayList(); public boolean hasComplex; @@ -46,34 +46,34 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock { if(!worldObj.isRemote) { - updateRods(); + updateRotors(); } } - public void updateRods() + public void updateRotors() { - if(rods.contains(Coord4D.get(this))) + if(rotors.contains(Coord4D.get(this))) { - rods.add(Coord4D.get(this)); + rotors.add(Coord4D.get(this)); } - buildRods(); + buildRotors(); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } - private void buildRods() + private void buildRotors() { - List newRods = new ArrayList(); + List newRotors = new ArrayList(); int newBlades = 0; boolean complex = false; String id = null; Coord4D pointer = Coord4D.get(this); - //Go to bottom rod + //Go to bottom rotor while(true) { - if(isRod(pointer.getFromSide(ForgeDirection.DOWN))) + if(isRotor(pointer.getFromSide(ForgeDirection.DOWN))) { pointer.step(ForgeDirection.DOWN); continue; @@ -82,13 +82,13 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock break; } - //Put all rods in new list, top to bottom + //Put all rotors in new list, top to bottom while(true) { - newRods.add(pointer.clone()); - newBlades += ((TileEntityTurbineRod)pointer.getTileEntity(worldObj)).getHousedBlades(); + newRotors.add(pointer.clone()); + newBlades += ((TileEntityTurbineRotor)pointer.getTileEntity(worldObj)).getHousedBlades(); - if(isRod(pointer.getFromSide(ForgeDirection.UP))) + if(isRotor(pointer.getFromSide(ForgeDirection.UP))) { pointer.step(ForgeDirection.UP); continue; @@ -103,42 +103,42 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock complex = true; } - //Update all rods, send packet if necessary - for(Coord4D coord : newRods) + //Update all rotors, send packet if necessary + for(Coord4D coord : newRotors) { - TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj); - int prevHoused = rod.getHousedBlades(); - int prevBlades = rod.blades; + TileEntityTurbineRotor rotor = (TileEntityTurbineRotor)coord.getTileEntity(worldObj); + int prevHoused = rotor.getHousedBlades(); + int prevBlades = rotor.blades; - rod.rods = newRods; - rod.blades = newBlades; - rod.multiblockUUID = id; + rotor.rotors = newRotors; + rotor.blades = newBlades; + rotor.multiblockUUID = id; - if(rods.indexOf(coord) == rods.size()-1) + if(rotors.indexOf(coord) == rotors.size()-1) { - rod.hasComplex = complex; + rotor.hasComplex = complex; } else { - rod.hasComplex = false; + rotor.hasComplex = false; } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rotor.getNetworkedData(new ArrayList())), new Range4D(coord)); } } public boolean editBlade(boolean add) { - if(!rods.contains(Coord4D.get(this))) + if(!rotors.contains(Coord4D.get(this))) { - rods.add(Coord4D.get(this)); + rotors.add(Coord4D.get(this)); } - if((add && (rods.size()*2) - blades > 0) || (!add && (blades > 0))) + if((add && (rotors.size()*2) - blades > 0) || (!add && (blades > 0))) { - for(Coord4D coord : rods) + for(Coord4D coord : rotors) { - TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj); - rod.internalEditBlade(add); + TileEntityTurbineRotor rotor = (TileEntityTurbineRotor)coord.getTileEntity(worldObj); + rotor.internalEditBlade(add); } return true; @@ -164,9 +164,9 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock { if(!worldObj.isRemote) { - if(rods.size() > 0) + if(rotors.size() > 0) { - return Math.max(0, Math.min(2, blades - (rods.indexOf(Coord4D.get(this)))*2)); + return Math.max(0, Math.min(2, blades - (rotors.indexOf(Coord4D.get(this)))*2)); } else { return blades; @@ -177,9 +177,9 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock } } - private boolean isRod(Coord4D coord) + private boolean isRotor(Coord4D coord) { - return coord.getTileEntity(worldObj) instanceof TileEntityTurbineRod; + return coord.getTileEntity(worldObj) instanceof TileEntityTurbineRotor; } private boolean isComplex(Coord4D coord) @@ -194,7 +194,7 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock if(!worldObj.isRemote) { - updateRods(); + updateRotors(); } } @@ -230,7 +230,7 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock super.getNetworkedData(data); data.add(getHousedBlades()); - data.add(rods.indexOf(Coord4D.get(this))); + data.add(rotors.indexOf(Coord4D.get(this))); if(multiblockUUID != null) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java new file mode 100644 index 000000000..c7d6d2f61 --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java @@ -0,0 +1,9 @@ +package mekanism.generators.common.tile.turbine; + +public class TileEntityTurbineVent extends TileEntityTurbineCasing +{ + public TileEntityTurbineVent() + { + super("TurbineVent"); + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 203b9c6d2..600ccd317 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -735,8 +735,9 @@ tooltip.GasGenerator=A generator that harnesses the molecular !nvarying gasses t tooltip.BioGenerator=A generator that burns organic materials of !nthe world to produce energy. tooltip.AdvancedSolarGenerator=An advanced generator that directly !nabsorbs the sun's rays with little loss !nto produce energy. tooltip.WindGenerator=A generator that uses the strength of the wind !nto produce energy, with greater efficiency !nat higher levels. -tooltip.TurbineRod=The steel rod that is used to house !nTurbine Blades within an Industrial Turbine. +tooltip.TurbineRotor=The steel rod that is used to house !nTurbine Blades within an Industrial Turbine. tooltip.RotationalComplex=A connector that is placed on !nthe highest turbine rod to carry kinetic energy into the !ngenerator itself. +tooltip.PressureDisperser=A block used to tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !nis capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. @@ -848,8 +849,10 @@ tile.Generator.GasGenerator.name=Gas-Burning Generator tile.Generator.BioGenerator.name=Bio-Generator tile.Generator.AdvancedSolarGenerator.name=Advanced Solar Generator tile.Generator.WindGenerator.name=Wind Generator -tile.Generator.TurbineRod.name=Turbine Rod +tile.Generator.TurbineRotor.name=Turbine Rotor tile.Generator.RotationalComplex.name=Rotational Complex +tile.Generator.PressureDisperser.name=Pressure Disperser +tile.Generator.ElectromagneticCoil.name=Electromagnetic Coil tile.Reactor.ReactorController.name=Reactor Controller tile.Reactor.ReactorFrame.name=Reactor Frame From cfa2c1e4d9235ff18f37e07925b679ba145744b0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 17:46:04 -0500 Subject: [PATCH 3/8] Hopefully finalized multiblock form code, started on bringing the new blocks in-game --- .../common/GeneratorsCommonProxy.java | 4 +++ .../common/block/BlockGenerator.java | 6 ++-- .../turbine/SynchronizedTurbineData.java | 2 +- .../turbine/TurbineUpdateProtocol.java | 36 +++++++++++++++++-- .../common/item/ItemBlockGenerator.java | 6 ++-- .../resources/assets/mekanism/lang/en_US.lang | 5 +-- 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index ecfb8672f..deb89681b 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -24,6 +24,8 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorPort; +import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; +import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; @@ -54,6 +56,8 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityReactorPort.class, "ReactorPort"); GameRegistry.registerTileEntity(TileEntityReactorLogicAdapter.class, "ReactorLogicAdapter"); GameRegistry.registerTileEntity(TileEntityRotationalComplex.class, "RotationalComplex"); + GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); + GameRegistry.registerTileEntity(TileEntityElectromagneticCoil.class, "ElectromagneticCoil"); } /** diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 038b6f341..19bdf55fb 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -62,8 +62,10 @@ import cpw.mods.fml.relauncher.SideOnly; * 7: Turbine Rotor * 8: Rotational Complex * 9: Pressure Disperser - * 10: Turbine Casing - * 11: Turbine Valve + * 10: Electromagnetic Coil + * 11: Turbine Casing + * 12: Turbine Valve + * 13: Turbine Vent * @author AidanBrady * */ 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 79453ad70..b2d228906 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -4,7 +4,7 @@ import mekanism.common.multiblock.SynchronizedData; public class SynchronizedTurbineData extends SynchronizedData { - public int turbineBlades; + public int blades; public int vents; public int coils; diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index e806140f5..502bfd700 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -8,7 +8,9 @@ import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; @@ -30,6 +32,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol turbines = new HashSet(); Set dispersers = new HashSet(); + Set coils = new HashSet(); //Scan for complex for(Coord4D coord : innerNodes) { - if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityRotationalComplex) + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityRotationalComplex) { if(complex != null) { @@ -89,7 +97,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.minLocation.yCoord; y--) { @@ -145,6 +159,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.coils) + { + return false; + } + for(Coord4D coord : structure.locations) { if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityTurbineVent) @@ -176,6 +204,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol Date: Fri, 22 Jan 2016 19:36:39 -0500 Subject: [PATCH 4/8] Textures for turbine components! Still need to texture turbine structure blocks. --- .../render/block/CTMRenderingHandler.java | 42 +++++----- .../client/render/block/RenderBlocksCTM.java | 1 - .../java/mekanism/common/base/IBlockCTM.java | 3 +- .../mekanism/common/block/BlockBasic.java | 6 ++ .../mekanism/common/block/BlockMachine.java | 79 ++++++++++++++++-- .../client/BlockRenderingHandler.java | 13 +-- .../common/block/BlockGenerator.java | 50 ++++++++++- .../generators/common/block/BlockReactor.java | 26 ++++-- .../TileEntityElectromagneticCoil.java | 7 +- .../turbine/TileEntityPressureDisperser.java | 7 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + .../textures/blocks/PressureDisperser.png | Bin 0 -> 1774 bytes .../textures/blocks/RotationalComplexSide.png | Bin 0 -> 1327 bytes .../textures/blocks/RotationalComplexTop.png | Bin 0 -> 1251 bytes .../blocks/ctm/ElectromagneticCoil-ctm.png | Bin 0 -> 1584 bytes .../blocks/ctm/ElectromagneticCoil.png | Bin 0 -> 1281 bytes 16 files changed, 177 insertions(+), 58 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java index 431b2f901..a2ff40b87 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -32,6 +32,11 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) { int meta = world.getBlockMetadata(x, y, z); + + if(block instanceof IBlockCTM && !((IBlockCTM)block).shouldRenderBlock(world, x, y, z, meta)) + { + return false; + } CTMData blockCTM = ((IBlockCTM)block).getCTMData(world, x, y, z, meta); @@ -57,32 +62,27 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler if(MachineType.get(block, meta) != null) { - if(!MachineType.get(block, meta).hasModel) + TileEntity tile = world.getTileEntity(x, y, z); + + int prevRotateTop = rendererOld.uvRotateTop; + int prevRotateBottom = rendererOld.uvRotateBottom; + + if(tile instanceof TileEntityBasicBlock) { - TileEntity tile = world.getTileEntity(x, y, z); - - int prevRotateTop = rendererOld.uvRotateTop; - int prevRotateBottom = rendererOld.uvRotateBottom; - - if(tile instanceof TileEntityBasicBlock) + if(((TileEntityBasicBlock)tile).facing >= 2) { - if(((TileEntityBasicBlock)tile).facing >= 2) - { - rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - } + rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; + rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; } - - rendererOld.renderStandardBlock(block, x, y, z); - rendererOld.setRenderBoundsFromBlock(block); - - rendererOld.uvRotateTop = prevRotateTop; - rendererOld.uvRotateBottom = prevRotateBottom; - - return true; } - return false; + rendererOld.renderStandardBlock(block, x, y, z); + rendererOld.setRenderBoundsFromBlock(block); + + rendererOld.uvRotateTop = prevRotateTop; + rendererOld.uvRotateBottom = prevRotateBottom; + + return true; } return rendererOld.renderStandardBlock(block, x, y, z); diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index 6a319c14d..0676e396e 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -15,7 +15,6 @@ import net.minecraft.util.IIcon; */ public class RenderBlocksCTM extends RenderBlocks { - RenderBlocksCTM() { super(); diff --git a/src/main/java/mekanism/common/base/IBlockCTM.java b/src/main/java/mekanism/common/base/IBlockCTM.java index 36a54a45c..c00d69f55 100644 --- a/src/main/java/mekanism/common/base/IBlockCTM.java +++ b/src/main/java/mekanism/common/base/IBlockCTM.java @@ -1,10 +1,11 @@ package mekanism.common.base; import mekanism.common.CTMData; - import net.minecraft.world.IBlockAccess; public interface IBlockCTM { public CTMData getCTMData(IBlockAccess world, int x, int y, int z, int meta); + + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 9f93d6d95..dc07463c8 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1069,6 +1069,12 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return true; + } public static enum BasicBlock { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e1c49a94d..04bfd5610 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1,8 +1,12 @@ package mekanism.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Random; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; @@ -19,15 +23,63 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IBlockCTM; +import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.IElectricChest; +import mekanism.common.base.IFactory; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ISpecialBounds; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ISustainedTank; +import mekanism.common.base.IUpgradeTile; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.tile.*; +import mekanism.common.tile.TileEntityAdvancedFactory; +import mekanism.common.tile.TileEntityAmbientAccumulator; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.tile.TileEntityChemicalCrystallizer; +import mekanism.common.tile.TileEntityChemicalDissolutionChamber; +import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInjectionChamber; +import mekanism.common.tile.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityChemicalWasher; +import mekanism.common.tile.TileEntityCombiner; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityCrusher; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityEliteFactory; +import mekanism.common.tile.TileEntityEnergizedSmelter; +import mekanism.common.tile.TileEntityEnrichmentChamber; +import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityLaser; +import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.tile.TileEntityLaserTractorBeam; +import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.common.tile.TileEntityOsmiumCompressor; +import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityPrecisionSawmill; +import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySeismicVibrator; +import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -45,7 +97,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -53,8 +109,9 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import java.util.*; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple machine block IDs. @@ -1355,4 +1412,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return !MachineType.get(this, meta).hasModel; + } } diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index dca3cad48..8e7bb173b 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -100,18 +100,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(block == GeneratorsBlocks.Generator) - { - int metadata = world.getBlockMetadata(x, y, z); - - if(GeneratorType.getFromMetadata(metadata) == null || !GeneratorType.getFromMetadata(metadata).hasModel) - { - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - return true; - } - } - + //Handled by CTMRenderingHandler return false; } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 19bdf55fb..53831ce96 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -1,13 +1,16 @@ package mekanism.generators.common.block; +import java.util.Arrays; import java.util.List; import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.CTMData; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; @@ -27,6 +30,8 @@ import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; +import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; +import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.block.Block; @@ -69,9 +74,12 @@ import cpw.mods.fml.relauncher.SideOnly; * @author AidanBrady * */ -public class BlockGenerator extends BlockContainer implements ISpecialBounds +public class BlockGenerator extends BlockContainer implements ISpecialBounds, IBlockCTM { public IIcon[][] icons = new IIcon[16][16]; + + public CTMData[] ctms = new CTMData[16]; + public IIcon BASE_ICON; public Random machineRand = new Random(); @@ -89,8 +97,26 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds public void registerBlockIcons(IIconRegister register) { BASE_ICON = register.registerIcon("mekanism:SteelCasing"); + + ctms[10] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(10)).registerIcons(register); + icons[7][0] = register.registerIcon("mekanism:TurbineRod"); - icons[8][0] = register.registerIcon("mekanism:TurbineRod"); + icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); + icons[8][1] = register.registerIcon("mekanism:RotationalComplexTop"); + icons[9][0] = register.registerIcon("mekanism:PressureDisperser"); + icons[10][0] = ctms[10].mainTextureData.icon; + } + + @Override + public CTMData getCTMData(IBlockAccess world, int x, int y, int z, int meta) + { + return ctms[meta]; + } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return !GeneratorType.getFromMetadata(meta).hasModel; } @Override @@ -102,6 +128,20 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return icons[meta][0]; } else if(meta == GeneratorType.ROTATIONAL_COMPLEX.meta) + { + if(side != 0 && side != 1) + { + return icons[meta][0]; + } + else { + return icons[meta][1]; + } + } + else if(meta == GeneratorType.PRESSURE_DISPERSER.meta) + { + return icons[meta][0]; + } + else if(meta == GeneratorType.ELECTROMAGNETIC_COIL.meta) { return icons[meta][0]; } @@ -517,7 +557,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @Override public int getRenderType() { - return MekanismGenerators.proxy.GENERATOR_RENDER_ID; + return Mekanism.proxy.CTM_RENDER_ID; } /*This method is not used, metadata manipulation is required to create a Tile Entity.*/ @@ -665,7 +705,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true), WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true), TURBINE_ROTOR(7, "TurbineRotor", -1, -1, TileEntityTurbineRotor.class, false), - ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false); + ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false), + PRESSURE_DISPERSER(9, "PressureDisperser", -1, -1, TileEntityPressureDisperser.class, false), + ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false); public int meta; public String name; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 1c6434fc3..0f351b75c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -1,8 +1,8 @@ package mekanism.generators.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; @@ -14,7 +14,13 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.reactor.*; +import mekanism.generators.common.tile.reactor.TileEntityReactorController; +import mekanism.generators.common.tile.reactor.TileEntityReactorFrame; +import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; +import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix; +import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; +import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; +import mekanism.generators.common.tile.reactor.TileEntityReactorPort; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -29,9 +35,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.Arrays; -import java.util.List; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockReactor extends BlockContainer implements IBlockCTM { @@ -304,6 +310,12 @@ public class BlockReactor extends BlockContainer implements IBlockCTM return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return true; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java index e22b48ffb..54de2ed9b 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java @@ -1,12 +1,15 @@ package mekanism.generators.common.tile.turbine; -import net.minecraft.tileentity.TileEntity; +import mekanism.common.tile.TileEntityBasicBlock; -public class TileEntityElectromagneticCoil extends TileEntity +public class TileEntityElectromagneticCoil extends TileEntityBasicBlock { @Override public boolean canUpdate() { return false; } + + @Override + public void onUpdate() {} } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java index 29cf3003f..4f38a86b5 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java @@ -1,12 +1,15 @@ package mekanism.generators.common.tile.turbine; -import net.minecraft.tileentity.TileEntity; +import mekanism.common.tile.TileEntityBasicBlock; -public class TileEntityPressureDisperser extends TileEntity +public class TileEntityPressureDisperser extends TileEntityBasicBlock { @Override public boolean canUpdate() { return false; } + + @Override + public void onUpdate() {} } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 23344eaa4..475c2c82f 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -312,6 +312,7 @@ fluid.lithium=Liquid Lithium fluid.deuterium=Liquid Deuterium fluid.tritium=Liquid Tritium fluid.fusionFuelDT=Liquid D-T Fuel +fluid.steam=Steam //OreGas names oregas.iron=Iron Ore diff --git a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png new file mode 100644 index 0000000000000000000000000000000000000000..52cbb419068d8b5c251dd062f680efd7d741a5a6 GIT binary patch literal 1774 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zoJmAMR9Fe^S4*!cK@je9???#oTzEu0R<;&)7VN~ox_`^Y8bO2&5@A6i5#nc5ySl1te3Z-O&p;p`-qno#e*dny1vdWYZL?n|Hsl42$7A7g zx#X^=yhkFDn_ZI!Hk*xDuh$}z$%y0eNOHAWS<1;|BJfi=Dwb{BX1>1sO{G%*91aJ; z`Ft+&`MfxtP9hqOlJt7L$5#48jECQc%eFkzXq+wFwM;~^frZSnwm zd%d2(f~wUj$>DHF%8=-nF%4)qk8Ci9Ou?On)I!%CGph3d@>=6}1N9Cwk#{mybn+50dSvZ|eivDmoObg;j4hDk) z&{cvQL&CgE5AIx6$7lylF#!cF<^C` zJUJGHbi|^tb2KXs#}O%AA9o%&91imM!}nY+N8`gM#*wVk8$Vs{+QJxC_GH zC`Rxgny!G^79*q(h|}qmjI>%U!nImWi_xia+U+)RI4xBhWa#?%aSY%*IR@Bk90UJ9 zNZ?(*uJO?!$AoPR*cB38VNp3M)^Ruvv{}G|Ealyxk1^MSmwb?PyIoojc84rsj83)q zs947#W0%LB2YBFF64!A$ohI{$57R%RY&QF>c`fbU6(dW{Ck>DX-uVyt3-kf<%w^L0 QiU0rr07*qoM6N<$g4CsG*8l(j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png new file mode 100644 index 0000000000000000000000000000000000000000..61b18bac1506b3e82ec967b7ac1152910b9d9b86 GIT binary patch literal 1327 zcmV+~14Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z-AP12R9Fe^moW~*APhyFiUo-!XXp*OaRd&~8+7FoEWKS9=H3E{F_qiebre=`2eKGh zQU3cMCn8G-VO!S~v@TO?)zStueo|Ba3QvHUfO-PPdk@xHwU@z^Qs8#IGr;-sSw0`! zf?mCp(w}_?$m!2Ju=`%U<`ByGNw`<92|%JFDg$W5j|Lfl-1dr^o{v>(9025vBi3&K zt@zR4E&&-0x$oWE0g&j(+5{N6B@ECzYD~4I!2ly;ms(4Vag&XaYv&x8oU___U>?hH lyVZwq0;nfoa1b>AkYC0PPC-TH{>=aY002ovPDHLkV1hx3hk*b9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png new file mode 100644 index 0000000000000000000000000000000000000000..5b0da119347f400ee662bb5dc00e6947367afff5 GIT binary patch literal 1251 zcmV<91RVQ`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zkx4{BR9Fe^maz@MAPfYZh=!6)Sc3srf~6RTB^U#VG7(X#$V9RmH&1EHygAH^Bc*hO z5Xfq|Ij5C2t%ILt>aQ>w009sH0doRQ>Vz>y^4@RDT5H=Jmk>8F#-Lg&w-=RC*!W-2 z{0h(j2#8<7n&_M}JJ_1vmAHZ4J1edYVg^6}1V8`;9xK*(xYl~VbvMF67sX`%GA{rC N002ovPDHLkV1hqpT-N{q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..47ce61b383073097e62ddb8b9d3af367ad506f49 GIT binary patch literal 1584 zcmV-02G9A4P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%R z-bqA3RCodHTQN?=Fc923MT$_Oq@oHhfCtd?14Khj0R`_thz3zoz(aTdO=|LhM3GP` zxIK~1-mwm?64`6%cxT6veD-acruiXIzFu$Wmd>+~HId#lc#%Z7cRgyFpEU-VJ8F)s)KF-8+5UAJO^4x3lKHKJ4OUyWc`f;~!r> zN-&M%=;WO_5x+S24ov56={grVR? zW&S`P@BI9~{K+o?6ClKfF}E=X#GKub*vtVTD#hH!91wGMLt--rgs2pA8*@O+*$s&; z<1Ha7r?+p!?OZkY^+hg4{P%;em?+-pnX3f`F8+Z0-ERZDEo|S^Fs&l zIsBm?yB`pe;)UBl2P`~4b$Sy(UE-A!m;+XxAob~)1Jos6Ie|G~4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zuSrBfR9Fe^mpcx_APk0`DiQ+-7B()|llCC&8~_9ZOOjG`$N(5AgBP=a_>FBo5Rc6{ zcWSMHs_eB^NGXxTZxer!M7{;(1egF5U;<2loWOoNmb=aGZ3$A!uC~(Yy`P$)1ai*s zc^^

DDuC8u>4x39LAIVzXImPa(w6hcRZTVS-W$LI^{%_8vg@K#Xzd025Zmk}m-# rzyz286JP@51b&xM`yo@5_A9>t-pfCOO0T?N00000NkvXXu0mjfMfhsf literal 0 HcmV?d00001 From 8e1adc97ea0de15175e78893b823c8145c8b72b4 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 20:08:37 -0500 Subject: [PATCH 5/8] Turbine assets completed, added blocks in-game. Still need to add special effect rendering, but that will come later --- .../client/GeneratorsClientProxy.java | 7 ++++ .../common/GeneratorsCommonProxy.java | 6 +++ .../common/block/BlockGenerator.java | 38 +++++++++++------- .../tile/turbine/TileEntityTurbineValve.java | 9 +++++ .../resources/assets/mekanism/lang/en_US.lang | 6 +++ .../textures/blocks/ctm/TurbineCasing-ctm.png | Bin 0 -> 1337 bytes .../textures/blocks/ctm/TurbineCasing.png | Bin 0 -> 1183 bytes .../textures/blocks/ctm/TurbineValve-ctm.png | Bin 0 -> 1537 bytes .../textures/blocks/ctm/TurbineValve.png | Bin 0 -> 1291 bytes .../textures/blocks/ctm/TurbineVent-ctm.png | Bin 0 -> 2182 bytes .../textures/blocks/ctm/TurbineVent.png | Bin 0 -> 1627 bytes 11 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 1afe0dbc2..7261371d0 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -29,13 +29,17 @@ import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -53,6 +57,9 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine()); ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor()); ClientRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod", new RenderTurbineRotor()); + GameRegistry.registerTileEntity(TileEntityTurbineCasing.class, "TurbineCasing"); //TODO turbine render + GameRegistry.registerTileEntity(TileEntityTurbineValve.class, "TurbineValve"); + GameRegistry.registerTileEntity(TileEntityTurbineVent.class, "TurbineVent"); } @Override diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index deb89681b..977b4f358 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -27,7 +27,10 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorPort; import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -73,6 +76,9 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine"); GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController"); GameRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod"); + GameRegistry.registerTileEntity(TileEntityTurbineCasing.class, "TurbineCasing"); + GameRegistry.registerTileEntity(TileEntityTurbineValve.class, "TurbineValve"); + GameRegistry.registerTileEntity(TileEntityTurbineVent.class, "TurbineVent"); } /** diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 53831ce96..7d2e3415e 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -33,7 +33,10 @@ import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; +import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -99,12 +102,19 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB BASE_ICON = register.registerIcon("mekanism:SteelCasing"); ctms[10] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(10)).registerIcons(register); + ctms[11] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(12, 13)).registerIcons(register); + ctms[12] = new CTMData("ctm/TurbineValve", this, Arrays.asList(11, 13)).registerIcons(register); + ctms[13] = new CTMData("ctm/TurbineVent", this, Arrays.asList(11, 12)).registerIcons(register); icons[7][0] = register.registerIcon("mekanism:TurbineRod"); icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); icons[8][1] = register.registerIcon("mekanism:RotationalComplexTop"); icons[9][0] = register.registerIcon("mekanism:PressureDisperser"); + icons[10][0] = ctms[10].mainTextureData.icon; + icons[11][0] = ctms[10].mainTextureData.icon; + icons[12][0] = ctms[10].mainTextureData.icon; + icons[13][0] = ctms[10].mainTextureData.icon; } @Override @@ -123,11 +133,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(meta == GeneratorType.TURBINE_ROTOR.meta) - { - return icons[meta][0]; - } - else if(meta == GeneratorType.ROTATIONAL_COMPLEX.meta) + GeneratorType type = GeneratorType.getFromMetadata(meta); + + if(type == GeneratorType.ROTATIONAL_COMPLEX) { if(side != 0 && side != 1) { @@ -137,16 +145,13 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return icons[meta][1]; } } - else if(meta == GeneratorType.PRESSURE_DISPERSER.meta) + else if(!type.hasModel) { return icons[meta][0]; } - else if(meta == GeneratorType.ELECTROMAGNETIC_COIL.meta) - { - return icons[meta][0]; + else { + return BASE_ICON; } - - return BASE_ICON; } @Override @@ -504,12 +509,14 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return false; } + + int guiId = GeneratorType.getFromMetadata(metadata).guiId; - if(tileEntity != null) + if(guiId != -1 && tileEntity != null) { if(!entityplayer.isSneaking()) { - entityplayer.openGui(MekanismGenerators.instance, GeneratorType.getFromMetadata(metadata).guiId, world, x, y, z); + entityplayer.openGui(MekanismGenerators.instance, guiId, world, x, y, z); return true; } } @@ -707,7 +714,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB TURBINE_ROTOR(7, "TurbineRotor", -1, -1, TileEntityTurbineRotor.class, false), ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false), PRESSURE_DISPERSER(9, "PressureDisperser", -1, -1, TileEntityPressureDisperser.class, false), - ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false); + ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false), + TURBINE_CASING(11, "TurbineCasing", -1, -1, TileEntityTurbineCasing.class, false), + TURBINE_VALVE(12, "TurbineValve", -1, -1, TileEntityTurbineValve.class, false), + TURBINE_VENT(13, "TurbineVent", -1, -1, TileEntityTurbineVent.class, false); public int meta; public String name; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java new file mode 100644 index 000000000..34d3f7000 --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -0,0 +1,9 @@ +package mekanism.generators.common.tile.turbine; + +public class TileEntityTurbineValve extends TileEntityTurbineCasing +{ + public TileEntityTurbineValve() + { + super("TurbineValve"); + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 475c2c82f..a80dfd238 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -740,6 +740,9 @@ tooltip.TurbineRotor=The steel rod that is used to house !nTurbine Blades within tooltip.RotationalComplex=A connector that is placed on the highest !nTurbine Rotor of an Industrial Turbine to !ncarry kinetic energy into its !nElectromagnetic Coils. tooltip.PressureDisperser=A block used in the Industrial Turbine!n to direct steam outwards. These should !nbe placed just above your turbine rods, forming a !ngapless layer of dispersers surrounding your !nRotational Complex. tooltip.ElectromagneticCoil=A block that converts kinetic energy from a !nRotational Complex into useable electricity. These can be placed in !nany arrangement above your Rotational Complex, as long !nas they are all touching each other and the !ncomplex itself. +tooltip.TurbineCasing=Pressure-resistant casing used in the !ncreation of an Industrial Turbine. +tooltip.TurbineValve=A type of Turbine Casing that includes a !nport for the transfer of energy and steam. +tooltip.TurbineVent=A type of Turbine Casing with an integrated !nvent for the release of steam. These !nshould be placed on the level of or above the turbine's !nRotational Complex. tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !nis capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. @@ -855,6 +858,9 @@ tile.Generator.TurbineRotor.name=Turbine Rotor tile.Generator.RotationalComplex.name=Rotational Complex tile.Generator.PressureDisperser.name=Pressure Disperser tile.Generator.ElectromagneticCoil.name=Electromagnetic Coil +tile.Generator.TurbineCasing.name=Turbine Casing +tile.Generator.TurbineValve.name=Turbine Valve +tile.Generator.TurbineVent.name=Turbine Vent tile.Reactor.ReactorController.name=Reactor Controller tile.Reactor.ReactorFrame.name=Reactor Frame diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..58a8410be6f6725eee45b300ccd6df1608b415f8 GIT binary patch literal 1337 zcmV-91;+Y`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z=Sf6CRCodHo52Y}F#toWbO7<7;KiZ5x`Q)&5%eH#pcLHU1@gK;(&WV+5Mqo?GIy%C1j+&M8FT_ppgaL5P!52vfD>>600000NkvXXu0mjf;ah>c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png new file mode 100644 index 0000000000000000000000000000000000000000..be74746465b2e6712243623dd6bf993a9da90375 GIT binary patch literal 1183 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 BaN+;} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..358dee71421e6531731aa0743b41d46555ddcde2 GIT binary patch literal 2182 zcmV;12zmF3P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%U zG)Y83RCodHTg`40F%Whk5ls`8hCoAT6-p&k390264jegh;|kBfEATG70!Nf{b7&=0 z3H9evs!#!P7Vln#&ktW^)GP=nq-JKPaxhWmQ)3YzT+n#W4 zP!#-H19bnKiv8V&I5{~H#bQx(yIm<`Hk+08_RhYn=VzTh1~-7CJ~Io?Bqqq8DEN&_ z0E%pGZc6z#HZ}y5uh;7X`f$wp`npt}`V0UAH2Byy_$PEbLFZOUboM_Dh|Oo0JmArM zX#m3;@BrNs(Cq|m^LyF}LSf7*3Tk+Odv-ad(P+peKz+C|f?V^lZSWhH0EC{Ko0GCH zEiFmq78e&U=t7uUttOvQ`vNe)4I0Y^ztI4E4Ppj(n{?s#R2ahgt-Xxx1*78i9Rp|} zTL08m#euM60P%&vj~JkR4T8)~L;|3G{^GT4et7>*iJMvAJ^WwW<~J?@{~}+l9!3wq zCI^w9zy1yn55j^H1jT=1*dnfo8KQ1zcTSm9xCEvN9kr$E>ZbNlaK9AwISZe&Z6rx^{0s zuo1$2Djb825N{JEXwAo>4Op1`MgyqUAnsG)7}~B1ayLTM|WBXBEZ z$_={lylwk@0Jw}E0EOujH+}F-&j+OE1J2G2k-PGB3NPVp!UV1PSgNtTU{w6RV*m|A z>z~@HI1qLWAil8pwXZ>txrs;s)am&EZjCE?ZS(-!`FWGwZ1WpmgR0ydU-MV_e1I_s z9)JDV-}qopfI^8$iVv72MB>Yi(+(R1ZS#BbfN?$_;3+#?sZ?an-*FsyQY4@MpHdG%h5&L5 zZP!WW{y>TgPaZ(Iey?YQ-~rUfbUr{Km%L3LKx5h9H@*gK=jU|>z%$$YS_4FppVt{6 z3Vve@&P?L+Sy;SZ^HqX7Eo-ahJIMeI9!M1D6VI(>+38F8}}l07*qo IM6N<$g4#?fivR!s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png new file mode 100644 index 0000000000000000000000000000000000000000..e522259ef671643744d0d28dce0d5511efab47ba GIT binary patch literal 1627 zcmV-h2Bi6kP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S z2}wjjR9Fe^SItU7K@=WCAwzDNWRXH5gewc(xN#LNTLf+E8G5K*p=G%CE_5S=KbsN@ zf$+?U1irO4>oda} z2R0c9`!!+WASJe=JARNrcW>Q}7U%1L^D`0st}RBRk%-6R!f_l@6p2KLc3%2KGbwA1 z!2xhAlgyS0qx&%S02H-aEs}3Gn*zowm5NKBjA=9)WSnJOzy(aGd~rQJJU&@)C4{w` z5aa%{>rRf2GjN(oxG*w<4CqP_Xb{05qQU}22Grnq>3& zJSorRavoibDV0ie$Giuq92gx4Qr{pL#qOM4x(8U2>(9Kd4@^Da`wXF6HN*x%FR$*1 zeR_P*;*wce!n-$?z$>!a6JrK2WYGEY^BW8X;&b>b5IHZDK*hvjF}~JPV+MHefVSIh zQUog39D58W6$9S1j1C~GLZLudd~S3A(Ja#goGq4NLpo}F zhSt%!ux8RxMa!A=CCC^+fMb3#{#K;itgi!K!~Y)~Zjse;#uBX7oLAe%flUVJ6|D0g Z@*f1)8G^7-91s8i002ovPDHLkV1iZT4*dWC literal 0 HcmV?d00001 From c341e6290b62d51730f52c94fd5bec8b93605ae1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 20:23:20 -0500 Subject: [PATCH 6/8] Stuff now renders normally --- .../client/GeneratorsClientProxy.java | 9 ++++ .../render/item/GeneratorsItemRenderer.java | 46 +++++++++++++++++++ .../common/block/BlockGenerator.java | 12 ++--- 3 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 7261371d0..01446322f 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -19,6 +19,8 @@ import mekanism.generators.client.render.RenderReactor; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderTurbineRotor; import mekanism.generators.client.render.RenderWindTurbine; +import mekanism.generators.client.render.item.GeneratorsItemRenderer; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; @@ -35,8 +37,10 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.GameRegistry; @@ -67,6 +71,11 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy { //Register block handler RenderingRegistry.registerBlockHandler(new BlockRenderingHandler()); + + //Register item handler + GeneratorsItemRenderer handler = new GeneratorsItemRenderer(); + + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(GeneratorsBlocks.Generator), handler); System.out.println("[MekanismGenerators] Render registrations complete."); } diff --git a/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java b/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java new file mode 100644 index 000000000..d233e4906 --- /dev/null +++ b/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java @@ -0,0 +1,46 @@ +package mekanism.generators.client.render.item; + +import mekanism.generators.client.GeneratorsClientProxy; +import mekanism.generators.common.item.ItemBlockGenerator; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GeneratorsItemRenderer implements IItemRenderer +{ + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) + { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) + { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) + { + RenderBlocks renderBlocks = (RenderBlocks)data[0]; + + if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) + { + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + + if(item.getItem() instanceof ItemBlockGenerator) + { + RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), GeneratorsClientProxy.GENERATOR_RENDER_ID); + } + } +} diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 7d2e3415e..6d69b141c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -102,9 +102,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB BASE_ICON = register.registerIcon("mekanism:SteelCasing"); ctms[10] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(10)).registerIcons(register); - ctms[11] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(12, 13)).registerIcons(register); - ctms[12] = new CTMData("ctm/TurbineValve", this, Arrays.asList(11, 13)).registerIcons(register); - ctms[13] = new CTMData("ctm/TurbineVent", this, Arrays.asList(11, 12)).registerIcons(register); + ctms[11] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(11, 12, 13)).registerIcons(register); + ctms[12] = new CTMData("ctm/TurbineValve", this, Arrays.asList(11, 12, 13)).registerIcons(register); + ctms[13] = new CTMData("ctm/TurbineVent", this, Arrays.asList(11, 12, 13)).registerIcons(register); icons[7][0] = register.registerIcon("mekanism:TurbineRod"); icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); @@ -112,9 +112,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB icons[9][0] = register.registerIcon("mekanism:PressureDisperser"); icons[10][0] = ctms[10].mainTextureData.icon; - icons[11][0] = ctms[10].mainTextureData.icon; - icons[12][0] = ctms[10].mainTextureData.icon; - icons[13][0] = ctms[10].mainTextureData.icon; + icons[11][0] = ctms[11].mainTextureData.icon; + icons[12][0] = ctms[12].mainTextureData.icon; + icons[13][0] = ctms[13].mainTextureData.icon; } @Override From 769a8fd4803bcba7ca500453c097d34b416ad51a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 23:46:16 -0500 Subject: [PATCH 7/8] Multiblock protocol works, begin turbine tile code --- .../mekanism/common/block/BlockBasic.java | 9 +- .../common/content/tank/DynamicFluidTank.java | 2 +- .../common/tile/TileEntityDynamicTank.java | 3 +- .../client/GeneratorsClientProxy.java | 19 +- .../render/RenderIndustrialTurbine.java | 128 +++++++++++++ .../common/block/BlockGenerator.java | 16 ++ .../turbine/SynchronizedTurbineData.java | 28 +++ .../common/content/turbine/TurbineCache.java | 19 +- .../content/turbine/TurbineFluidTank.java | 177 ++++++++++++++++++ .../turbine/TurbineUpdateProtocol.java | 28 ++- .../tile/turbine/TileEntityTurbineCasing.java | 123 ++++++++++++ .../tile/turbine/TileEntityTurbineValve.java | 75 +++++++- .../resources/assets/mekanism/lang/en_US.lang | 1 + 13 files changed, 606 insertions(+), 22 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java create mode 100644 src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index dc07463c8..9ef140c17 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -31,7 +31,6 @@ import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; -import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntitySolarEvaporationBlock; import mekanism.common.tile.TileEntitySolarEvaporationController; import mekanism.common.tile.TileEntitySolarEvaporationValve; @@ -130,9 +129,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { TileEntity tileEntity = world.getTileEntity(x, y, z); - if(block == this && tileEntity instanceof TileEntityMultiblock) + if(block == this && tileEntity instanceof IMultiblock) { - ((TileEntityMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).update(); } if(tileEntity instanceof TileEntityBasicBlock) @@ -886,9 +885,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { TileEntity tileEntity = world.getTileEntity(x, y, z); - if(tileEntity instanceof TileEntityMultiblock) + if(tileEntity instanceof IMultiblock) { - ((TileEntityMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).update(); } if(tileEntity instanceof IStructuralMultiblock) diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index 173739a37..994d2ed5f 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -154,7 +154,7 @@ public class DynamicFluidTank implements IFluidTank dynamicTank.structure.fluidStored.amount -= used; } - FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluidID(), used); + FluidStack drained = new FluidStack(dynamicTank.structure.fluidStored.getFluid(), used); if(dynamicTank.structure.fluidStored.amount <= 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 490e07163..0a07c889f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; @@ -384,7 +385,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock cachedFluids = new HashMap(); + + private Fluid STEAM = FluidRegistry.getFluid("steam"); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityTurbineCasing)tileEntity, x, y, z, partialTick); + } + + public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick) + { + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null /* && there is fluid */) + { + RenderData data = new RenderData(); + + data.location = tileEntity.structure.renderLocation; + data.height = tileEntity.structure.lowerVolume/(tileEntity.structure.volLength*tileEntity.structure.volWidth); + data.length = tileEntity.structure.volLength; + data.width = tileEntity.structure.volWidth; + + bindTexture(MekanismRenderer.getBlocksTexture()); + } + } + + private void pop() + { + GL11.glPopAttrib(); + GL11.glPopMatrix(); + } + + private void push() + { + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + + private int getStages(int height) + { + return (height-2)*(TankUpdateProtocol.FLUID_PER_TANK/10); + } + + private double getX(int x) + { + return x - TileEntityRendererDispatcher.staticPlayerX; + } + + private double getY(int y) + { + return y - TileEntityRendererDispatcher.staticPlayerY; + } + + private double getZ(int z) + { + return z - TileEntityRendererDispatcher.staticPlayerZ; + } + + private DisplayInteger[] getListAndRender(RenderData data, World world) + { + if(cachedFluids.containsKey(data)) + { + return cachedFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(STEAM.getIcon()); + + final int stages = getStages(data.height); + DisplayInteger[] displays = new DisplayInteger[stages]; + + cachedFluids.put(data, displays); + + for(int i = 0; i < stages; i++) + { + displays[i] = DisplayInteger.createAndStart(); + + if(STEAM.getIcon() != null) + { + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; + + toReturn.maxX = data.length - .01; + toReturn.maxY = ((float)i/(float)stages)*(data.height-2) - .01; + toReturn.maxZ = data.width - .01; + + MekanismRenderer.renderObject(toReturn); + } + + GL11.glEndList(); + } + + return displays; + } + + public static void resetDisplayInts() + { + cachedFluids.clear(); + } +} diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 6d69b141c..6bdfbcd92 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -16,6 +16,7 @@ import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.multiblock.IMultiblock; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; @@ -169,6 +170,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB if(!world.isRemote) { TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IMultiblock) + { + ((IMultiblock)tileEntity).update(); + } if(tileEntity instanceof TileEntityBasicBlock) { @@ -216,6 +222,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB { ((IBoundingBlock)tileEntity).onPlace(); } + + if(!world.isRemote && tileEntity instanceof IMultiblock) + { + ((IMultiblock)tileEntity).update(); + } } @Override @@ -450,6 +461,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } } + if(metadata == GeneratorType.TURBINE_CASING.meta || metadata == GeneratorType.TURBINE_VALVE.meta || metadata == GeneratorType.TURBINE_VENT.meta) + { + return ((IMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); + } + if(metadata == GeneratorType.TURBINE_ROTOR.meta) { TileEntityTurbineRotor rod = (TileEntityTurbineRotor)tileEntity; 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 b2d228906..64075c799 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -1,12 +1,40 @@ package mekanism.generators.common.content.turbine; import mekanism.common.multiblock.SynchronizedData; +import net.minecraftforge.fluids.FluidStack; public class SynchronizedTurbineData extends SynchronizedData { + public FluidStack fluidStored; + + public FluidStack prevFluid; + public int blades; public int vents; public int coils; public int lowerVolume; + + public int getFluidCapacity() + { + return lowerVolume*TurbineUpdateProtocol.FLUID_PER_TANK; + } + + public boolean needsRenderUpdate() + { + if((fluidStored == null && prevFluid != null) || (fluidStored != null && prevFluid == null)) + { + return true; + } + + if(fluidStored != null && prevFluid != null) + { + if((fluidStored.getFluid() != prevFluid.getFluid()) || (fluidStored.amount != prevFluid.amount)) + { + return true; + } + } + + return false; + } } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java index 424828601..8e25712c6 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineCache.java @@ -1,31 +1,40 @@ package mekanism.generators.common.content.turbine; -import net.minecraft.nbt.NBTTagCompound; import mekanism.common.multiblock.MultiblockCache; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidStack; public class TurbineCache extends MultiblockCache { + public FluidStack fluid; + @Override public void apply(SynchronizedTurbineData data) { - + data.fluidStored = fluid; } @Override public void sync(SynchronizedTurbineData data) { - + fluid = data.fluidStored; } @Override public void load(NBTTagCompound nbtTags) { - + if(nbtTags.hasKey("cachedFluid")) + { + fluid = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedFluid")); + } } @Override public void save(NBTTagCompound nbtTags) { - + if(fluid != null) + { + nbtTags.setTag("cachedFluid", fluid.writeToNBT(new NBTTagCompound())); + } } } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java new file mode 100644 index 000000000..c66b5b5d7 --- /dev/null +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java @@ -0,0 +1,177 @@ +package mekanism.generators.common.content.turbine; + +import mekanism.common.util.MekanismUtils; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; + +public class TurbineFluidTank implements IFluidTank +{ + public TileEntityTurbineCasing turbine; + + public TurbineFluidTank(TileEntityTurbineCasing tileEntity) + { + turbine = tileEntity; + } + + @Override + public FluidStack getFluid() + { + return turbine.structure != null ? turbine.structure.fluidStored : null; + } + + @Override + public int getCapacity() + { + return turbine.structure != null ? turbine.structure.getFluidCapacity() : 0; + } + + @Override + public int fill(FluidStack resource, boolean doFill) + { + if(turbine.structure != null && !turbine.getWorldObj().isRemote) + { + if(resource == null || resource.getFluidID() <= 0) + { + return 0; + } + + if(turbine.structure.fluidStored != null && !turbine.structure.fluidStored.isFluidEqual(resource)) + { + return 0; + } + + if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluidID() <= 0) + { + if(resource.amount <= getCapacity()) + { + if(doFill) + { + turbine.structure.fluidStored = resource.copy(); + + if(resource.amount > 0) + { + MekanismUtils.saveChunk(turbine); + } + } + + return resource.amount; + } + else { + if(doFill) + { + turbine.structure.fluidStored = resource.copy(); + turbine.structure.fluidStored.amount = getCapacity(); + + if(getCapacity() > 0) + { + MekanismUtils.saveChunk(turbine); + } + } + + return getCapacity(); + } + } + else if(resource.amount <= getNeeded()) + { + if(doFill) + { + turbine.structure.fluidStored.amount += resource.amount; + + if(resource.amount > 0) + { + MekanismUtils.saveChunk(turbine); + } + } + + return resource.amount; + } + else { + int prevNeeded = getNeeded(); + + if(doFill) + { + turbine.structure.fluidStored.amount = getCapacity(); + + if(prevNeeded > 0) + { + MekanismUtils.saveChunk(turbine); + } + } + + return prevNeeded; + } + } + + return 0; + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) + { + if(turbine.structure != null && !turbine.getWorldObj().isRemote) + { + if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluidID() <= 0) + { + return null; + } + + if(turbine.structure.fluidStored.amount <= 0) + { + return null; + } + + int used = maxDrain; + + if(turbine.structure.fluidStored.amount < used) + { + used = turbine.structure.fluidStored.amount; + } + + if(doDrain) + { + turbine.structure.fluidStored.amount -= used; + } + + FluidStack drained = new FluidStack(turbine.structure.fluidStored.getFluid(), used); + + if(turbine.structure.fluidStored.amount <= 0) + { + turbine.structure.fluidStored = null; + } + + if(drained.amount > 0 && doDrain) + { + MekanismUtils.saveChunk(turbine); + turbine.sendPacketToRenderer(); + } + + return drained; + } + + return null; + } + + public int getNeeded() + { + return getCapacity()-getFluidAmount(); + } + + @Override + public int getFluidAmount() + { + if(turbine.structure != null) + { + return turbine.structure.fluidStored.amount; + } + + return 0; + } + + @Override + public FluidTankInfo getInfo() + { + return new FluidTankInfo(this); + } +} diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 502bfd700..51b9dd411 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; @@ -23,6 +24,8 @@ import net.minecraftforge.common.util.ForgeDirection; public class TurbineUpdateProtocol extends UpdateProtocol { + public static final int FLUID_PER_TANK = TankUpdateProtocol.FLUID_PER_TANK; + public TurbineUpdateProtocol(TileEntityTurbineCasing tileEntity) { super(tileEntity); @@ -31,9 +34,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol rejectedItems, MultiblockCache cache, MultiblockCache merge) { - + if(((TurbineCache)cache).fluid == null) + { + ((TurbineCache)cache).fluid = ((TurbineCache)merge).fluid; + } + else if(((TurbineCache)merge).fluid != null && ((TurbineCache)cache).fluid.isFluidEqual(((TurbineCache)merge).fluid)) + { + ((TurbineCache)cache).fluid.amount += ((TurbineCache)merge).fluid.amount; + } + } + + @Override + protected void onFormed() + { + if(structureFound.fluidStored != null) + { + structureFound.fluidStored.amount = Math.min(structureFound.fluidStored.amount, structureFound.getFluidCapacity()); + } } public class CoilCounter 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 862606378..7e272e76a 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -1,16 +1,32 @@ package mekanism.generators.common.tile.turbine; +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMultiblock; import mekanism.generators.common.MekanismGenerators; 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.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock { + public int clientCapacity; + + public float prevScale; + public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -20,6 +36,113 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0.01) + { + prevScale = (9*prevScale + targetScale)/10; + } + } + } + + if(!worldObj.isRemote) + { + if(structure != null) + { + if(structure.fluidStored != null && structure.fluidStored.amount <= 0) + { + structure.fluidStored = null; + markDirty(); + } + + if(isRendering) + { + if(structure.needsRenderUpdate()) + { + sendPacketToRenderer(); + } + + structure.prevFluid = structure.fluidStored; + } + } + } + } + + @Override + public boolean onActivate(EntityPlayer player) + { + if(!player.isSneaking() && structure != null) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + //player.openGui(Mekanism.instance, 49, worldObj, xCoord, yCoord, zCoord); + + return true; + } + + return false; + } + + public int getScaledFluidLevel(int i) + { + if(clientCapacity == 0 || structure.fluidStored == null) + { + return 0; + } + + return structure.fluidStored.amount*i / clientCapacity; + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(structure != null) + { + data.add(structure.getFluidCapacity()); + + if(structure.fluidStored != null) + { + data.add(1); + data.add(structure.fluidStored.getFluidID()); + data.add(structure.fluidStored.amount); + } + else { + data.add(0); + } + } + + return data; + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + if(clientHasStructure) + { + clientCapacity = dataStream.readInt(); + + if(dataStream.readInt() == 1) + { + structure.fluidStored = new FluidStack(FluidRegistry.getFluid(dataStream.readInt()), dataStream.readInt()); + } + else { + structure.fluidStored = null; + } + } + } @Override protected SynchronizedTurbineData getNewStructure() diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 34d3f7000..6058a8b03 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -1,9 +1,82 @@ package mekanism.generators.common.tile.turbine; -public class TileEntityTurbineValve extends TileEntityTurbineCasing +import mekanism.common.util.LangUtils; +import mekanism.common.util.PipeUtils; +import mekanism.generators.common.content.turbine.TurbineFluidTank; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +public class TileEntityTurbineValve extends TileEntityTurbineCasing implements IFluidHandler { + public TurbineFluidTank fluidTank; + public TileEntityTurbineValve() { super("TurbineValve"); + fluidTank = new TurbineFluidTank(this); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + return fluidTank.fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + if(structure != null && structure.fluidStored != null) + { + if(resource.getFluid() == structure.fluidStored.getFluid()) + { + return fluidTank.drain(resource.amount, doDrain); + } + } + + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + if(structure != null) + { + return fluidTank.drain(maxDrain, doDrain); + } + + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + if(fluid == FluidRegistry.getFluid("steam")) + { + return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + } + + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + } + + @Override + public String getInventoryName() + { + return LangUtils.localize("gui.industrialTurbine"); } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index a80dfd238..5365c1287 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -449,6 +449,7 @@ gui.cells=cells gui.providers=providers gui.structure=Structure gui.dynamicTank=Dynamic Tank +gui.industrialTurbine=Industrial Turbine gui.visuals=Visuals gui.noEject=Can't Eject gui.undefined=Undefined From afe8969c3780e31eb55bcb7f9b5f3f25caf47dc0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Jan 2016 00:40:30 -0500 Subject: [PATCH 8/8] Added energy management to turbine and turbine valves --- .../common/tile/TileEntityInductionPort.java | 7 - .../client/GeneratorsClientProxy.java | 3 + .../client/gui/GuiIndustrialTurbine.java | 20 ++ .../render/RenderIndustrialTurbine.java | 22 +- .../common/GeneratorsCommonProxy.java | 3 + .../turbine/SynchronizedTurbineData.java | 7 + .../common/content/turbine/TurbineCache.java | 7 + .../turbine/TurbineUpdateProtocol.java | 2 + .../tile/turbine/TileEntityTurbineCasing.java | 43 ++- .../tile/turbine/TileEntityTurbineValve.java | 332 +++++++++++++++++- 10 files changed, 427 insertions(+), 19 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 8e5cf4f58..4f3f52b16 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -15,7 +15,6 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -108,12 +107,6 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return EnumSet.noneOf(ForgeDirection.class); } - @Override - public boolean canUpdate() - { - return true; - } - @Method(modid = "IC2") public void register() { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 2af6fd21c..c6ec4af8a 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -3,6 +3,7 @@ package mekanism.generators.client; import mekanism.generators.client.gui.GuiBioGenerator; import mekanism.generators.client.gui.GuiGasGenerator; import mekanism.generators.client.gui.GuiHeatGenerator; +import mekanism.generators.client.gui.GuiIndustrialTurbine; import mekanism.generators.client.gui.GuiNeutronCapture; import mekanism.generators.client.gui.GuiReactorController; import mekanism.generators.client.gui.GuiReactorFuel; @@ -102,6 +103,8 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy return new GuiBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity); case 5: return new GuiWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity); + case 6: + return new GuiIndustrialTurbine(player.inventory, (TileEntityTurbineCasing)tileEntity); case 10: return new GuiReactorController(player.inventory, (TileEntityReactorController)tileEntity); case 11: diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java new file mode 100644 index 000000000..4915e7c84 --- /dev/null +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -0,0 +1,20 @@ +package mekanism.generators.client.gui; + +import mekanism.client.gui.GuiMekanism; +import mekanism.common.inventory.container.ContainerFilter; +import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; +import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiIndustrialTurbine extends GuiMekanism +{ + public TileEntityTurbineCasing tileEntity; + + public GuiIndustrialTurbine(InventoryPlayer inventory, TileEntityTurbineCasing tentity) + { + super(tentity, new ContainerFilter(inventory, tentity)); + tileEntity = tentity; + } +} diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index e8020ab47..d18e93929 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -33,7 +33,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick) { - if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null /* && there is fluid */) + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0) { RenderData data = new RenderData(); @@ -43,6 +43,26 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer data.width = tileEntity.structure.volWidth; bindTexture(MekanismRenderer.getBlocksTexture()); + + if(data.location != null && data.height >= 3 && tileEntity.structure.fluidStored.getFluid() != null) + { + push(); + + GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity()); + MekanismRenderer.colorFluid(tileEntity.structure.fluidStored.getFluid()); + + DisplayInteger[] displayList = getListAndRender(data, tileEntity.getWorldObj()); + + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.structure.getFluidCapacity())+0.3F)); + displayList[getStages(data.height)-1].render(); + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + } } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 977b4f358..2e0756e8e 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -2,6 +2,7 @@ package mekanism.generators.common; import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; +import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.generators.common.inventory.container.ContainerBioGenerator; @@ -172,6 +173,8 @@ public class GeneratorsCommonProxy return new ContainerBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity); case 5: return new ContainerWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity); + case 6: + return new ContainerFilter(player.inventory, (TileEntityTurbineCasing)tileEntity); case 10: return new ContainerReactorController(player.inventory, (TileEntityReactorController)tileEntity); case 11: 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 64075c799..e6f7a4ba3 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -9,6 +9,8 @@ public class SynchronizedTurbineData extends SynchronizedData { public FluidStack fluid; + public double electricity; @Override public void apply(SynchronizedTurbineData data) { data.fluidStored = fluid; + data.electricityStored = electricity; } @Override public void sync(SynchronizedTurbineData data) { fluid = data.fluidStored; + electricity = data.electricityStored; } @Override @@ -27,6 +30,8 @@ public class TurbineCache extends MultiblockCache { fluid = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedFluid")); } + + electricity = nbtTags.getDouble("electricity"); } @Override @@ -36,5 +41,7 @@ public class TurbineCache extends MultiblockCache { nbtTags.setTag("cachedFluid", fluid.writeToNBT(new NBTTagCompound())); } + + nbtTags.setDouble("electricity", electricity); } } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 51b9dd411..8d20ccd46 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -255,6 +255,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol +public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { - public int clientCapacity; - public float prevScale; public TileEntityTurbineCasing() @@ -46,7 +45,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0.01) { @@ -84,7 +83,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock getOutputtingSides() + { + if(structure != null) + { + EnumSet set = EnumSet.allOf(ForgeDirection.class); + set.remove(ForgeDirection.UNKNOWN); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + if(structure.locations.contains(Coord4D.get(this).getFromSide(side))) + { + set.remove(side); + } + } + + return set; + } + + return EnumSet.noneOf(ForgeDirection.class); + } + + @Override + public EnumSet getConsumingSides() + { + return EnumSet.noneOf(ForgeDirection.class); + } + + @Override + public boolean canUpdate() + { + return true; + } + + @Method(modid = "IC2") + public void register() + { + if(!worldObj.isRemote) + { + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + + if(registered != this) + { + if(registered instanceof IEnergyTile) + { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile)registered)); + } + else if(registered == null) + { + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + ic2Registered = true; + } + } + } + } + + @Method(modid = "IC2") + public void deregister() + { + if(!worldObj.isRemote) + { + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + + if(registered instanceof IEnergyTile) + { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile)registered)); + } + } + } + + @Override + public double getMaxOutput() + { + return structure != null ? structure.getEnergyCapacity() : 0; + } + + @Override + public void onAdded() + { + super.onAdded(); + + if(MekanismUtils.useIC2()) + { + register(); + } + } + + @Override + public void onChunkUnload() + { + if(MekanismUtils.useIC2()) + { + deregister(); + } + + super.onChunkUnload(); + } + + @Override + public void invalidate() + { + super.invalidate(); + + if(MekanismUtils.useIC2()) + { + deregister(); + } + } + + @Override + @Method(modid = "CoFHCore") + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) + { + return 0; + } + + @Override + @Method(modid = "CoFHCore") + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) + { + if(getOutputtingSides().contains(from)) + { + double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE)); + + if(!simulate) + { + setEnergy(getEnergy() - toSend); + } + + return (int)Math.round(toSend*general.TO_TE); + } + + return 0; + } + + @Override + @Method(modid = "CoFHCore") + public boolean canConnectEnergy(ForgeDirection from) + { + return structure != null; + } + + @Override + @Method(modid = "CoFHCore") + public int getEnergyStored(ForgeDirection from) + { + return (int)Math.round(getEnergy()*general.TO_TE); + } + + @Override + @Method(modid = "CoFHCore") + public int getMaxEnergyStored(ForgeDirection from) + { + return (int)Math.round(getMaxEnergy()*general.TO_TE); + } + + @Override + @Method(modid = "IC2") + public int getSinkTier() + { + return 4; + } + + @Override + @Method(modid = "IC2") + public int getSourceTier() + { + return 4; + } + + @Override + @Method(modid = "IC2") + public void setStored(int energy) + { + setEnergy(energy*general.FROM_IC2); + } + + @Override + @Method(modid = "IC2") + public int addEnergy(int amount) + { + return (int)Math.round(getEnergy()*general.TO_IC2); + } + + @Override + @Method(modid = "IC2") + public boolean isTeleporterCompatible(ForgeDirection side) + { + return canOutputTo(side); + } + + @Override + public boolean canOutputTo(ForgeDirection side) + { + return getOutputtingSides().contains(side); + } + + @Override + @Method(modid = "IC2") + public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) + { + return false; + } + + @Override + @Method(modid = "IC2") + public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) + { + return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; + } + + @Override + @Method(modid = "IC2") + public int getStored() + { + return (int)Math.round(getEnergy()*general.TO_IC2); + } + + @Override + @Method(modid = "IC2") + public int getCapacity() + { + return (int)Math.round(getMaxEnergy()*general.TO_IC2); + } + + @Override + @Method(modid = "IC2") + public int getOutput() + { + return (int)Math.round(getMaxOutput()*general.TO_IC2); + } + + @Override + @Method(modid = "IC2") + public double getDemandedEnergy() + { + return 0; + } + + @Override + @Method(modid = "IC2") + public double getOfferedEnergy() + { + return Math.min(getEnergy(), getMaxOutput())*general.TO_IC2; + } + + @Override + public boolean canReceiveEnergy(ForgeDirection side) + { + return false; + } + + @Override + @Method(modid = "IC2") + public double getOutputEnergyUnitsPerTick() + { + return getMaxOutput()*general.TO_IC2; + } + + @Override + @Method(modid = "IC2") + public double injectEnergy(ForgeDirection direction, double amount, double voltage) + { + return amount; + } + + @Override + @Method(modid = "IC2") + public void drawEnergy(double amount) + { + if(structure != null) + { + double toDraw = Math.min(amount*general.FROM_IC2, getMaxOutput()); + setEnergy(Math.max(getEnergy() - toDraw, 0)); + } + } + + @Override + public double transferEnergyToAcceptor(ForgeDirection side, double amount) + { + return 0; + } @Override public FluidTankInfo[] getTankInfo(ForgeDirection from)