From ce3d3afcfec5c120d7646b4c5d0dfea5c1ac3e46 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Wed, 5 Sep 2012 23:15:16 -0400 Subject: [PATCH] minor cleanup --- src/common/basicpipes/BasicPipesMain.java | 2 +- src/common/basicpipes/pipes/BlockMachine.java | 9 +++++---- src/common/basicpipes/pipes/ItemMachine.java | 12 ------------ src/common/steampower/SteamPowerMain.java | 2 +- src/minecraft/textures/pipes/LavaPipe.png | Bin 0 -> 3196 bytes src/minecraft/textures/pipes/SteamPipe.png | Bin 3196 -> 770 bytes 6 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 src/common/basicpipes/pipes/ItemMachine.java create mode 100644 src/minecraft/textures/pipes/LavaPipe.png diff --git a/src/common/basicpipes/BasicPipesMain.java b/src/common/basicpipes/BasicPipesMain.java index 70d5dd56..3ee0e29b 100644 --- a/src/common/basicpipes/BasicPipesMain.java +++ b/src/common/basicpipes/BasicPipesMain.java @@ -31,7 +31,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; @NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) public class BasicPipesMain{ - @Instance + public BasicPipesMain instance; @SidedProxy(clientSide = "basicpipes.PipeClientProxy", serverSide = "basicpipes.PipeProxy") diff --git a/src/common/basicpipes/pipes/BlockMachine.java b/src/common/basicpipes/pipes/BlockMachine.java index 481a9e13..94b9c4fe 100644 --- a/src/common/basicpipes/pipes/BlockMachine.java +++ b/src/common/basicpipes/pipes/BlockMachine.java @@ -5,6 +5,8 @@ import net.minecraft.src.*; import java.util.Random; +import basicpipes.BasicPipesMain; + public class BlockMachine extends BlockContainer { @@ -74,10 +76,9 @@ public class BlockMachine extends BlockContainer return null; } @Override - public String getTextureFile() - { - return basicpipes.BasicPipesMain.textureFile + "/items.png"; - } + public String getTextureFile() { + return BasicPipesMain.textureFile+"/Items.png"; + } } diff --git a/src/common/basicpipes/pipes/ItemMachine.java b/src/common/basicpipes/pipes/ItemMachine.java deleted file mode 100644 index cdf33905..00000000 --- a/src/common/basicpipes/pipes/ItemMachine.java +++ /dev/null @@ -1,12 +0,0 @@ -package basicpipes.pipes; - -import net.minecraft.src.ItemBlock; - -public class ItemMachine extends ItemBlock { - - public ItemMachine(int par1) { - super(par1); - // TODO Auto-generated constructor stub - } - -} diff --git a/src/common/steampower/SteamPowerMain.java b/src/common/steampower/SteamPowerMain.java index ff896960..546bb31c 100644 --- a/src/common/steampower/SteamPowerMain.java +++ b/src/common/steampower/SteamPowerMain.java @@ -45,7 +45,7 @@ public class SteamPowerMain{ public static Block engine = new BlockSteamPiston(EngineID).setBlockName("SteamEngien"); public static Block gen = new BlockGenerator(genID).setBlockName("ElecGen"); public static Item itemEngine = new ItemEngine(EngineItemID).setItemName("SteamEngine"); - @Instance + public static SteamPowerMain instance; @SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy") diff --git a/src/minecraft/textures/pipes/LavaPipe.png b/src/minecraft/textures/pipes/LavaPipe.png new file mode 100644 index 0000000000000000000000000000000000000000..5f4bb528d01814f47003ede29cf06b68de001a59 GIT binary patch literal 3196 zcmV-?41@EDP)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 ig|t)N0U^=M(bfh2XR}B$G=L!h0000