diff --git a/src/common/basicpipes/BasicPipesMain.java b/src/common/basicpipes/BasicPipesMain.java index 4e78f3ed..a659402f 100644 --- a/src/common/basicpipes/BasicPipesMain.java +++ b/src/common/basicpipes/BasicPipesMain.java @@ -34,9 +34,9 @@ public class BasicPipesMain{ @Instance public static BasicPipesMain instance; - @SidedProxy(clientSide = "BasicPipes.PipeClientProxy", serverSide = "BasicPipes.PipeProxy") + @SidedProxy(clientSide = "basicpipes.PipeClientProxy", serverSide = "basicpipes.PipeProxy") public static PipeProxy proxy; - static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/EUIndustry/BasicPipes.cfg"))); + static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/BasicPipes.cfg"))); public static int pipeID = configurationProperties(); private static int partID; private static int ppipeID; @@ -48,6 +48,7 @@ public class BasicPipesMain{ public static Item gauge = new ItemGuage(ppipeID+1); public static String channel = "Pipes"; + public static String textureFile = "/textures"; public static int configurationProperties() { diff --git a/src/common/basicpipes/pipes/ItemParts.java b/src/common/basicpipes/pipes/ItemParts.java index 41f5ebb0..320fcd22 100644 --- a/src/common/basicpipes/pipes/ItemParts.java +++ b/src/common/basicpipes/pipes/ItemParts.java @@ -3,6 +3,8 @@ package basicpipes.pipes; import java.util.ArrayList; import java.util.List; +import basicpipes.BasicPipesMain; + import net.minecraft.src.CreativeTabs; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; @@ -42,7 +44,7 @@ public class ItemParts extends Item{ } } public String getTextureFile() { - return "/EUIClient/Textures/Items.png"; + return BasicPipesMain.textureFile+"/Items.png"; } @Override public String getItemName() diff --git a/src/common/basicpipes/pipes/ItemPipe.java b/src/common/basicpipes/pipes/ItemPipe.java index c9d23a7e..adfb4a3b 100644 --- a/src/common/basicpipes/pipes/ItemPipe.java +++ b/src/common/basicpipes/pipes/ItemPipe.java @@ -47,7 +47,7 @@ public class ItemPipe extends Item } } public String getTextureFile() { - return "/EUIClient/Textures/Items.png"; + return BasicPipesMain.textureFile+"/Items.png"; } @Override public String getItemName() diff --git a/src/common/steampower/ItemMachine.java b/src/common/steampower/ItemMachine.java index 3086957d..08e28e2f 100644 --- a/src/common/steampower/ItemMachine.java +++ b/src/common/steampower/ItemMachine.java @@ -24,7 +24,7 @@ public class ItemMachine extends ItemBlock { @Override public String getTextureFile() { // TODO Auto-generated method stub - return "/EUIClient/Textures/Items.png"; + return SteamPowerMain.textureFile+"/Items.png"; } @Override public int getIconFromDamage(int par1) diff --git a/src/common/steampower/ItemParts.java b/src/common/steampower/ItemParts.java deleted file mode 100644 index f1c358b3..00000000 --- a/src/common/steampower/ItemParts.java +++ /dev/null @@ -1,70 +0,0 @@ -package steampower; - -import java.util.ArrayList; - -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; - -public class ItemParts extends Item{ - - public ItemParts(int par1) - { - super(par1); - this.setItemName("Parts"); - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setMaxStackSize(64); - } - @Override - public int getIconFromDamage(int par1) - { - switch(par1) - { - case 0: return 3; - case 1: return 4; - case 2: return 5; - case 3: return 6; - case 4: return 7; - case 5: return 8; - case 6: return 9; - } - return this.iconIndex; - } - @Override - public String getTextureFile() { - // TODO Auto-generated method stub - return "/EUIClient/Textures/Items.png"; - } - public String getItemName() - { - return "parts"; - } - - - - public String getItemNameIS(ItemStack par1ItemStack) - { - int var3 = par1ItemStack.getItemDamage(); - switch(var3) - { - case 1: return "Tank"; - case 3: return "Valve"; - case 4: return "Tube"; - case 5: return "Seal"; - case 6: return "Rivits"; - } - return this.getItemName(); - } - public void addCreativeItems(ArrayList itemList) - { - itemList.add(new ItemStack(this, 1,1)); - itemList.add(new ItemStack(this, 1,3)); - itemList.add(new ItemStack(this, 1,4)); - itemList.add(new ItemStack(this, 1,5)); - itemList.add(new ItemStack(this, 1,6)); - - } -} - - - diff --git a/src/common/steampower/SteamPowerMain.java b/src/common/steampower/SteamPowerMain.java index 3a3c384e..174d1717 100644 --- a/src/common/steampower/SteamPowerMain.java +++ b/src/common/steampower/SteamPowerMain.java @@ -1,6 +1,8 @@ package steampower; import java.io.File; +import basicpipes.BasicPipesMain; + import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; @@ -11,7 +13,6 @@ import steampower.turbine.ItemEngine; import steampower.turbine.TileEntitytopGen; import universalelectricity.basiccomponents.BasicComponents; import universalelectricity.network.PacketManager; -import basicpipes.BasicPipesMain; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -29,7 +30,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; @NetworkMod(channels = { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) public class SteamPowerMain{ - static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/EUIndustry/SteamPower.cfg"))); + static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/SteamPower.cfg"))); private static int BlockID= configurationProperties(); public static int EngineItemID; public static int EngineID; @@ -47,9 +48,9 @@ public class SteamPowerMain{ @Instance public static SteamPowerMain instance; - @SidedProxy(clientSide = "SteamPower.SteamClientProxy", serverSide = "SteamPower.SteamProxy") + @SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy") public static SteamProxy proxy; - public static String textureFile = "/EUIClient/Textures/"; + public static String textureFile = "/textures/"; public static int configurationProperties() { config.load(); diff --git a/src/common/steampower/boiler/TileEntityBoiler.java b/src/common/steampower/boiler/TileEntityBoiler.java index 2ef0b106..a45b7f4d 100644 --- a/src/common/steampower/boiler/TileEntityBoiler.java +++ b/src/common/steampower/boiler/TileEntityBoiler.java @@ -1,4 +1,5 @@ package steampower.boiler; +import net.minecraft.src.Block; import net.minecraft.src.EntityPlayer; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; @@ -145,17 +146,27 @@ public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiv hullHeat = Math.min(hullHeat + heatStored, hullHeatMax); } } + if(!worldObj.isRemote) { - emptyBuckets();//adds water from container slot - this.waterStored = TradeHelper.shareLiquid(this, 1, false); - this.steamStored = TradeHelper.shareLiquid(this, 0, true); + + count++; + emptyBuckets(); + if(count >= 16) + { + //adds water from container slot + this.waterStored = TradeHelper.shareLiquid(this, 1, false); + this.steamStored = TradeHelper.shareLiquid(this, 0, true); + count = 0; + } + if(waterStored > 0 && hullHeated && heatStored > heatNeeded) { heatStored = Math.max(heatStored - heatNeeded, 0); --waterStored; steamStored = Math.min(steamStored + SteamPowerMain.steamOutBoiler,this.steamMax); } + TileEntity blockE = worldObj.getBlockTileEntity(xCoord, yCoord -1, zCoord); this.isBeingHeated = false; if(blockE instanceof TileEntityFireBox) @@ -179,6 +190,24 @@ public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiv this.onInventoryChanged(); } } + if(storedItems[0].isItemEqual(new ItemStack(Block.ice,1))) + { + if((int)waterStored < getLiquidCapacity(1) && this.heatStored > 100) + { + ++waterStored; + int stacksize = this.storedItems[0].stackSize; + if(stacksize > 1) + { + this.storedItems[0] = new ItemStack(Block.ice,stacksize -1); + } + if(stacksize == 1) + { + this.storedItems[0] = null; + } + this.heatStored-=100; + this.onInventoryChanged(); + } + } } } diff --git a/src/common/steampower/turbine/ItemEngine.java b/src/common/steampower/turbine/ItemEngine.java index 364e5863..34812210 100644 --- a/src/common/steampower/turbine/ItemEngine.java +++ b/src/common/steampower/turbine/ItemEngine.java @@ -27,7 +27,7 @@ public class ItemEngine extends Item @Override public String getTextureFile() { // TODO Auto-generated method stub - return "/EUIClient/Textures/Items.png"; + return SteamPowerMain.textureFile+"/Items.png"; } @Override public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer ePlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) diff --git a/src/minecraft/EUIClient/Textures/Items.png b/src/minecraft/EUIClient/Textures/Items.png deleted file mode 100644 index d95d6056..00000000 Binary files a/src/minecraft/EUIClient/Textures/Items.png and /dev/null differ diff --git a/src/minecraft/basicpipes/RenderPipe.java b/src/minecraft/basicpipes/RenderPipe.java index 97285150..21d72a5a 100644 --- a/src/minecraft/basicpipes/RenderPipe.java +++ b/src/minecraft/basicpipes/RenderPipe.java @@ -12,10 +12,12 @@ public class RenderPipe extends TileEntitySpecialRenderer { int type = 0; private ModelPipe model; + private ModelPipe model2; public RenderPipe() { model = new ModelPipe(); + model2 = new ModelPipe(); } public void renderAModelAt(TileEntityPipe tileEntity, double d, double d1, double d2, float f) @@ -25,13 +27,9 @@ public class RenderPipe extends TileEntitySpecialRenderer type = tileEntity.getType(); switch(type) { - case 0: bindTextureByName("/EUIClient/Textures/SteamPipe.png");break; - case 1: bindTextureByName("/EUIClient/Textures/WaterPipe.png");break; - //case 2: bindTextureByName("/eui/lavaPipe.png");break; - //case 3: bindTextureByName("/eui/oilPipe.png");break; - //case 4: bindTextureByName("/eui/fuelPipe.png");break; - //case 5: bindTextureByName("/eui/airPipe.png");break; - default:bindTextureByName("/EUIClient/Textures/DefaultPipe.png"); break; + case 0: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SteamPipe.png");break; + case 1: bindTextureByName(BasicPipesMain.textureFile+"/pipes/WaterPipe.png");break; + default:bindTextureByName(BasicPipesMain.textureFile+"/pipes/DefaultPipe.png"); break; } GL11.glPushMatrix(); diff --git a/src/minecraft/steampower/GuiBoiler.java b/src/minecraft/steampower/GuiBoiler.java index 16f47ba6..c32bb0e5 100644 --- a/src/minecraft/steampower/GuiBoiler.java +++ b/src/minecraft/steampower/GuiBoiler.java @@ -26,9 +26,10 @@ public class GuiBoiler extends GuiContainer protected void drawGuiContainerForegroundLayer() { this.fontRenderer.drawString("Boiler", 60, 6, 4210752); - this.fontRenderer.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); if(boilerInventory.hullHeat >=10000) + this.fontRenderer.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); + if(boilerInventory.hullHeat >=10000) { - this.fontRenderer.drawString("Heat Danger", (int)(105), 50, 4210752); + //this.fontRenderer.drawString("Heat Danger", (int)(105), 50, 4210752); } this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/minecraft/EUIClient/Textures/BoilerGui.png b/src/minecraft/textures/BoilerGui.png similarity index 100% rename from src/minecraft/EUIClient/Textures/BoilerGui.png rename to src/minecraft/textures/BoilerGui.png diff --git a/src/minecraft/EUIClient/Textures/CopperWire.png b/src/minecraft/textures/CopperWire.png similarity index 100% rename from src/minecraft/EUIClient/Textures/CopperWire.png rename to src/minecraft/textures/CopperWire.png diff --git a/src/minecraft/EUIClient/Textures/CornerTank.png b/src/minecraft/textures/CornerTank.png similarity index 100% rename from src/minecraft/EUIClient/Textures/CornerTank.png rename to src/minecraft/textures/CornerTank.png diff --git a/src/minecraft/EUIClient/Textures/Engine.png b/src/minecraft/textures/Engine.png similarity index 100% rename from src/minecraft/EUIClient/Textures/Engine.png rename to src/minecraft/textures/Engine.png diff --git a/src/minecraft/EUIClient/Textures/Furnace.png b/src/minecraft/textures/Furnace.png similarity index 100% rename from src/minecraft/EUIClient/Textures/Furnace.png rename to src/minecraft/textures/Furnace.png diff --git a/src/minecraft/EUIClient/Textures/Generator.png b/src/minecraft/textures/Generator.png similarity index 100% rename from src/minecraft/EUIClient/Textures/Generator.png rename to src/minecraft/textures/Generator.png diff --git a/src/minecraft/EUIClient/Textures/GrinderGUI.png b/src/minecraft/textures/GrinderGUI.png similarity index 100% rename from src/minecraft/EUIClient/Textures/GrinderGUI.png rename to src/minecraft/textures/GrinderGUI.png diff --git a/src/minecraft/textures/Items.png b/src/minecraft/textures/Items.png new file mode 100644 index 00000000..7cd95bb4 Binary files /dev/null and b/src/minecraft/textures/Items.png differ diff --git a/src/minecraft/EUIClient/Textures/SteamGUI.png b/src/minecraft/textures/SteamGUI.png similarity index 100% rename from src/minecraft/EUIClient/Textures/SteamGUI.png rename to src/minecraft/textures/SteamGUI.png diff --git a/src/minecraft/EUIClient/Textures/blocks.png b/src/minecraft/textures/blocks.png similarity index 100% rename from src/minecraft/EUIClient/Textures/blocks.png rename to src/minecraft/textures/blocks.png diff --git a/src/minecraft/EUIClient/Textures/DefaultPipe.png b/src/minecraft/textures/pipes/DefaultPipe.png similarity index 100% rename from src/minecraft/EUIClient/Textures/DefaultPipe.png rename to src/minecraft/textures/pipes/DefaultPipe.png diff --git a/src/minecraft/EUIClient/Textures/SteamPipe.png b/src/minecraft/textures/pipes/SteamPipe.png similarity index 100% rename from src/minecraft/EUIClient/Textures/SteamPipe.png rename to src/minecraft/textures/pipes/SteamPipe.png diff --git a/src/minecraft/EUIClient/Textures/WaterPipe.png b/src/minecraft/textures/pipes/WaterPipe.png similarity index 100% rename from src/minecraft/EUIClient/Textures/WaterPipe.png rename to src/minecraft/textures/pipes/WaterPipe.png diff --git a/src/minecraft/EUIClient/Textures/tankBlock.png b/src/minecraft/textures/tankBlock.png similarity index 100% rename from src/minecraft/EUIClient/Textures/tankBlock.png rename to src/minecraft/textures/tankBlock.png diff --git a/src/minecraft/EUIClient/Textures/tankTexture.png b/src/minecraft/textures/tankTexture.png similarity index 100% rename from src/minecraft/EUIClient/Textures/tankTexture.png rename to src/minecraft/textures/tankTexture.png