From 6e9ee32df1988b4d259c5a0f435e53255d381ab9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 21 Jan 2016 20:36:40 -0500 Subject: [PATCH] Turbines now render and look fancy, fixed some multiblock code --- .../common/content/boiler/BoilerManager.java | 16 +-- .../common/multiblock/MultiblockManager.java | 43 +++---- .../common/multiblock/SynchronizedData.java | 2 +- .../common/multiblock/UpdateProtocol.java | 8 +- .../common/tile/TileEntityMultiblock.java | 16 ++- .../generators/client/model/ModelTurbine.java | 115 ++++++++++++++++++ .../client/render/RenderTurbineRod.java | 32 ++++- .../tile/turbine/TileEntityTurbineRod.java | 21 +++- .../assets/mekanism/render/Turbine.png | Bin 0 -> 1521 bytes .../mekanism/textures/blocks/TurbineRod.png | Bin 1439 -> 2073 bytes 10 files changed, 198 insertions(+), 55 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/model/ModelTurbine.java create mode 100644 src/main/resources/assets/mekanism/render/Turbine.png diff --git a/src/main/java/mekanism/common/content/boiler/BoilerManager.java b/src/main/java/mekanism/common/content/boiler/BoilerManager.java index c30fbbf71..74e3efd20 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerManager.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerManager.java @@ -8,8 +8,8 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.tile.TileEntityThermoelectricBoiler; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.tile.TileEntityThermoelectricBoiler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -25,12 +25,12 @@ public class BoilerManager extends MultiblockManager public void tickSelf(World world) { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); + ArrayList idsToKill = new ArrayList(); + HashMap> tilesToKill = new HashMap>(); - for(Map.Entry> entry : inventories.entrySet()) + for(Map.Entry> entry : inventories.entrySet()) { - int inventoryID = entry.getKey(); + String inventoryID = entry.getKey(); HashSet boilers = new HashSet(); @@ -40,7 +40,7 @@ public class BoilerManager extends MultiblockManager { TileEntity tileEntity = obj.getTileEntity(world); - if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != -1 && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) + if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) { if(!tilesToKill.containsKey(inventoryID)) { @@ -78,7 +78,7 @@ public class BoilerManager extends MultiblockManager } } - for(Map.Entry> entry : tilesToKill.entrySet()) + for(Map.Entry> entry : tilesToKill.entrySet()) { for(Coord4D obj : entry.getValue()) { @@ -86,7 +86,7 @@ public class BoilerManager extends MultiblockManager } } - for(int inventoryID : idsToKill) + for(String inventoryID : idsToKill) { inventories.remove(inventoryID); } diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index b238d8f24..b5c17b90d 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityMultiblock; @@ -18,7 +19,7 @@ public class MultiblockManager> public String name; /** A map containing references to all multiblock inventory caches. */ - public Map> inventories = new HashMap>(); + public Map> inventories = new HashMap>(); public MultiblockManager(String s) { @@ -32,7 +33,7 @@ public class MultiblockManager> * @param id - inventory ID to pull * @return correct multiblock inventory cache */ - public MultiblockCache pullInventory(World world, int id) + public MultiblockCache pullInventory(World world, String id) { MultiblockCache toReturn = inventories.get(id); @@ -43,7 +44,7 @@ public class MultiblockManager> if(tileEntity != null) { tileEntity.cachedData = tileEntity.getNewCache(); - tileEntity.cachedID = -1; + tileEntity.cachedID = null; } } @@ -56,23 +57,9 @@ public class MultiblockManager> * Grabs a unique inventory ID for a multiblock. * @return unique inventory ID */ - public int getUniqueInventoryID() + public String getUniqueInventoryID() { - int id = 0; - - while(true) - { - for(Integer i : inventories.keySet()) - { - if(id == i) - { - id++; - continue; - } - } - - return id; - } + return UUID.randomUUID().toString(); } public static void tick(World world) @@ -85,12 +72,12 @@ public class MultiblockManager> public void tickSelf(World world) { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); + ArrayList idsToKill = new ArrayList(); + HashMap> tilesToKill = new HashMap>(); - for(Map.Entry> entry : inventories.entrySet()) + for(Map.Entry> entry : inventories.entrySet()) { - int inventoryID = entry.getKey(); + String inventoryID = entry.getKey(); for(Coord4D obj : entry.getValue().locations) { @@ -98,7 +85,7 @@ public class MultiblockManager> { TileEntity tileEntity = obj.getTileEntity(world); - if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != -1 && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) + if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) { if(!tilesToKill.containsKey(inventoryID)) { @@ -116,7 +103,7 @@ public class MultiblockManager> } } - for(Map.Entry> entry : tilesToKill.entrySet()) + for(Map.Entry> entry : tilesToKill.entrySet()) { for(Coord4D obj : entry.getValue()) { @@ -124,15 +111,15 @@ public class MultiblockManager> } } - for(int inventoryID : idsToKill) + for(String inventoryID : idsToKill) { inventories.remove(inventoryID); } } - public static int getStructureId(TileEntityMultiblock tile) + public static String getStructureId(TileEntityMultiblock tile) { - return tile.structure != null ? tile.getSynchronizedData().inventoryID : -1; + return tile.structure != null ? tile.getSynchronizedData().inventoryID : null; } public static boolean areEqual(TileEntity tile1, TileEntity tile2) diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index ff3ce8b4a..3bbe41c24 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -19,7 +19,7 @@ public abstract class SynchronizedData> public int volume; - public int inventoryID; + public String inventoryID; public boolean didTick; diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 55ef70374..80e20b18a 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -405,14 +405,14 @@ public abstract class UpdateProtocol> } } - List idsFound = new ArrayList(); - int idToUse = -1; + List idsFound = new ArrayList(); + String idToUse = null; for(Coord4D obj : structureFound.locations) { TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(pointer.getWorldObj()); - if(tileEntity.cachedID != -1) + if(tileEntity.cachedID != null) { idsFound.add(tileEntity.cachedID); } @@ -423,7 +423,7 @@ public abstract class UpdateProtocol> if(!idsFound.isEmpty()) { - for(int id : idsFound) + for(String id : idsFound) { if(getManager().inventories.get(id) != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 1f7b2f721..1304e2786 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -42,7 +42,7 @@ public abstract class TileEntityMultiblock> extend public MultiblockCache cachedData = getNewCache(); /** This multiblock segment's cached inventory ID */ - public int cachedID = -1; + public String cachedID = null; public TileEntityMultiblock(String name) { @@ -84,7 +84,7 @@ public abstract class TileEntityMultiblock> extend { isRendering = false; - if(cachedID != -1) + if(cachedID != null) { getManager().updateCache(this); } @@ -123,7 +123,7 @@ public abstract class TileEntityMultiblock> extend { getSynchronizedData().didTick = false; - if(getSynchronizedData().inventoryID != -1) + if(getSynchronizedData().inventoryID != null) { cachedData.sync(getSynchronizedData()); cachedID = getSynchronizedData().inventoryID; @@ -233,10 +233,9 @@ public abstract class TileEntityMultiblock> extend if(structure == null) { - cachedID = nbtTags.getInteger("cachedID"); - - if(cachedID != -1) + if(nbtTags.hasKey("cachedID")) { + cachedID = nbtTags.getString("cachedID"); cachedData.load(nbtTags); } } @@ -247,10 +246,9 @@ public abstract class TileEntityMultiblock> extend { super.writeToNBT(nbtTags); - nbtTags.setInteger("cachedID", cachedID); - - if(cachedID != -1) + if(cachedID != null) { + nbtTags.setString("cachedID", cachedID); cachedData.save(nbtTags); } } diff --git a/src/main/java/mekanism/generators/client/model/ModelTurbine.java b/src/main/java/mekanism/generators/client/model/ModelTurbine.java new file mode 100644 index 000000000..4258aa6c5 --- /dev/null +++ b/src/main/java/mekanism/generators/client/model/ModelTurbine.java @@ -0,0 +1,115 @@ +package mekanism.generators.client.model; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelTurbine extends ModelBase +{ + private static float BLADE_ROTATE = 0.418879F; + + public ModelRenderer rod; + public ModelRenderer extension_north; + public ModelRenderer blade_north; + public ModelRenderer extension_south; + public ModelRenderer extension_west; + public ModelRenderer extension_east; + public ModelRenderer blade_south; + public ModelRenderer blade_east; + public ModelRenderer blade_west; + + public ModelTurbine() + { + textureWidth = 64; + textureHeight = 64; + extension_south = new ModelRenderer(this, 0, 0); + extension_south.setRotationPoint(0.0F, 20.0F, 0.0F); + extension_south.addBox(-1.0F, 0.0F, 1.0F, 2, 1, 3, 0.0F); + setRotateAngle(extension_south, 0.0F, 0.0F, -BLADE_ROTATE); + extension_west = new ModelRenderer(this, 0, 4); + extension_west.setRotationPoint(0.0F, 20.0F, 0.0F); + extension_west.addBox(-4.0F, 0.0F, -1.0F, 3, 1, 2, 0.0F); + setRotateAngle(extension_west, BLADE_ROTATE, 0.0F, 0.0F); + blade_east = new ModelRenderer(this, 10, 5); + blade_east.setRotationPoint(0.0F, 20.0F, 0.0F); + blade_east.addBox(4.0F, 0.0F, -1.5F, 4, 1, 3, 0.0F); + setRotateAngle(blade_east, -BLADE_ROTATE, 0.0F, 0.0F); + blade_north = new ModelRenderer(this, 10, 0); + blade_north.setRotationPoint(0.0F, 20.0F, 0.0F); + blade_north.addBox(-1.5F, 0.0F, -8.0F, 3, 1, 4, 0.0F); + setRotateAngle(blade_north, 0.0F, 0.0F, BLADE_ROTATE); + extension_east = new ModelRenderer(this, 0, 4); + extension_east.setRotationPoint(0.0F, 20.0F, 0.0F); + extension_east.addBox(1.0F, 0.0F, -1.0F, 3, 1, 2, 0.0F); + setRotateAngle(extension_east, -BLADE_ROTATE, 0.0F, 0.0F); + rod = new ModelRenderer(this, 0, 44); + rod.setRotationPoint(-2.0F, 8.0F, -2.0F); + rod.addBox(0.0F, 0.0F, 0.0F, 4, 16, 4, 0.0F); + blade_south = new ModelRenderer(this, 10, 0); + blade_south.setRotationPoint(0.0F, 20.0F, 0.0F); + blade_south.addBox(-1.5F, 0.0F, 4.0F, 3, 1, 4, 0.0F); + setRotateAngle(blade_south, 0.0F, 0.0F, -BLADE_ROTATE); + extension_north = new ModelRenderer(this, 0, 0); + extension_north.setRotationPoint(0.0F, 20.0F, 0.0F); + extension_north.addBox(-1.0F, 0.0F, -4.0F, 2, 1, 3, 0.0F); + setRotateAngle(extension_north, 0.0F, 0.0F, BLADE_ROTATE); + blade_west = new ModelRenderer(this, 10, 5); + blade_west.setRotationPoint(0.0F, 20.0F, 0.0F); + blade_west.addBox(-8.0F, 0.0F, -1.5F, 4, 1, 3, 0.0F); + setRotateAngle(blade_west, BLADE_ROTATE, 0.0F, 0.0F); + } + + public void render(float size, int index) + { + GL11.glPushMatrix(); + + GL11.glRotatef(index*5, 0.0F, 1.0F, 0.0F); + + float scale = index*0.5F; + float widthDiv = 16; + + extension_south.render(size); + extension_west.render(size); + extension_east.render(size); + extension_north.render(size); + + GL11.glPushMatrix(); + GL11.glTranslatef(-0.25F, 0.0F, 0.0F); + GL11.glScalef(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); + GL11.glTranslatef(0.25F, 0.0F, 0.0F); + blade_west.render(size); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslatef(0.25F, 0.0F, 0.0F); + GL11.glScalef(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); + GL11.glTranslatef(-0.25F, 0.0F, 0.0F); + blade_east.render(size); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslatef(0.0F, 0.0F, -0.25F); + GL11.glScalef(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); + GL11.glTranslatef(0.0F, 0.0F, 0.25F); + blade_north.render(size); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslatef(0.0F, 0.0F, 0.25F); + GL11.glScalef(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); + GL11.glTranslatef(0.0F, 0.0F, -0.25F); + blade_south.render(size); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) + { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java index 1ca58175e..bf9982475 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java @@ -1,5 +1,11 @@ package mekanism.generators.client.render; +import org.lwjgl.opengl.GL11; + +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.client.model.ModelTurbine; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; @@ -8,10 +14,32 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderTurbineRod extends TileEntitySpecialRenderer { + private ModelTurbine model = new ModelTurbine(); + @Override - public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - // TODO Auto-generated method stub + renderAModelAt((TileEntityTurbineRod)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityTurbineRod tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Turbine.png")); + + if(tileEntity.getHousedBlades() > 0) + { + GL11.glTranslated(x + 0.5, y - 1, z + 0.5); + model.render(0.0625F, tileEntity.clientIndex*2); + } + + if(tileEntity.getHousedBlades() == 2) + { + GL11.glTranslatef(0.0F, 0.5F, 0.0F); + model.render(0.0625F, (tileEntity.clientIndex*2)+1); + } + + GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java index 893d67963..5ca514d71 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java @@ -12,7 +12,10 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntityTurbineRod extends TileEntityBasicBlock { @@ -21,6 +24,8 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock //Total blades on server, housed blades on client public int blades = 0; + public int clientIndex; + @Override public boolean canUpdate() { @@ -92,12 +97,13 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock for(Coord4D coord : newRods) { TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj); - int prev = rod.getHousedBlades(); + int prevHoused = rod.getHousedBlades(); + int prevBlades = rod.blades; rod.rods = newRods; rod.blades = newBlades; - if(rod.getHousedBlades() != prev) + if(rod.getHousedBlades() != prevHoused || rod.blades != prevBlades) { Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord)); } @@ -172,6 +178,7 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock super.handlePacketData(dataStream); blades = dataStream.readInt(); + clientIndex = dataStream.readInt(); } @Override @@ -179,7 +186,8 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock { super.getNetworkedData(data); - data.add(blades); + data.add(getHousedBlades()); + data.add(rods.indexOf(Coord4D.get(this))); return data; } @@ -199,6 +207,13 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock nbtTags.setInteger("blades", getHousedBlades()); } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } @Override public void onUpdate() {} diff --git a/src/main/resources/assets/mekanism/render/Turbine.png b/src/main/resources/assets/mekanism/render/Turbine.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b1576f0945075858bed698556c672e7bc8ce86 GIT binary patch literal 1521 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 delta 1421 zcmV;81#B!47nLqkwWLqi}?a&Km7Y-IodI1zQlu6?AXrC- zip8&0Q(L(k8m-0#Nt31RN*1N**eWFCIyZ@_8wcCzwyIBifj0*H0YKRU4@f*A4F+O+ z+4jJ+NmGX^s!2$D=)?~pChY}P;k$NXCsV{+_4>;>-#OX-eVh__(Z?q}P9Z-Dj?gOW6|D%o z20XmjW-qs4Uw;D_$dln!ZX3EHW|6b4l3{Ys;V+MIw=w?@E}M1q>|KLc`<$h@W4I5A z-YfQ0zKK8Awe%eDOR!(Bxk+Jv1^AEp(tHAVA5rwFl6`dE=SN>(trXq{-UWNnaHk7R z`)YMDdmI?C(e)+kn8+hI*L7zSv!oY*?^gJ<*kkCCsDH>)Y2abt!AgCqnO~Z5R_27= z%d=XU%mO2iWWT4) zbyOBQPEhjvKz%5PQO?=#8v4zT{)U>cODpsvPk+!cG+XTxAO{m@bvM#Jr)z6J><&E2 z2D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7qW-CFs9&fT)ZaU5gc&=gBz-Da zCx3k}{Y;8Pod(y&RKbhpuXfcI6;Cqz3RHyZ!0HyS%%BL5cAW%EB-0C9M18!Hn4 z00A~hL_t(o3DuX$4#F@DMA;AUsYskS@JUDo0P)ZjTS$RmYx=|HsdYNQmT+i52 z=y}KPk=jLvn_)^=9L}mI@*BJZCAGJH;OP z+C)*LsnY#12!tQrf%tOqDr{2j1^2KS-T_3kRbJJ5@_dSR9H4SN?Qgzf>N#&a{ltTI z9Qd_zdk#<$*fi~3drp4P&ihq%NKAl(! z^3Tey1AQsiJx|;WgkdO7*m0n%VjA1jbK>-!W5)q1Y(lM+cs=Ft^c>|N=l|n?R?c*1 z?hZjI%1{czr)kPk(5?eoF=c