From 18aef1ff28f3c23e00f54026f6d9fb0290d50a3f Mon Sep 17 00:00:00 2001 From: Rseifert Date: Mon, 3 Sep 2012 17:52:07 -0400 Subject: [PATCH] Texture updates and Gui opening change nothing big. Just updated the textures and reverted the gui to open on right click instead of with a wrench --- .../steampower/turbine/BlockSteamPiston.java | 2 +- src/minecraft/steampower/ModelFurnace.java | 54 +++++++++--------- src/minecraft/textures/Engine.png | Bin 2686 -> 1033 bytes src/minecraft/textures/Furnace.png | Bin 2426 -> 1455 bytes src/minecraft/textures/SteelPiston.png | Bin 0 -> 1033 bytes src/minecraft/textures/YellowPiston.png | Bin 0 -> 1051 bytes 6 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 src/minecraft/textures/SteelPiston.png create mode 100644 src/minecraft/textures/YellowPiston.png diff --git a/src/common/steampower/turbine/BlockSteamPiston.java b/src/common/steampower/turbine/BlockSteamPiston.java index e7be1d43..fda19383 100644 --- a/src/common/steampower/turbine/BlockSteamPiston.java +++ b/src/common/steampower/turbine/BlockSteamPiston.java @@ -18,7 +18,7 @@ public class BlockSteamPiston extends universalelectricity.extend.BlockMachine{ } @Override - public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) + public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) { if (par1World.isRemote) { diff --git a/src/minecraft/steampower/ModelFurnace.java b/src/minecraft/steampower/ModelFurnace.java index 19d53f42..798a0a5c 100644 --- a/src/minecraft/steampower/ModelFurnace.java +++ b/src/minecraft/steampower/ModelFurnace.java @@ -25,33 +25,33 @@ public class ModelFurnace extends ModelBase public ModelFurnace() { - textureWidth = 256; - textureHeight = 256; - - Body = new ModelRenderer(this, 0, 0); - Body.addBox(-8F, -8F, -8F, 14, 14, 12); - Body.setRotationPoint(1F, 18F, 1F); - Body.setTextureSize(256, 256); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - top = new ModelRenderer(this, 80, 20); - top.addBox(-8F, 0F, -8F, 16, 2, 16); - top.setRotationPoint(0F, 8F, 0F); - top.setTextureSize(256, 256); - top.mirror = true; - setRotation(top, 0F, 0F, 0F); - bottom = new ModelRenderer(this, 80, 0); - bottom.addBox(-8F, 22F, -8F, 16, 2, 16); - bottom.setRotationPoint(0F, 0F, 0F); - bottom.setTextureSize(256, 256); - bottom.mirror = true; - setRotation(bottom, 0F, 0F, 0F); - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(-4F, -4F, 0F, 10, 8, 1); - Shape1.setRotationPoint(-1F, 16F, 5F); - Shape1.setTextureSize(256, 256); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); + textureWidth = 256; + textureHeight = 256; + + Body = new ModelRenderer(this, 0, 0); + Body.addBox(-8F, -8F, -8F, 14, 14, 12); + Body.setRotationPoint(1F, 18F, 1F); + Body.setTextureSize(64, 32); + Body.mirror = true; + setRotation(Body, 0F, 0F, 0F); + top = new ModelRenderer(this, 80, 20); + top.addBox(-8F, 0F, -8F, 16, 2, 16); + top.setRotationPoint(0F, 8F, 0F); + top.setTextureSize(64, 32); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + bottom = new ModelRenderer(this, 80, 0); + bottom.addBox(-8F, 22F, -8F, 16, 2, 16); + bottom.setRotationPoint(0F, 0F, 0F); + bottom.setTextureSize(64, 32); + bottom.mirror = true; + setRotation(bottom, 0F, 0F, 0F); + Shape1 = new ModelRenderer(this, 0, 27); + Shape1.addBox(-4F, -4F, 0F, 10, 8, 1); + Shape1.setRotationPoint(-1F, 16F, 5F); + Shape1.setTextureSize(64, 32); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) diff --git a/src/minecraft/textures/Engine.png b/src/minecraft/textures/Engine.png index 52a2d997f7cc7f3fc255c52b3aeb77277fd89f34..0f68fe758befe90e39392f330cb363dd0cf91623 100644 GIT binary patch delta 952 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 DZza#8 literal 0 HcmV?d00001 diff --git a/src/minecraft/textures/YellowPiston.png b/src/minecraft/textures/YellowPiston.png new file mode 100644 index 0000000000000000000000000000000000000000..b0134785c73ba4fd6b2f663654c589c7cbc00a2c GIT binary patch literal 1051 zcmV+$1mydPP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2iyq* z6(Spfw^cj<00WyzL_t(|+U;7;YZE~f{$_U@2sAYmPyGX|RFNL^svz|wxp?#7sYsf7 zuoOb^P!NI$O(_;ZTeJu9Q0T1`Pl}-6Ne?0(inL%aDTPuhtx3AsWIV*(ZqofVJKfn$ zvk#Wtnf>0Q^L6IUn{PwFXt@k10<@QFAP{JZAEzg8Rv<}9G#V91QWBKbjCYmFrtw_J z=8fm4Z`U00W~@k){5VysTPT;;jeDiCXb;+{7UjGXKNF>hN;vc_$(Sk2z z^GKyGA}sSofId(^cvjy?5}>NP7K5w+0Ax9NVhNb>`m>G)5Zd(jodh-Q5VhJLbJ-bmDXdBuSX#xlFam-eP|(JEc2NA(_EE!g6Hu*gF`osZgy$x}Pi-G1JU0P6 z`+5}c+ywB{_EErd6Tnm3M*$yigQ6?JAZ@>TjV!VScP zJUNvdV76z=V@+A>?t*38$#{Ijss|!H12#4uP^UUzaBzux1`xMD+-X2OzFu%UJ1?ly z_IMggKr&BN0N6NaUhUIbe>S(>-aEzhS`V17!0G_6_UhpR*Lzm8(;H5`6ppI(_m7y! zIR4pCZ!e&#JK_nrKkuB?-QKfWU*E03i=0R&!PsIGTnYmK{Xi%H+?b^JG)IiP-uL;3 z^YrEQ*Nyd%=J!x!OMtDz2=zpOUw<-MrAeTlM=TKNT-L5PSNeI-vwB*y`O$3`v+w8 VQjG~4b)EnK002ovPDHLkV1iC8=0^Yk literal 0 HcmV?d00001