From 609ed4e3a1103020b2d039515531d2dee3703b70 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 17 Jan 2016 17:21:06 -0500 Subject: [PATCH] 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=`~(