From c1c15ae70727edf0615f7eda0a4541f2ec451678 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 16 Jan 2016 11:29:37 -0500 Subject: [PATCH 1/4] Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods --- .../container/ContainerMetallurgicInfuser.java | 4 ++-- .../mekanism/common/multiblock/UpdateProtocol.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 141abba2d..036d745c9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -75,7 +75,7 @@ public class ContainerMetallurgicInfuser extends Container { if(InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type)) { - if(!mergeItemStack(slotStack, 1, 2, false)) + if(!mergeItemStack(slotStack, 0, 1, false)) { return null; } @@ -89,7 +89,7 @@ public class ContainerMetallurgicInfuser extends Container } else if(isInputItem(slotStack)) { - if(!mergeItemStack(slotStack, 2, 3, false)) + if(!mergeItemStack(slotStack, 1, 2, false)) { return null; } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index d1587b67d..55ef70374 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -200,13 +200,17 @@ public abstract class UpdateProtocol> if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin)) { - structureFound = structure; - return; + if(isInteriorValid(structure)) + { + structureFound = structure; + return; + } } } } } + innerNodes.clear(); iteratedNodes.add(tile); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) @@ -222,6 +226,11 @@ public abstract class UpdateProtocol> } } } + + public boolean isInteriorValid(T structure) + { + return true; + } public ForgeDirection getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) { From 4c2b47021360993e62e7d84f641bcfb13f533cb1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 17 Jan 2016 15:59:02 -0500 Subject: [PATCH 2/4] Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 8 +- .../client/BlockRenderingHandler.java | 2 +- .../client/GeneratorsClientProxy.java | 8 +- ...WindTurbine.java => GuiWindGenerator.java} | 12 +- .../client/render/RenderWindTurbine.java | 6 +- .../common/GeneratorsCommonProxy.java | 8 +- .../generators/common/MekanismGenerators.java | 4 +- .../common/block/BlockGenerator.java | 15 +- ...rbine.java => ContainerWindGenerator.java} | 8 +- .../common/item/ItemBlockGenerator.java | 5 +- ...bine.java => TileEntityWindGenerator.java} | 6 +- .../tile/turbine/TileEntityTurbineRod.java | 190 ++++++++++++++++++ .../mekanism/tools/common/MekanismTools.java | 4 +- .../resources/assets/mekanism/lang/en_US.lang | 7 +- 15 files changed, 243 insertions(+), 42 deletions(-) rename src/main/java/mekanism/generators/client/gui/{GuiWindTurbine.java => GuiWindGenerator.java} (92%) rename src/main/java/mekanism/generators/common/inventory/container/{ContainerWindTurbine.java => ContainerWindGenerator.java} (90%) rename src/main/java/mekanism/generators/common/tile/{TileEntityWindTurbine.java => TileEntityWindGenerator.java} (94%) create mode 100644 src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java diff --git a/build.properties b/build.properties index d2a61e32c..873609929 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=8.1.8 +mod_version=9.0.0 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 543433fdb..784f2db44 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -71,14 +71,14 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; -import mekanism.common.tile.TileEntityThermoelectricBoiler; -import mekanism.common.tile.TileEntityThermoelectricValve; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntitySolarEvaporationBlock; import mekanism.common.tile.TileEntitySolarEvaporationValve; +import mekanism.common.tile.TileEntityThermoelectricBoiler; +import mekanism.common.tile.TileEntityThermoelectricValve; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; @@ -140,7 +140,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.8", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -166,7 +166,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(9, 0, 0); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 7421edcf7..dca3cad48 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -80,7 +80,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); hydrogenGenerator.render(0.0625F); } - else if(metadata == GeneratorType.WIND_TURBINE.meta) + else if(metadata == GeneratorType.WIND_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index a20ec41f6..4c960380a 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -10,7 +10,7 @@ import mekanism.generators.client.gui.GuiReactorHeat; import mekanism.generators.client.gui.GuiReactorLogicAdapter; import mekanism.generators.client.gui.GuiReactorStats; import mekanism.generators.client.gui.GuiSolarGenerator; -import mekanism.generators.client.gui.GuiWindTurbine; +import mekanism.generators.client.gui.GuiWindGenerator; import mekanism.generators.client.render.RenderAdvancedSolarGenerator; import mekanism.generators.client.render.RenderBioGenerator; import mekanism.generators.client.render.RenderGasGenerator; @@ -24,7 +24,7 @@ import mekanism.generators.common.tile.TileEntityBioGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; -import mekanism.generators.common.tile.TileEntityWindTurbine; +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; @@ -48,7 +48,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityBioGenerator.class, "BioGenerator", new RenderBioGenerator()); ClientRegistry.registerTileEntity(TileEntityHeatGenerator.class, "HeatGenerator", new RenderHeatGenerator()); ClientRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator", new RenderGasGenerator()); - ClientRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine", new RenderWindTurbine()); + ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine()); ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor()); } @@ -77,7 +77,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy case 4: return new GuiBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity); case 5: - return new GuiWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity); + return new GuiWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity); case 10: return new GuiReactorController(player.inventory, (TileEntityReactorController)tileEntity); case 11: diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java similarity index 92% rename from src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java rename to src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 2cbd08946..e143c64de 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -17,8 +17,8 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.inventory.container.ContainerWindTurbine; -import mekanism.generators.common.tile.TileEntityWindTurbine; +import mekanism.generators.common.inventory.container.ContainerWindGenerator; +import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,15 +26,15 @@ import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiWindTurbine extends GuiMekanism +public class GuiWindGenerator extends GuiMekanism { - public TileEntityWindTurbine tileEntity; + public TileEntityWindGenerator tileEntity; private DecimalFormat powerFormat = new DecimalFormat("0.##"); - public GuiWindTurbine(InventoryPlayer inventory, TileEntityWindTurbine tentity) + public GuiWindGenerator(InventoryPlayer inventory, TileEntityWindGenerator tentity) { - super(new ContainerWindTurbine(inventory, tentity)); + super(new ContainerWindGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java index f4629764c..93c17e0a6 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java @@ -4,7 +4,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindTurbine; -import mekanism.generators.common.tile.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -18,10 +18,10 @@ public class RenderWindTurbine extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityWindTurbine)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityWindGenerator)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityWindTurbine tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityWindGenerator tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 63099c4c0..8a5c29703 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -10,13 +10,13 @@ import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; -import mekanism.generators.common.inventory.container.ContainerWindTurbine; +import mekanism.generators.common.inventory.container.ContainerWindGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; -import mekanism.generators.common.tile.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindGenerator; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorFrame; import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; @@ -63,7 +63,7 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityBioGenerator.class, "BioGenerator"); GameRegistry.registerTileEntity(TileEntityHeatGenerator.class, "HeatGenerator"); GameRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator"); - GameRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine"); + GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine"); GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController"); } @@ -157,7 +157,7 @@ public class GeneratorsCommonProxy case 4: return new ContainerBioGenerator(player.inventory, (TileEntityBioGenerator)tileEntity); case 5: - return new ContainerWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity); + return new ContainerWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity); case 10: return new ContainerReactorController(player.inventory, (TileEntityReactorController)tileEntity); case 11: diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 130eaf489..eff099f54 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -34,7 +34,7 @@ import net.minecraftforge.oredict.OreDictionary; import java.io.IOException; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { /** Mekanism Generators Packet Pipeline */ @@ -47,7 +47,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(9, 0, 0); @EventHandler public void preInit(FMLPreInitializationEvent event) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 0e609af53..3e7cf25d3 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -43,7 +43,8 @@ import java.util.Random; * 3: Hydrogen Generator * 4: Bio-Generator * 5: Advanced Solar Generator - * 6: Wind Turbine + * 6: Wind Generator + * 7: Turbine Rod * @author AidanBrady * */ @@ -161,6 +162,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { int metadata = world.getBlockMetadata(x, y, z); TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); + if(MekanismUtils.isActive(world, x, y, z)) { float xRandom = (float)x + 0.5F; @@ -254,7 +256,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return (!nonAir) && canPlace; } - else if(world.getBlockMetadata(x, y, z) == GeneratorType.WIND_TURBINE.meta) + else if(world.getBlockMetadata(x, y, z) == GeneratorType.WIND_GENERATOR.meta) { boolean canPlace = super.canPlaceBlockAt(world, x, y, z); @@ -313,7 +315,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } if(MekanismUtils.isBCWrench(tool)) + { ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; @@ -501,7 +505,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { int metadata = world.getBlockMetadata(x, y, z); - if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && metadata != GeneratorType.WIND_TURBINE.meta) + if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && metadata != GeneratorType.WIND_GENERATOR.meta) { return true; } @@ -516,7 +520,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds GAS_GENERATOR(3, "GasGenerator", 3, general.FROM_H2*100, TileEntityGasGenerator.class, true), BIO_GENERATOR(4, "BioGenerator", 4, 160000, TileEntityBioGenerator.class, true), ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true), - WIND_TURBINE(6, "WindTurbine", 5, 200000, TileEntityWindTurbine.class, true); + WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true); public int meta; public String name; @@ -540,8 +544,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds for(GeneratorType type : values()) { if(type.meta == meta) + { return type; + } } + return null; } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java similarity index 90% rename from src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java rename to src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java index 9e6efd0a6..39002000d 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tile.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -10,11 +10,11 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class ContainerWindTurbine extends Container +public class ContainerWindGenerator extends Container { - private TileEntityWindTurbine tileEntity; + private TileEntityWindGenerator tileEntity; - public ContainerWindTurbine(InventoryPlayer inventory, TileEntityWindTurbine tentity) + public ContainerWindGenerator(InventoryPlayer inventory, TileEntityWindGenerator tentity) { tileEntity = tentity; addSlotToContainer(new SlotCharge(tentity, 0, 143, 35)); diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 634c4df71..5d3733384 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -45,7 +45,8 @@ import ic2.api.item.ISpecialElectricItem; * 3: Hydrogen Generator * 4: Bio-Generator * 5: Advanced Solar Generator - * 6: Wind Turbine + * 6: Wind Generator + * 7: Turbine Rod * @author AidanBrady * */ @@ -145,7 +146,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } } } - else if(stack.getItemDamage() == GeneratorType.WIND_TURBINE.meta) + else if(stack.getItemDamage() == GeneratorType.WIND_GENERATOR.meta) { if(!block.isReplaceable(world, x, y, z)) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java similarity index 94% rename from src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java rename to src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index f11d794d7..a9d8d415f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -10,14 +10,14 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityWindTurbine extends TileEntityGenerator implements IBoundingBlock +public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock { /** The angle the blades of this Wind Turbine are currently at. */ public double angle; - public TileEntityWindTurbine() + public TileEntityWindGenerator() { - super("wind", "WindTurbine", 200000, (generators.windGenerationMax)*2); + super("wind", "WindGenerator", 200000, (generators.windGenerationMax)*2); inventory = new ItemStack[1]; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java new file mode 100644 index 000000000..c45f49e8e --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java @@ -0,0 +1,190 @@ +package mekanism.generators.common.tile.turbine; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.base.ITileComponent; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.util.MekanismUtils; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityTurbineRod extends TileEntityBasicBlock +{ + public List rods = new ArrayList(); + + //Total blades on server, housed blades on client + public int blades = 0; + + @Override + public boolean canUpdate() + { + return false; + } + + @Override + public void onNeighborChange(Block block) + { + if(!worldObj.isRemote) + { + updateRods(); + } + } + + private void updateRods() + { + Coord4D current = Coord4D.get(this); + Coord4D up = current.getFromSide(ForgeDirection.UP); + Coord4D down = current.getFromSide(ForgeDirection.DOWN); + + 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))); + } + } + + private void buildRods() + { + List newRods = new ArrayList(); + int newBlades = 0; + + Coord4D pointer = Coord4D.get(this); + + //Go to bottom rod + while(true) + { + if(isRod(pointer.getFromSide(ForgeDirection.DOWN))) + { + pointer.step(ForgeDirection.DOWN); + continue; + } + + break; + } + + //Put all rods in new list, top to bottom + while(true) + { + newRods.add(pointer.clone()); + newBlades += ((TileEntityTurbineRod)pointer.getTileEntity(worldObj)).getHousedBlades(); + + if(isRod(pointer.getFromSide(ForgeDirection.UP))) + { + pointer.step(ForgeDirection.UP); + continue; + } + + break; + } + + //Update all rods, send packet if necessary + for(Coord4D coord : newRods) + { + TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj); + int prev = rod.getHousedBlades(); + + rod.rods = newRods; + rod.blades = newBlades; + + if(rod.getHousedBlades() != prev) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rod.getNetworkedData(new ArrayList())), new Range4D(coord)); + } + } + } + + public boolean editBlade(boolean add) + { + if((add && (rods.size()*2) - blades > 0) || (!add && (blades > 0))) + { + for(Coord4D coord : rods) + { + TileEntityTurbineRod rod = (TileEntityTurbineRod)coord.getTileEntity(worldObj); + rod.internalEditBlade(add); + } + + return true; + } + else { + return false; + } + } + + public void internalEditBlade(boolean add) + { + int prev = getHousedBlades(); + + blades += add ? 1 : -1; + + if(getHousedBlades() != prev) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + public int getHousedBlades() + { + return Math.max(0, Math.min(2, blades - (rods.indexOf(Coord4D.get(this))+1)*2)); + } + + private boolean isRod(Coord4D coord) + { + return coord.getTileEntity(worldObj) instanceof TileEntityTurbineRod; + } + + @Override + public void onChunkLoad() + { + super.onChunkLoad(); + + if(!worldObj.isRemote) + { + updateRods(); + } + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + blades = dataStream.readInt(); + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(blades); + + return data; + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + blades = nbtTags.getInteger("blades"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setInteger("blades", getHousedBlades()); + } + + @Override + public void onUpdate() {} +} diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 2fdda0e63..500e6c073 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -28,7 +28,7 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import java.io.IOException; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -38,7 +38,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(9, 0, 0); //Enums: Tools public static ToolMaterial toolOBSIDIAN; diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 008503f18..ad814acd1 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -734,7 +734,8 @@ tooltip.SolarGenerator=A generator that uses the power !nof the sun to produce e tooltip.GasGenerator=A generator that harnesses the molecular !nvarying gasses to produce energy. 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.WindTurbine=A generator that uses the strength of the wind !nto produce energy, with greater efficiency !nat higher levels. +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.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. @@ -837,6 +838,7 @@ nei.rotaryCondensentrator=R. Condensentrator //Items item.SolarPanel.name=Solar Panel item.Hohlraum.name=Hohlraum +item.TurbineBlade.name=Turbine Blade //Generators tile.Generator.HeatGenerator.name=Heat Generator @@ -844,7 +846,8 @@ tile.Generator.SolarGenerator.name=Solar Generator tile.Generator.GasGenerator.name=Gas-Burning Generator tile.Generator.BioGenerator.name=Bio-Generator tile.Generator.AdvancedSolarGenerator.name=Advanced Solar Generator -tile.Generator.WindTurbine.name=Wind Turbine +tile.Generator.WindGenerator.name=Wind Generator +tile.Generator.TurbineRod.name=Turbine Rod tile.Reactor.ReactorController.name=Reactor Controller tile.Reactor.ReactorFrame.name=Reactor Frame From 609ed4e3a1103020b2d039515531d2dee3703b70 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 17 Jan 2016 17:21:06 -0500 Subject: [PATCH 3/4] Turbine Rods and Turbine Blades added in-game, multiblock functionality and interaction complete- still need to finish model and rendering stuff --- .../client/GeneratorsClientProxy.java | 3 + .../client/render/RenderTurbineRod.java | 17 ++ .../common/GeneratorsCommonProxy.java | 2 + .../generators/common/GeneratorsItems.java | 2 + .../common/block/BlockGenerator.java | 186 +++++++++++++++--- .../common/item/ItemBlockGenerator.java | 61 +++--- .../tile/turbine/TileEntityTurbineRod.java | 21 +- .../mekanism/textures/blocks/TurbineRod.png | Bin 0 -> 1439 bytes .../mekanism/textures/items/TurbineBlade.png | Bin 0 -> 1328 bytes 9 files changed, 240 insertions(+), 52 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/render/RenderTurbineRod.java create mode 100644 src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png create mode 100644 src/main/resources/assets/mekanism/textures/items/TurbineBlade.png diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 4c960380a..98b960583 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -17,6 +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.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; @@ -28,6 +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 net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -50,6 +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()); } @Override diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java new file mode 100644 index 000000000..1ca58175e --- /dev/null +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRod.java @@ -0,0 +1,17 @@ +package mekanism.generators.client.render; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderTurbineRod extends TileEntitySpecialRenderer +{ + @Override + public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) + { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 8a5c29703..5f66e5102 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.TileEntityTurbineRod; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; @@ -65,6 +66,7 @@ public class GeneratorsCommonProxy GameRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator"); GameRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine"); GameRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController"); + GameRegistry.registerTileEntity(TileEntityTurbineRod.class, "TurbineRod"); } /** diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index e91174693..9eaf8ffe8 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -11,10 +11,12 @@ 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 void register() { GameRegistry.registerItem(SolarPanel, "SolarPanel"); GameRegistry.registerItem(Hohlraum, "Hohlraum"); + GameRegistry.registerItem(TurbineBlade, "TurbineBlade"); } } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 3e7cf25d3..eed76a368 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -1,20 +1,33 @@ 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.List; +import java.util.Random; + import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.ISpecialBounds; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ISustainedTank; import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; +import mekanism.generators.common.GeneratorsItems; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.*; +import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; +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.TileEntityTurbineRod; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,14 +39,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +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; - -import java.util.List; -import java.util.Random; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** @@ -50,6 +64,9 @@ import java.util.Random; */ public class BlockGenerator extends BlockContainer implements ISpecialBounds { + public IIcon[][] icons = new IIcon[16][16]; + public IIcon BASE_ICON; + public Random machineRand = new Random(); public BlockGenerator() @@ -61,7 +78,33 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } @Override - public void registerBlockIcons(IIconRegister register) {} + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) + { + BASE_ICON = register.registerIcon("mekanism:SteelCasing"); + icons[7][0] = register.registerIcon("mekanism:TurbineRod"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) + { + if(meta == GeneratorType.TURBINE_ROD.meta) + { + return icons[meta][0]; + } + + return BASE_ICON; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) + { + int meta = world.getBlockMetadata(x, y, z); + + return getIcon(side, meta); + } @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block block) @@ -148,12 +191,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @SideOnly(Side.CLIENT) public void getSubBlocks(Item i, CreativeTabs creativetabs, List list) { - list.add(new ItemStack(i, 1, 0)); - list.add(new ItemStack(i, 1, 1)); - list.add(new ItemStack(i, 1, 3)); - list.add(new ItemStack(i, 1, 4)); - list.add(new ItemStack(i, 1, 5)); - list.add(new ItemStack(i, 1, 6)); + for(GeneratorType type : GeneratorType.values()) + { + list.add(new ItemStack(i, 1, type.meta)); + } } @Override @@ -161,7 +202,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds public void randomDisplayTick(World world, int x, int y, int z, Random random) { int metadata = world.getBlockMetadata(x, y, z); - TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); if(MekanismUtils.isActive(world, x, y, z)) { @@ -276,7 +317,24 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + + if(!world.isRemote && tileEntity instanceof TileEntityTurbineRod) + { + int amount = ((TileEntityTurbineRod)tileEntity).getHousedBlades(); + + if(amount > 0) + { + float motion = 0.7F; + double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, new ItemStack(GeneratorsItems.TurbineBlade, amount)); + + world.spawnEntityInWorld(entityItem); + } + } if(tileEntity instanceof IBoundingBlock) { @@ -299,7 +357,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return true; } - TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); int metadata = world.getBlockMetadata(x, y, z); if(entityplayer.getCurrentEquippedItem() != null) @@ -334,6 +392,66 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return false; } } + + if(metadata == GeneratorType.TURBINE_ROD.meta) + { + TileEntityTurbineRod rod = (TileEntityTurbineRod)tileEntity; + + if(!entityplayer.isSneaking()) + { + if(entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().getItem() == GeneratorsItems.TurbineBlade) + { + if(!world.isRemote && rod.editBlade(true)) + { + if(!entityplayer.capabilities.isCreativeMode) + { + entityplayer.getCurrentEquippedItem().stackSize--; + + if(entityplayer.getCurrentEquippedItem().stackSize == 0) + { + entityplayer.setCurrentItemOrArmor(0, null); + } + } + } + + return true; + } + } + else { + if(!world.isRemote) + { + if(entityplayer.getCurrentEquippedItem() == null) + { + if(rod.editBlade(false)) + { + if(!entityplayer.capabilities.isCreativeMode) + { + entityplayer.setCurrentItemOrArmor(0, new ItemStack(GeneratorsItems.TurbineBlade)); + entityplayer.inventory.markDirty(); + } + } + } + else if(entityplayer.getCurrentEquippedItem().getItem() == GeneratorsItems.TurbineBlade) + { + if(entityplayer.getCurrentEquippedItem().stackSize < entityplayer.getCurrentEquippedItem().getMaxStackSize()) + { + if(rod.editBlade(false)) + { + if(!entityplayer.capabilities.isCreativeMode) + { + entityplayer.getCurrentEquippedItem().stackSize++; + entityplayer.inventory.markDirty(); + } + } + } + } + } + + return true; + } + + return false; + } if(tileEntity != null) { @@ -406,6 +524,10 @@ 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) + { + setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + } else { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @@ -446,7 +568,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { - TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); if(tileEntity == null) @@ -454,11 +576,17 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return null; } - IEnergizedItem electricItem = (IEnergizedItem)itemStack.getItem(); - electricItem.setEnergy(itemStack, tileEntity.electricityStored); + if(tileEntity instanceof TileEntityElectricBlock) + { + IEnergizedItem electricItem = (IEnergizedItem)itemStack.getItem(); + electricItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored); + } - ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); - inventory.setInventory(tileEntity.getInventory(), itemStack); + if(tileEntity instanceof TileEntityContainerBlock) + { + ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); + inventory.setInventory(((TileEntityContainerBlock)tileEntity).getInventory(), itemStack); + } if(tileEntity instanceof ISustainedData) { @@ -505,7 +633,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { int metadata = world.getBlockMetadata(x, y, z); - if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && metadata != GeneratorType.WIND_GENERATOR.meta) + if(metadata != GeneratorType.SOLAR_GENERATOR.meta && + metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && + metadata != GeneratorType.WIND_GENERATOR.meta && + metadata != GeneratorType.TURBINE_ROD.meta) { return true; } @@ -520,7 +651,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds GAS_GENERATOR(3, "GasGenerator", 3, general.FROM_H2*100, TileEntityGasGenerator.class, true), 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); + WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true), + TURBINE_ROD(7, "TurbineRod", -1, -1, TileEntityTurbineRod.class, false); public int meta; public String name; @@ -587,6 +719,10 @@ 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) + { + block.setBlockBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + } else { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 5d3733384..8c1d6cfee 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -1,5 +1,8 @@ package mekanism.generators.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -11,11 +14,11 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; - import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -28,16 +31,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - /** * Item class for handling multiple generator block IDs. * 0: Heat Generator @@ -96,24 +96,30 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { GeneratorType type = GeneratorType.getFromMetadata(itemstack.getItemDamage()); - if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) + if(type != GeneratorType.TURBINE_ROD) { - list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); - list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + "."); - } - else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) - { - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); - - if(hasTank(itemstack)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - if(getFluidStack(itemstack) != null) - { - list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); - } + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + "."); + } + else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) + { + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + + if(hasTank(itemstack)) + { + if(getFluidStack(itemstack) != null) + { + list.add(EnumColor.PINK + FluidRegistry.getFluidName(getFluidStack(itemstack)) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); + } + } + + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + } + else { + list.addAll(MekanismUtils.splitLines(type.getDescription())); } - - list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } else { list.addAll(MekanismUtils.splitLines(type.getDescription())); @@ -166,10 +172,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); - tileEntity.electricityStored = getEnergy(stack); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + + if(tileEntity instanceof TileEntityElectricBlock) + { + ((TileEntityElectricBlock)tileEntity).electricityStored = getEnergy(stack); + } - ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); + if(tileEntity instanceof ISustainedInventory) + { + ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); + } if(tileEntity instanceof ISustainedData) { @@ -361,7 +374,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public boolean canSend(ItemStack itemStack) { - return true; + return GeneratorType.getFromMetadata(itemStack.getItemDamage()).maxEnergy != -1; } @Override 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 c45f49e8e..893d67963 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRod.java @@ -8,10 +8,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.ITileComponent; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -44,6 +42,11 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock Coord4D up = current.getFromSide(ForgeDirection.UP); Coord4D down = current.getFromSide(ForgeDirection.DOWN); + if(!rods.contains(current)) + { + rods.add(current); + } + if((isRod(up) != !rods.contains(up)) || (isRod(down) != !rods.contains(down))) { buildRods(); @@ -132,7 +135,19 @@ public class TileEntityTurbineRod extends TileEntityBasicBlock public int getHousedBlades() { - return Math.max(0, Math.min(2, blades - (rods.indexOf(Coord4D.get(this))+1)*2)); + if(!worldObj.isRemote) + { + if(rods.size() > 0) + { + return Math.max(0, Math.min(2, blades - (rods.indexOf(Coord4D.get(this)))*2)); + } + else { + return blades; + } + } + else { + return blades; + } } private boolean isRod(Coord4D coord) diff --git a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb0c94b5c2c22545fe9835e57bd0f91c2af6b03 GIT binary patch literal 1439 zcmV;Q1z`G#P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003tNklPuVqDMIQs{WQ+dW1tp2>77QH%M!G&;?)+Vh$ET^z>}KPk=j zLvn_)^=9L}mI@*BJZCAGJH;OP+C)*LsnY#12!tQrf%tOqDr{2j1^2KS-T_3kRbJJ5 z@_dSR9H4SN?Qgzf>N#&a{ltTI9Qd_zdk#<$*fi~3drp4P&ijjLhomdL;&&sX?eJR&HPuvWIVJJ@6aiFVW8r#%!;`E(k#{nvA zLamf|J>~H99OWSA|KosG&U9z)4nZl(Pzu7QY06U2t^-;zWq+z%E55pKLh{*h;IQ9Q tR4p!7D>>I+RPc9q>(wTC9TGpd15e<>vCM*oD#8E&002ovPDHLkV1lGKw)6l1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png b/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..9abdd384d41163f76ee52666edd311fad5793fa9 GIT binary patch literal 1328 zcmV-01<(44P)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-bqA3R5%f(Qp*j5AQXh{#S(0Q0_?>zeOQPE(15W54;(yk(u-W#otHd<=D}vOB!JAD znfHlG{ke2azpiWY-cxwrcQuZq$bHoeN^y+?ylQ|TGGoOU>6VVB!8fsFc*BNaNZ2>< z@u0y-1MB-f3(xaZ+qUUxng~0NgKVs|npy}U5Wqci)@4~VHiE{Oo0tTjgAB?cmETO_ zn=|8mT^GT5h{(?3d7de2*L4XSOy^ww4_HhNtpjCq=`~( Date: Mon, 18 Jan 2016 17:18:05 -0500 Subject: [PATCH 4/4] Fix a small transporter bug --- .../transporter/TransporterPathfinder.java | 11 ++++----- .../content/transporter/TransporterStack.java | 23 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 652d6c723..72217b620 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -24,6 +24,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.mojang.realmsclient.util.Pair; + public final class TransporterPathfinder { public static class IdlePath @@ -541,7 +543,7 @@ public final class TransporterPathfinder } } - public static List getIdlePath(ILogisticalTransporter start, TransporterStack stack) + public static Pair, Path> getIdlePath(ILogisticalTransporter start, TransporterStack stack) { if(stack.homeLocation != null) { @@ -559,8 +561,7 @@ public final class TransporterPathfinder if(path.size() >= 2) { - stack.pathType = Path.HOME; - return path; + return Pair.of(path, Path.HOME); } else { stack.homeLocation = null; @@ -574,9 +575,7 @@ public final class TransporterPathfinder { return null; } - - stack.pathType = dest.pathType; - return dest.path; + return Pair.of(dest.path, dest.pathType); } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 092f67df6..0a4c6ba14 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import com.mojang.realmsclient.util.Pair; + public class TransporterStack { public ItemStack itemStack; @@ -150,11 +152,16 @@ public class TransporterStack return stack; } - public void setPath(List path) + public void setPath(List path, Path type) { - TransporterManager.remove(this); + //Make sure old path isn't null + if(pathType != Path.NONE) + { + TransporterManager.remove(this); + } pathToTarget = path; + pathType = type; if(pathType != Path.NONE) { @@ -181,9 +188,8 @@ public class TransporterStack return itemStack; } - pathType = Path.DEST; idleDir = ForgeDirection.UNKNOWN; - setPath(newPath.path); + setPath(newPath.path, Path.DEST); initiatedPath = true; return newPath.rejected; @@ -198,9 +204,8 @@ public class TransporterStack return itemStack; } - pathType = Path.DEST; idleDir = ForgeDirection.UNKNOWN; - setPath(newPath.path); + setPath(newPath.path, Path.DEST); initiatedPath = true; return newPath.rejected; @@ -208,19 +213,19 @@ public class TransporterStack public boolean calculateIdle(ILogisticalTransporter transporter) { - List newPath = TransporterPathfinder.getIdlePath(transporter, this); + Pair, Path> newPath = TransporterPathfinder.getIdlePath(transporter, this); if(newPath == null) { return false; } - if(pathType == Path.HOME) + if(newPath.second() == Path.HOME) { idleDir = ForgeDirection.UNKNOWN; } - setPath(newPath); + setPath(newPath.first(), newPath.second()); originalLocation = transporter.coord(); initiatedPath = true;