From 23bf14b37ddd6a10510dc8ef6d67f325fc256ee0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 7 Jun 2015 18:58:31 +0100 Subject: [PATCH 01/12] Clean the sawmill gui a bit, and remove debug code --- .../techreborn/api/recipe/RecipeCrafter.java | 3 ++- .../container/ContainerIndustrialSawmill.java | 3 ++- .../client/gui/GuiIndustrialSawmill.java | 16 ++++++++++++++-- src/main/java/techreborn/init/ModRecipes.java | 1 - .../tiles/TileImplosionCompressor.java | 1 - .../resources/assets/techreborn/lang/en_US.lang | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index d04f103d7..73e10e13a 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -130,7 +130,8 @@ public class RecipeCrafter { this.currentTickTime = 0; syncIsActive(); } else { - this.currentTickTime = 0; + this.currentTickTime = -1; + syncIsActive(); } } } diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java index abfae1b13..a93cf3426 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot; import techreborn.client.SlotOutput; import techreborn.tiles.TileIndustrialSawmill; -public class ContainerIndustrialSawmill extends TechRebornContainer { +public class ContainerIndustrialSawmill extends ContainerCrafting { EntityPlayer player; @@ -22,6 +22,7 @@ public class ContainerIndustrialSawmill extends TechRebornContainer { public ContainerIndustrialSawmill(TileIndustrialSawmill tileIndustrialSawmill, EntityPlayer player) { + super(tileIndustrialSawmill.crafter); tile = tileIndustrialSawmill; this.player = player; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index a683b1db1..47d41d326 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -43,15 +43,27 @@ public class GuiIndustrialSawmill extends GuiContainer { int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + int j = 0; + + if(sawmill.crafter.currentTickTime != 0) { + j = this.sawmill.crafter.currentTickTime * 24 / this.sawmill.crafter.currentNeededTicks; + } + this.drawTexturedModalRect(k + 57, l + 36, 176, 11, j - 1, 13); + + j = (int)this.sawmill.energy.getEnergyStored() * 12 / this.sawmill.energy.getCapacity(); + if(j > 0) { + this.drawTexturedModalRect(k + 36, l + 66 + 12 - j, 176, 12 - j, 14, j + 2); + } } protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.tilesawmill.name"); + String name = StatCollector.translateToLocal("tile.techreborn.industrialSawmill.name"); 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, + I18n.format("container.inventory", new Object[0]), 58, this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index f8cee69af..890b98cf5 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -175,7 +175,6 @@ public class ModRecipes { RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.netherrack, 4), new ItemStack(Blocks.diamond_block, 1), new ItemStack(ModItems.bucketTritium), null, 120, 5)); - RecipeHanderer.addRecipe(new AlloySmelterRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond), 120, 5)); diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index c817c2ad3..bd3360e15 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -73,7 +73,6 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha @Override public void updateEntity() { - System.out.println("hello"); super.updateEntity(); crafter.updateEntity(); energy.updateEntity(); diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index ba0d13428..e9d10044b 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -52,6 +52,7 @@ tile.techreborn.machineFrame.bronze.name=Brone Machine Hull tile.techreborn.machineFrame.brass.name=Brass Machine Hull tile.techreborn.machineFrame.steel.name=Steel Machine Hull tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull +tile.techreborn.industrialSawmill.name=Saw Mill #Ores tile.techreborn.ore.Galena.name=Galena Ore From af65c885b1df1a00a60e4d03efb79b28f8268876 Mon Sep 17 00:00:00 2001 From: Tntrololol Date: Sun, 7 Jun 2015 13:05:53 -0500 Subject: [PATCH 02/12] Added proper textures to heat generator --- .../blocks/generator/BlockHeatGenerator.java | 8 ++++---- .../blocks/machine/heat_generator_bottom.png | Bin 0 -> 697 bytes .../blocks/machine/heat_generator_side.png | Bin 0 -> 684 bytes .../blocks/machine/heat_generator_top.png | Bin 0 -> 698 bytes 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index fde952a69..e1260cc36 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -36,10 +36,10 @@ public class BlockHeatGenerator extends BlockMachineBase{ @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/machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); + this.blockIcon = icon.registerIcon("techreborn:machine/heat_generator_side"); + this.iconFront = icon.registerIcon("techreborn:machine/heat_generator_side"); + this.iconTop = icon.registerIcon("techreborn:machine/heat_generator_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/heat_generator_bottom"); } @Override diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b7590890bbb99048088c986bc260674bb3262815 GIT binary patch literal 697 zcmV;q0!ICbP)gxH{Afe>&44uHfF-~uBX zEXIR@9#7+{d_)9`?ka|qQp#9lJpTU+`QgW(JS{rh3;=h>)G#wt6%iq&gu9b-CdNpN z5fK3(wbp2@;qHhCA%uMrGrF#0I;x7P;=}oVRx5e6=BQ>C{et6@6OtWTuO>twj~Nl+VTyBC+LT4VV9_sl!<1Vy-VT9QD@j$U zrGV|*o^+Vnp5hP!Ap`*4JzisGwAKzI9I8&j09@a_;=yW3*DcxZ?%8w!5y9PYcT|;r z*%Ry_%J19lEZ+6qj%A8G{o*N~e*6h73f3<%Ra&iVL*V6h%Wyvs+#EOKoy`VSMO)+S zWW#q~ea%=#f;r!Q_BnYN7{`%e7|6d}lZTO#Ga(+tGP8Mh1B^s%ja(J!mYkiQpsKV| zDW%Mugjy=@&dxy(Ote;c{NyoZ%n&0Ve)NQ~6-0!XBJtsy#25)7AYXp-z5lb@&Eid( z)YXR5<26kSsB!<|1^^MEmWqh5IX!StO92r$jG|5P;f9;%*Z*^7dQVQcJE_&W&$!-D z{<_6f_t=`vzQ6uKM0jxih}+96YORD20;x;r%fC6hxR~KN|KNREYp5!#M;G&+tj^!# z&#PZ&&{By1x$wu;6){F?tz7>6%M8xl<+ItLSC`LF)j3Y9^$|zM>pk$d+3R^+>J8nk0)00000NkvXXu0mjfpIt=L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png new file mode 100644 index 0000000000000000000000000000000000000000..0354b4ae30baebb2e6a0be6594fdcdd350d00a51 GIT binary patch literal 684 zcmV;d0#p5oP)A=!#q7?_AZ;2-et5Eeqh zSYx%j2u)YdqgDN=%8Ce#8VV#JteeW4kvAUKeVUhMs;DY$+tRizDngrDQc5`I$OaiI z3V@lRS9}#Ah7d6C@n*y<iVG zu*@8-8**; zu*c6{*xL^u?ajOQ=FJQh#l=A{cdJ`M2&fsUt-qJ#9a)x-6#`CVio0I)OKp>12d_r%R+13)po0YFOa zZxbZ#MtQiuhndkd4e@MV;+$i7ao!V~dfVg6i?bfb(5WlSlJj!GVm>D>PUj5roanVD zP9}Rj-ajb1N2eu+$H$!#F+TtMAB*`Mf4(?lRaMkizltcU?fNJAN5@BuuNJLpj1U6( zaEM=36)7c({V@O`cv3CD?18&#;$H6i)%Q))km?5SeNP;XN54$4-gYXB!~M=TO~O5T z`rHn#6{Jlf(D474Q$&@6;)pyrc83||Wkpr3xIUe-u4|lk925nM(>XE3fcKukXn=D$ zH~$!;(v=Wm#LOs;h7{8&&N=eQxO1dPH%5RMBdXu+`ptdc!pv}hb%)-Orpi|h6-1<* S`EJnw0000QmRl1AaTzP(J0ehro`tnRxGJW+5n`;{s&H+%U zDk8${LN`|t5mHM3otxOz?i{L$wU*-eBVSdy(sq9fM6hBR9vm{)y_TET$j=s1O02$l zhgeJD9A7>Rh)H?+=n0RPA5dBttZ(Ede(3cx9ciR=7w7BjA>gd#<+JCYiNZNvzIcUL zn=M?vHcO0=loCawz*>v&8194Q@#7jQ;kN15D4BAV?-JpYj0N3q&ZQe zB!=2=H5xHGJmg@1pI=|U6GEsd0Hm0ho4-!Kx0(5VKGu`|dY{o~L{(M%{=UP>$ Date: Sun, 7 Jun 2015 19:11:08 +0100 Subject: [PATCH 03/12] Added wrench rotation to the aesu. --- src/main/java/techreborn/blocks/storage/BlockAesu.java | 8 ++++---- src/main/java/techreborn/tiles/TileAesu.java | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index efd31c506..5369dc2fd 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.packets.PacketHandler; import techreborn.tiles.TileAesu; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -58,14 +59,13 @@ public class BlockAesu extends BlockMachineBase { } @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { - + public IIcon getIcon(int side, int metadata) { + if(side == metadata) + return this.iconFront; 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/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 215de5542..bc2aebd97 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -28,19 +28,20 @@ public class TileAesu extends TileEntityElectricBlock implements IWrenchable { @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; + return true; } @Override public short getFacing() { - return 0; + return (short) getBlockMetadata(); } @Override public void setFacing(short facing) { - } + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, facing, 2); + } @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) From 8187708e03d067077dcf963af04e7f124daddd82 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 7 Jun 2015 19:22:17 +0100 Subject: [PATCH 04/12] Fixed on/off textures when power runs out --- src/main/java/techreborn/api/recipe/RecipeCrafter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index 73e10e13a..f9ba961c9 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -274,7 +274,7 @@ public class RecipeCrafter { private boolean isActiveServer() { - return currentRecipe != null; + return currentRecipe != null && energy.getEnergyStored() >= currentRecipe.euPerTick(); } public boolean isActive() { From a1ccb7202e4b826ccc074de897d7ebbe3a0d5b2f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 7 Jun 2015 19:37:56 +0100 Subject: [PATCH 05/12] Added timer to the recipes. --- src/main/java/techreborn/Core.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 3cfcd4cd8..cff33da79 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -3,6 +3,7 @@ package techreborn; import java.io.File; import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.lang3.time.StopWatch; import techreborn.achievement.TRAchievements; import techreborn.api.recipe.RecipeHanderer; import techreborn.client.GuiHandler; @@ -62,7 +63,11 @@ public class Core { // Register ModItems ModItems.init(); // Recipes + StopWatch watch = new StopWatch(); + watch.start(); ModRecipes.init(); + LogHelper.all(watch + " : main recipes"); + watch.stop(); //Client only init, needs to be done before parts system proxy.init(); // Compat @@ -86,7 +91,11 @@ public class Core { @Mod.EventHandler public void postinit(FMLPostInitializationEvent event){ // Has to be done here as Buildcraft registers there recipes late + StopWatch watch = new StopWatch(); + watch.start(); RecipeManager.init(); + LogHelper.all(watch + " : main recipes"); + watch.stop(); //Has to be done after the recipes have been added CompatManager.postInit(event); From 70cd363656ddf41775c2e7a0bd294d6a42e79a35 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 19:39:21 +0100 Subject: [PATCH 06/12] On Icons for a load of machines --- .../machine/BlockAssemblingMachine.java | 2 +- .../blocks/machine/BlockCentrifuge.java | 37 ++++++++++++++++--- .../machine/BlockIndustrialElectrolyzer.java | 20 ++++++++++ .../machine/BlockIndustrialSawmill.java | 23 +++++++++++- .../blocks/machine/BlockMatterFabricator.java | 4 ++ ... industrial_centrifuge_side_on.png.mcmeta} | 0 ...> industrial_centrifuge_top_on.png.mcmeta} | 0 7 files changed, 79 insertions(+), 7 deletions(-) rename src/main/resources/assets/techreborn/textures/blocks/machine/{industrial_centrifuge_side_on.mcmeta => industrial_centrifuge_side_on.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/blocks/machine/{industrial_centrifuge_top_on.mcmeta => industrial_centrifuge_top_on.png.mcmeta} (100%) diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 6258dcb79..4ac54fcd3 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -45,7 +45,7 @@ public class BlockAssemblingMachine extends BlockMachineBase { { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); - this.iconFrontOn = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/assembling_machine_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/assembling_machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 7cdb12045..8eec64c38 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; @@ -22,9 +23,15 @@ public class BlockCentrifuge extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconTopOn; @SideOnly(Side.CLIENT) private IIcon iconBottom; @@ -55,20 +62,40 @@ public class BlockCentrifuge extends BlockMachineBase { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_on"); this.iconTop = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_off"); + this.iconTopOn = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_on"); this.iconBottom = icon.registerIcon("techreborn:machine/industrial_centrifuge_bottom"); } - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z); + if(side >= 2 && tileCentrifuge.crafter.isActive()){ + return this.iconFrontOn; + } + + if(side == 1 && tileCentrifuge.crafter.isActive()){ + return this.iconTopOn; + } + 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)); + : (side == metadata ? this.iconFront : this.iconFront)); + + } + + @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.iconFront)); } diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index 09ca13435..d88e905a5 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; @@ -22,6 +23,9 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -58,9 +62,25 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { { this.blockIcon = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); + this.iconFrontOn= icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } + + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileIndustrialElectrolyzer tileIndustrialElectrolyzer = (TileIndustrialElectrolyzer) blockAccess.getTileEntity(x, y, z); + if(side == metadata && tileIndustrialElectrolyzer.crafter.isActive()){ + return this.iconFrontOn; + } + + 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)); + + } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java index 846deab24..be2ba1fac 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java @@ -10,10 +10,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.tiles.TileIndustrialElectrolyzer; import techreborn.tiles.TileIndustrialSawmill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,6 +24,9 @@ public class BlockIndustrialSawmill extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -56,10 +61,26 @@ public class BlockIndustrialSawmill extends BlockMachineBase { public void registerBlockIcons(IIconRegister icon) { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/electric_industrial_sawmill"); + this.iconFront = icon.registerIcon("techreborn:machine/industrial_sawmill_off"); + this.iconFront = icon.registerIcon("techreborn:machine/industrial_sawmill_on"); this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } + + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileIndustrialSawmill tileIndustrialSawmill = (TileIndustrialSawmill) blockAccess.getTileEntity(x, y, z); + if(side == metadata && tileIndustrialSawmill.crafter.isActive()){ + return this.iconFrontOn; + } + + 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)); + + } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index a0f5439a9..c082111a9 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -22,6 +22,9 @@ public class BlockMatterFabricator extends BlockMachineBase{ @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -57,6 +60,7 @@ public class BlockMatterFabricator extends BlockMachineBase{ { this.blockIcon = icon.registerIcon("techreborn:machine/matterfab_off"); this.iconFront = icon.registerIcon("techreborn:machine/matterfab_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/matterfab_on"); this.iconTop = icon.registerIcon("techreborn:machine/matterfab_off"); this.iconBottom = icon.registerIcon("techreborn:machine/matterfab_off"); } diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta From 958dbbd9c4319c3f64643569ff786c730245782e Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:23:49 +0100 Subject: [PATCH 07/12] Round and round it goes --- src/main/java/techreborn/pda/GuiPda.java | 12 +----------- src/main/java/techreborn/tiles/TileCentrifuge.java | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/techreborn/pda/GuiPda.java b/src/main/java/techreborn/pda/GuiPda.java index b71ff843c..165238f95 100644 --- a/src/main/java/techreborn/pda/GuiPda.java +++ b/src/main/java/techreborn/pda/GuiPda.java @@ -12,8 +12,6 @@ public class GuiPda extends GuiScreen { private static final ResourceLocation pdaGuipages = new ResourceLocation( "techreborn:" + "textures/gui/pda.png"); - public static final ResourceLocation buttonOre = new ResourceLocation( - "techreborn:" + "textures/blocks/ore/book_of_revealing"); public GuiPda(EntityPlayer player) { @@ -25,21 +23,13 @@ public class GuiPda extends GuiScreen { super.initGui(); this.guiLeft = this.width / 2 - this.guiWidth / 2; this.guiTop = this.height / 2 - this.guiHeight / 2; - GuiButtonCustomTexture oresButton = new GuiButtonCustomTexture(1, - guiLeft + 20, guiTop + 20, 0, 224, 16, 16, buttonOre); - - buttonList.add(oresButton); } @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - mc.getTextureManager().bindTexture(pdaGuipages); - drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth, - this.guiHeight); - mc.renderEngine.bindTexture(buttonOre); - + drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth,this.guiHeight); super.drawScreen(mouseX, mouseY, partialTicks); } diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 78bb1466a..ad8c43018 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -131,6 +131,7 @@ public class TileCentrifuge extends TileMachineBase implements IWrenchable, IEn if(crafter.currentRecipe !=null){ info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t"); } + info.add("Round and round it goes"); } @Override From c78191d9f15c031c23f70c04ced1bfc023bd3a84 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:35:00 +0100 Subject: [PATCH 08/12] Broken --- .../textures/items/tool/lapotronicEnergyOrb.png | Bin 376 -> 0 bytes .../textures/items/tool/lapotronicEnergyOrb1.png | Bin 0 -> 224 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb1.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png b/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png deleted file mode 100644 index f6eeea2415af5b3b80290eaf31e53a488202b8d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqW;q^4j_wottr!>>Sv_4GLo7}wCoB*!cqH)Oe@#^m z+n@cF|2f0%zUnfPsG3obS@$h!mZPtu)H%Dtk8IALzobg6OFpzzQu2-U*#ia7R~k3Z zSt8M<*t5gLdWMm~ovIHac_$|23KWXI+{@EHZ-3H?vpq=(K;ZI`Y1gy#^-CX0CGSya zJ39T7(E}c4_TZ4Szx@{9l6(Ah%EM=RA@2=K%ga9>w%9Ib(`qffY-VF)??H}AEW%X9fgOo@29)35r^|AgCw#q$mB zRKDtY#8q;3gM>plKPY928PnL^{e(p RNrOU^!PC{xWt~$(69Cpin{xmF diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb1.png b/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb1.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec1b05e98e0b280aabb72a5dd704c986a70b04e GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S4JQM2vkotPhVC$_5Z>R zd-k9DfAjv6|NsAsl(B9HN->rM`2{mLJiCzw

