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 00000000..5f4bb528 Binary files /dev/null and b/src/minecraft/textures/pipes/LavaPipe.png differ diff --git a/src/minecraft/textures/pipes/SteamPipe.png b/src/minecraft/textures/pipes/SteamPipe.png index 5f4bb528..05cb6ff1 100644 Binary files a/src/minecraft/textures/pipes/SteamPipe.png and b/src/minecraft/textures/pipes/SteamPipe.png differ