diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 98cd1ec5a..bbe7834f8 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -7,7 +7,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.network.PacketKey.KeyMessage; - +import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; @@ -49,6 +49,8 @@ public class MekanismClient extends Mekanism Mekanism.gasmaskOn.clear(); Mekanism.flamethrowerActive.clear(); Mekanism.activeVibrators.clear(); + + TileEntityRotationalComplex.clientRotationMap.clear(); SoundHandler.soundMaps.clear(); 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/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 5a2f6c4c6..d82e2299a 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -24,7 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.mojang.realmsclient.util.Pair; +import org.apache.commons.lang3.tuple.Pair; public final class TransporterPathfinder { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 0a4c6ba14..3acf60e81 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.mojang.realmsclient.util.Pair; +import org.apache.commons.lang3.tuple.Pair; public class TransporterStack { @@ -220,12 +220,12 @@ public class TransporterStack return false; } - if(newPath.second() == Path.HOME) + if(newPath.getRight() == Path.HOME) { idleDir = ForgeDirection.UNKNOWN; } - setPath(newPath.first(), newPath.second()); + setPath(newPath.getLeft(), newPath.getRight()); originalLocation = transporter.coord(); initiatedPath = true; 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 1cda67d81..0437cda6e 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -404,14 +404,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); } @@ -422,7 +422,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 56ee6cdf1..fc092bc86 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..fd4ce3669 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java @@ -1,17 +1,70 @@ package mekanism.generators.client.render; +import mekanism.common.Mekanism; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.client.model.ModelTurbine; +import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; +import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderTurbineRod extends TileEntitySpecialRenderer { + private ModelTurbine model = new ModelTurbine(); + + private static final float BASE_SPEED = 512F; + @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")); + + int baseIndex = tileEntity.clientIndex*2; + float rotateSpeed = 0.0F; + + if(tileEntity.multiblockUUID != null && TileEntityRotationalComplex.clientRotationMap.containsKey(tileEntity.multiblockUUID)) + { + rotateSpeed = TileEntityRotationalComplex.clientRotationMap.get(tileEntity.multiblockUUID); + } + + if(!Mekanism.proxy.isPaused()) + { + tileEntity.rotationLower = (tileEntity.rotationLower + rotateSpeed*BASE_SPEED*(1F/(float)(baseIndex+1))) % 360; + tileEntity.rotationUpper = (tileEntity.rotationUpper + rotateSpeed*BASE_SPEED*(1F/(float)(baseIndex+2))) % 360; + } + + if(tileEntity.getHousedBlades() > 0) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y - 1, z + 0.5); + GL11.glRotatef(tileEntity.rotationLower, 0.0F, 1.0F, 0.0F); + model.render(0.0625F, baseIndex); + GL11.glPopMatrix(); + } + + if(tileEntity.getHousedBlades() == 2) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y - 0.5, z + 0.5); + GL11.glRotatef(tileEntity.rotationUpper, 0.0F, 1.0F, 0.0F); + model.render(0.0625F, baseIndex+1); + GL11.glPopMatrix(); + } + + GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 2cffa11bd..7f88b7bc7 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -24,6 +24,7 @@ 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.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -52,6 +53,7 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityReactorNeutronCapture.class, "ReactorNeutronCapture"); GameRegistry.registerTileEntity(TileEntityReactorPort.class, "ReactorPort"); GameRegistry.registerTileEntity(TileEntityReactorLogicAdapter.class, "ReactorLogicAdapter"); + GameRegistry.registerTileEntity(TileEntityRotationalComplex.class, "RotationalComplex"); } /** diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 3396e5b87..ea6f15338 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -27,6 +27,7 @@ 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.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRod; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -59,6 +60,7 @@ import java.util.Random; * 5: Advanced Solar Generator * 6: Wind Generator * 7: Turbine Rod + * 8: Rotational Complex * @author AidanBrady * */ @@ -83,6 +85,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { BASE_ICON = register.registerIcon("mekanism:SteelCasing"); icons[7][0] = register.registerIcon("mekanism:TurbineRod"); + icons[8][0] = register.registerIcon("mekanism:TurbineRod"); } @Override @@ -93,6 +96,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { return icons[meta][0]; } + else if(meta == GeneratorType.ROTATIONAL_COMPLEX.meta) + { + return icons[meta][0]; + } return BASE_ICON; } @@ -652,7 +659,8 @@ 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_ROD(7, "TurbineRod", -1, -1, TileEntityTurbineRod.class, false), + ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false); public int meta; public String name; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 46e93bf1b..f70f958c5 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -47,6 +47,7 @@ import ic2.api.item.ISpecialElectricItem; * 5: Advanced Solar Generator * 6: Wind Generator * 7: Turbine Rod + * 8: Rotational Complex * @author AidanBrady * */ @@ -96,7 +97,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { GeneratorType type = GeneratorType.getFromMetadata(itemstack.getItemDamage()); - if(type != GeneratorType.TURBINE_ROD) + if(type != GeneratorType.TURBINE_ROD && type != GeneratorType.ROTATIONAL_COMPLEX) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java new file mode 100644 index 000000000..881b8a2ce --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java @@ -0,0 +1,105 @@ +package mekanism.generators.common.tile.turbine; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityBasicBlock; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityRotationalComplex extends TileEntityBasicBlock +{ + public static Map clientRotationMap = new HashMap(); + + public static final float ROTATION_THRESHOLD = 0.01F; + + public String multiblockUUID; + public float rotation; + + @Override + public void onUpdate() {} + + @Override + public boolean canUpdate() + { + return false; + } + + @Override + public void onAdded() + { + super.onAdded(); + + if(!worldObj.isRemote) + { + setMultiblock("asdf"); + setRotation(1F); + } + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + rotation = dataStream.readFloat(); + + if(dataStream.readBoolean()) + { + multiblockUUID = PacketHandler.readString(dataStream); + clientRotationMap.put(multiblockUUID, rotation); + } + else { + multiblockUUID = null; + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(rotation); + + if(multiblockUUID != null) + { + data.add(true); + data.add(multiblockUUID); + } + else { + data.add(false); + } + + return data; + } + + public void setMultiblock(String id) + { + multiblockUUID = id; + + Coord4D coord = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); + TileEntity tile = coord.getTileEntity(worldObj); + + if(tile instanceof TileEntityTurbineRod) + { + ((TileEntityTurbineRod)tile).updateRods(); + } + } + + public void setRotation(float newRotation) + { + if(Math.abs(newRotation-rotation) > ROTATION_THRESHOLD) + { + rotation = newRotation; + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } +} diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java index 893d67963..74ac9563f 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java @@ -8,19 +8,33 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; 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 { public List rods = new ArrayList(); + public boolean hasComplex; + + public String multiblockUUID; + //Total blades on server, housed blades on client public int blades = 0; + //Client stuff + public int clientIndex; + + public float rotationLower; + public float rotationUpper; + @Override public boolean canUpdate() { @@ -36,28 +50,23 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock } } - private void updateRods() + public void updateRods() { - Coord4D current = Coord4D.get(this); - Coord4D up = current.getFromSide(ForgeDirection.UP); - Coord4D down = current.getFromSide(ForgeDirection.DOWN); - - if(!rods.contains(current)) + if(rods.contains(Coord4D.get(this))) { - rods.add(current); + rods.add(Coord4D.get(this)); } - if((isRod(up) != !rods.contains(up)) || (isRod(down) != !rods.contains(down))) - { - buildRods(); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } + buildRods(); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } private void buildRods() { List newRods = new ArrayList(); int newBlades = 0; + boolean complex = false; + String id = null; Coord4D pointer = Coord4D.get(this); @@ -88,24 +97,42 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock break; } + if(isComplex(pointer.getFromSide(ForgeDirection.UP))) + { + id = ((TileEntityRotationalComplex)pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj)).multiblockUUID; + complex = true; + } + //Update all rods, send packet if necessary 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; + rod.multiblockUUID = id; - if(rod.getHousedBlades() != prev) + if(rods.indexOf(coord) == rods.size()-1) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord)); + rod.hasComplex = complex; } + else { + rod.hasComplex = false; + } + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord)); } } public boolean editBlade(boolean add) { + if(!rods.contains(Coord4D.get(this))) + { + rods.add(Coord4D.get(this)); + } + if((add && (rods.size()*2) - blades > 0) || (!add && (blades > 0))) { for(Coord4D coord : rods) @@ -155,6 +182,11 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock return coord.getTileEntity(worldObj) instanceof TileEntityTurbineRod; } + private boolean isComplex(Coord4D coord) + { + return coord.getTileEntity(worldObj) instanceof TileEntityRotationalComplex; + } + @Override public void onChunkLoad() { @@ -171,7 +203,25 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock { super.handlePacketData(dataStream); + int prevBlades = blades; + int prevIndex = clientIndex; + blades = dataStream.readInt(); + clientIndex = dataStream.readInt(); + + if(dataStream.readBoolean()) + { + multiblockUUID = PacketHandler.readString(dataStream); + } + else { + multiblockUUID = null; + } + + if(prevBlades != blades || prevIndex != clientIndex) + { + rotationLower = 0; + rotationUpper = 0; + } } @Override @@ -179,7 +229,17 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock { super.getNetworkedData(data); - data.add(blades); + data.add(getHousedBlades()); + data.add(rods.indexOf(Coord4D.get(this))); + + if(multiblockUUID != null) + { + data.add(true); + data.add(multiblockUUID); + } + else { + data.add(false); + } return data; } @@ -199,6 +259,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/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index ad814acd1..698be237c 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -736,6 +736,7 @@ tooltip.BioGenerator=A generator that burns organic materials of !nthe world to 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.RotationalComplex=A connector that is placed on !nthe highest turbine rod to carry kinetic energy into the !ngenerator itself. 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,6 +849,7 @@ 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.RotationalComplex.name=Rotational Complex tile.Reactor.ReactorController.name=Reactor Controller tile.Reactor.ReactorFrame.name=Reactor Frame 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 000000000..a9b1576f0 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/Turbine.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png index 6fb0c94b5..d9dace097 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png and b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png differ