|lIEG~0YrSYFc|d`uB~T}Uk$a;6 z_r`|S2#2!wFWjd;yQTA_-dQZ_^_(`#)6z!8?`@StE}Rg$Q2dnVHPa1-au3$!pFLRL zyqvHwVWaFMu5XU=@&)o|WSkw}G`|s&vy63cs1V9!T69~^hU?Kkjo=TTe~V9Fk$<(l R%R2?+PES`qmvv4FO#n}_R8#-} literal 0 HcmV?d00001 From 49c80a9f1b474b4e55a5f1a505816d05c15345e3 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:36:09 +0100 Subject: [PATCH 09/12] Changed texture for LapotronPack --- ...tronicEnergyOrb1.png => lapotronicEnergyOrb.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/techreborn/textures/items/tool/{lapotronicEnergyOrb1.png => lapotronicEnergyOrb.png} (100%) diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb1.png b/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb1.png rename to src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png From b1cbec9e63055518bdec5cd465f66a5aeb5c0546 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:41:06 +0100 Subject: [PATCH 10/12] Added Grinder on textures --- .../blocks/machine/BlockGrinder.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/blocks/machine/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java index efd0cba72..ee84683cd 100644 --- a/src/main/java/techreborn/blocks/machine/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -10,10 +10,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.tiles.TileCentrifuge; import techreborn.tiles.TileGrinder; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,9 +24,15 @@ public class BlockGrinder extends BlockMachineBase{ @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconTopOn; @SideOnly(Side.CLIENT) private IIcon iconBottom; @@ -57,18 +65,39 @@ public class BlockGrinder extends BlockMachineBase{ { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_grinder_front_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/industrial_grinder_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/industrial_grinder_top_off"); + this.iconTopOn = icon.registerIcon("techreborn:machine/industrial_grinder_top_on"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileGrinder tileGrinder = (TileGrinder) blockAccess.getTileEntity(x, y, z); + if(side >= 2 && tileGrinder.crafter.isActive()){ + return this.iconFrontOn; + } + + if(side == 1 && tileGrinder.crafter.isActive()){ + return this.iconTopOn; + } + 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)); + : (side == metadata ? this.iconFront : this.iconFront)); + + } + + @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.iconFront)); } From a8962929cc8e29a9dc8c9b5e301402615aa15e07 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:45:53 +0100 Subject: [PATCH 11/12] Fixed small derp --- .../techreborn/blocks/machine/BlockCentrifuge.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 8eec64c38..4d7a93ac6 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileCentrifuge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -73,19 +74,17 @@ public class BlockCentrifuge extends BlockMachineBase { public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { int metadata = blockAccess.getBlockMetadata(x, y, z); TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z); - if(side >= 2 && tileCentrifuge.crafter.isActive()){ + if(side == metadata && tileCentrifuge.crafter.isActive()){ return this.iconFrontOn; } - if(side == 1 && tileCentrifuge.crafter.isActive()){ return this.iconTopOn; } - - + return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.iconFront)); + : (side == metadata ? this.iconFront : this.blockIcon)); } @@ -95,7 +94,7 @@ public class BlockCentrifuge extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.iconFront)); + : (side == metadata ? this.iconFront : this.blockIcon)); } From f240604c4adc493f7df102b3b2bb370a6b8926f6 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 7 Jun 2015 20:47:44 +0100 Subject: [PATCH 12/12] Fixed Derp.... --- .../techreborn/blocks/machine/BlockCentrifuge.java | 11 ++++++----- .../java/techreborn/blocks/machine/BlockGrinder.java | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 4d7a93ac6..8eec64c38 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; -import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileCentrifuge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -74,17 +73,19 @@ public class BlockCentrifuge extends BlockMachineBase { public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { int metadata = blockAccess.getBlockMetadata(x, y, z); TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z); - if(side == metadata && tileCentrifuge.crafter.isActive()){ + if(side >= 2 && tileCentrifuge.crafter.isActive()){ return this.iconFrontOn; } + if(side == 1 && tileCentrifuge.crafter.isActive()){ return this.iconTopOn; } - + + 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)); + : (side == metadata ? this.iconFront : this.iconFront)); } @@ -94,7 +95,7 @@ public class BlockCentrifuge extends BlockMachineBase { 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)); + : (side == metadata ? this.iconFront : this.iconFront)); } diff --git a/src/main/java/techreborn/blocks/machine/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java index ee84683cd..5fbcf5e3e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -75,7 +75,7 @@ public class BlockGrinder extends BlockMachineBase{ public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { int metadata = blockAccess.getBlockMetadata(x, y, z); TileGrinder tileGrinder = (TileGrinder) blockAccess.getTileEntity(x, y, z); - if(side >= 2 && tileGrinder.crafter.isActive()){ + if(side == metadata && tileGrinder.crafter.isActive()){ return this.iconFrontOn; } @@ -87,7 +87,7 @@ public class BlockGrinder extends BlockMachineBase{ return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.iconFront)); + : (side == metadata ? this.iconFront : this.blockIcon)); }