From 48dd12aa5a53f52b0a02546150e15916fc19bcb2 Mon Sep 17 00:00:00 2001 From: joflashstudios Date: Fri, 5 Jun 2015 16:24:52 -0400 Subject: [PATCH] Added gas turbine. Still missing recipe and some config elements. --- .../blocks/generator/BlockGasTurbine.java | 74 +++++ .../java/techreborn/client/GuiHandler.java | 16 +- .../client/container/ContainerGasTurbine.java | 50 ++++ .../techreborn/client/gui/GuiGasTurbine.java | 49 +++ src/main/java/techreborn/init/ModBlocks.java | 11 +- .../java/techreborn/tiles/TileGasTurbine.java | 283 ++++++++++++++++++ .../assets/techreborn/lang/en_US.lang | 1 + 7 files changed, 478 insertions(+), 6 deletions(-) create mode 100644 src/main/java/techreborn/blocks/generator/BlockGasTurbine.java create mode 100644 src/main/java/techreborn/client/container/ContainerGasTurbine.java create mode 100644 src/main/java/techreborn/client/gui/GuiGasTurbine.java create mode 100644 src/main/java/techreborn/tiles/TileGasTurbine.java diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java new file mode 100644 index 000000000..d091e14a6 --- /dev/null +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -0,0 +1,74 @@ +package techreborn.blocks.generator; + +import java.util.Map; +import net.minecraftforge.fluids.*; +import net.minecraft.util.ChatComponentText; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import techreborn.Core; +import techreborn.blocks.BlockMachineBase; +import techreborn.client.GuiHandler; +import techreborn.tiles.TileGasTurbine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockGasTurbine extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockGasTurbine(Material material) + { + super(material); + setBlockName("techreborn.gasTurbine"); + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) + { + return new TileGasTurbine(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, + EntityPlayer player, int side, float hitX, float hitY, float hitZ) + { + if (!player.isSneaking()) + player.openGui(Core.INSTANCE, GuiHandler.gasTurbineID, world, x, y, + z); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.iconFront = icon.registerIcon("techreborn:machine/machine_side"); + this.iconTop = icon.registerIcon("techreborn:machine/gas_generator_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/gas_generator_bottom"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } + +} diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index e7035e107..099c04f89 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -24,6 +24,7 @@ import techreborn.client.container.ContainerQuantumTank; import techreborn.client.container.ContainerRollingMachine; import techreborn.client.container.ContainerThermalGenerator; import techreborn.client.container.ContainerSemifluidGenerator; +import techreborn.client.container.ContainerGasTurbine; import techreborn.client.gui.GuiAesu; import techreborn.client.gui.GuiAlloyFurnace; import techreborn.client.gui.GuiAlloySmelter; @@ -45,6 +46,7 @@ import techreborn.client.gui.GuiQuantumTank; import techreborn.client.gui.GuiRollingMachine; import techreborn.client.gui.GuiThermalGenerator; import techreborn.client.gui.GuiSemifluidGenerator; +import techreborn.client.gui.GuiGasTurbine; import techreborn.pda.GuiPda; import techreborn.tiles.*; import cpw.mods.fml.common.network.IGuiHandler; @@ -73,8 +75,7 @@ public class GuiHandler implements IGuiHandler { public static final int sawMillID = 19; public static final int chemicalReactorID = 20; public static final int semifluidGeneratorID = 21; - - + public static final int gasTurbineID = 22; @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, @@ -88,6 +89,10 @@ public class GuiHandler implements IGuiHandler { { return new ContainerSemifluidGenerator( (TileSemifluidGenerator) world.getTileEntity(x, y, z), player); + } else if (ID == gasTurbineID) + { + return new ContainerGasTurbine( + (TileGasTurbine) world.getTileEntity(x, y, z), player); } else if (ID == quantumTankID) { return new ContainerQuantumTank( @@ -184,8 +189,11 @@ public class GuiHandler implements IGuiHandler { { return new GuiSemifluidGenerator(player, (TileSemifluidGenerator) world.getTileEntity(x, y, z)); - } - else if (ID == quantumTankID) + } else if (ID == gasTurbineID) + { + return new GuiGasTurbine(player, + (TileGasTurbine) world.getTileEntity(x, y, z)); + } else if (ID == quantumTankID) { return new GuiQuantumTank(player, (TileQuantumTank) world.getTileEntity(x, y, z)); diff --git a/src/main/java/techreborn/client/container/ContainerGasTurbine.java b/src/main/java/techreborn/client/container/ContainerGasTurbine.java new file mode 100644 index 000000000..e4bd1ec17 --- /dev/null +++ b/src/main/java/techreborn/client/container/ContainerGasTurbine.java @@ -0,0 +1,50 @@ +package techreborn.client.container; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import techreborn.client.SlotFake; +import techreborn.client.SlotOutput; +import techreborn.tiles.TileGasTurbine; + +public class ContainerGasTurbine extends TechRebornContainer { + public TileGasTurbine tileGasTurbine; + public EntityPlayer player; + + public ContainerGasTurbine(TileGasTurbine tileGasTurbine, + EntityPlayer player) + { + super(); + this.tileGasTurbine = tileGasTurbine; + this.player = player; + + this.addSlotToContainer(new Slot(tileGasTurbine.inventory, 0, 80, + 17)); + this.addSlotToContainer(new SlotOutput(tileGasTurbine.inventory, + 1, 80, 53)); + this.addSlotToContainer(new SlotFake(tileGasTurbine.inventory, 2, + 59, 42, false, false, 1)); + + int i; + + for (i = 0; i < 3; ++i) + { + for (int j = 0; j < 9; ++j) + { + this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (i = 0; i < 9; ++i) + { + this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, + 142)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) + { + return true; + } +} diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java new file mode 100644 index 000000000..7161fb243 --- /dev/null +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -0,0 +1,49 @@ +package techreborn.client.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import techreborn.client.container.ContainerGasTurbine; +import techreborn.tiles.TileGasTurbine; + +public class GuiGasTurbine extends GuiContainer { + + //TODO: use semifluid generator texture + private static final ResourceLocation texture = new ResourceLocation( + "techreborn", "textures/gui/ThermalGenerator.png"); + + TileGasTurbine tile; + + public GuiGasTurbine(EntityPlayer player, TileGasTurbine tile) + { + super(new ContainerGasTurbine(tile, player)); + this.xSize = 176; + this.ySize = 167; + this.tile = tile; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, + int p_146976_2_, int p_146976_3_) + { + this.mc.getTextureManager().bindTexture(texture); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + } + + protected void drawGuiContainerForegroundLayer(int p_146979_1_, + int p_146979_2_) + { + String name = "Gas Turbine"; + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString( + I18n.format("container.inventory", new Object[0]), 8, + this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); + this.fontRendererObj.drawString(tile.tank.getFluidAmount() + "", 10, + 30, 16448255); + } +} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index d2566240f..ecd75cca7 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -15,6 +15,7 @@ import techreborn.blocks.generator.BlockMagicEnergyConverter; import techreborn.blocks.generator.BlockPlasmaGenerator; import techreborn.blocks.generator.BlockSemiFluidGenerator; import techreborn.blocks.generator.BlockThermalGenerator; +import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.machine.BlockAlloyFurnace; import techreborn.blocks.machine.BlockAlloySmelter; import techreborn.blocks.machine.BlockAssemblingMachine; @@ -60,6 +61,7 @@ import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileRollingMachine; import techreborn.tiles.TileThermalGenerator; import techreborn.tiles.TileSemifluidGenerator; +import techreborn.tiles.TileGasTurbine; import techreborn.util.LogHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -85,6 +87,7 @@ public class ModBlocks { public static Block IndustrialElectrolyzer; public static Block MagicalAbsorber; public static Block Semifluidgenerator; + public static Block Gasturbine; public static Block AlloyFurnace; public static Block ChemicalReactor; public static Block lathe; @@ -104,8 +107,8 @@ public class ModBlocks { public static Block FusionCoil; public static Block LightningRod; public static Block heatGenerator; - public static Block industrialSawmill; - + public static Block industrialSawmill; + public static Block ore; public static Block storage; public static Block storage2; @@ -198,6 +201,10 @@ public class ModBlocks { GameRegistry.registerBlock(Semifluidgenerator, "semifluidgenerator"); GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGenerator"); + Gasturbine = new BlockGasTurbine(Material.rock); + GameRegistry.registerBlock(Gasturbine, "gasturbine"); + GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbine"); + AlloyFurnace = new BlockAlloyFurnace(Material.rock); GameRegistry.registerBlock(AlloyFurnace, "alloyfurnace"); GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnace"); diff --git a/src/main/java/techreborn/tiles/TileGasTurbine.java b/src/main/java/techreborn/tiles/TileGasTurbine.java new file mode 100644 index 000000000..cf99d7ad6 --- /dev/null +++ b/src/main/java/techreborn/tiles/TileGasTurbine.java @@ -0,0 +1,283 @@ +package techreborn.tiles; + +import java.util.Map; +import java.util.HashMap; + +import ic2.api.energy.prefab.BasicSource; +import ic2.api.energy.tile.IEnergyTile; +import ic2.api.tile.IWrenchable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.*; +import techreborn.config.ConfigTechReborn; +import techreborn.init.ModBlocks; +import techreborn.util.FluidUtils; +import techreborn.util.Inventory; +import techreborn.util.Tank; + +public class TileGasTurbine extends TileEntity implements IWrenchable, + IFluidHandler, IInventory, IEnergyTile { + + public Tank tank = new Tank("TileGasTurbine", + FluidContainerRegistry.BUCKET_VOLUME * 10, this); + public Inventory inventory = new Inventory(3, "TileGasTurbine", 64); + public BasicSource energySource; + + //TODO: run this off config + public static final int euTick = 16; + + Map fluids = new HashMap(); + + //We use this to keep track of fractional millibuckets, allowing us to hit our eu/bucket targets while still only ever removing integer millibucket amounts. + double pendingWithdraw = 0.0; + + public TileGasTurbine() + { + //TODO: fix this to have Gas Turbine generator values + this.energySource = new BasicSource(this, + ConfigTechReborn.ThermalGeneratorCharge, + ConfigTechReborn.ThermalGeneratorTier); + + fluids.put("fluidhydrogen", 15000); + fluids.put("fluidmethane", 45000); + } + + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) + { + return false; + } + + @Override + public short getFacing() + { + return 0; + } + + @Override + public void setFacing(short facing) + { + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) + { + if (entityPlayer.isSneaking()) + { + return true; + } + return false; + } + + @Override + public float getWrenchDropRate() + { + return 1.0F; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) + { + return new ItemStack(ModBlocks.Gasturbine, 1); + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + return tank.fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, + boolean doDrain) + { + return tank.drain(resource.amount, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + return tank.drain(maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + if (fluid != null) + { + return fluids.containsKey(FluidRegistry.getFluidName(fluid)); + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return tank.getFluid() == null || tank.getFluid().getFluid() == fluid; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return getTankInfo(from); + } + + @Override + public void readFromNBT(NBTTagCompound tagCompound) + { + super.readFromNBT(tagCompound); + tank.readFromNBT(tagCompound); + inventory.readFromNBT(tagCompound); + energySource.readFromNBT(tagCompound); + } + + @Override + public void writeToNBT(NBTTagCompound tagCompound) + { + super.writeToNBT(tagCompound); + tank.writeToNBT(tagCompound); + inventory.writeToNBT(tagCompound); + energySource.writeToNBT(tagCompound); + } + + public Packet getDescriptionPacket() + { + NBTTagCompound nbtTag = new NBTTagCompound(); + writeToNBT(nbtTag); + return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, + this.zCoord, 1, nbtTag); + } + + @Override + public void onDataPacket(NetworkManager net, + S35PacketUpdateTileEntity packet) + { + worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, + yCoord, zCoord); + readFromNBT(packet.func_148857_g()); + } + + @Override + public void updateEntity() + { + super.updateEntity(); + FluidUtils.drainContainers(this, inventory, 0, 1); + energySource.updateEntity(); + if (tank.getFluidAmount() > 0 + && energySource.getCapacity() - energySource.getEnergyStored() >= euTick) + { + Integer euPerBucket = fluids.get(tank.getFluidType().getName()); + //float totalTicks = (float)euPerBucket / 8f; //x eu per bucket / 8 eu per tick + //float millibucketsPerTick = 1000f / totalTicks; + float millibucketsPerTick = 16000f / (float)euPerBucket; + pendingWithdraw += millibucketsPerTick; + + int currentWithdraw = (int)pendingWithdraw; //float --> int conversion floors the float + pendingWithdraw -= currentWithdraw; + + tank.drain(currentWithdraw, true); + energySource.addEnergy(euTick); + } + if (tank.getFluidType() != null && getStackInSlot(2) == null) + { + inventory.setInventorySlotContents(2, new ItemStack(tank + .getFluidType().getBlock())); + } else if (tank.getFluidType() == null && getStackInSlot(2) != null) + { + setInventorySlotContents(2, null); + } + } + + @Override + public int getSizeInventory() + { + return inventory.getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int p_70301_1_) + { + return inventory.getStackInSlot(p_70301_1_); + } + + @Override + public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) + { + return inventory.decrStackSize(p_70298_1_, p_70298_2_); + } + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) + { + return inventory.getStackInSlotOnClosing(p_70304_1_); + } + + @Override + public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) + { + inventory.setInventorySlotContents(p_70299_1_, p_70299_2_); + } + + @Override + public String getInventoryName() + { + return inventory.getInventoryName(); + } + + @Override + public boolean hasCustomInventoryName() + { + return inventory.hasCustomInventoryName(); + } + + @Override + public int getInventoryStackLimit() + { + return inventory.getInventoryStackLimit(); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) + { + return inventory.isUseableByPlayer(p_70300_1_); + } + + @Override + public void openInventory() + { + inventory.openInventory(); + } + + @Override + public void closeInventory() + { + inventory.closeInventory(); + } + + @Override + public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) + { + return inventory.isItemValidForSlot(p_94041_1_, p_94041_2_); + } + + @Override + public void onChunkUnload() + { + energySource.onChunkUnload(); + } + + @Override + public void invalidate() + { + energySource.invalidate(); + super.invalidate(); + } + +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index e2601b051..10b64c2e5 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -1,6 +1,7 @@ itemGroup.techreborn=Tech Reborn #machines +tile.techreborn.gasTurbine.name=Gas Turbine tile.techreborn.industrialBlock.name=Industrial tile.techreborn.thermalGenerator.name=Thermal Generator tile.techreborn.quantumTank.name=Quantum Tank