From 70ab630ff0417766b81124137ff2aa48545f516e Mon Sep 17 00:00:00 2001 From: cp Date: Sat, 29 Mar 2014 22:29:06 +0800 Subject: [PATCH] Started work on combustion generator. --- resources/assets/enderio/lang/en_US.lang | 1 + .../textures/blocks/combustionGenFront.png | Bin 0 -> 1501 bytes .../textures/blocks/combustionGenFrontOn.png | Bin 0 -> 1505 bytes .../enderio/textures/gui/combustionGen.png | Bin 0 -> 2392 bytes ...on.png => bucketNutrient_distillation.png} | Bin src/main/java/crazypants/enderio/EnderIO.java | 37 +++++++----- .../java/crazypants/enderio/GuiHandler.java | 1 + .../java/crazypants/enderio/ModObject.java | 1 + .../machine/AbstractMachineEntity.java | 3 + .../generator/BlockCombustionGenerator.java | 45 ++++++++++++++ .../generator/GuiCombustionGenerator.java | 50 ++++++++++++++++ .../generator/TileCombustionGenerator.java | 56 ++++++++++++++++++ 12 files changed, 178 insertions(+), 16 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/combustionGenFront.png create mode 100644 resources/assets/enderio/textures/blocks/combustionGenFrontOn.png create mode 100644 resources/assets/enderio/textures/gui/combustionGen.png rename resources/assets/enderio/textures/items/{bucketNutrientDistillation.png => bucketNutrient_distillation.png} (100%) create mode 100644 src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java create mode 100644 src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java create mode 100644 src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 3d4d3e06..03ed2d40 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -101,6 +101,7 @@ tile.blockSagMill.name=SAG Mill tile.blockHyperCube.name=Dimensional Transceiver tile.blockPowerMonitor.name=Power Monitor tile.blockVat.name=The Vat +tile.blockCombustionGenerator.name=Combustion Generator //Travel tile.blockTravelAnchor.name=Travel Anchor diff --git a/resources/assets/enderio/textures/blocks/combustionGenFront.png b/resources/assets/enderio/textures/blocks/combustionGenFront.png new file mode 100644 index 0000000000000000000000000000000000000000..41e10fa6fad602bb0ee970aff099e376c9a0d34a GIT binary patch literal 1501 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 Hu0mjfM#QN@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/gui/combustionGen.png b/resources/assets/enderio/textures/gui/combustionGen.png new file mode 100644 index 0000000000000000000000000000000000000000..2b5f8f35c345862ef372e614045c07af9c21793a GIT binary patch literal 2392 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~66`J3D)xs`N57=^ff~6G}>s>nmO}QoiBi`hOe4|Nrvc-QCBI9sB?P zKT!QB7!84869O;JdwPO0N=cAkFfe(KWWW&oom~|ev77}Sk;M!Qd|N@7F}ZNY380`< ziEBhjaDG}zd16s2LqK9?UWuNcYluRbv7V`(p`rU{Cv#v4v&YlLF{C2y?d#pK{(hTif#i*k^HxYj#v9jw?VVwyBU%}j9On?D{b|jyeGEEcm0`sUjDNEx zrklD8EI92t@9Lku3^rNp*KCW$SzEp;ozJ?)bzl|ywf`q3{INS_b^9UvLe_r)3{gt2 zr^#z5E%>VUV7@Zrf3+ij`dEBAf97&sxSg@DVZ#6SEE+F_H?e5kWHQA)1l-#O7JKtU6Ekn@x~O{3*55 z`|G!VAHV+n`}O0$HkO%d#1<^@pRq;n`F^8<_=n2#^ci#~ZuuJaZ)M|St{rphlOAkf zdiT_yS0?np-#?v=i@9ICpTsN?E4D!P8ptirnBwd&$LqGqzHKjaSt z_ib6u^hk&|1TZz-yTdqR!lKV>I0G(B|5U)fAivF&F=OV(0(O^m{RuG)L7sXnPlFkj z%UOs_m{66382MOx&RerK^Re`>iFy7qFfNi{EazR4J44d4 zufdv4Ep~?H3*M`<7+7l$E%`dFF;h6rZ4IY`cgn3@IS*E`8!NX9ZOC}Ai`7{9xX^}# zglmm6CpL3t#C>2sz;KMcPw#=^NkOP}irx)LzQ70&Y4|wbnQ?~XLWZ9IJ<1#h9v3n^ zwtxJR>DcuH43F!NUS_qC=32nOrJ<^@ckfr_>Lm*pqyrdO;V4IMLH*5{8+K2eSH$$; zcthh&`}FE>9nY3CfHWZ^hbAA51}2RK_9p*=a#FtOGtRSFv|48e^E%Ie{u&kUI*vV8 zbzl@hLk%o5K{h$mXY47L)cl_Jyj*$LsV3_Ovx?rA)tN8)Sjh=@2%Mqds0K3Tg1prG zShq6sMN@kjb?p%z guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 2aafd8f6..976a854d 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -30,6 +30,7 @@ public enum ModObject { // Machines blockStirlingGenerator, + blockCombustionGenerator, blockReservoir, blockAlloySmelter, blockSolarPanel, diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index c2aed815..4a551804 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -355,6 +355,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements IIn @Override public ItemStack getStackInSlot(int slot) { + if(slot < 0 || slot >= inventory.length) { + return null; + } return inventory[slot]; } diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java new file mode 100644 index 00000000..bdd0c854 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -0,0 +1,45 @@ +package crazypants.enderio.machine.generator; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; + +public class BlockCombustionGenerator extends AbstractMachineBlock { + + public static BlockCombustionGenerator create() { + BlockCombustionGenerator gen = new BlockCombustionGenerator(); + gen.init(); + return gen; + } + + protected BlockCombustionGenerator() { + super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiCombustionGenerator(player.inventory, (TileCombustionGenerator) world.getTileEntity(x, y, z)); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_COMBUSTION_GEN; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:combustionGenFrontOn"; + } + return "enderio:combustionGenFront"; + } + + +} diff --git a/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java new file mode 100644 index 00000000..ec8a9ffe --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java @@ -0,0 +1,50 @@ +package crazypants.enderio.machine.generator; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.render.RenderUtil; + +public class GuiCombustionGenerator extends GuiMachineBase { + + private TileCombustionGenerator entity; + + public GuiCombustionGenerator(InventoryPlayer par1InventoryPlayer, TileCombustionGenerator te) { + super(te, new EmptyContainer()); + this.entity = te; + } + + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/combustionGen.png"); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + int scaled; + + if(entity.getProgress() < 1 && entity.getProgress() > 0) { + scaled = entity.getProgressScaled(12); + drawTexturedModalRect(sx + 80, sy + 65 - scaled, 176, 12 - scaled, 14, scaled + 2); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + + public static class EmptyContainer extends Container { + + @Override + public boolean canInteractWith(EntityPlayer var1) { + return true; + } + + } + +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java new file mode 100644 index 00000000..502f859d --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -0,0 +1,56 @@ +package crazypants.enderio.machine.generator; + +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.power.IPowerEmitter; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.SlotDefinition; + +public class TileCombustionGenerator extends AbstractMachineEntity implements IPowerEmitter { + + public TileCombustionGenerator() { + super(new SlotDefinition(-1, -1, -1, -1, -1, -1)); + } + + @Override + public String getInventoryName() { + return ModObject.blockCombustionGenerator.unlocalisedName; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockCombustionGenerator.unlocalisedName; + } + + @Override + public boolean canEmitPowerFrom(ForgeDirection side) { + return true; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return false; + } + + @Override + public boolean isActive() { + return false; + } + + @Override + public float getProgress() { + return 0; + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + return false; + } +}