From 72b65ab0254e440a90a218d58c33193c45df4cea Mon Sep 17 00:00:00 2001 From: Rseifert Date: Fri, 7 Dec 2012 12:49:50 -0500 Subject: [PATCH] remove 1.4.2 archive, Changed Boiler, FireBox Boiler is now its own block, and will later have upgraded version FireBox is now its own Block, and will have a liquid burning version, bio fuel version, and a lava buffer that can transfer more heat from lava without damaging the boiler I also made changes for the IReadOut interface from basic pipes --- .../src/common/basicpipes/BasicPipesMain.java | 221 ------- .../common/basicpipes/LTanks/ItemTank.java | 130 ---- .../basicpipes/LTanks/TileEntityLTank.java | 210 ------- 1.4.2/src/common/basicpipes/PipeProxy.java | 56 -- .../basicpipes/conductors/BlockPipe.java | 90 --- .../basicpipes/conductors/BlockRod.java | 83 --- .../basicpipes/conductors/ItemGuage.java | 114 ---- .../basicpipes/conductors/ItemParts.java | 62 -- .../basicpipes/conductors/ItemPipe.java | 130 ---- .../basicpipes/conductors/TileEntityPipe.java | 210 ------- .../basicpipes/conductors/TileEntityRod.java | 137 ----- .../basicpipes/machines/BlockMachine.java | 79 --- .../basicpipes/machines/BlockValve.java | 179 ------ .../basicpipes/machines/ItemMachine.java | 124 ---- .../common/basicpipes/machines/ItemValve.java | 126 ---- .../machines/TileEntityCondenser.java | 110 ---- .../basicpipes/machines/TileEntityPump.java | 140 ----- .../basicpipes/machines/TileEntityValve.java | 109 ---- 1.4.2/src/common/basicpipes/mcmod.info | 21 - .../src/common/basicpipes/pipes/api/Beam.java | 26 - .../basicpipes/pipes/api/IBeamProducer.java | 26 - .../basicpipes/pipes/api/IHeatProducer.java | 16 - .../basicpipes/pipes/api/ILiquidConsumer.java | 39 -- .../basicpipes/pipes/api/ILiquidProducer.java | 38 -- .../basicpipes/pipes/api/IMechanical.java | 36 -- .../basicpipes/pipes/api/IStorageTank.java | 5 - .../common/basicpipes/pipes/api/Liquid.java | 64 -- .../common/basicpipes/pipes/api/MHelper.java | 125 ---- 1.4.2/src/common/mcpmod.info | 17 - 1.4.2/src/common/steampower/BlockMachine.java | 239 -------- .../src/common/steampower/ContainerFake.java | 47 -- 1.4.2/src/common/steampower/ItemMachine.java | 65 -- .../src/common/steampower/SteamPowerMain.java | 153 ----- 1.4.2/src/common/steampower/SteamProxy.java | 67 -- .../common/steampower/TileEntityMachine.java | 220 ------- .../steampower/boiler/TileEntityBoiler.java | 249 -------- .../steampower/burner/ContainerFireBox.java | 42 -- .../steampower/burner/TileEntityFireBox.java | 214 ------- 1.4.2/src/common/steampower/mcmod.info | 21 - .../steampower/turbine/BlockGenerator.java | 68 -- .../steampower/turbine/BlockSteamPiston.java | 114 ---- .../common/steampower/turbine/ItemEngine.java | 112 ---- .../steampower/turbine/TileEntityGen.java | 185 ------ .../turbine/TileEntitySteamPiston.java | 330 ---------- .../steampower/turbine/TileEntitytopGen.java | 12 - .../basicpipes/ItemRenderHelper.java | 56 -- .../minecraft/basicpipes/ModelGearRod.java | 139 ----- .../minecraft/basicpipes/ModelLargePipe.java | 177 ------ 1.4.2/src/minecraft/basicpipes/ModelPipe.java | 93 --- 1.4.2/src/minecraft/basicpipes/ModelPump.java | 140 ----- .../minecraft/basicpipes/PipeClientProxy.java | 34 - .../minecraft/basicpipes/RenderGearRod.java | 49 -- .../src/minecraft/basicpipes/RenderPipe.java | 62 -- .../src/minecraft/basicpipes/RenderPump.java | 59 -- .../renderTank/ModelLiquidTank.java | 422 ------------- .../renderTank/ModelLiquidTankCorner.java | 133 ---- .../basicpipes/renderTank/RenderLTank.java | 71 --- 1.4.2/src/minecraft/mcp.png | Bin 6940 -> 0 bytes .../src/minecraft/steampower/GUIFireBox.java | 92 --- .../minecraft/steampower/GUISteamPiston.java | 79 --- 1.4.2/src/minecraft/steampower/GuiBoiler.java | 94 --- .../steampower/ItemRenderHelperS.java | 62 -- .../minecraft/steampower/ModelCenterTank.java | 53 -- .../minecraft/steampower/ModelCornerTank.java | 95 --- .../src/minecraft/steampower/ModelEngine.java | 109 ---- .../minecraft/steampower/ModelFurnace.java | 77 --- .../minecraft/steampower/ModelGenerator.java | 131 ---- 1.4.2/src/minecraft/steampower/ModelTank.java | 148 ----- .../minecraft/steampower/RenderBoiler.java | 62 -- .../minecraft/steampower/RenderFurnace.java | 37 -- .../minecraft/steampower/RenderGenerator.java | 37 -- .../steampower/SteamClientProxy.java | 34 - .../steampower/geared/ModelGearPiston.java | 381 ------------ .../steampower/geared/RenderGearPiston.java | 51 -- 1.4.2/src/minecraft/textures/BoilerGui.png | Bin 1900 -> 0 bytes 1.4.2/src/minecraft/textures/CornerTank.png | Bin 2658 -> 0 bytes 1.4.2/src/minecraft/textures/Engine.png | Bin 1033 -> 0 bytes 1.4.2/src/minecraft/textures/Furnace.png | Bin 1455 -> 0 bytes 1.4.2/src/minecraft/textures/GearRod.png | Bin 257 -> 0 bytes .../minecraft/textures/GearShaftPiston.png | Bin 706 -> 0 bytes 1.4.2/src/minecraft/textures/Generator.png | Bin 1423 -> 0 bytes 1.4.2/src/minecraft/textures/GrinderGUI.png | Bin 1284 -> 0 bytes 1.4.2/src/minecraft/textures/Items.png | Bin 29075 -> 0 bytes 1.4.2/src/minecraft/textures/SteamGUI.png | Bin 3750 -> 0 bytes 1.4.2/src/minecraft/textures/SteelPiston.png | Bin 1033 -> 0 bytes 1.4.2/src/minecraft/textures/blocks.png | Bin 22475 -> 0 bytes .../minecraft/textures/pipes/DefaultPipe.png | Bin 770 -> 0 bytes .../src/minecraft/textures/pipes/LavaPipe.png | Bin 3196 -> 0 bytes .../minecraft/textures/pipes/SixLavaPipe.png | Bin 796 -> 0 bytes .../minecraft/textures/pipes/SixOilPipe.png | Bin 782 -> 0 bytes .../minecraft/textures/pipes/SixSteamPipe.png | Bin 1906 -> 0 bytes .../minecraft/textures/pipes/SixWaterPipe.png | Bin 791 -> 0 bytes .../minecraft/textures/pipes/SteamPipe.png | Bin 770 -> 0 bytes .../minecraft/textures/pipes/WaterPipe.png | Bin 3192 -> 0 bytes .../src/minecraft/textures/pumps/LavaPump.png | Bin 740 -> 0 bytes .../src/minecraft/textures/pumps/OilPump.png | Bin 727 -> 0 bytes 1.4.2/src/minecraft/textures/pumps/Pump.png | Bin 735 -> 0 bytes .../minecraft/textures/pumps/WaterPump.png | Bin 733 -> 0 bytes 1.4.2/src/minecraft/textures/tankBlock.png | Bin 2478 -> 0 bytes 1.4.2/src/minecraft/textures/tankTexture.png | Bin 658 -> 0 bytes .../minecraft/textures/tanks/GUITurret.png | Bin 1208 -> 0 bytes .../minecraft/textures/tanks/LiquidTank.png | Bin 614 -> 0 bytes .../minecraft/textures/tanks/LiquidTank0.png | Bin 594 -> 0 bytes .../minecraft/textures/tanks/LiquidTank1.png | Bin 626 -> 0 bytes .../minecraft/textures/tanks/LiquidTank2.png | Bin 626 -> 0 bytes .../minecraft/textures/tanks/LiquidTank3.png | Bin 623 -> 0 bytes .../minecraft/textures/tanks/LiquidTank4.png | Bin 614 -> 0 bytes .../textures/tanks/LiquidTankCorner.png | Bin 446 -> 0 bytes .../dark/SteamPower/ItemRenderHelperS.java | 4 +- .../dark/SteamPower/SteamPowerMain.java | 74 +-- .../dark/SteamPower/boiler/BlockBoiler.java | 117 ++++ .../SteamPower/boiler/TileEntityBoiler.java | 465 +++++++------- .../boiler/TileEntityBoilerPipe.java | 8 + .../BlockHeaters.java} | 62 +- .../SteamPower/firebox/TileEntityFireBox.java | 5 +- .../firebox/TileEntityLavaBuffer.java | 8 + .../firebox/TileEntityLiquidBurner.java | 8 + .../steamengine/BlockSteamPiston.java | 2 +- .../steamengine/ItemSteamPiston.java | 2 +- .../steamengine/TileEntitySteamPiston.java | 580 +++++++++--------- .../steamengine/TileEntitytopGen.java | 32 - 121 files changed, 762 insertions(+), 8443 deletions(-) delete mode 100644 1.4.2/src/common/basicpipes/BasicPipesMain.java delete mode 100644 1.4.2/src/common/basicpipes/LTanks/ItemTank.java delete mode 100644 1.4.2/src/common/basicpipes/LTanks/TileEntityLTank.java delete mode 100644 1.4.2/src/common/basicpipes/PipeProxy.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/BlockPipe.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/BlockRod.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/ItemGuage.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/ItemParts.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/ItemPipe.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/TileEntityPipe.java delete mode 100644 1.4.2/src/common/basicpipes/conductors/TileEntityRod.java delete mode 100644 1.4.2/src/common/basicpipes/machines/BlockMachine.java delete mode 100644 1.4.2/src/common/basicpipes/machines/BlockValve.java delete mode 100644 1.4.2/src/common/basicpipes/machines/ItemMachine.java delete mode 100644 1.4.2/src/common/basicpipes/machines/ItemValve.java delete mode 100644 1.4.2/src/common/basicpipes/machines/TileEntityCondenser.java delete mode 100644 1.4.2/src/common/basicpipes/machines/TileEntityPump.java delete mode 100644 1.4.2/src/common/basicpipes/machines/TileEntityValve.java delete mode 100644 1.4.2/src/common/basicpipes/mcmod.info delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/Beam.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/IBeamProducer.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/IHeatProducer.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/ILiquidConsumer.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/ILiquidProducer.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/IMechanical.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/IStorageTank.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/Liquid.java delete mode 100644 1.4.2/src/common/basicpipes/pipes/api/MHelper.java delete mode 100644 1.4.2/src/common/mcpmod.info delete mode 100644 1.4.2/src/common/steampower/BlockMachine.java delete mode 100644 1.4.2/src/common/steampower/ContainerFake.java delete mode 100644 1.4.2/src/common/steampower/ItemMachine.java delete mode 100644 1.4.2/src/common/steampower/SteamPowerMain.java delete mode 100644 1.4.2/src/common/steampower/SteamProxy.java delete mode 100644 1.4.2/src/common/steampower/TileEntityMachine.java delete mode 100644 1.4.2/src/common/steampower/boiler/TileEntityBoiler.java delete mode 100644 1.4.2/src/common/steampower/burner/ContainerFireBox.java delete mode 100644 1.4.2/src/common/steampower/burner/TileEntityFireBox.java delete mode 100644 1.4.2/src/common/steampower/mcmod.info delete mode 100644 1.4.2/src/common/steampower/turbine/BlockGenerator.java delete mode 100644 1.4.2/src/common/steampower/turbine/BlockSteamPiston.java delete mode 100644 1.4.2/src/common/steampower/turbine/ItemEngine.java delete mode 100644 1.4.2/src/common/steampower/turbine/TileEntityGen.java delete mode 100644 1.4.2/src/common/steampower/turbine/TileEntitySteamPiston.java delete mode 100644 1.4.2/src/common/steampower/turbine/TileEntitytopGen.java delete mode 100644 1.4.2/src/minecraft/basicpipes/ItemRenderHelper.java delete mode 100644 1.4.2/src/minecraft/basicpipes/ModelGearRod.java delete mode 100644 1.4.2/src/minecraft/basicpipes/ModelLargePipe.java delete mode 100644 1.4.2/src/minecraft/basicpipes/ModelPipe.java delete mode 100644 1.4.2/src/minecraft/basicpipes/ModelPump.java delete mode 100644 1.4.2/src/minecraft/basicpipes/PipeClientProxy.java delete mode 100644 1.4.2/src/minecraft/basicpipes/RenderGearRod.java delete mode 100644 1.4.2/src/minecraft/basicpipes/RenderPipe.java delete mode 100644 1.4.2/src/minecraft/basicpipes/RenderPump.java delete mode 100644 1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java delete mode 100644 1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java delete mode 100644 1.4.2/src/minecraft/basicpipes/renderTank/RenderLTank.java delete mode 100644 1.4.2/src/minecraft/mcp.png delete mode 100644 1.4.2/src/minecraft/steampower/GUIFireBox.java delete mode 100644 1.4.2/src/minecraft/steampower/GUISteamPiston.java delete mode 100644 1.4.2/src/minecraft/steampower/GuiBoiler.java delete mode 100644 1.4.2/src/minecraft/steampower/ItemRenderHelperS.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelCenterTank.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelCornerTank.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelEngine.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelFurnace.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelGenerator.java delete mode 100644 1.4.2/src/minecraft/steampower/ModelTank.java delete mode 100644 1.4.2/src/minecraft/steampower/RenderBoiler.java delete mode 100644 1.4.2/src/minecraft/steampower/RenderFurnace.java delete mode 100644 1.4.2/src/minecraft/steampower/RenderGenerator.java delete mode 100644 1.4.2/src/minecraft/steampower/SteamClientProxy.java delete mode 100644 1.4.2/src/minecraft/steampower/geared/ModelGearPiston.java delete mode 100644 1.4.2/src/minecraft/steampower/geared/RenderGearPiston.java delete mode 100644 1.4.2/src/minecraft/textures/BoilerGui.png delete mode 100644 1.4.2/src/minecraft/textures/CornerTank.png delete mode 100644 1.4.2/src/minecraft/textures/Engine.png delete mode 100644 1.4.2/src/minecraft/textures/Furnace.png delete mode 100644 1.4.2/src/minecraft/textures/GearRod.png delete mode 100644 1.4.2/src/minecraft/textures/GearShaftPiston.png delete mode 100644 1.4.2/src/minecraft/textures/Generator.png delete mode 100644 1.4.2/src/minecraft/textures/GrinderGUI.png delete mode 100644 1.4.2/src/minecraft/textures/Items.png delete mode 100644 1.4.2/src/minecraft/textures/SteamGUI.png delete mode 100644 1.4.2/src/minecraft/textures/SteelPiston.png delete mode 100644 1.4.2/src/minecraft/textures/blocks.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/DefaultPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/LavaPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/SixLavaPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/SixOilPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/SixSteamPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/SixWaterPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/SteamPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pipes/WaterPipe.png delete mode 100644 1.4.2/src/minecraft/textures/pumps/LavaPump.png delete mode 100644 1.4.2/src/minecraft/textures/pumps/OilPump.png delete mode 100644 1.4.2/src/minecraft/textures/pumps/Pump.png delete mode 100644 1.4.2/src/minecraft/textures/pumps/WaterPump.png delete mode 100644 1.4.2/src/minecraft/textures/tankBlock.png delete mode 100644 1.4.2/src/minecraft/textures/tankTexture.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/GUITurret.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank0.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank1.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank2.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank3.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTank4.png delete mode 100644 1.4.2/src/minecraft/textures/tanks/LiquidTankCorner.png create mode 100644 src/common/dark/SteamPower/boiler/BlockBoiler.java create mode 100644 src/common/dark/SteamPower/boiler/TileEntityBoilerPipe.java rename src/common/dark/SteamPower/{SteamMachines.java => firebox/BlockHeaters.java} (56%) create mode 100644 src/common/dark/SteamPower/firebox/TileEntityLavaBuffer.java create mode 100644 src/common/dark/SteamPower/firebox/TileEntityLiquidBurner.java delete mode 100644 src/common/dark/SteamPower/steamengine/TileEntitytopGen.java diff --git a/1.4.2/src/common/basicpipes/BasicPipesMain.java b/1.4.2/src/common/basicpipes/BasicPipesMain.java deleted file mode 100644 index fef619c3..00000000 --- a/1.4.2/src/common/basicpipes/BasicPipesMain.java +++ /dev/null @@ -1,221 +0,0 @@ -package basicpipes; - -import java.io.File; - -import net.minecraft.src.Block; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraftforge.common.Configuration; -import universalelectricity.prefab.network.PacketManager; -import basicpipes.LTanks.ItemTank; -import basicpipes.LTanks.TileEntityLTank; -import basicpipes.conductors.BlockPipe; -import basicpipes.conductors.BlockRod; -import basicpipes.conductors.ItemGuage; -import basicpipes.conductors.ItemParts; -import basicpipes.conductors.ItemPipe; -import basicpipes.conductors.TileEntityPipe; -import basicpipes.conductors.TileEntityRod; -import basicpipes.machines.BlockMachine; -import basicpipes.machines.BlockValve; -import basicpipes.machines.TileEntityPump; -import basicpipes.pipes.api.Liquid; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; - -@Mod(modid = "basicPipes", name = "Basic Pipes", version = "1.9", dependencies = "after:UniversalElectricity") -@NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) -public class BasicPipesMain { - - public BasicPipesMain instance; - - @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(), - "/UniversalElectricity/BasicPipes.cfg"))); - public static int pipeID = configurationProperties(); - private static int partID; - private static int ppipeID; - public static int machineID; - private static int toolID; - private static int tankID; - public static int valveID; - public static int rodID; - public static Block pipe = new BlockPipe(pipeID).setBlockName("pipe"); - public static Block machine = new BlockMachine(machineID) - .setBlockName("pump"); - public static Block valve = new BlockValve(valveID).setBlockName("valve"); - public static Block rod = new BlockRod(rodID); - public static Item parts = new ItemParts(partID); - public static Item itemPipes = new ItemPipe(ppipeID); - public static Item itemTank = new ItemTank(tankID); - public static Item gauge = new ItemGuage(toolID); - - public static String channel = "Pipes"; - public static String textureFile = "/textures"; - public static boolean ueLoaded = false; - - public static int configurationProperties() { - config.load(); - pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "PipeBlock", 155).value); - machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "machineBlock", 156).value); - valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "ValveBlock", 157).value); - rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "gearBlock", 158).value); - partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, - "parts", 23022).value); - ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, - "pipes", 23023).value); - toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, - "ToolID", 23024).value); - tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, - "tankID", 23025).value); - config.save(); - return pipeID; - } - - @PreInit - public void preInit(FMLPreInitializationEvent event) { - proxy.preInit(); - GameRegistry.registerBlock(pipe); - GameRegistry.registerBlock(rod); - GameRegistry.registerBlock(machine, - basicpipes.machines.ItemMachine.class); - } - - @Init - public void load(FMLInitializationEvent evt) { - // register - proxy.init(); - GameRegistry.registerTileEntity(TileEntityPipe.class, "pipe"); - GameRegistry.registerTileEntity(TileEntityPump.class, "pump"); - GameRegistry.registerTileEntity(TileEntityRod.class, "rod"); - GameRegistry.registerTileEntity(TileEntityLTank.class, "ltank"); - // Names and lang stuff - // Pipe Names - for (int i = 0; i < Liquid.values().length; i++) { - LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)), - Liquid.getLiquid(i).lName + " Pipe"); - } - for (int i = 0; i < Liquid.values().length; i++) { - LanguageRegistry.addName((new ItemStack(itemTank, 1, i)), - Liquid.getLiquid(i).lName + " Tank"); - } - // Pump - LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "WaterPump"); - LanguageRegistry.addName((new ItemStack(machine, 1, 4)), - "WaterCondensor"); - LanguageRegistry.addName((new ItemStack(rod, 1)), "MechRod"); - // Tools - LanguageRegistry.addName((new ItemStack(gauge, 1, 0)), "PipeGuage"); - // Parts - LanguageRegistry.addName((new ItemStack(parts, 1, 0)), "BronzeTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 1)), "IronTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 2)), "ObsidianTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 3)), "NetherTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 4)), "LeatherSeal"); - LanguageRegistry.addName((new ItemStack(parts, 1, 5)), "SlimeSeal"); - LanguageRegistry.addName((new ItemStack(parts, 1, 6)), "BronzeTank"); - LanguageRegistry.addName((new ItemStack(parts, 1, 7)), "Valve"); - } - - @PostInit - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(); - GameRegistry.addRecipe(new ItemStack(this.gauge, 1, 0), new Object[] { - "TVT"," T ", 'V', new ItemStack(parts,1,7), 'T',new ItemStack(parts,1,1) }); - //iron tube - GameRegistry.addRecipe(new ItemStack(parts, 2, 1), new Object[] { - "@@@", '@', Item.ingotIron }); - //obby tube - GameRegistry.addRecipe(new ItemStack(parts, 2, 2), new Object[] { - "@@@", '@', Block.obsidian }); - //nether tube - GameRegistry - .addRecipe(new ItemStack(parts, 2, 3), - new Object[] { "N@N", 'N', Block.netherrack, '@', - new ItemStack(parts, 2, 2) }); - //seal - GameRegistry.addRecipe(new ItemStack(parts, 2, 4), new Object[] { "@@", - "@@", '@', Item.leather }); - //slime steal - GameRegistry.addShapelessRecipe(new ItemStack(parts, 1, 5), - new Object[] { new ItemStack(parts, 1, 4), - new ItemStack(Item.slimeBall, 1) });// stick seal - // crafting pipes - // {"black", "red", "green", "brown", "blue", "purple", "cyan", - // "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", - // "orange", "white"}; - GameRegistry.addRecipe(new ItemStack(rod, 1), new Object[] { "I@I", - 'I', Item.ingotIron, '@', new ItemStack(parts, 1, 1) }); - // water - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 1), - new Object[] { new ItemStack(parts, 1, 1), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 4) }); - // lava TODO change to use obby pipe and nether items - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 2), - new Object[] { new ItemStack(parts, 1, 2), - new ItemStack(Item.dyePowder, 1, 1) }); - // oil - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 3), - new Object[] { new ItemStack(parts, 1, 1), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 0) }); - // fuel - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 4), - new Object[] { new ItemStack(parts, 1, 1), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 11) }); - GameRegistry.addRecipe(new ItemStack(parts, 1, 7), new Object[] { - "T@T", 'T', new ItemStack(parts, 1, 1), '@', Block.lever });// valve - - GameRegistry.addRecipe(new ItemStack(parts, 1, 6), new Object[] { - " @ ", "@ @", " @ ", '@', Item.ingotIron });// tank - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 0), - new Object[] { new ItemStack(parts, 1, 6), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 15) }); - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 1), - new Object[] { new ItemStack(parts, 1, 6), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 4) }); - // lava TODO change to use obby pipe and nether items - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 2), - new Object[] { new ItemStack(parts, 1, 6), Block.obsidian, - Block.obsidian, Block.obsidian, Block.obsidian }); - // oil - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 3), - new Object[] { new ItemStack(parts, 1, 6), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 0) }); - // fuel - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 4), - new Object[] { new ItemStack(parts, 1, 6), - new ItemStack(parts, 1, 4), - new ItemStack(Item.dyePowder, 1, 11) }); - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 0), - new Object[] { new ItemStack(parts, 1, 1), - new ItemStack(parts, 1, 4) }); - GameRegistry.addRecipe(new ItemStack(machine, 1, 0), new Object[] { - "@T@", "BPB", "@P@", '@', new ItemStack(Item.ingotIron, 2), - 'B', new ItemStack(parts, 1, 7), 'P', - new ItemStack(Block.pistonBase), 'T', - new ItemStack(parts, 1, 6) }); - - } - -} diff --git a/1.4.2/src/common/basicpipes/LTanks/ItemTank.java b/1.4.2/src/common/basicpipes/LTanks/ItemTank.java deleted file mode 100644 index 2f588502..00000000 --- a/1.4.2/src/common/basicpipes/LTanks/ItemTank.java +++ /dev/null @@ -1,130 +0,0 @@ -package basicpipes.LTanks; - -import java.util.List; - -import basicpipes.BasicPipesMain; -import basicpipes.pipes.api.Liquid; - -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; - -public class ItemTank extends Item -{ - int index = 64;//64 + 2 rows alloted to pipes - private int spawnID; - - public ItemTank(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setIconIndex(10); - this.setItemName("tank"); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public int getIconFromDamage(int par1) - { - - return par1+index; - } - @Override - public String getItemNameIS(ItemStack itemstack) - { - return itemstack.getItemDamage() < Liquid.values().length ? Liquid.getLiquid(itemstack.getItemDamage()).lName+" Tank" : "unknown"; - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - for(int i = 0; i < Liquid.values().length; i++) - { - par3List.add(new ItemStack(this, 1, i)); - } - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "Pipes"; - } - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - int blockID = par3World.getBlockId(par4, par5, par6); - spawnID = BasicPipesMain.machineID; - if (blockID == Block.snow.blockID) - { - par7 = 1; - } - else if (blockID != Block.vine.blockID && blockID != Block.tallGrass.blockID && blockID != Block.deadBush.blockID) - { - if (par7 == 0) - { - --par5; - } - - if (par7 == 1) - { - ++par5; - } - - if (par7 == 2) - { - --par6; - } - - if (par7 == 3) - { - ++par6; - } - - if (par7 == 4) - { - --par4; - } - - if (par7 == 5) - { - ++par4; - } - } - - if (BasicPipesMain.pipe.canPlaceBlockAt(par3World,par4,par5,par6)) - { - Block var9 = Block.blocksList[this.spawnID]; - par3World.editingBlocks = true; - if (par3World.setBlockAndMetadataWithNotify(par4, par5, par6, var9.blockID,5)) - { - if (par3World.getBlockId(par4, par5, par6) == var9.blockID) - { - - Block.blocksList[this.spawnID].onBlockAdded(par3World, par4, par5, par6); - Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); - TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6); - if(blockEntity instanceof TileEntityLTank) - { - TileEntityLTank pipeEntity = (TileEntityLTank) blockEntity; - Liquid dm = Liquid.getLiquid(par1ItemStack.getItemDamage()); - pipeEntity.setType(dm); - } - } - - --par1ItemStack.stackSize; - par3World.editingBlocks = false; - return true; - } - } - par3World.editingBlocks = false; - return false; - } - - -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/LTanks/TileEntityLTank.java b/1.4.2/src/common/basicpipes/LTanks/TileEntityLTank.java deleted file mode 100644 index b127bf54..00000000 --- a/1.4.2/src/common/basicpipes/LTanks/TileEntityLTank.java +++ /dev/null @@ -1,210 +0,0 @@ -package basicpipes.LTanks; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.Vector3; -import universalelectricity.prefab.network.IPacketReceiver; -import universalelectricity.prefab.network.PacketManager; -import basicpipes.BasicPipesMain; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.IStorageTank; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityLTank extends TileEntity implements IStorageTank,ILiquidProducer,IPacketReceiver{ -public TileEntity[] cc = {null,null,null,null,null,null}; -public Liquid type = Liquid.DEFUALT; -public int LStored = 0; -public int pLStored = 0; -public int LMax = 4; -private int count = 0; -private int count2 = 0; -private boolean firstUpdate = true; -public void updateEntity() -{ - if(++count >= 5) - { - count = 0; - this.cc = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - if(!worldObj.isRemote) - { - MHelper.shareLiquid(worldObj,xCoord, yCoord, zCoord,this.LStored,this.getLiquidCapacity(type), type); - if(firstUpdate ||(this.LStored != pLStored)|| count2 >= 100) - { - count2 = 0; - firstUpdate = false; - Packet packet = PacketManager.getPacket(BasicPipesMain.channel, this, new Object[]{type.ordinal(),LStored}); - PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 20); - } - this.pLStored = this.LStored; - } - } -} -public void writeToNBT(NBTTagCompound nbt) -{ - super.writeToNBT(nbt); - nbt.setInteger("Vol", this.LStored); - nbt.setInteger("type", this.type.ordinal()); -} - -@Override -public void readFromNBT(NBTTagCompound nbt) -{ - super.readFromNBT(nbt); - this.LStored = nbt.getInteger("Vol"); - this.type = Liquid.getLiquid(nbt.getInteger("type")); -} - -//-------------------- -//Liquid stuff -//------------------------------------ -@Override -public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) -{ - - if(type == this.type) - { - if(this.LStored < this.getLiquidCapacity(this.type)) - { - int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol) - this.LMax, 0); - this.LStored = Math.min(Math.max((LStored + vol - rejectedVolume),0),this.LMax); - return rejectedVolume; - }else - { - TileEntity te = null; - if(this.type.isGas) - { - worldObj.getBlockTileEntity(xCoord, yCoord+1, zCoord); - }else - { - worldObj.getBlockTileEntity(xCoord, yCoord-1, zCoord); - } - if( te instanceof IStorageTank) - { - return ((IStorageTank)te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); - } - } - } - return vol; -} - -@Override -public boolean canRecieveLiquid(Liquid type, ForgeDirection side) { - if(type == this.type) - { - if(this.type.isGas && side == ForgeDirection.UP) - { - return false; - } - if(!this.type.isGas && side == ForgeDirection.DOWN) - { - return false; - } - return true; - } - return false; -} - -@Override -public int getStoredLiquid(Liquid type) { - if(type == this.type) - { - return LStored; - } - return 0; -} - -@Override -public int getLiquidCapacity(Liquid type) { - if(type == this.type) - { - return LMax; - } - return 0; -} - -public Liquid getType() { - // TODO Auto-generated method stub - return type; -} - -@Override -public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == this.type && this.LStored > 1 && vol > 0) - { - //TODO correct / do math for - LStored--; - return 1; - } - return 0; -} - -@Override -public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == this.type) - { - if(this.type.isGas && side == ForgeDirection.UP) - { - return true; - } - if(!this.type.isGas && side == ForgeDirection.DOWN) - { - return true; - } - } - return false; -} - -@Override -public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == this.type) - { - if(this.type.isGas && side == ForgeDirection.DOWN) - { - return true; - } - if(!this.type.isGas && side == ForgeDirection.UP) - { - return true; - } - } - return false; -} - -@Override -public int presureOutput(Liquid type, ForgeDirection side) { - if(type == this.type) - { - return this.type.defaultPresure; - } - return 0; -} - - -@Override -public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput data) { - try - { - this.type = Liquid.getLiquid(data.readInt()); - this.LStored = data.readInt(); - }catch(Exception e) - { - e.printStackTrace(); - System.out.print("Fail reading data for Storage tank \n"); - } - -} -public void setType(Liquid dm) { - this.type = dm; - -} -} diff --git a/1.4.2/src/common/basicpipes/PipeProxy.java b/1.4.2/src/common/basicpipes/PipeProxy.java deleted file mode 100644 index ce0e8cc9..00000000 --- a/1.4.2/src/common/basicpipes/PipeProxy.java +++ /dev/null @@ -1,56 +0,0 @@ -package basicpipes; - -import basicpipes.conductors.TileEntityPipe; -import basicpipes.conductors.TileEntityRod; -import basicpipes.machines.TileEntityPump; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; - -public class PipeProxy implements IGuiHandler -{ - - public void preInit() - { - - } - public void init() - { - - } - public void postInit() - { - - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - switch(ID) - { - } - } - - return null; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - switch(ID) - { - } - } - - return null; - } -} diff --git a/1.4.2/src/common/basicpipes/conductors/BlockPipe.java b/1.4.2/src/common/basicpipes/conductors/BlockPipe.java deleted file mode 100644 index aeac6929..00000000 --- a/1.4.2/src/common/basicpipes/conductors/BlockPipe.java +++ /dev/null @@ -1,90 +0,0 @@ -package basicpipes.conductors; - -import java.util.Random; - -import basicpipes.BasicPipesMain; -import basicpipes.pipes.api.ILiquidConsumer; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.Liquid; - -import net.minecraft.src.BlockContainer; -import net.minecraft.src.EntityItem; -import net.minecraft.src.ItemStack; -import net.minecraft.src.Material; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import net.minecraftforge.common.ForgeDirection; - -public class BlockPipe extends BlockContainer -{ - - public BlockPipe(int id) - { - super(id, Material.iron); - this.setBlockName("Pipe"); - this.setBlockBounds(0.30F, 0.30F, 0.30F, 0.70F, 0.70F, 0.70F); - this.setHardness(1f); - this.setResistance(3f); - } - public boolean isOpaqueCube(){return false;} - public boolean renderAsNormalBlock(){return false;} - public int getRenderType(){return -1;} - public int idDropped(int par1, Random par2Random, int par3){return 0;} - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - super.onBlockAdded(world, x, y, z); - } - /** - * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are - * their own) Args: x, y, z, neighbor blockID - */ - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockID) - { - super.onNeighborBlockChange(world, x, y, z, blockID); - } - @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) - { - int var5 = par1World.getBlockId(par2, par3, par4); - return var5 == 0 || blocksList[var5].blockMaterial.isGroundCover(); - } - @Override - public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) - { - return true; - } - - @Override - public TileEntity createNewTileEntity(World var1) { - // TODO Auto-generated method stub - return new TileEntityPipe(); - } - @Override - public void breakBlock(World world, int x, int y, int z,int par5, int par6) - { - super.breakBlock(world, x, y, z, par5, par6); - TileEntity ent = world.getBlockTileEntity(x, y, z); - Random furnaceRand = new Random(); - if(ent instanceof TileEntityPipe) - { - TileEntityPipe pipe = (TileEntityPipe) ent; - int meta = pipe.type.ordinal(); - float var8 = furnaceRand.nextFloat() * 0.8F + 0.1F; - float var9 = furnaceRand.nextFloat() * 0.8F + 0.1F; - float var10 = furnaceRand.nextFloat() * 0.8F + 0.1F; - EntityItem var12 = new EntityItem(world, (double)((float)x + var8), (double)((float)y + var9), - (double)((float)z + var10), new ItemStack(BasicPipesMain.itemPipes, 1, meta)); - float var13 = 0.05F; - var12.motionX = (double)((float)furnaceRand.nextGaussian() * var13); - var12.motionY = (double)((float)furnaceRand.nextGaussian() * var13 + 0.2F); - var12.motionZ = (double)((float)furnaceRand.nextGaussian() * var13); - world.spawnEntityInWorld(var12); - } - } - - } - - diff --git a/1.4.2/src/common/basicpipes/conductors/BlockRod.java b/1.4.2/src/common/basicpipes/conductors/BlockRod.java deleted file mode 100644 index 370a7330..00000000 --- a/1.4.2/src/common/basicpipes/conductors/BlockRod.java +++ /dev/null @@ -1,83 +0,0 @@ -package basicpipes.conductors; - -import basicpipes.ItemRenderHelper; -import steampower.TileEntityMachine; -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Material; -import net.minecraft.src.MathHelper; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import net.minecraftforge.common.ForgeDirection; - -public class BlockRod extends universalelectricity.prefab.BlockMachine { - - public BlockRod(int par1) { - super("MechanicRod", par1, Material.iron); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public int damageDropped(int metadata) - { - return 0; - } - @Override - public void onBlockPlacedBy(World world,int i,int j,int k, EntityLiving player) - { - int angle= MathHelper.floor_double((player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int meta = 0; - ForgeDirection idr; - int dZ = 0; - int dX = 0; - switch(angle) - { - case 0: meta = 2;dZ--;break; - case 1: meta = 5;dX--;break; - case 2: meta = 3;dZ++;break; - case 3: meta = 4;dX++;break; - } - world.setBlockAndMetadataWithUpdate(i, j, k,blockID, meta, true); - } - @Override - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer par5EntityPlayer) - { - int meta = world.getBlockMetadata(x, y, z); - if(meta >= 5) - { - world.setBlockMetadataWithNotify(x, y, z, 0); - } - else - { - world.setBlockMetadataWithNotify(x,y,z,meta+1); - } - return true; - } - @Override - public TileEntity createNewTileEntity(World var1) - { - return new TileEntityRod(); - } - public boolean isOpaqueCube() - { - return false; - } - - /** - * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc) - */ - public boolean renderAsNormalBlock() - { - return false; - } - - /** - * The type of render function that is called for this block - */ - public int getRenderType() - { - return ItemRenderHelper.renderID; - } - -} diff --git a/1.4.2/src/common/basicpipes/conductors/ItemGuage.java b/1.4.2/src/common/basicpipes/conductors/ItemGuage.java deleted file mode 100644 index e36c9757..00000000 --- a/1.4.2/src/common/basicpipes/conductors/ItemGuage.java +++ /dev/null @@ -1,114 +0,0 @@ -package basicpipes.conductors; - -import java.util.List; - -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import basicpipes.BasicPipesMain; -import basicpipes.LTanks.TileEntityLTank; -import basicpipes.pipes.api.IMechanical; -import basicpipes.pipes.api.Liquid; - -public class ItemGuage extends Item -{ - private int spawnID; - - public ItemGuage(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setIconIndex(10); - this.setItemName("guage"); - this.setCreativeTab(CreativeTabs.tabTools); - this.setMaxStackSize(1); - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - par3List.add(new ItemStack(this, 1, 0)); - } - @Override - public int getIconFromDamage(int par1) - { - switch(par1) - { - case 0: return 24; - } - return this.iconIndex; - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "guage"; - } - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - if(!par3World.isRemote) - { - if(itemStack.getItemDamage() == 0) - { - TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6); - if(blockEntity instanceof TileEntityPipe) - { - TileEntityPipe pipeEntity = (TileEntityPipe) blockEntity; - Liquid type = pipeEntity.getType(); - int steam = pipeEntity.getStoredLiquid(type); - int pressure = pipeEntity.presure; - String typeName = type.lName; - String print = "Error"; - - print = typeName +" " + steam +" @ "+pressure+"PSI"; - - player.sendChatToPlayer(print); - return true; - } - if(blockEntity instanceof TileEntityLTank) - { - TileEntityLTank pipeEntity = (TileEntityLTank) blockEntity; - Liquid type = pipeEntity.getType(); - int steam = pipeEntity.getStoredLiquid(type); - String typeName = type.lName; - String print = "Error"; - - print = typeName +" " + steam; - - player.sendChatToPlayer(print); - return true; - } - if(blockEntity instanceof IMechanical) - { - IMechanical rod = (IMechanical) blockEntity; - int steam = rod.getForce(); - int pressure = rod.getAnimationPos(); - String print = "Error"; - - print = " " + steam +"N "+pressure*45+"degrees"; - - player.sendChatToPlayer(print); - return true; - } - } - - } - - return false; - } - public String getItemNameIS(ItemStack par1ItemStack) - { - int var3 = par1ItemStack.getItemDamage(); - switch(var3) - { - case 0: return "PipeGuage"; - } - return this.getItemName(); - } -} diff --git a/1.4.2/src/common/basicpipes/conductors/ItemParts.java b/1.4.2/src/common/basicpipes/conductors/ItemParts.java deleted file mode 100644 index 59fe3b86..00000000 --- a/1.4.2/src/common/basicpipes/conductors/ItemParts.java +++ /dev/null @@ -1,62 +0,0 @@ -package basicpipes.conductors; - -import java.util.ArrayList; -import java.util.List; - -import basicpipes.BasicPipesMain; - -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.World; - -public class ItemParts extends Item{ - String[] names = new String[]{"BronzeTube","IronTube","ObbyTube","NetherTube","Seal","StickSeal","BronzeTank","Valve",}; - int[] iconID = new int[] {0 ,1 ,2 ,3 ,16 ,17 ,18 ,19};//TODO check these - public ItemParts(int par1) - { - super(par1); - this.setItemName("Parts"); - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setMaxStackSize(64); - this.setCreativeTab(CreativeTabs.tabMaterials); - } - @Override - public int getIconFromDamage(int par1) - { - if(par1 < iconID.length) - { - return iconID[par1]; - } - return par1; - } - @Override - public String getItemNameIS(ItemStack itemstack) - { - return names[itemstack.getItemDamage()]; - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - for(int i = 0; i < names.length; i++) - { - par3List.add(new ItemStack(this, 1, i)); - } - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "parts"; - } -} - - - - - - diff --git a/1.4.2/src/common/basicpipes/conductors/ItemPipe.java b/1.4.2/src/common/basicpipes/conductors/ItemPipe.java deleted file mode 100644 index b22999a6..00000000 --- a/1.4.2/src/common/basicpipes/conductors/ItemPipe.java +++ /dev/null @@ -1,130 +0,0 @@ -package basicpipes.conductors; - -import java.util.List; - -import basicpipes.BasicPipesMain; -import basicpipes.pipes.api.Liquid; - -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; - -public class ItemPipe extends Item -{ - int index = 32;//32 + 4 rows alloted to pipes - private int spawnID; - - public ItemPipe(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setIconIndex(10); - this.setItemName("pipe"); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public int getIconFromDamage(int par1) - { - - return par1+index; - } - @Override - public String getItemNameIS(ItemStack itemstack) - { - return itemstack.getItemDamage() < Liquid.values().length ? Liquid.getLiquid(itemstack.getItemDamage()).lName+" Pipe" : "Empty Pipe"; - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - for(int i = 0; i < Liquid.values().length; i++) - { - par3List.add(new ItemStack(this, 1, i)); - } - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "Pipes"; - } - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - int blockID = par3World.getBlockId(par4, par5, par6); - spawnID = BasicPipesMain.pipeID; - if (blockID == Block.snow.blockID) - { - par7 = 1; - } - else if (blockID != Block.vine.blockID && blockID != Block.tallGrass.blockID && blockID != Block.deadBush.blockID) - { - if (par7 == 0) - { - --par5; - } - - if (par7 == 1) - { - ++par5; - } - - if (par7 == 2) - { - --par6; - } - - if (par7 == 3) - { - ++par6; - } - - if (par7 == 4) - { - --par4; - } - - if (par7 == 5) - { - ++par4; - } - } - - if (BasicPipesMain.pipe.canPlaceBlockAt(par3World,par4,par5,par6)) - { - Block var9 = Block.blocksList[this.spawnID]; - par3World.editingBlocks = true; - if (par3World.setBlockWithNotify(par4, par5, par6, var9.blockID)) - { - if (par3World.getBlockId(par4, par5, par6) == var9.blockID) - { - - Block.blocksList[this.spawnID].onBlockAdded(par3World, par4, par5, par6); - Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); - TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6); - if(blockEntity instanceof TileEntityPipe) - { - TileEntityPipe pipeEntity = (TileEntityPipe) blockEntity; - Liquid dm = Liquid.getLiquid(par1ItemStack.getItemDamage()); - pipeEntity.setType(dm); - } - } - - --par1ItemStack.stackSize; - par3World.editingBlocks = false; - return true; - } - } - par3World.editingBlocks = false; - return false; - } - - -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/conductors/TileEntityPipe.java b/1.4.2/src/common/basicpipes/conductors/TileEntityPipe.java deleted file mode 100644 index 628dd6ca..00000000 --- a/1.4.2/src/common/basicpipes/conductors/TileEntityPipe.java +++ /dev/null @@ -1,210 +0,0 @@ -package basicpipes.conductors; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.Vector3; -import universalelectricity.prefab.network.IPacketReceiver; -import universalelectricity.prefab.network.PacketManager; -import basicpipes.pipes.api.ILiquidConsumer; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityPipe extends TileEntity implements ILiquidConsumer, - IPacketReceiver { - protected Liquid type = Liquid.DEFUALT; - - public int capacity = 2; - public int presure = 0; - public int connectedUnits = 0; - public int liquidStored = 0; - private int count = 0; - private int count2 = 0; - - protected boolean firstUpdate = true; - - public TileEntity[] connectedBlocks = { null, null, null, null, null, null }; - - public int getPressure() { - return this.presure; - } - - @Override - public void updateEntity() { - int highestPressure = 0; - if (++count >= 5) { - this.connectedBlocks = MHelper.getSourounding(worldObj, xCoord, - yCoord, zCoord); - for (int i = 0; i < 6; i++) { - - if (connectedBlocks[i] instanceof ILiquidConsumer - && ((ILiquidConsumer) connectedBlocks[i]) - .canRecieveLiquid(this.type, ForgeDirection - .getOrientation(i).getOpposite())) { - this.connectedUnits++; - if (connectedBlocks[i] instanceof TileEntityPipe) { - if (((TileEntityPipe) connectedBlocks[i]).getPressure() > highestPressure) { - highestPressure = ((TileEntityPipe) connectedBlocks[i]) - .getPressure(); - } - } - } else if (connectedBlocks[i] instanceof ILiquidProducer - && ((ILiquidProducer) connectedBlocks[i]) - .canProduceLiquid(this.type, ForgeDirection - .getOrientation(i).getOpposite())) { - this.connectedUnits++; - if (((ILiquidProducer) connectedBlocks[i]) - .canProducePresure(this.type, - ForgeDirection.getOrientation(i)) - && ((ILiquidProducer) connectedBlocks[i]) - .presureOutput(this.type, ForgeDirection - .getOrientation(i).getOpposite()) > highestPressure) { - highestPressure = ((ILiquidProducer) connectedBlocks[i]) - .presureOutput(this.type, - ForgeDirection.getOrientation(i)); - } - } else { - connectedBlocks[i] = null; - } - } - if (!worldObj.isRemote) { - if (firstUpdate || count2++ >= 10) { - count2 = 0; - firstUpdate = false; - Packet packet = PacketManager.getPacket("Pipes", this, - new Object[] { this.type.ordinal() }); - PacketManager.sendPacketToClients(packet, worldObj, - Vector3.get(this), 60); - } - this.presure = highestPressure - 1; - for (int i = 0; i < 6; i++) { - if (connectedBlocks[i] instanceof ILiquidProducer) { - int vol = ((ILiquidProducer) connectedBlocks[i]) - .onProduceLiquid(this.type, this.capacity - - this.liquidStored, ForgeDirection - .getOrientation(i).getOpposite()); - this.liquidStored = Math.min(this.liquidStored + vol, - this.capacity); - } - if (connectedBlocks[i] instanceof ILiquidConsumer - && this.liquidStored > 0 && this.presure > 0) { - if (connectedBlocks[i] instanceof TileEntityPipe) { - this.liquidStored--; - int vol = ((ILiquidConsumer) connectedBlocks[i]) - .onReceiveLiquid(this.type, Math.max( - this.liquidStored, 1), - ForgeDirection.getOrientation(i) - .getOpposite()); - this.liquidStored += vol; - } else { - this.liquidStored = ((ILiquidConsumer) connectedBlocks[i]) - .onReceiveLiquid(this.type, - this.liquidStored, ForgeDirection - .getOrientation(i) - .getOpposite()); - } - } - } - } - } - } - - // --------------- - // liquid stuff - // --------------- - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) { - if (type == this.type) { - int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol) - - this.capacity, 0); - this.liquidStored = Math.min( - Math.max((liquidStored + vol - rejectedVolume), 0), - this.capacity); - return rejectedVolume; - } - return vol; - } - - /** - * @return Return the stored volume in this pipe. - */ - @Override - public int getStoredLiquid(Liquid type) { - if (type == this.type) { - return this.liquidStored; - } - return 0; - } - - @Override - public int getLiquidCapacity(Liquid type) { - if (type == this.type) { - return this.capacity; - } - return 0; - } - - // find wether or not this side of X block can recieve X liquid type. Also - // use to determine connection of a pipe - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection side) { - if (type == this.type) { - return true; - } - return false; - } - - // returns liquid type - public Liquid getType() { - return this.type; - } - - // used by the item to set the liquid type on spawn - public void setType(Liquid rType) { - this.type = rType; - - } - - // --------------------- - // data - // -------------------- - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput data) { - try { - int type = data.readInt(); - if (worldObj.isRemote) { - this.type = Liquid.getLiquid(type); - } - } catch (Exception e) { - e.printStackTrace(); - } - - } - - /** - * Reads a tile entity from NBT. - */ - public void readFromNBT(NBTTagCompound par1NBTTagCompound) { - super.readFromNBT(par1NBTTagCompound); - this.liquidStored = par1NBTTagCompound.getInteger("liquid"); - this.type = Liquid.getLiquid(par1NBTTagCompound.getInteger("type")); - } - - /** - * Writes a tile entity to NBT. - */ - public void writeToNBT(NBTTagCompound par1NBTTagCompound) { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("liquid", this.liquidStored); - par1NBTTagCompound.setInteger("type", this.type.ordinal()); - } -} diff --git a/1.4.2/src/common/basicpipes/conductors/TileEntityRod.java b/1.4.2/src/common/basicpipes/conductors/TileEntityRod.java deleted file mode 100644 index a6b70c24..00000000 --- a/1.4.2/src/common/basicpipes/conductors/TileEntityRod.java +++ /dev/null @@ -1,137 +0,0 @@ -package basicpipes.conductors; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import steampower.SteamPowerMain; -import universalelectricity.core.Vector3; -import universalelectricity.prefab.network.IPacketReceiver; -import universalelectricity.prefab.network.PacketManager; -import basicpipes.pipes.api.IMechanical; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityRod extends TileEntity implements IPacketReceiver,IMechanical { - - public int pos = 0; - private int force = 0; - private int pForce = 0; - public int aForce = 0; - public int forceMax = 1000; - private int tickCount = 0; - private int posCount = 0; - - private ForgeDirection frontDir; - private ForgeDirection backDir; - - private TileEntity bb; - private TileEntity ff; - @Override - public void updateEntity() - { - super.updateEntity(); - if(tickCount++ >=10) - { tickCount = 0; - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - frontDir = ForgeDirection.getOrientation(meta); - backDir = ForgeDirection.getOrientation(meta).getOpposite(); - bb = worldObj.getBlockTileEntity(xCoord+backDir.offsetX, yCoord, zCoord+backDir.offsetZ); - ff = worldObj.getBlockTileEntity(xCoord+frontDir.offsetX, yCoord, zCoord+frontDir.offsetZ); - if(force > 0) - { - int posCountA = (forceMax/force) & 10; - if(posCount++ >= posCountA) - { - pos ++;if(pos > 7){pos = 0;}; - } - } - if(bb instanceof TileEntityRod) - { - this.pos = ((IMechanical)bb).getAnimationPos(); - } - if(!worldObj.isRemote) - { - - if(ff instanceof IMechanical) - { - if(((IMechanical) ff).canInputSide(backDir)) - { - ((IMechanical) ff).applyForce(aForce); - } - } - if(bb instanceof IMechanical) - { - if(((IMechanical) bb).canOutputSide(frontDir)) - { - this.force = ((IMechanical) bb).getForce(); - } - }else - { - this.force -=Math.max(force/10, 0); - } - aForce = Math.max(force - 10,0); - if(this.force != this.pForce) - { - Packet packet = PacketManager.getPacket(SteamPowerMain.channel,this, new Object[]{force}); - PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 40); - } - this.pForce = this.force; - } - } - } - @Override - public int getForceSide(ForgeDirection side) { - return aForce; - } - - @Override - public boolean canOutputSide(ForgeDirection side) { - if(side == frontDir) - { - return true; - } - return false; - } - - @Override - public boolean canInputSide(ForgeDirection side) { - if(side == backDir) - { - return true; - } - return false; - } - - @Override - public int applyForce(int force) { - this.force = force; - return force; - } - - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput data) { - try - { - this.force = data.readInt(); - }catch(Exception e) - { - e.printStackTrace(); - System.out.print("MechRodDataFailure \n"); - } - - } - @Override - public int getAnimationPos() { - return this.pos; - } - @Override - public int getForce() { - // TODO Auto-generated method stub - return this.force; - } -} diff --git a/1.4.2/src/common/basicpipes/machines/BlockMachine.java b/1.4.2/src/common/basicpipes/machines/BlockMachine.java deleted file mode 100644 index 1997ba5e..00000000 --- a/1.4.2/src/common/basicpipes/machines/BlockMachine.java +++ /dev/null @@ -1,79 +0,0 @@ -package basicpipes.machines; - -import net.minecraft.src.BlockContainer; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.Material; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import basicpipes.BasicPipesMain; -import basicpipes.ItemRenderHelper; -import basicpipes.LTanks.TileEntityLTank; - -public class BlockMachine extends BlockContainer -{ - - public BlockMachine(int id) - { - super(id, Material.iron); - this.setBlockName("Machine"); - this.setCreativeTab(CreativeTabs.tabBlock); - this.setRequiresSelfNotify(); - this.blockIndexInTexture = 26; - this.setHardness(1f); - this.setResistance(3f); - } - public boolean isOpaqueCube() - { - return false; - } - - public boolean renderAsNormalBlock() - { - return false; - } - - /** - * The type of render function that is called for this block - */ - public int getRenderType() - { - return ItemRenderHelper.renderID; - } - public int damageDropped(int meta) - { - if(meta < 4) - { - return 0; - } - return meta; - } - @Override - public TileEntity createNewTileEntity(World var1,int meta) { - // TODO Auto-generated method stub - if(meta < 4) - { - return new TileEntityPump(); - } - if(meta == 4) - { - return new TileEntityCondenser(); - } - if(meta == 5) - { - return new TileEntityLTank(); - } - return null; - } - - @Override - public TileEntity createNewTileEntity(World var1) { - // TODO Auto-generated method stub - return null; - } - @Override - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - } - - diff --git a/1.4.2/src/common/basicpipes/machines/BlockValve.java b/1.4.2/src/common/basicpipes/machines/BlockValve.java deleted file mode 100644 index a7c14936..00000000 --- a/1.4.2/src/common/basicpipes/machines/BlockValve.java +++ /dev/null @@ -1,179 +0,0 @@ -package basicpipes.machines; - -import java.util.Random; - -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Material; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import basicpipes.BasicPipesMain; - -public class BlockValve extends universalelectricity.prefab.BlockMachine -{ - - public BlockValve(int id) - { - super("Valve", id, Material.iron); - this.setBlockName("Valve"); - this.setCreativeTab(CreativeTabs.tabRedstone); - this.setRequiresSelfNotify(); - this.blockIndexInTexture = 26; - } - public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player) - { - TileEntity te = world.getBlockTileEntity(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - if(te instanceof TileEntityValve) - { - TileEntityValve valve = (TileEntityValve) te; - if(meta < 8) - { - if(!valve.on){ - valve.on = true; - }else{ - valve.on = false; - } - } - } - return false; - } - //rotation valve around y axis - public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer player) - { - int meta = world.getBlockMetadata(x, y, z); - if(meta < 4) - { - if(meta == 3) - { - world.setBlockMetadataWithNotify(x, y, z, 0); - } - else - { - world.setBlockMetadataWithNotify(x, y, z, meta+1); - } - return true; - } - if(meta > 3 && meta < 8) - { - if(meta == 7) - { - world.setBlockMetadataWithNotify(x, y, z, 4); - } - else - { - world.setBlockMetadataWithNotify(x, y, z, meta+1); - } - return true; - } - if(meta > 7 && meta < 12) - { - if(meta == 11) - { - world.setBlockMetadataWithNotify(x, y, z, 8); - } - else - { - world.setBlockMetadataWithNotify(x, y, z, meta+1); - } - return true; - } - if(meta > 11 && meta < 16) - { - if(meta == 15) - { - world.setBlockMetadataWithNotify(x, y, z, 12); - } - else - { - world.setBlockMetadataWithNotify(x, y, z, meta+1); - } - return true; - } - return false; - } - - //one shift click inverts pipe to face up - public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer player) - { - int meta = world.getBlockMetadata(x, y, z); - if(meta < 4) - { - world.setBlockMetadataWithNotify(x, y, z, meta+4); - return true; - } - if(meta > 3 && meta < 8) - { - world.setBlockMetadataWithNotify(x, y, z, meta-4); - return true; - } - if(meta > 7 && meta < 12) - { - - world.setBlockMetadataWithNotify(x, y, z, meta+4); - - return true; - } - if(meta > 11 && meta < 16) - { - - world.setBlockMetadataWithNotify(x, y, z, meta-4); - - return true; - } - return false; - } - public boolean isOpaqueCube() - { - return false; - } - - public boolean renderAsNormalBlock() - { - return false; - } - - /** - * The type of render function that is called for this block - */ - public int getRenderType() - { - return -1; - } - - /** - * Returns the ID of the items to drop on destruction. - */ - public int idDropped(int par1, Random par2Random, int par3) - { - return this.blockID; - } - public int damageDropped(int meta) - { - if(meta < 8) - { - return 0; - } - if(meta < 16 && meta > 7) - { - return 4; - } - return 0; - } - //Per tick - public int conductorCapacity() - { - return 1; - } - @Override - public TileEntity createNewTileEntity(World var1) { - // TODO Auto-generated method stub - return new TileEntityValve(); - } - @Override - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - } - - diff --git a/1.4.2/src/common/basicpipes/machines/ItemMachine.java b/1.4.2/src/common/basicpipes/machines/ItemMachine.java deleted file mode 100644 index b6fdd401..00000000 --- a/1.4.2/src/common/basicpipes/machines/ItemMachine.java +++ /dev/null @@ -1,124 +0,0 @@ -package basicpipes.machines; - -import java.util.List; - -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MathHelper; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import basicpipes.BasicPipesMain; - -public class ItemMachine extends ItemBlock -{ - int index = 26; - private int spawnID; - - public ItemMachine(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setIconIndex(10); - this.setItemName("Machine"); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public int getIconFromDamage(int par1) - { - - return par1+index; - } - @Override - public String getItemNameIS(ItemStack itemstack) - { - return itemstack.getItemDamage() == 0 ? "Pump" :"Conderser";//itemstack.getItemDamage() == 4 ? "Condenser":"Unknown"; - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - - par3List.add(new ItemStack(this, 1, 0)); - //par3List.add(new ItemStack(this, 1, 4)); - - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "Machines"; - } - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - int blockID = par3World.getBlockId(par4, par5, par6); - spawnID = BasicPipesMain.machineID; - if (blockID == Block.snow.blockID) - { - par7 = 1; - } - else if (blockID != Block.vine.blockID && blockID != Block.tallGrass.blockID && blockID != Block.deadBush.blockID) - { - if (par7 == 0) - { - --par5; - } - - if (par7 == 1) - { - ++par5; - } - - if (par7 == 2) - { - --par6; - } - - if (par7 == 3) - { - ++par6; - } - - if (par7 == 4) - { - --par4; - } - - if (par7 == 5) - { - ++par4; - } - } - - if (BasicPipesMain.pipe.canPlaceBlockAt(par3World,par4,par5,par6)) - { - Block var9 = Block.blocksList[this.spawnID]; - par3World.editingBlocks = true; - int angle = MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (par3World.setBlockAndMetadataWithNotify(par4, par5, par6, var9.blockID,angle+itemStack.getItemDamage())) - { - if (par3World.getBlockId(par4, par5, par6) == var9.blockID) - { - - Block.blocksList[this.spawnID].onBlockAdded(par3World, par4, par5, par6); - Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, player); - TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6); - - } - - --itemStack.stackSize; - par3World.editingBlocks = false; - return true; - } - } - par3World.editingBlocks = false; - return false; - } - - -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/machines/ItemValve.java b/1.4.2/src/common/basicpipes/machines/ItemValve.java deleted file mode 100644 index 78ed427c..00000000 --- a/1.4.2/src/common/basicpipes/machines/ItemValve.java +++ /dev/null @@ -1,126 +0,0 @@ -package basicpipes.machines; - -import java.util.List; - -import basicpipes.BasicPipesMain; - -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MathHelper; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; - -public class ItemValve extends ItemBlock -{ - int index = 26; - private int spawnID; - - public ItemValve(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - this.setIconIndex(10); - this.setItemName("Machine"); - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public int getIconFromDamage(int par1) - { - - return par1+index; - } - @Override - public String getItemNameIS(ItemStack itemstack) - { - return itemstack.getItemDamage() == 0 ? "Pump" :"Conderser";//itemstack.getItemDamage() == 4 ? "Condenser":"Unknown"; - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - - par3List.add(new ItemStack(this, 1, 0)); - par3List.add(new ItemStack(this, 1, 4)); - - } - public String getTextureFile() { - return BasicPipesMain.textureFile+"/Items.png"; - } - @Override - public String getItemName() - { - return "Machines"; - } - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) - { - int blockID = par3World.getBlockId(par4, par5, par6); - spawnID = BasicPipesMain.valveID; - if (blockID == Block.snow.blockID) - { - par7 = 1; - } - else if (blockID != Block.vine.blockID && blockID != Block.tallGrass.blockID && blockID != Block.deadBush.blockID) - { - if (par7 == 0) - { - --par5; - } - - if (par7 == 1) - { - ++par5; - } - - if (par7 == 2) - { - --par6; - } - - if (par7 == 3) - { - ++par6; - } - - if (par7 == 4) - { - --par4; - } - - if (par7 == 5) - { - ++par4; - } - } - - if (BasicPipesMain.pipe.canPlaceBlockAt(par3World,par4,par5,par6)) - { - Block var9 = Block.blocksList[this.spawnID]; - par3World.editingBlocks = true; - int angle = MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - if (par3World.setBlockAndMetadataWithNotify(par4, par5, par6, var9.blockID,angle+itemStack.getItemDamage())) - { - if (par3World.getBlockId(par4, par5, par6) == var9.blockID) - { - - Block.blocksList[this.spawnID].onBlockAdded(par3World, par4, par5, par6); - Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, player); - TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6); - - } - - --itemStack.stackSize; - par3World.editingBlocks = false; - return true; - } - } - par3World.editingBlocks = false; - return false; - } - - -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/machines/TileEntityCondenser.java b/1.4.2/src/common/basicpipes/machines/TileEntityCondenser.java deleted file mode 100644 index 23701e8e..00000000 --- a/1.4.2/src/common/basicpipes/machines/TileEntityCondenser.java +++ /dev/null @@ -1,110 +0,0 @@ -package basicpipes.machines; - -import universalelectricity.implement.IElectricityReceiver; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.Liquid; - -public class TileEntityCondenser extends TileEntity implements ILiquidProducer, IElectricityReceiver { - int tickCount = 0; - int waterStored = 0; - int energyStored = 0; - @Override - public int onProduceLiquid(Liquid type,int maxVol, ForgeDirection side) { - if(type == Liquid.WATER) - { - int tradeW = Math.min(maxVol, waterStored); - waterStored -= tradeW; - return tradeW; - } - return 0; - } - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("energyStored", (int)this.energyStored); - par1NBTTagCompound.setInteger("waterStored", (int)this.waterStored); - } - - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.energyStored = par1NBTTagCompound.getInteger("energyStored"); - this.waterStored = par1NBTTagCompound.getInteger("waterStored"); - } - public void updateEntity() - { - if(energyStored > 100 && waterStored < 3) - { - energyStored -= 100; - waterStored += 1; - } - } - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } - @Override - public void onDisable(int duration) { - // TODO Auto-generated method stub - - } - @Override - public boolean isDisabled() { - // TODO Auto-generated method stub - return false; - } - @Override - public double wattRequest() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean canReceiveFromSide(ForgeDirection side) { - // TODO Auto-generated method stub - return false; - } - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return 32; - } - return 0; - } - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } - @Override - public boolean canConnect(ForgeDirection side) { - // TODO Auto-generated method stub - return true; - } - @Override - public double getVoltage() { - // TODO Auto-generated method stub - return 120; - } - @Override - public void onReceive(TileEntity sender, double amps, double voltage, - ForgeDirection side) { - // TODO Auto-generated method stub - - } - - - - -} diff --git a/1.4.2/src/common/basicpipes/machines/TileEntityPump.java b/1.4.2/src/common/basicpipes/machines/TileEntityPump.java deleted file mode 100644 index 37aa6d65..00000000 --- a/1.4.2/src/common/basicpipes/machines/TileEntityPump.java +++ /dev/null @@ -1,140 +0,0 @@ -package basicpipes.machines; - -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.implement.IElectricityReceiver; -import universalelectricity.prefab.TileEntityElectricityReceiver; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - -public class TileEntityPump extends TileEntityElectricityReceiver implements ILiquidProducer,IElectricityReceiver { - int dCount = 0; - float eStored = 0; - float eMax = 2000; - int lStored = 0; - int wMax = 10; - public Liquid type = Liquid.DEFUALT; - public TileEntity[] sList = {null,null,null,null,null,null}; - private int count = 0; - @Override - public void onDisable(int duration) { - dCount = duration; - } - - @Override - public boolean isDisabled() { - if(dCount <= 0) - { - return false; - } - return true; - } - - @Override - public void updateEntity() { - super.updateEntity(); - if(count++ >= 40) - { - count = 0; - sList = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - int bBlock = worldObj.getBlockId(xCoord, yCoord -1, zCoord); - Liquid bellow = Liquid.getLiquidByBlock(bBlock); - - if(bellow != null && this.lStored <= 0) - { - this.type = bellow; - } - //eStored+=200; - if(!worldObj.isRemote) - { - if(bBlock == type.Still && this.eStored >= 200 && this.lStored < this.wMax) - { - eStored -= 200; - lStored += 1; - worldObj.setBlockAndMetadataWithNotify(xCoord, yCoord-1, zCoord, 0, 0); - - } - } - } - } - - @Override - public boolean canReceiveFromSide(ForgeDirection side) { - if(side != ForgeDirection.DOWN) - { - return true; - } - return false; - } - @Override - public int onProduceLiquid(Liquid type, int maxVol, ForgeDirection side) { - if(type == this.type && lStored > 0) - { - lStored -= 1; - return 1; - } - return 0; - } - - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - int facing = 0; - switch(meta) - { - case 0: facing = 2;break; - case 1: facing = 5;break; - case 2: facing = 3;break; - case 3: facing = 4;break; - } - - if(type == this.type && side != ForgeDirection.DOWN && side != ForgeDirection.UP && side != ForgeDirection.getOrientation(facing).getOpposite()) - { - return true; - } - return false; - } - - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return 32; - }else - if(type == Liquid.LAVA) - { - return 10; - }else - if(type == this.type) - { - return 50; - } - return 0; - } - - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == this.type) - { - return true; - } - return false; - } - - @Override - public void onReceive(TileEntity sender, double watts, double voltage, - ForgeDirection side) { - if (wattRequest() > 0 && canConnect(side)) - { - float rejectedElectricity = (float) Math.max((this.eStored + watts) - this.eMax, 0.0); - this.eStored = (float) Math.max(this.eStored + watts - rejectedElectricity, 0.0); - } - - } - - @Override - public double wattRequest() { - return Math.max(eMax - eStored,0); - } -} diff --git a/1.4.2/src/common/basicpipes/machines/TileEntityValve.java b/1.4.2/src/common/basicpipes/machines/TileEntityValve.java deleted file mode 100644 index 42189fd2..00000000 --- a/1.4.2/src/common/basicpipes/machines/TileEntityValve.java +++ /dev/null @@ -1,109 +0,0 @@ -package basicpipes.machines; - -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import basicpipes.conductors.TileEntityPipe; -import basicpipes.pipes.api.ILiquidConsumer; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - -public class TileEntityValve extends TileEntity implements ILiquidConsumer { -Liquid type = Liquid.DEFUALT; -int liquidStored = 0; -int lMax = 1; -int tickCount = 0; -TileEntity[] connected = {null,null,null,null,null,null}; -boolean on = false; - @Override - public void updateEntity() - { - tickCount++; - if(tickCount >= 10) - { - int deltaX = 0; - int deltaZ = 0; - int deltaY = 0; - int facing = 0; - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - if(meta == 0 && meta == 8) - { - facing = 2; - } - if(meta == 1 && meta == 9) - { - facing = 5; - } - if(meta == 2 && meta == 10) - { - facing = 3; - } - if(meta == 3 && meta == 11) - { - facing = 4; - } - if((meta > 3 && meta < 8)&&(meta> 11 && meta < 16)) - { - facing = 0; - } - switch(facing) - { - case 0: deltaY++;break; - case 1: deltaY--;break; - case 2: deltaZ--;break; - case 5: deltaZ++;break; - case 3: deltaX--;break; - case 4: deltaX++;break; - } - - connected = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - for(int i = 0;i<6;i++) - { - if(!(connected[i] instanceof TileEntityPipe)) - { - connected[i] = null; - } - } - if(!worldObj.isRemote) - { - //TODO send packet - } - tickCount = 0; - } - } - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) { - if(this.type == Liquid.DEFUALT) - { - this.type = type; - } - return vol; - } - - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection forgeDirection) { - if(type == this.type) - { - return true; - } - return false; - } - - @Override - public int getStoredLiquid(Liquid type) { - if(type == this.type) - { - return liquidStored; - } - return 0; - } - - @Override - public int getLiquidCapacity(Liquid type) { - if(type == this.type) - { - return lMax; - } - return 0; - } - -} diff --git a/1.4.2/src/common/basicpipes/mcmod.info b/1.4.2/src/common/basicpipes/mcmod.info deleted file mode 100644 index 80365e90..00000000 --- a/1.4.2/src/common/basicpipes/mcmod.info +++ /dev/null @@ -1,21 +0,0 @@ -[ -{ - "modid": "basicPipes", - "name": "Basic Pipes", - "description": "Simple liquid pumping & storage system for UE based mods. Can pump several types of common liquids including water,lava,oil,and Fuel.", - "version": "1.9", - "mcversion": "1.3.2", - "url": "http://www.minecraftforge.net/forum/index.php/topic,604.0.html", - "updateUrl": "", - "authors": [ - "DarkGuardsman" - ], - "credits": "Created by Darkguardsman; Vector/network code from Calclavia; Some Textures thanks to Atrain;", - "logoFile": "", - "screenshots": [ - ], - "parent":"", - "dependencies": ["UE" - ] -} -] \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/pipes/api/Beam.java b/1.4.2/src/common/basicpipes/pipes/api/Beam.java deleted file mode 100644 index 5d827c1c..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/Beam.java +++ /dev/null @@ -1,26 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; - -public class Beam { - //might need a more complex system for this later but for now this will work - public int intensity; //Beam intensity level - public boolean light; //Can prodcue light, might use this later - public ForgeDirection movDir; //Used to find the beams current direction - public Beam() - { - this(0,false,ForgeDirection.UNKNOWN); - } - Beam(int i, boolean light, ForgeDirection dir) - { - intensity = i; - this.light = light; - movDir = dir; - } - public static int getBeamLevel(Beam beam) - { - return beam.intensity; - } - - -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/IBeamProducer.java b/1.4.2/src/common/basicpipes/pipes/api/IBeamProducer.java deleted file mode 100644 index d3f639c7..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/IBeamProducer.java +++ /dev/null @@ -1,26 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; - -public interface IBeamProducer { - - /** - * onProduceLiquid - * block. - * @param type - the type of liquid - * @param regInt - requested beam intensity - * @param side - The side - * @return New Beam - Return a vol of liquid type that is produced - */ - public int createNewBeam(int type, int reqInt, ForgeDirection side); - /** - * canProduceLiquid - * block. - * @param type - the type of liquid - * @param side - The side - * @return boolean - True if can, false if can't produce liquid of type or on that side - * Also used for connection rules of pipes' - */ - public boolean canCreateBeam(int type, ForgeDirection side); - -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/IHeatProducer.java b/1.4.2/src/common/basicpipes/pipes/api/IHeatProducer.java deleted file mode 100644 index ae4e397f..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/IHeatProducer.java +++ /dev/null @@ -1,16 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; - - -public interface IHeatProducer -{ - /** - * onProduceElectricity is called when a conductor is connected to the producer block in which the conductor will demand power from the producer - * block. - * @param jouls - The maximum jouls can be transfered - * @param up - The side of block in which the conductor is on - * @return jouls - Return jouls to consumer - */ - public float onProduceHeat(float jouls, ForgeDirection up); -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/pipes/api/ILiquidConsumer.java b/1.4.2/src/common/basicpipes/pipes/api/ILiquidConsumer.java deleted file mode 100644 index d5eb17a2..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/ILiquidConsumer.java +++ /dev/null @@ -1,39 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; -/** - * Based off of Calclavia's old wire API - * @author DarkGuardsman - * - */ - -public interface ILiquidConsumer -{ - /** - * onRecieveLiquid - * @param vol - The amount this block received. - * @param side - The side of the block in which the liquid came from. - * @parm type - The type of liquid being received - * @return vol - The amount liquid that can't be recieved - */ - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side); - - /** - * You can use this to check if a pipe can connect to this liquid consumer to properly render the graphics - * @param forgeDirection - The side in which the volume is coming from. - * @parm type - The type of liquid - * @return Returns true or false if this consumer can receive a volume at this given tick or moment. - */ - public boolean canRecieveLiquid(Liquid type, ForgeDirection forgeDirection); - - /** - * @return Return the stored liquid of type in this consumer. - */ - public int getStoredLiquid(Liquid type); - - /** - * @return Return the maximum amount of stored liquid this consumer can get. - */ - public int getLiquidCapacity(Liquid type); - -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/ILiquidProducer.java b/1.4.2/src/common/basicpipes/pipes/api/ILiquidProducer.java deleted file mode 100644 index 9e37facf..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/ILiquidProducer.java +++ /dev/null @@ -1,38 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; - -/** - * Based off of Calclavia's old wire API - * @author DarkGuardsman - * - */ -public interface ILiquidProducer -{ - /** - * onProduceLiquid - * block. - * @param type - the type of liquid - * @param maxvol - The maximum vol or requested volume - * @param side - The side - * @return vol - Return a vol of liquid type that is produced - */ - public int onProduceLiquid(Liquid type, int maxVol, ForgeDirection side); - /** - * canProduceLiquid - * block. - * @param type - the type of liquid - * @param side - The side - * @return boolean - True if can, false if can't produce liquid of type or on that side - * Also used for connection rules of pipes' - */ - public boolean canProduceLiquid(Liquid type, ForgeDirection side); - public boolean canProducePresure(Liquid type, ForgeDirection side); - /** - * - * @param type - liquid type - * @param side - side this of presure - * @return pressure that is used to output liquid on - */ - public int presureOutput(Liquid type, ForgeDirection side); -} \ No newline at end of file diff --git a/1.4.2/src/common/basicpipes/pipes/api/IMechanical.java b/1.4.2/src/common/basicpipes/pipes/api/IMechanical.java deleted file mode 100644 index ced09be3..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/IMechanical.java +++ /dev/null @@ -1,36 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraftforge.common.ForgeDirection; -// mechanical -public interface IMechanical { -/** - * - * @param side the rpm is coming from - * @return rpm that the block is running at - */ - public int getForceSide(ForgeDirection side); - public int getForce(); - /** - * - * @param side - * @return if mechanical force can be outputed from this side - */ - public boolean canOutputSide(ForgeDirection side); - /** - * - * @param side - * @return if mechanical force can be inputed from this side - */ - public boolean canInputSide(ForgeDirection side); - /** - * - * @param RPM being applied to this machine - * @return the rpm after the load has been applied - */ - public int applyForce(int force); - /** - * not required but is handy to get animation position of some mechanical block - * @return int between 0 -7 - */ - public int getAnimationPos(); -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/IStorageTank.java b/1.4.2/src/common/basicpipes/pipes/api/IStorageTank.java deleted file mode 100644 index e110c041..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/IStorageTank.java +++ /dev/null @@ -1,5 +0,0 @@ -package basicpipes.pipes.api; - -public interface IStorageTank extends ILiquidConsumer { - -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/Liquid.java b/1.4.2/src/common/basicpipes/pipes/api/Liquid.java deleted file mode 100644 index f6a3be46..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/Liquid.java +++ /dev/null @@ -1,64 +0,0 @@ -package basicpipes.pipes.api; - - -import net.minecraft.src.Block; -/** - * System too easily reference a liquid type and its info - * @author Rseifert - * - */ -public enum Liquid { - // -1 == null || unused - STEAM("Steam",false,true,-1,-1,100), - WATER("Water",false,false,Block.waterStill.blockID,Block.waterMoving.blockID,32), - LAVA("Lava",false,false,Block.lavaStill.blockID,Block.lavaMoving.blockID,20), - OIL("Oil",true,false,-1,-1,32),//BasicComponents.oilStill.blockID,BasicComponents.oilMoving.blockID), - Fuel("Fuel",true,false,-1,-1,40), - Air("Air",false,true,0,-1,100), - Methain("Methain",true,true,-1,-1,100), - BioFuel("BioFuel",true,false,-1,-1,40), - Coolent("Coolent",false,false,-1,-1,40), - NukeWaste("NukeWaste",false,false,-1,-1,20), - Ether("Ether",false,false,-1,-1,100), - DEFUALT("Empty",false,false,-1,-1,0); - public final boolean flamable;//can it catch on fire, not used but might be - public final boolean isGas;//is it a gas, used to find if it floats - public final int Still;//if there is a block of still liquid linked to this - public final int Moving;//if there is a block of moving liquid linked to this - public final String lName;//Default name for the liquid - public final int defaultPresure;//default pressure output of the liquid -private Liquid(String name,boolean flame,boolean gas,int block, int Moving,int dPressure) -{ - this.flamable = flame; - this.isGas = gas; - this.Still = block; - this.Moving = Moving; - this.lName = name; - this.defaultPresure = dPressure; -} -/** - * Only use this if you are converting from the old system - * Or have a special need for it - * @param id of liquid - * @return Liquid Object - */ - public static Liquid getLiquid(int id) - { - if (id >= 0 && id < Liquid.values().length) - { - return Liquid.values()[id]; - } - return DEFUALT; - } -public static Liquid getLiquidByBlock(int bBlock) { - for(int i = 0; i < Liquid.values().length;i++) - { - Liquid selected = Liquid.getLiquid(i); - if(bBlock == selected.Still) - { - return selected; - } - } - return Liquid.DEFUALT; -} -} diff --git a/1.4.2/src/common/basicpipes/pipes/api/MHelper.java b/1.4.2/src/common/basicpipes/pipes/api/MHelper.java deleted file mode 100644 index 922444b7..00000000 --- a/1.4.2/src/common/basicpipes/pipes/api/MHelper.java +++ /dev/null @@ -1,125 +0,0 @@ -package basicpipes.pipes.api; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import net.minecraftforge.common.ForgeDirection; - -public class MHelper { -/** - * you will have to tell your TileEntity to trade up if liquid or down if gas. I suggest having your onRecieveLiquid - * pump liquid one block up if you block is full. - * @param entity - entity at center of search - * @return an Array containing TileEntities around the TileEntity - */ - public static TileEntity[] getSourounding(World world, int x, int y, int z) - { - TileEntity[] list = new TileEntity[]{null,null,null,null,null,null}; - for(int i =0; i< 6;i++) - { - ForgeDirection d = ForgeDirection.getOrientation(i); - TileEntity aEntity = world.getBlockTileEntity(x+d.offsetX, y+d.offsetY, z+d.offsetZ); - if(aEntity instanceof TileEntity) - { - list[i] = aEntity; - } - } - return list; - } - /** - * Used to help trade liquid without having to do too much work - * @param blockEntity - tile entity trading the liquid - * @param type - liquid type being traded - * @param vol - the volume to be traded - * @return the remaining untraded liquid - */ - public static int shareLiquid(World world, int x, int y, int z,int vol,int max, Liquid type) - { - TileEntity ent = world.getBlockTileEntity(x, y, z); - int currentVol = vol; - - int tCount = 1; - boolean rise = type.isGas; - if(currentVol <= 0) - { - return 0; - } - - - ForgeDirection st = ForgeDirection.getOrientation(rise ? 1 : 0); - TileEntity first = world.getBlockTileEntity(x+st.offsetX, y+st.offsetY, z+st.offsetZ); - //trades to the first, bottom for liquid, top for gas - if(first instanceof IStorageTank && currentVol > 0 && ((IStorageTank) first).getStoredLiquid(type) < ((IStorageTank) first).getLiquidCapacity(type)) - { - currentVol = ((ILiquidConsumer) first).onReceiveLiquid(type, currentVol, st); - } - int vAve = currentVol; - TileEntity[] TeA = MHelper.getSourounding(world,x,y,z); - for(int i = 2; i < 6; i++) - { - if(TeA[i] instanceof IStorageTank) - { - vAve += ((IStorageTank)TeA[i]).getStoredLiquid(type); - tCount++; - } - } - vAve = (int)(vAve/tCount); - //trades to side if anything is left - for(int i = 2; i < 6;i++) - { - ForgeDirection side = ForgeDirection.getOrientation(i); - TileEntity sSide = world.getBlockTileEntity(x+side.offsetX, y+side.offsetY, z+side.offsetZ); - if(currentVol <= 0 || currentVol <= vAve) - { - break; - } - if(sSide instanceof IStorageTank &&((IStorageTank) sSide).getStoredLiquid(type) < vAve) - { - int tA = vAve -Math.max((vAve - currentVol), 0); - currentVol = ((ILiquidConsumer) sSide).onReceiveLiquid(type, tA, st) -tA + currentVol; - } - } - //trades to the opposite of the first if anything is left - /** - * need to find a way to solve it just trading back the ammount on next cycle - if(currentVol > 0) - { - TileEntity last = world.getBlockTileEntity(x+st.getOpposite().offsetX, y+st.getOpposite().offsetY, z+st.getOpposite().offsetZ); - if(last instanceof IStorageTank && currentVol == max) - { - currentVol = ((ILiquidConsumer) last).onReceiveLiquid(type, max/10, st.getOpposite()) + currentVol -(max/10); - } - } - */ - return Math.max(currentVol,0); - } - /** - * - * @param entity - entity in question - * @return 1-4 if corner 0 if not a corner - * you have to figure out which is which depending on what your using this for - * 1 should be north east 2 south east - */ - public static int corner(TileEntity entity) - { - TileEntity[] en = getSourounding(entity.worldObj, entity.xCoord,entity.yCoord,entity.zCoord); - if(en[4] != null && en[2] != null && en[5] == null && en[3] == null) - { - return 3; - } - if(en[2] != null && en[5] != null && en[3] == null && en[4] == null) - { - return 4; - } - if(en[5] != null && en[3] != null && en[4] == null && en[2] == null) - { - return 1; - } - if(en[3] != null && en[4] != null && en[2] == null && en[5] == null) - { - return 2; - } - - return 0; - - } -} diff --git a/1.4.2/src/common/mcpmod.info b/1.4.2/src/common/mcpmod.info deleted file mode 100644 index 953d942a..00000000 --- a/1.4.2/src/common/mcpmod.info +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ - "modid": "mcp", - "name": "Minecraft Coder Pack", - "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.", - "version": "7.19", - "mcversion": "1.4.2", - "logoFile": "/mcp.png", - "url": "http://mcp.ocean-labs.de/", - "updateUrl": "", - "authors": ["Searge", "ProfMobius", "IngisKahn", "Fesh0r", "ZeuX", "R4wk", "Others"], - "credits": "Made by the MCP team", - "parent": "", - "screenshots": [], - "dependencies": [] -} -] diff --git a/1.4.2/src/common/steampower/BlockMachine.java b/1.4.2/src/common/steampower/BlockMachine.java deleted file mode 100644 index a0bd2c3d..00000000 --- a/1.4.2/src/common/steampower/BlockMachine.java +++ /dev/null @@ -1,239 +0,0 @@ -package steampower; - -import java.util.Random; - -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.Material; -import net.minecraft.src.MathHelper; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import steampower.boiler.TileEntityBoiler; -import steampower.burner.TileEntityFireBox; - -public class BlockMachine extends universalelectricity.prefab.BlockMachine -{ - - private Random mRandom = new Random(); - private static boolean keepFurnaceInventory = true; - - public BlockMachine(int par1) - { - super("machine", par1, Material.iron); - this.setRequiresSelfNotify(); - this.setCreativeTab(CreativeTabs.tabBlock); - this.setHardness(1f); - this.setResistance(3f); - } - @Override - public int damageDropped(int metadata) - { - return metadata; - } - @Override - public void randomDisplayTick(World par1World, int x, int y, int z, Random par5Random) - { - TileEntity tileEntity = par1World.getBlockTileEntity(x, y, z); - - if(tileEntity instanceof TileEntityFireBox) - { - if(((TileEntityFireBox)tileEntity).generateRate > 0) - { - int var6 = ((TileEntityFireBox) tileEntity).getDirection(); - float var7 = (float)x + 0.5F; - float var8 = (float)y + 0.0F + par5Random.nextFloat() * 6.0F / 16.0F; - float var9 = (float)z + 0.5F; - float var10 = 0.52F; - float var11 = par5Random.nextFloat() * 0.6F - 0.3F; - - if (var6 == 4) - { - par1World.spawnParticle("smoke", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 - var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (var6 == 2) - { - par1World.spawnParticle("smoke", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var10), (double)var8, (double)(var9 + var11), 0.0D, 0.0D, 0.0D); - } - else if (var6 == 1) - { - par1World.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var11), (double)var8, (double)(var9 - var10), 0.0D, 0.0D, 0.0D); - } - else if (var6 == 3) - { - par1World.spawnParticle("smoke", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", (double)(var7 + var11), (double)var8, (double)(var9 + var10), 0.0D, 0.0D, 0.0D); - } - } - } - } - - @Override - public boolean onUseWrench(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) - { - TileEntityMachine tileEntity = (TileEntityMachine)par1World.getBlockTileEntity(par2, par3, par4); - - //Reorient the block - switch(tileEntity.getDirection()) - { - case 1: tileEntity.setDirection(2); break; - case 2: tileEntity.setDirection(3); break; - case 3: tileEntity.setDirection(4); break; - case 4: tileEntity.setDirection(1); break; - } - - return true; - } - /** - * Called upon block activation (left or right click on the block.). The three integers represent x,y,z of the - * block. - */ - @Override - public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) - { - if (par1World.isRemote) - { - return true; - } - else - { - TileEntity blockEntity = (TileEntity)par1World.getBlockTileEntity(x, y, z); - - if (blockEntity != null) - { - - if(blockEntity instanceof TileEntityBoiler) - { - TileEntity var6 = (TileEntityBoiler)par1World.getBlockTileEntity(x, y, z); - par5EntityPlayer.openGui(SteamPowerMain.instance, 1, par1World, x, y, z); - } - if(blockEntity instanceof TileEntityFireBox) - { - TileEntity var6 = (TileEntityFireBox)par1World.getBlockTileEntity(x, y, z); - par5EntityPlayer.openGui(SteamPowerMain.instance, 0, par1World, x, y, z); - } - } - - return true; - } - } - @Override - public TileEntity createNewTileEntity(World var1,int meta) - { - switch(meta) - { - case 1: return new TileEntityBoiler(); - case 2: return new TileEntityFireBox(); - case 3: return new TileEntityFireBox(); - case 4: return new TileEntityFireBox(); - case 5: return new TileEntityFireBox(); - } - return null; - } - - /** - * Called when the block is placed in the world. - */ - @Override - public void onBlockPlacedBy(World par1World, int x, int y, int z, EntityLiving par5EntityLiving) - { - int angle = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int metadata = par1World.getBlockMetadata(x, y, z); - TileEntityMachine tileEntity = (TileEntityMachine)par1World.getBlockTileEntity(x, y, z); - - switch (angle) - { - case 0: tileEntity.setDirection(1); break; - case 1: tileEntity.setDirection(2); break; - case 2: tileEntity.setDirection(3); break; - case 3: tileEntity.setDirection(4); break; - } - } - /** - * Called whenever the block is removed. - */ - @Override - public void breakBlock(World par1World, int par2, int par3, int par4,int par5, int par6){ - if (!keepFurnaceInventory) - { - TileEntityMachine var5 = null; - TileEntity entityBox = par1World.getBlockTileEntity(par2, par3, par4); - if(entityBox instanceof TileEntityFireBox) - { - var5 = (TileEntityFireBox)entityBox; - } - else if(entityBox instanceof TileEntityBoiler) - { - var5 = (TileEntityBoiler)entityBox; - } - if (var5 != null) - { - for (int var6 = 0; var6 < var5.getSizeInventory(); ++var6) - { - ItemStack var7 = var5.getStackInSlot(var6); - - if (var7 != null) - { - float var8 = this.mRandom.nextFloat() * 0.8F + 0.1F; - float var9 = this.mRandom.nextFloat() * 0.8F + 0.1F; - float var10 = this.mRandom.nextFloat() * 0.8F + 0.1F; - - while (var7.stackSize > 0) - { - int var11 = this.mRandom.nextInt(21) + 10; - - if (var11 > var7.stackSize) - { - var11 = var7.stackSize; - } - - var7.stackSize -= var11; - EntityItem var12 = new EntityItem(par1World, (double)((float)par2 + var8), (double)((float)par3 + var9), (double)((float)par4 + var10), new ItemStack(var7.itemID, var11, var7.getItemDamage())); - - if (var7.hasTagCompound()) - { - var12.item.setTagCompound((NBTTagCompound)var7.getTagCompound().copy()); - } - - float var13 = 0.05F; - var12.motionX = (double)((float)this.mRandom.nextGaussian() * var13); - var12.motionY = (double)((float)this.mRandom.nextGaussian() * var13 + 0.2F); - var12.motionZ = (double)((float)this.mRandom.nextGaussian() * var13); - par1World.spawnEntityInWorld(var12); - } - } - } - } - } - - super.breakBlock(par1World, par2, par3, par4, par5, par6); - } - - @Override - public String getTextureFile() - { - return "/EUIClient/textures/blocks/blocks.png"; - } - @Override - public boolean isOpaqueCube() - { - return false; - } - @Override - public boolean renderAsNormalBlock() - { - return false; - } - @Override - public int getRenderType() - { - return ItemRenderHelperS.renderID; - } - -} diff --git a/1.4.2/src/common/steampower/ContainerFake.java b/1.4.2/src/common/steampower/ContainerFake.java deleted file mode 100644 index 132a9246..00000000 --- a/1.4.2/src/common/steampower/ContainerFake.java +++ /dev/null @@ -1,47 +0,0 @@ -package steampower; - -import net.minecraft.src.Container; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.InventoryPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.Slot; -import net.minecraft.src.TileEntity; - -public class ContainerFake extends Container -{ - private IInventory tileEntity; - - public ContainerFake(InventoryPlayer par1InventoryPlayer, IInventory tileEntity) - { - this.tileEntity = tileEntity; - // this.addSlotToContainer(new Slot(tileEntity, 0, 33, 34)); - int var3; - - for (var3 = 0; var3 < 3; ++var3) - { - for (int var4 = 0; var4 < 9; ++var4) - { - this.addSlotToContainer(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18)); - } - } - - for (var3 = 0; var3 < 9; ++var3) - { - this.addSlotToContainer(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142)); - } - } - - public boolean canInteractWith(EntityPlayer par1EntityPlayer) - { - return this.tileEntity.isUseableByPlayer(par1EntityPlayer); - } - - /** - * Called to transfer a stack from one inventory to the other eg. when shift clicking. - */ - public ItemStack transferStackInSlot(int par1) - { - return null; - } -} diff --git a/1.4.2/src/common/steampower/ItemMachine.java b/1.4.2/src/common/steampower/ItemMachine.java deleted file mode 100644 index 9be0d49f..00000000 --- a/1.4.2/src/common/steampower/ItemMachine.java +++ /dev/null @@ -1,65 +0,0 @@ -package steampower; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.src.*; - -public class ItemMachine extends ItemBlock { - - public ItemMachine(int id) { - super(id); - setMaxDamage(0); - setHasSubtypes(true); - this.setIconIndex(21); - this.setCreativeTab(CreativeTabs.tabBlock); - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - - par3List.add(new ItemStack(this, 1, 1)); - par3List.add(new ItemStack(this, 1, 2)); - - } - @Override - public String getTextureFile() { - // TODO Auto-generated method stub - return SteamPowerMain.textureFile+"Items.png"; - } - @Override - public int getIconFromDamage(int par1) - { - switch(par1) - { - case 1: return 23; - case 2: return 22; - case 15: return 25; - } - return this.iconIndex+par1; - } - @Override - public int getMetadata(int metadata) - { - return metadata; - } - @Override - public String getItemName() - { - return "Machine"; - } - @Override - public String getItemNameIS(ItemStack par1ItemStack) - { - int var3 = par1ItemStack.getItemDamage(); - switch(var3) - { - case 0: return "CoalProcessor"; - case 1: return "Boiler"; - case 2: return "FireBox"; - case 3: return "SteamGen"; - case 15: return "EnergyNuller"; - } - return this.getItemName(); - } - } - diff --git a/1.4.2/src/common/steampower/SteamPowerMain.java b/1.4.2/src/common/steampower/SteamPowerMain.java deleted file mode 100644 index 7167be40..00000000 --- a/1.4.2/src/common/steampower/SteamPowerMain.java +++ /dev/null @@ -1,153 +0,0 @@ -package steampower; - -import java.io.File; - -import net.minecraft.src.Block; -import net.minecraft.src.CraftingManager; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.oredict.ShapedOreRecipe; -import steampower.turbine.BlockGenerator; -import steampower.turbine.BlockSteamPiston; -import steampower.turbine.ItemEngine; -import steampower.turbine.TileEntitytopGen; -import universalelectricity.prefab.network.PacketManager; -import basicpipes.BasicPipesMain; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.Init; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkMod; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; - -@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9", dependencies = "after:basicPipes") -@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(), - "/UniversalElectricity/SteamPower.cfg"))); - private static int BlockID = configurationProperties(); - public static int EngineItemID; - public static int EngineID; - public static int genID; - public static int genOutput; - public static int steamOutBoiler; - public static int pipeLoss; - public static int boilerHeat; - public static int fireOutput; - public static final String channel = "SPpack"; - public static Block machine = new BlockMachine(BlockID) - .setBlockName("machine"); - 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"); - - public static SteamPowerMain instance; - - @SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy") - public static SteamProxy proxy; - public static String textureFile = "/textures/"; - - public static int configurationProperties() { - config.load(); - BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "MachinesID", 3030).value); - EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, - "EngineItem", 30308).value); - EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "SteamEngineID", 3031).value); - genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, - "ElecGenID", 3032).value); - genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL, - "genOutputWattsmax", 1000).value); - steamOutBoiler = Integer.parseInt(config.get( - Configuration.CATEGORY_GENERAL, "steamOutPerCycle", 10).value); - boilerHeat = Integer.parseInt(config.get( - Configuration.CATEGORY_GENERAL, "boilerInKJNeed", 4500).value); - fireOutput = Integer.parseInt(config.get( - Configuration.CATEGORY_GENERAL, "fireBoxOutKJMax", 250).value); - config.save(); - return BlockID; - } - - @PreInit - public void preInit(FMLPreInitializationEvent event) { - instance = this; - NetworkRegistry.instance().registerGuiHandler(this, this.proxy); - proxy.preInit(); - GameRegistry.registerBlock(machine, ItemMachine.class); - GameRegistry.registerBlock(engine); - GameRegistry.registerBlock(gen); - } - - @Init - public void load(FMLInitializationEvent evt) { - proxy.init(); - GameRegistry.registerTileEntity(TileEntitytopGen.class, "gentop"); - // Names............... - LanguageRegistry.addName((new ItemStack(machine, 1, 1)), "Boiler"); - LanguageRegistry.addName((new ItemStack(gen, 1, 0)), "Generator"); - LanguageRegistry.addName((new ItemStack(machine, 1, 2)), "FireBox"); - LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), - "SteamPiston"); - - } - - @PostInit - public void postInit(FMLPostInitializationEvent event) { - - proxy.postInit(); - // Crafting - try { - CraftingManager - .getInstance() - .getRecipeList() - .add(new ShapedOreRecipe(new ItemStack(gen, 1), - new Object[] { "@T@", "OVO", "@T@", 'T', - new ItemStack(BasicPipesMain.rod, 1), '@', - "plateSteel", 'O', "basicCircuit", 'V', - "motor" })); - /** - * TileEntityBoiler();<- metadata 1 TileEntityFireBox();<-metadata - * 2-5 - */ - CraftingManager - .getInstance() - .getRecipeList() - .add(new ShapedOreRecipe(new ItemStack(machine, 1, 1), - new Object[] { "TT", "VV", "TT", 'T', - new ItemStack(BasicPipesMain.parts, 1, 6), - 'V', - new ItemStack(BasicPipesMain.parts, 1, 7) })); - CraftingManager - .getInstance() - .getRecipeList() - .add(new ShapedOreRecipe(new ItemStack(machine, 1, 2), - new Object[] { "@", "F", 'F', Block.stoneOvenIdle, - '@', "plateSteel" })); - CraftingManager - .getInstance() - .getRecipeList() - .add(new ShapedOreRecipe(new ItemStack(itemEngine, 1, 0), - new Object[] { "GGG", "VPV", "@T@", 'T', - new ItemStack(BasicPipesMain.parts, 1, 1), - 'G', BasicPipesMain.rod, '@', "plateSteel", - 'P', Block.pistonBase, 'V', - new ItemStack(BasicPipesMain.parts, 1, 7), - 'M', "motor" })); - } catch (Exception e) { - e.printStackTrace(); - System.out.print("UE based recipes not loaded"); - } - } - -} diff --git a/1.4.2/src/common/steampower/SteamProxy.java b/1.4.2/src/common/steampower/SteamProxy.java deleted file mode 100644 index 9bf6e79e..00000000 --- a/1.4.2/src/common/steampower/SteamProxy.java +++ /dev/null @@ -1,67 +0,0 @@ -package steampower; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import steampower.boiler.TileEntityBoiler; -import steampower.burner.ContainerFireBox; -import steampower.burner.TileEntityFireBox; -import steampower.turbine.TileEntityGen; -import steampower.turbine.TileEntitySteamPiston; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; - -public class SteamProxy implements IGuiHandler{ - - public void preInit() - { - - } - public void init() - { - GameRegistry.registerTileEntity(TileEntityBoiler.class, "boiler"); - GameRegistry.registerTileEntity(TileEntityFireBox.class, "fireBox"); - GameRegistry.registerTileEntity(TileEntitySteamPiston.class, "steamPiston"); - GameRegistry.registerTileEntity(TileEntityGen.class, "elecGen"); - - } - public void postInit() - { - - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - switch(ID) - { - case 0: return new GUIFireBox(player.inventory, ((TileEntityFireBox)tileEntity)); - case 1: return new GuiBoiler(player.inventory, ((TileEntityBoiler)tileEntity)); - case 2: return new GUISteamPiston(player.inventory, ((TileEntitySteamPiston)tileEntity)); - } - } - - return null; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - - if (tileEntity != null) - { - switch(ID) - { - case 0: return new ContainerFireBox(player.inventory, ((TileEntityFireBox)tileEntity)); - default: return new ContainerFake(player.inventory, (IInventory) tileEntity); - } - } - - return null; - } -} diff --git a/1.4.2/src/common/steampower/TileEntityMachine.java b/1.4.2/src/common/steampower/TileEntityMachine.java deleted file mode 100644 index 20345c5a..00000000 --- a/1.4.2/src/common/steampower/TileEntityMachine.java +++ /dev/null @@ -1,220 +0,0 @@ -package steampower; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.ItemStack; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.Packet; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.ISidedInventory; -import universalelectricity.core.Vector3; -import universalelectricity.prefab.network.PacketManager; -public class TileEntityMachine extends TileEntity implements IInventory, ISidedInventory -{ - public int facing = 0; - private int count = 0; - public ItemStack[] storedItems = new ItemStack[this.getInvSize()]; - private int getInvSize() { - return 1; - } - public int getDirection() - { - return this.facing; - } - - public void setDirection(int i) - { - this.facing = i; - } - - @Override - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("facing", this.facing); - //inventory - NBTTagList var2 = new NBTTagList(); - - for (int var3 = 0; var3 < this.storedItems.length; ++var3) - { - if (this.storedItems[var3] != null) - { - NBTTagCompound var4 = new NBTTagCompound(); - var4.setByte("Slot", (byte)var3); - this.storedItems[var3].writeToNBT(var4); - var2.appendTag(var4); - } - } - - par1NBTTagCompound.setTag("Items", var2); - } - - @Override - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - //inventory - NBTTagList var2 = par1NBTTagCompound.getTagList("Items"); - this.storedItems = new ItemStack[this.getSizeInventory()]; - - for (int var3 = 0; var3 < var2.tagCount(); ++var3) - { - NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3); - byte var5 = var4.getByte("Slot"); - - if (var5 >= 0 && var5 < this.storedItems.length) - { - this.storedItems[var5] = ItemStack.loadItemStackFromNBT(var4); - } - } - //vars - this.facing = par1NBTTagCompound.getInteger("facing"); - } - @Override - public boolean canUpdate() - { - return true; - } - public Object[] getSendData() - { - return new Object[]{}; - } - public boolean needUpdate() - { - return true; - } - @Override - public void updateEntity() - { - super.updateEntity(); - - if(count ++ >= 10 && !worldObj.isRemote && needUpdate()) - {count = 0; - Packet packet = PacketManager.getPacket(SteamPowerMain.channel,this, getSendData()); - PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 40); - } - } - - - ////////////////////////// - //I Inventory shit - ///////////////////////// - public int getSizeInventory() - { - return this.storedItems.length; - } - - /** - * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. *Isn't - * this more of a set than a get?* - */ - public int getInventoryStackLimit() - { - return 64; - } - - - /** - * Do not make give this method the name canInteractWith because it clashes with Container - */ - public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) - { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double)this.xCoord + 0.5D, (double)this.yCoord + 0.5D, (double)this.zCoord + 0.5D) <= 64.0D; - } - - /** - * Returns the stack in slot i - */ - public ItemStack getStackInSlot(int par1) - { - return this.storedItems[par1]; - } - - public ItemStack decrStackSize(int par1, int par2) - { - if (this.storedItems[par1] != null) - { - ItemStack var3; - - if (this.storedItems[par1].stackSize <= par2) - { - var3 = this.storedItems[par1]; - this.storedItems[par1] = null; - return var3; - } - else - { - var3 = this.storedItems[par1].splitStack(par2); - - if (this.storedItems[par1].stackSize == 0) - { - this.storedItems[par1] = null; - } - - return var3; - } - } - else - { - return null; - } - } - - /** - * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - - * like when you close a workbench GUI. - */ - public ItemStack getStackInSlotOnClosing(int par1) - { - if (this.storedItems[par1] != null) - { - ItemStack var2 = this.storedItems[par1]; - this.storedItems[par1] = null; - return var2; - } - else - { - return null; - } - } - - /** - * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). - */ - public void setInventorySlotContents(int par1, ItemStack par2ItemStack) - { - this.storedItems[par1] = par2ItemStack; - - if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) - { - par2ItemStack.stackSize = this.getInventoryStackLimit(); - } - } - @Override - public int getStartInventorySide(ForgeDirection side) { - // TODO Auto-generated method stub - return 0; - } - @Override - public int getSizeInventorySide(ForgeDirection side) { - // TODO Auto-generated method stub - return 0; - } - @Override - public String getInvName() { - // TODO Auto-generated method stub - return "SteamMachine"; - } - @Override - public void openChest() { - // TODO Auto-generated method stub - - } - @Override - public void closeChest() { - // TODO Auto-generated method stub - - } -} \ No newline at end of file diff --git a/1.4.2/src/common/steampower/boiler/TileEntityBoiler.java b/1.4.2/src/common/steampower/boiler/TileEntityBoiler.java deleted file mode 100644 index 2e783b87..00000000 --- a/1.4.2/src/common/steampower/boiler/TileEntityBoiler.java +++ /dev/null @@ -1,249 +0,0 @@ -package steampower.boiler; -import net.minecraft.src.Block; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import steampower.TileEntityMachine; -import universalelectricity.prefab.network.IPacketReceiver; -import basicpipes.pipes.api.IHeatProducer; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.IStorageTank; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiver,ILiquidProducer, IStorageTank -{ - public int steam = 0; - public int water = 0; - public int heat = 0; - public int hullHeat = 0; - public TileEntity[] connectedBlocks = {null,null,null,null,null,null}; - public int tankCount = 0; - public int tickCount = 0; - - //----------------------------- - //Update stuff - //----------------------------- - @Override - public void updateEntity() - { - //update connection list used for rendering - this.connectedBlocks = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - this.tankCount = 0; - for(int i =0; i < connectedBlocks.length; i++) - { - if(connectedBlocks[i] != null) - { - tankCount++; - } - }//end connection update - if(tickCount++ >= 10 && !worldObj.isRemote) - { - tickCount = 0; - - TileEntity ent = worldObj.getBlockTileEntity(xCoord, yCoord-1, zCoord); - if(ent instanceof IHeatProducer) - { - this.heat = (int) Math.min(((IHeatProducer)ent).onProduceHeat(250, ForgeDirection.UP)+heat,2000); - }else - if(worldObj.getBlockId(xCoord, yCoord-1, zCoord) == Block.lavaStill.blockID) - { - this.heat = Math.min(90+heat,2000); - } - if(hullHeat < 10000) - { - int mHeat = 10000 - hullHeat; - int hHeat = mHeat - Math.max((mHeat - this.heat),0); - hullHeat = Math.min(hullHeat + hHeat,10000); - this.heat -=hHeat; - }else - { - if(heat >= 2000 && this.water >= 1 && this.steam < this.getLiquidCapacity(Liquid.STEAM)) - { - this.water--; - this.steam = Math.min(this.steam +20,this.getLiquidCapacity(Liquid.STEAM)); - this.heat -= 2000; - } - this.hullHeat-=5; - } - this.water = MHelper.shareLiquid(worldObj,xCoord, yCoord, zCoord,this.water,this.getLiquidCapacity(Liquid.WATER), Liquid.WATER); - this.steam = MHelper.shareLiquid(worldObj,xCoord, yCoord, zCoord,this.steam,this.getLiquidCapacity(Liquid.STEAM), Liquid.STEAM); - } - super.updateEntity(); - } - //----------------------------- - //Liquid stuff - //----------------------------- - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) - { - if(type == Liquid.WATER) - { - if(this.water < this.getLiquidCapacity(Liquid.WATER)) - { - int rej = Math.max((this.water + vol) - this.getLiquidCapacity(Liquid.WATER), 0); - this.water += vol - rej; - return rej; - } - else - { - TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord+1, zCoord); - if( te instanceof IStorageTank) - { - return ((IStorageTank)te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); - } - } - }else - if(type == Liquid.STEAM) - { - if(this.steam < this.getLiquidCapacity(Liquid.STEAM)) - { - int rej = Math.max((this.steam + vol) - this.getLiquidCapacity(Liquid.STEAM), 0); - this.steam += vol - rej; - return rej; - } - else - { - TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord-1, zCoord); - if( te instanceof IStorageTank) - { - return ((IStorageTank)te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); - } - } - } - return vol; - } - - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection s) { - if(type == Liquid.WATER) - { - return true; - }else - if(type == Liquid.STEAM && s == ForgeDirection.UNKNOWN) - { - return true; - } - return false; - } - - @Override - public int getStoredLiquid(Liquid type) { - if(type == Liquid.WATER) - { - return this.water; - }else - if(type == Liquid.STEAM) - { - return this.steam; - } - return 0; - } - - @Override - public int getLiquidCapacity(Liquid type) { - if(type == Liquid.WATER) - { - return 14; - }else - if(type == Liquid.STEAM) - { - return 140; - } - return 0; - } - - @Override - public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.STEAM) - { - //TODO setup the actual math for this - if(vol < this.steam) - { - this.steam -= vol; - return vol; - }else - if(this.steam >= 1) - { - this.steam -= 1; - return 1; - } - } - return 0; - } - - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } - - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } - - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return 100; - } - return 0; - } - //----------------------------- - //Data - //----------------------------- - public Object[] getSendData() - { - return new Object[]{this.water,this.steam,this.heat,this.hullHeat}; - } - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput dataStream) { - try{ - this.water = dataStream.readInt(); - this.steam = dataStream.readInt(); - this.heat = dataStream.readInt(); - this.hullHeat = dataStream.readInt(); - }catch(Exception e) - { - e.printStackTrace(); - } - - } - @Override - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("water", this.water); - par1NBTTagCompound.setInteger("steam", this.steam); - par1NBTTagCompound.setInteger("heat", this.heat); - par1NBTTagCompound.setInteger("hullHeat", this.hullHeat); - } - - @Override - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.water = par1NBTTagCompound.getInteger("water"); - this.steam = par1NBTTagCompound.getInteger("steam"); - this.heat = par1NBTTagCompound.getInteger("heat"); - this.hullHeat = par1NBTTagCompound.getInteger("hullHeat"); - } - - -} diff --git a/1.4.2/src/common/steampower/burner/ContainerFireBox.java b/1.4.2/src/common/steampower/burner/ContainerFireBox.java deleted file mode 100644 index 66353850..00000000 --- a/1.4.2/src/common/steampower/burner/ContainerFireBox.java +++ /dev/null @@ -1,42 +0,0 @@ -package steampower.burner; - -import net.minecraft.src.*; - -public class ContainerFireBox extends Container -{ - private TileEntityFireBox tileEntity; - - public ContainerFireBox(InventoryPlayer par1InventoryPlayer, TileEntityFireBox tileEntity) - { - this.tileEntity = tileEntity; - this.addSlotToContainer(new Slot(tileEntity, 0, 33, 34)); - int var3; - - for (var3 = 0; var3 < 3; ++var3) - { - for (int var4 = 0; var4 < 9; ++var4) - { - this.addSlotToContainer(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18)); - } - } - - for (var3 = 0; var3 < 9; ++var3) - { - this.addSlotToContainer(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142)); - } - } - - public boolean canInteractWith(EntityPlayer par1EntityPlayer) - { - return this.tileEntity.isUseableByPlayer(par1EntityPlayer); - } - - /** - * Called to transfer a stack from one inventory to the other eg. when shift clicking. - */ - public ItemStack transferStackInSlot(int par1) - { - - return null; - } -} diff --git a/1.4.2/src/common/steampower/burner/TileEntityFireBox.java b/1.4.2/src/common/steampower/burner/TileEntityFireBox.java deleted file mode 100644 index 38fdf37f..00000000 --- a/1.4.2/src/common/steampower/burner/TileEntityFireBox.java +++ /dev/null @@ -1,214 +0,0 @@ -package steampower.burner; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.ISidedInventory; -import steampower.SteamPowerMain; -import steampower.TileEntityMachine; -import steampower.boiler.TileEntityBoiler; -import universalelectricity.prefab.network.IPacketReceiver; -import basicpipes.pipes.api.IHeatProducer; -import basicpipes.pipes.api.MHelper; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityFireBox extends TileEntityMachine implements IPacketReceiver,IInventory, ISidedInventory, IHeatProducer -{ - //max heat generated per second - - public boolean isConnected = false; - public TileEntity[] connectedBlocks = {null, null, null, null, null, null}; - private int connectedUnits = 0; - public static int maxGenerateRate = 250; - //Current generation rate based on hull heat. In TICKS. - public int generateRate = 0; - int count = 0; - public int itemCookTime = 0; - private int getInvSize() { - return 1; - } - public int getTickInterval() - { - return 5; - - } - public boolean needUpdate() - { - return true; - } - public void updateEntity() - { - super.updateEntity(); - if(count++ >= 10) - { - count = 0; - addConnection(); - if(!worldObj.isRemote) - { - sharCoal(); - } - TileEntity blockEntity = worldObj.getBlockTileEntity(this.xCoord, this.yCoord + 1, this.zCoord); - if(blockEntity instanceof TileEntityBoiler) - { - isConnected = true; - } - else - { - isConnected = false; - } - if (!this.worldObj.isRemote){ - - - maxGenerateRate = SteamPowerMain.fireOutput + (connectedUnits*10); - - //The top slot is for recharging items. Check if the item is a electric item. If so, recharge it. - if (this.storedItems[0] != null && isConnected) - { - if (this.storedItems[0].getItem().shiftedIndex == Item.coal.shiftedIndex) - { - if(this.itemCookTime <= 0) - { - itemCookTime = Math.max(1600 - (int)(this.generateRate*20), 400); - this.decrStackSize(0, 1); - } - } - } - - } - //Starts generating electricity if the device is heated up - if (this.itemCookTime > 0) - { - this.itemCookTime --; - if(isConnected) - { - this.generateRate = Math.min(this.generateRate+Math.min((this.generateRate)+1, 1), this.maxGenerateRate/10); - } - } - //Loose heat when the generator is not connected or if there is no coal in the inventory. - if(this.itemCookTime <= 0 || !isConnected) - { - this.generateRate = Math.max(this.generateRate-5, 0); - } - } - } - - //gets all connected fireBoxes and shares its supply of coal - public void sharCoal(){ - for(int i =0; i<6;i++) - { - - if(connectedBlocks[i] instanceof TileEntityFireBox) - { - TileEntityFireBox connectedConsumer = (TileEntityFireBox) connectedBlocks[i]; - if(this.storedItems[0] != null) - { - if(this.storedItems[0].getItem().shiftedIndex == Item.coal.shiftedIndex && this.storedItems[0].stackSize > 0) - { - if(connectedConsumer.storedItems[0] != null) - { - if(connectedConsumer.storedItems[0].getItem().shiftedIndex == Item.coal.shiftedIndex) - { - if(connectedConsumer.storedItems[0].getItem().shiftedIndex == Item.coal.shiftedIndex) - { - int CSum = Math.round(this.storedItems[0].stackSize + connectedConsumer.storedItems[0].stackSize)/2; - if(this.storedItems[0].stackSize > connectedConsumer.storedItems[0].stackSize) - { - int transferC = 0; - transferC = Math.round(CSum - connectedConsumer.storedItems[0].stackSize); - connectedConsumer.storedItems[0].stackSize = connectedConsumer.storedItems[0].stackSize + transferC; - this.storedItems[0].stackSize = this.storedItems[0].stackSize - transferC; - } - } - } - } - else - { - connectedConsumer.storedItems[0] = new ItemStack(this.storedItems[0].getItem(),1,this.storedItems[0].getItemDamage()); - this.storedItems[0].stackSize -= 1; - } - } - } - } - } - - - } - public void addConnection() - { - connectedUnits = 0; - TileEntity[] aEntity = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - for(int i = 0; i<6; i++) - { - - - if(aEntity[i] instanceof TileEntityFireBox && i != 0 && i != 1) - { - this.connectedBlocks[i] = aEntity[i]; - connectedUnits += 1; - } - else - { - this.connectedBlocks[i] = null; - } - } - } - /** - * Reads a tile entity from NBT. - */ - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.itemCookTime = par1NBTTagCompound.getInteger("itemCookTime"); - this.generateRate = par1NBTTagCompound.getInteger("generateRate"); - } - /** - * Writes a tile entity to NBT. - */ - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("itemCookTime", (int)this.itemCookTime); - par1NBTTagCompound.setInteger("generateRate", (int)this.generateRate); - } - @Override - public String getInvName() { - return "FireBox"; - } - public float onProduceHeat(float jouls, ForgeDirection side) { - if(side == ForgeDirection.UP) - { - return Math.min(generateRate,jouls); - } - return 0; - } - @Override - public Object[] getSendData() - { - return new Object[]{(int)facing,(int)connectedUnits,(int)generateRate,(int)itemCookTime}; - } - - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput dataStream) { - try - { - facing = dataStream.readInt(); - connectedUnits = dataStream.readInt(); - generateRate = dataStream.readInt(); - itemCookTime = dataStream.readInt(); - } - catch(Exception e) - { - e.printStackTrace(); - } - - } -} diff --git a/1.4.2/src/common/steampower/mcmod.info b/1.4.2/src/common/steampower/mcmod.info deleted file mode 100644 index 922b39f5..00000000 --- a/1.4.2/src/common/steampower/mcmod.info +++ /dev/null @@ -1,21 +0,0 @@ -[ -{ - "modid": "SteamPower", - "name": "Steam Power", - "description": "Basic power plant package for Universal Electricity. Power system is based on steam and works with any heat source. Current heat sources lava, and fireBox Furnace", - "version": "1.8", - "mcversion": "1.3.2", - "url": "http://www.minecraftforge.net/forum/index.php/topic,222.0.html", - "updateUrl": "", - "authors": [ - "DarkGuardsman" - ], - "credits": "Created by Darkguardsman; Vector/network code from Calclavia; Some Models thanks to Azkhare;", - "logoFile": "", - "screenshots": [ - ], - "parent":"", - "dependencies": ["UE","BasicPipes" - ] -} -] \ No newline at end of file diff --git a/1.4.2/src/common/steampower/turbine/BlockGenerator.java b/1.4.2/src/common/steampower/turbine/BlockGenerator.java deleted file mode 100644 index 008c12a5..00000000 --- a/1.4.2/src/common/steampower/turbine/BlockGenerator.java +++ /dev/null @@ -1,68 +0,0 @@ -package steampower.turbine; - -import java.util.ArrayList; - -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.Material; -import net.minecraft.src.MathHelper; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import steampower.ItemRenderHelperS; - -public class BlockGenerator extends universalelectricity.prefab.BlockMachine { - - public BlockGenerator(int id) { - super("Generator", id, Material.iron); - this.setCreativeTab(CreativeTabs.tabBlock); - } - - @Override - public void addCreativeItems(ArrayList itemList) { - itemList.add(new ItemStack(this, 1, 0)); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, - EntityLiving par5EntityLiving) { - int angle = MathHelper - .floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - world.setBlockAndMetadataWithUpdate(x, y, z, blockID, angle, true); - } - - @Override - public boolean onUseWrench(World par1World, int x, int y, int z, - EntityPlayer par5EntityPlayer) { - int angle = MathHelper - .floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int metadata = par1World.getBlockMetadata(x, y, z); - if (metadata < 3) { - par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle); - } else { - par1World.setBlockAndMetadata(x, y, z, blockID, 0); - } - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getRenderType() { - return ItemRenderHelperS.renderID; - } - - @Override - public TileEntity createNewTileEntity(World world) { - return new TileEntityGen(); - } -} diff --git a/1.4.2/src/common/steampower/turbine/BlockSteamPiston.java b/1.4.2/src/common/steampower/turbine/BlockSteamPiston.java deleted file mode 100644 index 8a78297d..00000000 --- a/1.4.2/src/common/steampower/turbine/BlockSteamPiston.java +++ /dev/null @@ -1,114 +0,0 @@ -package steampower.turbine; - -import java.util.Random; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Material; -import net.minecraft.src.MathHelper; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import steampower.SteamPowerMain; - -public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine { - - public BlockSteamPiston(int par1) { - super("SteamEngine", par1, Material.iron); - - } - - @Override - public boolean onMachineActivated(World par1World, int x, int y, int z, - EntityPlayer par5EntityPlayer) { - return false; - - } - - @Override - public boolean onUseWrench(World par1World, int x, int y, int z, - EntityPlayer par5EntityPlayer) { - int angle = MathHelper - .floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int metadata = par1World.getBlockMetadata(x, y, z); - if (metadata < 3) { - par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle); - } else { - par1World.setBlockAndMetadata(x, y, z, blockID, 0); - } - return true; - } - - public TileEntity createNewTileEntity(World var1) { - return null; - } - - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { - super.breakBlock(world, x, y, z, par5, par6); - int meta = world.getBlockMetadata(x, y, z); - if (meta < 4) { - if (world.getBlockId(x, y + 1, z) == this.blockID) { - if (world.getBlockMetadata(x, y, z) > 4) { - world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); - } - } - } else if (meta > 4) { - if (world.getBlockId(x, y - 1, z) == this.blockID) { - if (world.getBlockMetadata(x, y, z) < 4) { - world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); - } - } - } - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - if (metadata >= 0 && metadata < 4) { - return new TileEntitySteamPiston(); - } - if (metadata == 14) { - return new TileEntitytopGen(); - } - return null; - } - - public void onNeighborBlockChange(World par1World, int par2, int par3, - int par4, int par5) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - if (meta < 4) { - if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID) { - par1World.setBlockWithNotify(par2, par3, par4, 0); - } - } else { - if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID) { - par1World.setBlockWithNotify(par2, par3, par4, 0); - } - } - } - - @Override - public int idDropped(int par1, Random par2Random, int par3) { - return SteamPowerMain.itemEngine.shiftedIndex; - } - - @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - int var5 = par1World.getBlockId(par2, par3, par4); - int var6 = par1World.getBlockId(par2, par3 + 1, par4); - return (var5 == 0 || blocksList[var5].blockMaterial.isGroundCover()) - && (var6 == 0 || blocksList[var6].blockMaterial.isGroundCover()); - } -} diff --git a/1.4.2/src/common/steampower/turbine/ItemEngine.java b/1.4.2/src/common/steampower/turbine/ItemEngine.java deleted file mode 100644 index ec8b6ae8..00000000 --- a/1.4.2/src/common/steampower/turbine/ItemEngine.java +++ /dev/null @@ -1,112 +0,0 @@ -package steampower.turbine; - -import java.util.List; - -import net.minecraft.src.Block; -import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MathHelper; -import net.minecraft.src.World; -import steampower.SteamPowerMain; -import steampower.TileEntityMachine; - -public class ItemEngine extends Item { - public ItemEngine(int par1) { - super(par1); - this.maxStackSize = 5; - this.setCreativeTab(CreativeTabs.tabBlock); - this.setIconIndex(21); - } - - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, - List par3List) { - par3List.add(new ItemStack(this, 1, 0)); - } - - @Override - public String getTextureFile() { - // TODO Auto-generated method stub - return SteamPowerMain.textureFile + "Items.png"; - } - - public boolean onItemUse(ItemStack itemStack, EntityPlayer ePlayer, - World world, int x, int y, int z, int par7, float par8, float par9, - float par10) { - int var11 = world.getBlockId(x, y, z); - int BlockID = SteamPowerMain.EngineID; - - if (var11 == Block.snow.blockID) { - par7 = 1; - } else if (var11 != Block.vine.blockID - && var11 != Block.tallGrass.blockID - && var11 != Block.deadBush.blockID - && (Block.blocksList[var11] == null || !Block.blocksList[var11] - .isBlockReplaceable(world, x, y, z))) { - if (par7 == 0) { - --y; - } - - if (par7 == 1) { - ++y; - } - - if (par7 == 2) { - --z; - } - - if (par7 == 3) { - ++z; - } - - if (par7 == 4) { - --x; - } - - if (par7 == 5) { - ++x; - } - } - - if (itemStack.stackSize == 0) { - return false; - } else if (!ePlayer.func_82247_a(x, y, z, par7, itemStack)) { - return false; - } else if (y == 255 - && Block.blocksList[BlockID].blockMaterial.isSolid()) { - return false; - } else if (world.canPlaceEntityOnSide(BlockID, x, y, z, false, par7, - ePlayer)) { - Block var12 = Block.blocksList[BlockID]; - int angle = MathHelper - .floor_double((ePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - switch (angle) { - case 0: - world.setBlockAndMetadata(x, y, z, var12.blockID, 0); - break; - case 1: - world.setBlockAndMetadata(x, y, z, var12.blockID, 1); - break; - case 2: - world.setBlockAndMetadata(x, y, z, var12.blockID, 2); - break; - case 3: - world.setBlockAndMetadata(x, y, z, var12.blockID, 3); - break; - } - int meta = world.getBlockMetadata(x, y, z); - // ePlayer.sendChatToPlayer("A:"+angle+" M:"+meta); - world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID); - world.setBlockAndMetadataWithNotify(x, y + 1, z, var12.blockID, 14); - world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID); - world.editingBlocks = false; - --itemStack.stackSize; - - return true; - } else { - return false; - } - } -} diff --git a/1.4.2/src/common/steampower/turbine/TileEntityGen.java b/1.4.2/src/common/steampower/turbine/TileEntityGen.java deleted file mode 100644 index 166c762b..00000000 --- a/1.4.2/src/common/steampower/turbine/TileEntityGen.java +++ /dev/null @@ -1,185 +0,0 @@ -package steampower.turbine; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import steampower.TileEntityMachine; -import universalelectricity.electricity.ElectricityManager; -import universalelectricity.implement.IConductor; -import universalelectricity.implement.IElectricityProducer; -import universalelectricity.prefab.network.IPacketReceiver; -import basicpipes.pipes.api.IMechanical; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntityGen extends TileEntityMachine implements IPacketReceiver, IMechanical,IElectricityProducer -{ - ForgeDirection facing = ForgeDirection.DOWN; - - public int force = 0; - public int aForce = 0; - public int pos = 0; - public int disableTicks = 0; - public double genAmmount = 0; - public int tCount = 0; - public boolean empProf = false; - - IConductor[] wires = {null,null,null,null,null,null}; - public boolean needUpdate() - { - return false; - } - @Override - public void updateEntity() - { - - - this.genAmmount = force/this.getVoltage(); - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - int nMeta = 0; - int wireCount = 0; - switch(meta) - { - case 0: nMeta = 2;break; - case 1: nMeta = 5;break; - case 2: nMeta = 3;break; - case 3: nMeta = 4;break; - } - facing = ForgeDirection.getOrientation(nMeta).getOpposite(); - if(genAmmount > 0) - { - //worldObj.setBlock(xCoord, yCoord+1, zCoord, 1); - } - for(int i = 0; i < 6; i++) - { - ForgeDirection side = ForgeDirection.UNKNOWN; - switch(i) - { - case 0: side = ForgeDirection.UP;break; - //case 1: side = ForgeDirection.DOWN;break; - case 2: side = ForgeDirection.NORTH;break; - case 3: side = ForgeDirection.EAST;break; - case 4: side = ForgeDirection.SOUTH;break; - case 5: side = ForgeDirection.WEST;break; - } - if(side != facing && side != facing.getOpposite()) - { - TileEntity tileEntity = worldObj.getBlockTileEntity(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ); - - if (tileEntity instanceof IConductor) - { - if (ElectricityManager.instance.getElectricityRequired(((IConductor)tileEntity).getNetwork()) > 0) - { - this.wires[i] = (IConductor)tileEntity; - wireCount++; - } - else - { - this.wires[i] = null; - } - } - else - { - this.wires[i] = null; - } - } - - } - for(int side =0; side < 6; side++) - { - if(wires[side] instanceof IConductor) - { - double max = wires[side].getMaxAmps(); - ElectricityManager.instance.produceElectricity(this, wires[side],Math.min(genAmmount/wireCount,max), this.getVoltage()); - } - } - super.updateEntity(); - } - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput data) { - // TODO Auto-generated method stub - - } - //------------------------------ - //Mechanics - //------------------------------ - @Override - public int getForceSide(ForgeDirection side) { - if(side == facing.getOpposite()) - { - return aForce; - } - return 0; - } - - @Override - public int getForce() { - // TODO Auto-generated method stub - return this.force; - } - - @Override - public boolean canOutputSide(ForgeDirection side) { - if(side == facing.getOpposite()) - { - return true; - } - return false; - } - - @Override - public boolean canInputSide(ForgeDirection side) { - if(side == facing) - { - return true; - } - return false; - } - - @Override - public int applyForce(int force) { - this.force = force; - return force; - } - - @Override - public int getAnimationPos() { - return pos; - } - //------------------------------ - //Electric - //------------------------------ - @Override - public void onDisable(int duration) - { - this.disableTicks = duration; - } - - @Override - public boolean isDisabled() { - if(disableTicks-- <= 0) - { - return false; - } - return true; - } - - @Override - public double getVoltage() { - return 120; - } - - @Override - public boolean canConnect(ForgeDirection side) { - if(side != ForgeDirection.DOWN && side != facing && side != facing.getOpposite()) - { - return true; - } - return false; - } - -} diff --git a/1.4.2/src/common/steampower/turbine/TileEntitySteamPiston.java b/1.4.2/src/common/steampower/turbine/TileEntitySteamPiston.java deleted file mode 100644 index b3f84578..00000000 --- a/1.4.2/src/common/steampower/turbine/TileEntitySteamPiston.java +++ /dev/null @@ -1,330 +0,0 @@ -package steampower.turbine; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import steampower.TileEntityMachine; -import universalelectricity.prefab.network.IPacketReceiver; -import basicpipes.pipes.api.ILiquidConsumer; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.IMechanical; -import basicpipes.pipes.api.Liquid; - -import com.google.common.io.ByteArrayDataInput; - -public class TileEntitySteamPiston extends TileEntityMachine implements IPacketReceiver,ILiquidConsumer,ILiquidProducer,IMechanical -{ - public int force = 0; - public int aForce = 0; - public int bForce = 0; - private int frictionLoad = 10; - public int steam = 0; - public int water = 0; - public int maxWater = 2; - public int maxSteam = 10; - public int pos = 0; //max at 7 - private int tickCount = 0; - private int runTime = 0; - private int genRate = 0;//max 100 - private int posCount = 0; - public int tCount = 0; - private ForgeDirection frontDir; - public TileEntity ff; - public TileEntity bb; - private int pWater = 0; - private int pSteam = 0; - private int pForce = 0; - public int pCount = 0; - public boolean running= false; - - @Override - public void updateEntity() - { - super.updateEntity(); - if(tickCount++ >=10) - {tickCount = 0; - //this.pos += 1; if(pos >= 8){pos = 0;} - //++tCount;if(tCount > 120){tCount = 0;} - - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - int nMeta = 0; - - switch(meta) - { - case 0: nMeta = 2;break; - case 1: nMeta = 5;break; - case 2: nMeta = 3;break; - case 3: nMeta = 4;break; - } - frontDir = ForgeDirection.getOrientation(nMeta); - ff = worldObj.getBlockTileEntity(xCoord+frontDir.offsetX, yCoord+1, zCoord+frontDir.offsetZ); - bb = worldObj.getBlockTileEntity(xCoord+frontDir.getOpposite().offsetX, yCoord+1, zCoord+frontDir.getOpposite().offsetZ); - if(this.runTime > 0) - { - this.running = true; - }else - { - this.running = false; - } - if(this.running) - { - int countA = 10 - (genRate/10); - if(posCount++ >=countA) - { - posCount = 0; - pos += 1;if(pos > 7){pos =0;} - } - } - if(!worldObj.isRemote) - { - if(this.runTime < 1 && this.steam > 0) - { - this.steam--; - this.runTime=60; - } - if(bb instanceof IMechanical) - { - if(((IMechanical) bb).canOutputSide(frontDir)) - { - this.bForce = ((IMechanical) bb).getForce(); - }else - if( bb instanceof TileEntitySteamPiston) - { - if(((TileEntitySteamPiston) bb).getMeta() == this.getMeta()) - { - this.bForce = ((TileEntitySteamPiston) bb).getForce(); - } - } - else - { - this.bForce = 0; - } - } - if(this.runTime > 0) - { - genRate=Math.min(genRate + 1, 100); - this.runTime-=1; - this.force = Math.min(genRate * 10,1000); - this.aForce = Math.max(force - this.frictionLoad+bForce,0); - } - if(runTime == 0 && this.steam == 0) - { - genRate = Math.max(genRate--, 0); - force= Math.max(force-=10, 0);; - } - - if(ff instanceof IMechanical) - { - if(((IMechanical) ff).canInputSide(frontDir.getOpposite())) - { - ((IMechanical) ff).applyForce(this.aForce); - }else - { - - } - } - pWater = this.water; - pSteam = this.steam; - pForce = this.force; - - - } - } - } - - - //------------------- - //Liquid and mechanical stuff - //---------------- - @Override - public int getForceSide(ForgeDirection side) { - return aForce; - } - - @Override - public boolean canOutputSide(ForgeDirection side) { - if(frontDir.getOpposite() == side) - { - return true; - } - return false; - } - - @Override - public boolean canInputSide(ForgeDirection side) { - if(frontDir == side) - { - return true; - } - return false; - } - - @Override - public int applyForce(int force) { - this.bForce = force; - return aForce; - } - - @Override - public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.WATER) - { - if(this.water > 0) - { - this.water -= 1; - return 1; - } - } - return 0; - } - - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } - - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } - - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return 32; - } - return 0; - } - - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.STEAM) - { - int rejectedSteam = Math.max((this.steam + vol) - this.maxSteam, 0); - this.steam += vol - rejectedSteam; - return rejectedSteam; - } - return 0; - } - - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection forgeDirection) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } - - @Override - public int getStoredLiquid(Liquid type) { - if(type == Liquid.WATER) - { - return this.water; - }else - if(type == Liquid.STEAM) - { - return this.steam; - } - return 0; - } - - @Override - public int getLiquidCapacity(Liquid type) { - if(type == Liquid.WATER) - { - return this.maxWater; - }else - if(type == Liquid.STEAM) - { - return this.maxSteam; - } - return 0; - } - //------------------- - //Data - //---------------- - public Object[] getSendData() - { - return new Object[]{steam,water,force,aForce,genRate,runTime}; - } - public boolean needUpdate() - { - if(this.pForce != this.force || this.pWater != this.water || this.pSteam != this.steam) - { - return true; - } - return false; - } - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput dataStream) { - try - { - this.steam = dataStream.readInt(); - this.water = dataStream.readInt(); - this.force = dataStream.readInt(); - this.aForce = dataStream.readInt(); - this.genRate= dataStream.readInt(); - this.runTime = dataStream.readInt(); - ++pCount; - } - catch(Exception e) - { - System.out.print("SteamPistonDataFail"); - e.printStackTrace(); - } - - } - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.runTime = par1NBTTagCompound.getInteger("time"); - this.genRate = par1NBTTagCompound.getInteger("gen"); - this.steam = par1NBTTagCompound.getInteger("steam"); - this.water = par1NBTTagCompound.getInteger("water"); - } - - /** - * Writes a tile entity to NBT. - */ - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("time", (int)this.runTime); - par1NBTTagCompound.setInteger("gen", (int)this.genRate); - par1NBTTagCompound.setInteger("steam", (int)this.steam); - par1NBTTagCompound.setInteger("water", (int)this.water); - - } - - - @Override - public int getAnimationPos() { - // TODO Auto-generated method stub - return this.pos; - } - - - @Override - public int getForce() { - // TODO Auto-generated method stub - return this.force; - } - public int getMeta() { - return worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - } -} diff --git a/1.4.2/src/common/steampower/turbine/TileEntitytopGen.java b/1.4.2/src/common/steampower/turbine/TileEntitytopGen.java deleted file mode 100644 index c0f7dbd9..00000000 --- a/1.4.2/src/common/steampower/turbine/TileEntitytopGen.java +++ /dev/null @@ -1,12 +0,0 @@ -package steampower.turbine; - -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import steampower.TileEntityMachine; -import basicpipes.pipes.api.ILiquidConsumer; -import basicpipes.pipes.api.ILiquidProducer; -import basicpipes.pipes.api.Liquid; - -public class TileEntitytopGen extends TileEntityMachine { - -} diff --git a/1.4.2/src/minecraft/basicpipes/ItemRenderHelper.java b/1.4.2/src/minecraft/basicpipes/ItemRenderHelper.java deleted file mode 100644 index 82b99bec..00000000 --- a/1.4.2/src/minecraft/basicpipes/ItemRenderHelper.java +++ /dev/null @@ -1,56 +0,0 @@ -package basicpipes; - -import net.minecraft.src.Block; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.RenderBlocks; - -import org.lwjgl.opengl.GL11; - -import basicpipes.conductors.TileEntityPipe; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class ItemRenderHelper implements ISimpleBlockRenderingHandler { - public static ItemRenderHelper instance = new ItemRenderHelper(); - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - private ModelPump modelPump = new ModelPump(); - private ModelGearRod modelRod = new ModelGearRod(); - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - if(block.blockID == BasicPipesMain.machineID && metadata < 4) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float)1.1F, (float)0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture("/textures/pumps/Pump.png")); - modelPump.renderMain(0.0725F); - modelPump.renderC1(0.0725F); - modelPump.renderC2(0.0725F); - modelPump.renderC3(0.0725F); - GL11.glPopMatrix(); - } - if(block.blockID == BasicPipesMain.rodID) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float)1.5F, (float)0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture("/textures/GearRod.png")); - modelRod.render(0.0825F,0); - GL11.glPopMatrix(); - } - } - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - public boolean shouldRender3DInInventory() { - - return true; - } - - public int getRenderId() - { - return renderID; - } -} diff --git a/1.4.2/src/minecraft/basicpipes/ModelGearRod.java b/1.4.2/src/minecraft/basicpipes/ModelGearRod.java deleted file mode 100644 index 4a8f6330..00000000 --- a/1.4.2/src/minecraft/basicpipes/ModelGearRod.java +++ /dev/null @@ -1,139 +0,0 @@ -// Date: 9/25/2012 4:29:17 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package basicpipes; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelGearRod extends ModelBase -{ - //fields - ModelRenderer Rod; - ModelRenderer front; - ModelRenderer back; - ModelRenderer f2; - ModelRenderer b2; - ModelRenderer b3; - ModelRenderer b4; - ModelRenderer b1; - ModelRenderer f1; - ModelRenderer f4; - ModelRenderer f3; - ModelRenderer Rod2; - - public ModelGearRod() - { - textureWidth = 64; - textureHeight = 32; - - Rod = new ModelRenderer(this, 0, 0); - Rod.addBox(-1.5F, -1.5F, 0F, 3, 3, 12); - Rod.setRotationPoint(0F, 16F, -6F); - Rod.setTextureSize(64, 32); - Rod.mirror = true; - setRotation(Rod, 0F, 0F, 0F); - front = new ModelRenderer(this, 35, 0); - front.addBox(-2F, -2F, -2F, 4, 4, 2); - front.setRotationPoint(0F, 16F, -6F); - front.setTextureSize(64, 32); - front.mirror = true; - setRotation(front, 0F, 0F, 0F); - back = new ModelRenderer(this, 35, 0); - back.addBox(-2F, -2F, 0F, 4, 4, 2); - back.setRotationPoint(0F, 16F, 6F); - back.setTextureSize(64, 32); - back.mirror = true; - setRotation(back, 0F, 0F, 0.7853982F); - f2 = new ModelRenderer(this, 0, 17); - f2.addBox(0F, 0F, 0F, 1, 1, 2); - f2.setRotationPoint(1F, 17F, -10F); - f2.setTextureSize(64, 32); - f2.mirror = true; - setRotation(f2, 0F, 0F, 0F); - b2 = new ModelRenderer(this, 0, 17); - b2.addBox(-0.5F, -0.5F, 0F, 1, 1, 2); - b2.setRotationPoint(0F, 18F, 8F); - b2.setTextureSize(64, 32); - b2.mirror = true; - setRotation(b2, 0F, 0F, 0.7853982F); - b3 = new ModelRenderer(this, 0, 17); - b3.addBox(-0.5F, -0.5F, 0F, 1, 1, 2); - b3.setRotationPoint(-2F, 16F, 8F); - b3.setTextureSize(64, 32); - b3.mirror = true; - setRotation(b3, 0F, 0F, 0.7853982F); - b4 = new ModelRenderer(this, 0, 17); - b4.addBox(-0.5F, -0.5F, 0F, 1, 1, 2); - b4.setRotationPoint(2F, 16F, 8F); - b4.setTextureSize(64, 32); - b4.mirror = true; - setRotation(b4, 0F, 0F, 0.7853982F); - b1 = new ModelRenderer(this, 0, 17); - b1.addBox(-0.5F, -0.5F, 0F, 1, 1, 2); - b1.setRotationPoint(0F, 14F, 8F); - b1.setTextureSize(64, 32); - b1.mirror = true; - setRotation(b1, 0F, 0F, 0.7853982F); - f1 = new ModelRenderer(this, 0, 17); - f1.addBox(0F, 0F, 0F, 1, 1, 2); - f1.setRotationPoint(1F, 14F, -10F); - f1.setTextureSize(64, 32); - f1.mirror = true; - setRotation(f1, 0F, 0F, 0F); - f4 = new ModelRenderer(this, 0, 17); - f4.addBox(0F, 0F, 0F, 1, 1, 2); - f4.setRotationPoint(-2F, 17F, -10F); - f4.setTextureSize(64, 32); - f4.mirror = true; - setRotation(f4, 0F, 0F, 0F); - f3 = new ModelRenderer(this, 0, 17); - f3.addBox(0F, 0F, 0F, 1, 1, 2); - f3.setRotationPoint(-2F, 14F, -10F); - f3.setTextureSize(64, 32); - f3.mirror = true; - setRotation(f3, 0F, 0F, 0F); - Rod2 = new ModelRenderer(this, 0, 0); - Rod2.addBox(-1.5F, -1.5F, 0F, 3, 3, 12); - Rod2.setRotationPoint(0F, 16F, -6F); - Rod2.setTextureSize(64, 32); - Rod2.mirror = true; - setRotation(Rod2, 0F, 0F, 0.7853982F); - } - public void render(float f5,int r) - { - - Rod.rotateAngleZ= 45 * r; - Rod2.rotateAngleZ= Rod.rotateAngleZ + 45; - Rod.render(f5); - Rod2.render(f5); - //TODO add rotation to rods - front.render(f5); - back.render(f5); - f2.render(f5); - b2.render(f5); - b3.render(f5); - b4.render(f5); - b1.render(f5); - f1.render(f5); - f4.render(f5); - f3.render(f5); - - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/basicpipes/ModelLargePipe.java b/1.4.2/src/minecraft/basicpipes/ModelLargePipe.java deleted file mode 100644 index cc8e8f02..00000000 --- a/1.4.2/src/minecraft/basicpipes/ModelLargePipe.java +++ /dev/null @@ -1,177 +0,0 @@ -// Date: 9/20/2012 12:00:21 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package basicpipes; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelLargePipe extends ModelBase -{ - //fields - ModelRenderer Mid; - ModelRenderer RightPipe; - ModelRenderer RightInter; - ModelRenderer RightConnect; - ModelRenderer LeftInter; - ModelRenderer LeftPipe; - ModelRenderer LeftConnect; - ModelRenderer TopInter; - ModelRenderer TopPipe; - ModelRenderer TopConnect; - ModelRenderer BottomPipe; - ModelRenderer BottomInter; - ModelRenderer BottomConnect; - ModelRenderer BackPipe; - ModelRenderer BackInter; - ModelRenderer BackConnect; - ModelRenderer FrontInter; - ModelRenderer FrontPipe; - ModelRenderer FrontConnect; - - public ModelLargePipe() - { - textureWidth = 128; - textureHeight = 32; - - Mid = new ModelRenderer(this, 50, 13); - Mid.addBox(-3F, -3F, -3F, 6, 6, 6); - Mid.setRotationPoint(0F, 16F, 0F); - Mid.setTextureSize(128, 32); - Mid.mirror = true; - setRotation(Mid, 0F, 0F, 0F); - RightPipe = new ModelRenderer(this, 25, 0); - RightPipe.addBox(0F, -3F, -3F, 4, 6, 6); - RightPipe.setRotationPoint(3F, 16F, 0F); - RightPipe.setTextureSize(128, 32); - RightPipe.mirror = true; - setRotation(RightPipe, 0F, 0F, 0F); - RightInter = new ModelRenderer(this, 98, 0); - RightInter.addBox(0F, -4F, -4F, 1, 8, 8); - RightInter.setRotationPoint(2F, 16F, 0F); - RightInter.setTextureSize(128, 32); - RightInter.mirror = true; - setRotation(RightInter, 0F, 0F, 0F); - RightConnect = new ModelRenderer(this, 98, 0); - RightConnect.addBox(0F, -4F, -4F, 1, 8, 8); - RightConnect.setRotationPoint(7F, 16F, 0F); - RightConnect.setTextureSize(128, 32); - RightConnect.mirror = true; - setRotation(RightConnect, 0F, 0F, 0F); - LeftInter = new ModelRenderer(this, 98, 0); - LeftInter.addBox(-1F, -4F, -4F, 1, 8, 8); - LeftInter.setRotationPoint(-2F, 16F, 0F); - LeftInter.setTextureSize(128, 32); - LeftInter.mirror = true; - setRotation(LeftInter, 0F, 0F, 0F); - LeftPipe = new ModelRenderer(this, 25, 0); - LeftPipe.addBox(-4F, -3F, -3F, 4, 6, 6); - LeftPipe.setRotationPoint(-3F, 16F, 0F); - LeftPipe.setTextureSize(128, 32); - LeftPipe.mirror = true; - setRotation(LeftPipe, 0F, 0F, 0F); - LeftConnect = new ModelRenderer(this, 98, 0); - LeftConnect.addBox(-1F, -4F, -4F, 1, 8, 8); - LeftConnect.setRotationPoint(-7F, 16F, 0F); - LeftConnect.setTextureSize(128, 32); - LeftConnect.mirror = true; - setRotation(LeftConnect, 0F, 0F, 0F); - TopInter = new ModelRenderer(this, 77, 17); - TopInter.addBox(-4F, -1F, -4F, 8, 1, 8); - TopInter.setRotationPoint(0F, 14F, 0F); - TopInter.setTextureSize(128, 32); - TopInter.mirror = true; - setRotation(TopInter, 0F, 0F, 0F); - TopPipe = new ModelRenderer(this, 50, 0); - TopPipe.addBox(-3F, -4F, -3F, 6, 4, 6); - TopPipe.setRotationPoint(0F, 13F, 0F); - TopPipe.setTextureSize(128, 32); - TopPipe.mirror = true; - setRotation(TopPipe, 0F, 0F, 0F); - TopConnect = new ModelRenderer(this, 77, 17); - TopConnect.addBox(-4F, -1F, -4F, 8, 1, 8); - TopConnect.setRotationPoint(0F, 9F, 0F); - TopConnect.setTextureSize(128, 32); - TopConnect.mirror = true; - setRotation(TopConnect, 0F, 0F, 0F); - BottomPipe = new ModelRenderer(this, 50, 0); - BottomPipe.addBox(-3F, 0F, -3F, 6, 4, 6); - BottomPipe.setRotationPoint(0F, 19F, 0F); - BottomPipe.setTextureSize(128, 32); - BottomPipe.mirror = true; - setRotation(BottomPipe, 0F, 0F, 0F); - BottomInter = new ModelRenderer(this, 77, 17); - BottomInter.addBox(-4F, 0F, -4F, 8, 1, 8); - BottomInter.setRotationPoint(0F, 18F, 0F); - BottomInter.setTextureSize(128, 32); - BottomInter.mirror = true; - setRotation(BottomInter, 0F, 0F, 0F); - BottomConnect = new ModelRenderer(this, 77, 17); - BottomConnect.addBox(-4F, 0F, -4F, 8, 1, 8); - BottomConnect.setRotationPoint(0F, 23F, 0F); - BottomConnect.setTextureSize(128, 32); - BottomConnect.mirror = true; - setRotation(BottomConnect, 0F, 0F, 0F); - BackPipe = new ModelRenderer(this, 0, 0); - BackPipe.addBox(-3F, -3F, 0F, 6, 6, 4); - BackPipe.setRotationPoint(0F, 16F, 3F); - BackPipe.setTextureSize(128, 32); - BackPipe.mirror = true; - setRotation(BackPipe, 0F, 0F, 0F); - BackInter = new ModelRenderer(this, 0, 23); - BackInter.addBox(-4F, -4F, 0F, 8, 8, 1); - BackInter.setRotationPoint(0F, 16F, 2F); - BackInter.setTextureSize(128, 32); - BackInter.mirror = true; - setRotation(BackInter, 0F, 0F, 0F); - BackConnect = new ModelRenderer(this, 0, 23); - BackConnect.addBox(-4F, -4F, 0F, 8, 8, 1); - BackConnect.setRotationPoint(0F, 16F, 7F); - BackConnect.setTextureSize(128, 32); - BackConnect.mirror = true; - setRotation(BackConnect, 0F, 0F, 0F); - FrontInter = new ModelRenderer(this, 0, 23); - FrontInter.addBox(-4F, -4F, -1F, 8, 8, 1); - FrontInter.setRotationPoint(0F, 16F, -2F); - FrontInter.setTextureSize(128, 32); - FrontInter.mirror = true; - setRotation(FrontInter, 0F, 0F, 0F); - FrontPipe = new ModelRenderer(this, 0, 0); - FrontPipe.addBox(-3F, -3F, -4F, 6, 6, 4); - FrontPipe.setRotationPoint(0F, 16F, -3F); - FrontPipe.setTextureSize(128, 32); - FrontPipe.mirror = true; - setRotation(FrontPipe, 0F, 0F, 0F); - FrontConnect = new ModelRenderer(this, 0, 23); - FrontConnect.addBox(-4F, -4F, -1F, 8, 8, 1); - FrontConnect.setRotationPoint(0F, 16F, -7F); - FrontConnect.setTextureSize(128, 32); - FrontConnect.mirror = true; - setRotation(FrontConnect, 0F, 0F, 0F); - } - public void renderMiddle() { Mid.render(0.0625F); } - public void renderBottom() { BottomPipe.render(0.0625F); BottomConnect.render(0.0625F); BottomInter.render(0.0625F);} - public void renderTop() { TopPipe.render(0.0625F);TopConnect.render(0.0625F); TopInter.render(0.0625F);} - public void renderLeft() { LeftPipe.render(0.0625F);LeftConnect.render(0.0625F); LeftInter.render(0.0625F);} - public void renderRight() { RightPipe.render(0.0625F);RightConnect.render(0.0625F); RightInter.render(0.0625F);} - public void renderBack() { BackPipe.render(0.0625F); BackConnect.render(0.0625F);BackInter.render(0.0625F); } - public void renderFront() { FrontPipe.render(0.0625F);FrontConnect.render(0.0625F);FrontInter.render(0.0625F);} - - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/basicpipes/ModelPipe.java b/1.4.2/src/minecraft/basicpipes/ModelPipe.java deleted file mode 100644 index 6ddce333..00000000 --- a/1.4.2/src/minecraft/basicpipes/ModelPipe.java +++ /dev/null @@ -1,93 +0,0 @@ -package basicpipes; - -import net.minecraft.src.*; - -public class ModelPipe extends ModelBase -{ - //fields - ModelRenderer Middle; - ModelRenderer Right; - ModelRenderer Left; - ModelRenderer Back; - ModelRenderer Front; - ModelRenderer Top; - ModelRenderer Bottom; - - public ModelPipe() - { - textureWidth = 64; - textureHeight = 32; - - Middle = new ModelRenderer(this, 0, 0); - Middle.addBox(-1F, -1F, -1F, 4, 4, 4); - Middle.setRotationPoint(-1F, 15F, -1F); - Middle.setTextureSize(64, 32); - Middle.mirror = true; - setRotation(Middle, 0F, 0F, 0F); - Right = new ModelRenderer(this, 21, 0); - Right.addBox(0F, 0F, 0F, 6, 4, 4); - Right.setRotationPoint(2F, 14F, -2F); - Right.setTextureSize(64, 32); - Right.mirror = true; - setRotation(Right, 0F, 0F, 0F); - Left = new ModelRenderer(this, 21, 0); - Left.addBox(0F, 0F, 0F, 6, 4, 4); - Left.setRotationPoint(-8F, 14F, -2F); - Left.setTextureSize(64, 32); - Left.mirror = true; - setRotation(Left, 0F, 0F, 0F); - Back = new ModelRenderer(this, 0, 11); - Back.addBox(0F, 0F, 0F, 4, 4, 6); - Back.setRotationPoint(-2F, 14F, 2F); - Back.setTextureSize(64, 32); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - Front = new ModelRenderer(this, 0, 11); - Front.addBox(0F, 0F, 0F, 4, 4, 6); - Front.setRotationPoint(-2F, 14F, -8F); - Front.setTextureSize(64, 32); - Front.mirror = true; - setRotation(Front, 0F, 0F, 0F); - Top = new ModelRenderer(this, 21, 11); - Top.addBox(0F, 0F, 0F, 4, 6, 4); - Top.setRotationPoint(-2F, 8F, -2F); - Top.setTextureSize(64, 32); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - Bottom = new ModelRenderer(this, 21, 11); - Bottom.addBox(0F, 0F, 0F, 4, 6, 4); - Bottom.setRotationPoint(-2F, 18F, -2F); - Bottom.setTextureSize(64, 32); - Bottom.mirror = true; - setRotation(Bottom, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.renderMiddle(); - this.renderBottom(); - this.renderTop(); - this.renderLeft(); - this.renderRight(); - this.renderBack(); - this.renderFront(); - } - - public void renderMiddle() { Middle.render(0.0625F); } - public void renderBottom() { Bottom.render(0.0625F); } - public void renderTop() { Top.render(0.0625F); } - public void renderLeft() { Left.render(0.0625F); } - public void renderRight() { Right.render(0.0625F); } - public void renderBack() { Back.render(0.0625F); } - public void renderFront() { Front.render(0.0625F);} - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/basicpipes/ModelPump.java b/1.4.2/src/minecraft/basicpipes/ModelPump.java deleted file mode 100644 index 53a2af45..00000000 --- a/1.4.2/src/minecraft/basicpipes/ModelPump.java +++ /dev/null @@ -1,140 +0,0 @@ -// Date: 9/3/2012 6:12:15 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package basicpipes; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelPump extends ModelBase -{ - //fields - ModelRenderer Main; - ModelRenderer sidePort; - ModelRenderer FrontPort; - ModelRenderer pivit; - ModelRenderer crank; - ModelRenderer Rope; - ModelRenderer pivit2; - ModelRenderer Piston; - ModelRenderer pPlate; - ModelRenderer Rope2; - ModelRenderer BackPort; - - public ModelPump() - { - textureWidth = 128; - textureHeight = 128; - - Main = new ModelRenderer(this, 0, 0); - Main.addBox(-5F, 0F, -5F, 10, 13, 10); - Main.setRotationPoint(1F, 11F, 0F); - Main.setTextureSize(128, 128); - Main.mirror = true; - setRotation(Main, 0F, 0F, 0F); - sidePort = new ModelRenderer(this, 0, 76); - sidePort.addBox(-6F, -3F, -3F, 6, 6, 6); - sidePort.setRotationPoint(8F, 16F, 0F); - sidePort.setTextureSize(128, 128); - sidePort.mirror = true; - setRotation(sidePort, 0F, 0F, 0F); - FrontPort = new ModelRenderer(this, 0, 63); - FrontPort.addBox(-3F, -3F, 0F, 6, 6, 6); - FrontPort.setRotationPoint(0F, 16F, -8F); - FrontPort.setTextureSize(128, 128); - FrontPort.mirror = true; - setRotation(FrontPort, 0F, 0F, 0F); - pivit = new ModelRenderer(this, 0, 40); - pivit.addBox(-1F, 0F, -1F, 2, 3, 1); - pivit.setRotationPoint(0F, 8F, 1F); - pivit.setTextureSize(128, 128); - pivit.mirror = true; - setRotation(pivit, 0F, 0F, 0F); - crank = new ModelRenderer(this, 48, 0); - crank.addBox(-8F, 0F, -1F, 14, 2, 1); - crank.setRotationPoint(0F, 7F, 0F); - crank.setTextureSize(128, 128); - crank.mirror = true; - setRotation(crank, 0F, 0F, 0F); - Rope = new ModelRenderer(this, 0, 28); - Rope.addBox(0F, 0F, 0F, 1, 7, 1); - Rope.setRotationPoint(4F, 8F, -1F); - Rope.setTextureSize(128, 128); - Rope.mirror = true; - setRotation(Rope, 0F, 0F, 0F); - pivit2 = new ModelRenderer(this, 0, 40); - pivit2.addBox(-1F, 0F, -1F, 2, 3, 1); - pivit2.setRotationPoint(0F, 8F, -1F); - pivit2.setTextureSize(128, 128); - pivit2.mirror = true; - setRotation(pivit2, 0F, 0F, 0F); - pPlate = new ModelRenderer(this, 34, 30); - pPlate.addBox(0F, 0F, 0F, 1, 12, 1); - pPlate.setRotationPoint(-5F, 12F, -1F); - pPlate.setTextureSize(128, 128); - pPlate.mirror = true; - setRotation(pPlate, 0F, 0F, 0F); - Piston = new ModelRenderer(this, 20, 30); - Piston.addBox(0F, 0F, 0F, 3, 12, 3); - Piston.setRotationPoint(-8F, 12F, -2F); - Piston.setTextureSize(128, 128); - Piston.mirror = true; - setRotation(Piston, 0F, 0F, 0F); - Rope2 = new ModelRenderer(this, 0, 28); - Rope2.addBox(0F, 0F, 0F, 1, 7, 1); - Rope2.setRotationPoint(-7F, 8F, -1F); - Rope2.setTextureSize(128, 128); - Rope2.mirror = true; - setRotation(Rope2, 0F, 0F, 0F); - BackPort = new ModelRenderer(this, 0, 50); - BackPort.addBox(-3F, -3F, -6F, 6, 6, 6); - BackPort.setRotationPoint(0F, 16F, 8F); - BackPort.setTextureSize(128, 128); - BackPort.mirror = true; - setRotation(BackPort, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } - public void renderMain(float f5) - { - Main.render(f5); - pivit.render(f5); - crank.render(f5); - Rope.render(f5); - pivit2.render(f5); - Piston.render(f5); - pPlate.render(f5); - Rope2.render(f5); - } - public void renderC1(float f5) - { - sidePort.render(f5); - } - public void renderC2(float f5) - { - FrontPort.render(f5); - } - public void renderC3(float f5) - { - BackPort.render(f5); - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/1.4.2/src/minecraft/basicpipes/PipeClientProxy.java b/1.4.2/src/minecraft/basicpipes/PipeClientProxy.java deleted file mode 100644 index 6c65d868..00000000 --- a/1.4.2/src/minecraft/basicpipes/PipeClientProxy.java +++ /dev/null @@ -1,34 +0,0 @@ -package basicpipes; - -import steampower.SteamPowerMain; -import basicpipes.PipeProxy; -import basicpipes.LTanks.TileEntityLTank; -import basicpipes.conductors.TileEntityPipe; -import basicpipes.conductors.TileEntityRod; -import basicpipes.machines.TileEntityPump; -import basicpipes.renderTank.RenderLTank; -import net.minecraftforge.client.MinecraftForgeClient; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - -public class PipeClientProxy extends PipeProxy -{ - @Override - public void preInit() - { - //Preload textures - MinecraftForgeClient.preloadTexture(BasicPipesMain.textureFile+"/Items.png"); - MinecraftForgeClient.preloadTexture(BasicPipesMain.textureFile+"/blocks.png"); - RenderingRegistry.registerBlockHandler(new ItemRenderHelper()); - } - - @Override - public void init() - { - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPipe.class, new RenderPipe()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPump.class, new RenderPump()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRod.class, new RenderGearRod()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLTank.class, new RenderLTank()); - } -} diff --git a/1.4.2/src/minecraft/basicpipes/RenderGearRod.java b/1.4.2/src/minecraft/basicpipes/RenderGearRod.java deleted file mode 100644 index 85e52659..00000000 --- a/1.4.2/src/minecraft/basicpipes/RenderGearRod.java +++ /dev/null @@ -1,49 +0,0 @@ -package basicpipes; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import steampower.geared.ModelGearPiston; - -import basicpipes.conductors.TileEntityPipe; -import basicpipes.conductors.TileEntityRod; -import basicpipes.machines.TileEntityPump; -import basicpipes.pipes.api.Liquid; - - -public class RenderGearRod extends TileEntitySpecialRenderer -{ - private ModelGearRod model; - public RenderGearRod() - { - model = new ModelGearRod(); - } - public void renderAModelAt(TileEntityRod tileEntity, double d, double d1, double d2, float f) - { - bindTextureByName("/textures/GearRod.png"); - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - switch(meta) - { - case 0: GL11.glRotatef(90f, 1f, 0f, 0f);break; - case 1: GL11.glRotatef(-90f, 1f, 0f, 0f);break; - case 2:GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 5:GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 3:GL11.glRotatef(180f, 0f, 1f, 0f);break; - case 4:GL11.glRotatef(270f, 0f, 1f, 0f);break; - } - model.render(0.0625F,tileEntity.pos); - GL11.glPopMatrix(); - - } - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) { - this.renderAModelAt((TileEntityRod)tileEntity, var2, var4, var6, var8); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/basicpipes/RenderPipe.java b/1.4.2/src/minecraft/basicpipes/RenderPipe.java deleted file mode 100644 index b1a76cbb..00000000 --- a/1.4.2/src/minecraft/basicpipes/RenderPipe.java +++ /dev/null @@ -1,62 +0,0 @@ -package basicpipes; - -import net.minecraft.src.ModelBase; -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import basicpipes.conductors.TileEntityPipe; -import basicpipes.pipes.api.Liquid; - - -public class RenderPipe extends TileEntitySpecialRenderer -{ - Liquid type; - int size = 6; - - private ModelPipe fourPipe; - private ModelLargePipe SixPipe; - private ModelBase model = fourPipe; - - public RenderPipe() - { - fourPipe = new ModelPipe(); - SixPipe = new ModelLargePipe(); - } - - public void renderAModelAt(TileEntityPipe tileEntity, double d, double d1, double d2, float f) - { - //Texture file - - type = tileEntity.getType(); - - - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - switch(type.ordinal()) - { - case 0: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SixSteamPipe.png");break; - case 1: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SixWaterPipe.png");break; - case 2: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SixLavaPipe.png");break; - case 3: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SixOilPipe.png");break; - default:bindTextureByName(BasicPipesMain.textureFile+"/pipes/DefaultPipe.png"); break; - } - if(tileEntity.connectedBlocks[0] != null) SixPipe.renderBottom(); - if(tileEntity.connectedBlocks[1] != null) SixPipe.renderTop(); - if(tileEntity.connectedBlocks[3] != null) SixPipe.renderFront(); - if(tileEntity.connectedBlocks[2] != null) SixPipe.renderBack(); - if(tileEntity.connectedBlocks[5] != null) SixPipe.renderRight(); - if(tileEntity.connectedBlocks[4] != null) SixPipe.renderLeft(); - SixPipe.renderMiddle(); - GL11.glPopMatrix(); - - } - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) { - this.renderAModelAt((TileEntityPipe)tileEntity, var2, var4, var6, var8); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/basicpipes/RenderPump.java b/1.4.2/src/minecraft/basicpipes/RenderPump.java deleted file mode 100644 index 47daad6b..00000000 --- a/1.4.2/src/minecraft/basicpipes/RenderPump.java +++ /dev/null @@ -1,59 +0,0 @@ -package basicpipes; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import basicpipes.conductors.TileEntityPipe; -import basicpipes.machines.TileEntityPump; -import basicpipes.pipes.api.Liquid; - - -public class RenderPump extends TileEntitySpecialRenderer -{ - int type = 0; - private ModelPump model; - - public RenderPump() - { - model = new ModelPump(); - } - - public void renderAModelAt(TileEntityPump tileEntity, double d, double d1, double d2, float f) - { - Liquid type = tileEntity.type; - int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - switch(type.ordinal()) - { - default: bindTextureByName("/textures/pumps/Pump.png");break; - //case 0://steam - case 1:bindTextureByName("/textures/pumps/WaterPump.png");break;//water - case 2:bindTextureByName("/textures/pumps/LavaPump.png");break;//lava - case 3:bindTextureByName("/textures/pumps/OilPump.png");break;//oil - //case 4://fuel - } - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - switch(meta) - { - case 1:GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 2:GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 3:GL11.glRotatef(180f, 0f, 1f, 0f);break; - case 0:GL11.glRotatef(270f, 0f, 1f, 0f);break; - } - model.renderMain(0.0625F); - model.renderC1(0.0625F); - model.renderC2(0.0625F); - model.renderC3(0.0625F); - GL11.glPopMatrix(); - - } - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) { - this.renderAModelAt((TileEntityPump)tileEntity, var2, var4, var6, var8); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java b/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java deleted file mode 100644 index a2a31d3c..00000000 --- a/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java +++ /dev/null @@ -1,422 +0,0 @@ -// Date: 10/8/2012 7:31:40 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package basicpipes.renderTank; - -import basicpipes.LTanks.TileEntityLTank; -import basicpipes.conductors.TileEntityPipe; -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; -import net.minecraft.src.TileEntity; -import net.minecraftforge.common.ForgeDirection; - -public class ModelLiquidTank extends ModelBase -{ - //fields - ModelRenderer Mid; - ModelRenderer Corner; - ModelRenderer Corner2; - ModelRenderer Corner3; - ModelRenderer Corner4; - ModelRenderer C8; - ModelRenderer C7; - ModelRenderer C6; - ModelRenderer C5; - ModelRenderer C4; - ModelRenderer C; - ModelRenderer C3; - ModelRenderer C2; - ModelRenderer GuageT; - ModelRenderer GuageB; - ModelRenderer Guage; - ModelRenderer GuageR; - ModelRenderer GuageGlass; - ModelRenderer GuageL; - - ModelRenderer GuageT2; - ModelRenderer GuageB2; - ModelRenderer Guage2; - ModelRenderer GuageR2; - ModelRenderer GuageGlass2; - ModelRenderer GuageL2; - - ModelRenderer GuageT3; - ModelRenderer GuageB3; - ModelRenderer Guage3; - ModelRenderer GuageR3; - ModelRenderer GuageGlass3; - ModelRenderer GuageL3; - - ModelRenderer GuageT4; - ModelRenderer GuageB4; - ModelRenderer Guage4; - ModelRenderer GuageR4; - ModelRenderer GuageGlass4; - ModelRenderer GuageL4; - - ModelRenderer CCBottom; - ModelRenderer CCRight; - ModelRenderer CCLeft; - ModelRenderer CCFront; - ModelRenderer CCBack; - ModelRenderer CCTop; - - public ModelLiquidTank() - { - textureWidth = 128; - textureHeight = 128; - - Mid = new ModelRenderer(this, 0, 50); - Mid.addBox(-6F, 0F, -6F, 12, 14, 12); - Mid.setRotationPoint(0F, 9F, 0F); - Mid.setTextureSize(128, 128); - Mid.mirror = true; - setRotation(Mid, 0F, 0F, 0F); - Corner = new ModelRenderer(this, 0, 30); - Corner.addBox(-1F, 0F, -1F, 2, 16, 2); - Corner.setRotationPoint(-7F, 8F, 7F); - Corner.setTextureSize(128, 128); - Corner.mirror = true; - setRotation(Corner, 0F, 0F, 0F); - Corner2 = new ModelRenderer(this, 0, 30); - Corner2.addBox(-1F, 0F, -1F, 2, 16, 2); - Corner2.setRotationPoint(-7F, 8F, -7F); - Corner2.setTextureSize(128, 128); - Corner2.mirror = true; - setRotation(Corner2, 0F, 0F, 0F); - Corner3 = new ModelRenderer(this, 0, 30); - Corner3.addBox(-1F, 0F, -1F, 2, 16, 2); - Corner3.setRotationPoint(7F, 8F, -7F); - Corner3.setTextureSize(128, 128); - Corner3.mirror = true; - setRotation(Corner3, 0F, 0F, 0F); - Corner4 = new ModelRenderer(this, 0, 30); - Corner4.addBox(-1F, 0F, -1F, 2, 16, 2); - Corner4.setRotationPoint(7F, 8F, 7F); - Corner4.setTextureSize(128, 128); - Corner4.mirror = true; - setRotation(Corner4, 0F, 0F, 0F); - C8 = new ModelRenderer(this, 9, 35); - C8.addBox(-1F, 0F, -1F, 2, 2, 12); - C8.setRotationPoint(6F, 22F, -5F); - C8.setTextureSize(128, 128); - C8.mirror = true; - setRotation(C8, 0F, 0F, 0F); - C7 = new ModelRenderer(this, 9, 35); - C7.addBox(-1F, 0F, -1F, 2, 2, 12); - C7.setRotationPoint(-6F, 8F, -5F); - C7.setTextureSize(128, 128); - C7.mirror = true; - setRotation(C7, 0F, 0F, 0F); - C6 = new ModelRenderer(this, 9, 35); - C6.addBox(-1F, 0F, -1F, 2, 2, 12); - C6.setRotationPoint(6F, 8F, -5F); - C6.setTextureSize(128, 128); - C6.mirror = true; - setRotation(C6, 0F, 0F, 0F); - C5 = new ModelRenderer(this, 9, 30); - C5.addBox(-1F, 0F, -1F, 12, 2, 2); - C5.setRotationPoint(-5F, 8F, 6F); - C5.setTextureSize(128, 128); - C5.mirror = true; - setRotation(C5, 0F, 0F, 0F); - C4 = new ModelRenderer(this, 9, 35); - C4.addBox(-1F, 0F, -1F, 2, 2, 12); - C4.setRotationPoint(-6F, 22F, -5F); - C4.setTextureSize(128, 128); - C4.mirror = true; - setRotation(C4, 0F, 0F, 0F); - C = new ModelRenderer(this, 9, 30); - C.addBox(-1F, 0F, -1F, 12, 2, 2); - C.setRotationPoint(-5F, 22F, 6F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 0F); - C3 = new ModelRenderer(this, 9, 30); - C3.addBox(-1F, 0F, -1F, 12, 2, 2); - C3.setRotationPoint(-5F, 8F, -6F); - C3.setTextureSize(128, 128); - C3.mirror = true; - setRotation(C3, 0F, 0F, 0F); - C2 = new ModelRenderer(this, 9, 30); - C2.addBox(-1F, 0F, -1F, 12, 2, 2); - C2.setRotationPoint(-5F, 22F, -6F); - C2.setTextureSize(128, 128); - C2.mirror = true; - setRotation(C2, 0F, 0F, 0F); - //G1-------------------------------------- - GuageT = new ModelRenderer(this, 54, 42); - GuageT.addBox(-1F, -1F, 0F, 2, 1, 2); - GuageT.setRotationPoint(0F, 12F, -8F); - GuageT.setTextureSize(128, 128); - GuageT.mirror = true; - setRotation(GuageT, 0F, 0F, 0F); - GuageB = new ModelRenderer(this, 54, 42); - GuageB.addBox(-1F, 8F, 0F, 2, 1, 2); - GuageB.setRotationPoint(0F, 12F, -8F); - GuageB.setTextureSize(128, 128); - GuageB.mirror = true; - setRotation(GuageB, 0F, 0F, 0F); - Guage = new ModelRenderer(this, 54, 32); - Guage.addBox(-1F, 0F, 0F, 2, 8, 1); - Guage.setRotationPoint(0F, 12F, -7F); - Guage.setTextureSize(128, 128); - Guage.mirror = true; - setRotation(Guage, 0F, 0F, 0F); - GuageR = new ModelRenderer(this, 44, 32); - GuageR.addBox(1F, -1F, -1F, 2, 10, 2); - GuageR.setRotationPoint(0F, 12F, -7F); - GuageR.setTextureSize(128, 128); - GuageR.mirror = true; - setRotation(GuageR, 0F, 0F, 0F); - GuageGlass = new ModelRenderer(this, 60, 32); - GuageGlass.addBox(-1F, 0F, 0F, 2, 8, 1); - GuageGlass.setRotationPoint(0F, 12F, -8F); - GuageGlass.setTextureSize(128, 128); - GuageGlass.mirror = true; - setRotation(GuageGlass, 0F, 0F, 0F); - GuageL = new ModelRenderer(this, 44, 32); - GuageL.addBox(-3F, -1F, -1F, 2, 10, 2); - GuageL.setRotationPoint(0F, 12F, -7F); - GuageL.setTextureSize(128, 128); - GuageL.mirror = true; - setRotation(GuageL, 0F, 0F, 0F); - //G2---------------------------------- - GuageT2 = new ModelRenderer(this, 54, 42); - GuageT2.addBox(-1F, -1F, 0F, 2, 1, 2); - GuageT2.setRotationPoint(-8F, 12F, 0F); - GuageT2.setTextureSize(128, 128); - GuageT2.mirror = true; - setRotation(GuageT2, 0F, 1.570796F, 0F); - GuageB2 = new ModelRenderer(this, 54, 42); - GuageB2.addBox(-1F, 8F, 0F, 2, 1, 2); - GuageB2.setRotationPoint(-8F, 12F, 0F); - GuageB2.setTextureSize(128, 128); - GuageB2.mirror = true; - setRotation(GuageB2, 0F, 1.570796F, 0F); - Guage2 = new ModelRenderer(this, 54, 32); - Guage2.addBox(-1F, 0F, 0F, 2, 8, 1); - Guage2.setRotationPoint(-7F, 12F, 0F); - Guage2.setTextureSize(128, 128); - Guage2.mirror = true; - setRotation(Guage2, 0F, 1.570796F, 0F); - GuageR2 = new ModelRenderer(this, 44, 32); - GuageR2.addBox(1F, -1F, -1F, 2, 10, 2); - GuageR2.setRotationPoint(-7F, 12F, 0F); - GuageR2.setTextureSize(128, 128); - GuageR2.mirror = true; - setRotation(GuageR2, 0F, 1.570796F, 0F); - GuageGlass2 = new ModelRenderer(this, 60, 32); - GuageGlass2.addBox(-1F, 0F, 0F, 2, 8, 1); - GuageGlass2.setRotationPoint(-8F, 12F, 0F); - GuageGlass2.setTextureSize(128, 128); - GuageGlass2.mirror = true; - setRotation(GuageGlass2, 0F, 1.570796F, 0F); - GuageL2 = new ModelRenderer(this, 44, 32); - GuageL2.addBox(-3F, -1F, -1F, 2, 10, 2); - GuageL2.setRotationPoint(-7F, 12F, 0F); - GuageL2.setTextureSize(128, 128); - GuageL2.mirror = true; - setRotation(GuageL2, 0F, 1.570796F, 0F); - //G3-------------------------------------- - GuageT3 = new ModelRenderer(this, 54, 42); - GuageT3.addBox(-1F, -1F, 0F, 2, 1, 2); - GuageT3.setRotationPoint(0F, 12F, 8F); - GuageT3.setTextureSize(128, 128); - GuageT3.mirror = true; - setRotation(GuageT3, 0F, 3.141593F, 0F); - GuageB3 = new ModelRenderer(this, 54, 42); - GuageB3.addBox(-1F, 8F, 0F, 2, 1, 2); - GuageB3.setRotationPoint(0F, 12F, 8F); - GuageB3.setTextureSize(128, 128); - GuageB3.mirror = true; - setRotation(GuageB3, 0F, 3.141593F, 0F); - Guage3 = new ModelRenderer(this, 54, 32); - Guage3.addBox(-1F, 0F, 0F, 2, 8, 1); - Guage3.setRotationPoint(0F, 12F, 7F); - Guage3.setTextureSize(128, 128); - Guage3.mirror = true; - setRotation(Guage3, 0F, 3.141593F, 0F); - GuageR3 = new ModelRenderer(this, 44, 32); - GuageR3.addBox(1F, -1F, -1F, 2, 10, 2); - GuageR3.setRotationPoint(0F, 12F, 7F); - GuageR3.setTextureSize(128, 128); - GuageR3.mirror = true; - setRotation(GuageR3, 0F, 3.141593F, 0F); - GuageGlass3 = new ModelRenderer(this, 60, 32); - GuageGlass3.addBox(-1F, 0F, 0F, 2, 8, 1); - GuageGlass3.setRotationPoint(0F, 12F, 8F); - GuageGlass3.setTextureSize(128, 128); - GuageGlass3.mirror = true; - setRotation(GuageGlass3, 0F, 3.141593F, 0F); - GuageL3 = new ModelRenderer(this, 44, 32); - GuageL3.addBox(-3F, -1F, -1F, 2, 10, 2); - GuageL3.setRotationPoint(0F, 12F, 7F); - GuageL3.setTextureSize(128, 128); - GuageL3.mirror = true; - setRotation(GuageL3, 0F, 3.141593F, 0F); - //G4------------------------------- - GuageT4 = new ModelRenderer(this, 54, 42); - GuageT4.addBox(-1F, -1F, 0F, 2, 1, 2); - GuageT4.setRotationPoint(8F, 12F, 0F); - GuageT4.setTextureSize(128, 128); - GuageT4.mirror = true; - setRotation(GuageT4, 0F, -1.570796F, 0F); - GuageB4 = new ModelRenderer(this, 54, 42); - GuageB4.addBox(-1F, 8F, 0F, 2, 1, 2); - GuageB4.setRotationPoint(8F, 12F, 0F); - GuageB4.setTextureSize(128, 128); - GuageB4.mirror = true; - setRotation(GuageB4, 0F, -1.570796F, 0F); - Guage4 = new ModelRenderer(this, 54, 32); - Guage4.addBox(-1F, 0F, 0F, 2, 8, 1); - Guage4.setRotationPoint(7F, 12F, 0F); - Guage4.setTextureSize(128, 128); - Guage4.mirror = true; - setRotation(Guage4, 0F, -1.570796F, 0F); - GuageR4 = new ModelRenderer(this, 44, 32); - GuageR4.addBox(1F, -1F, -1F, 2, 10, 2); - GuageR4.setRotationPoint(7F, 12F, 0F); - GuageR4.setTextureSize(128, 128); - GuageR4.mirror = true; - setRotation(GuageR4, 0F, -1.570796F, 0F); - GuageGlass4 = new ModelRenderer(this, 60, 32); - GuageGlass4.addBox(-1F, 0F, 0F, 2, 8, 1); - GuageGlass4.setRotationPoint(8F, 12F, 0F); - GuageGlass4.setTextureSize(128, 128); - GuageGlass4.mirror = true; - setRotation(GuageGlass4, 0F, -1.570796F, 0F); - GuageL4 = new ModelRenderer(this, 44, 32); - GuageL4.addBox(-3F, -1F, -1F, 2, 10, 2); - GuageL4.setRotationPoint(7F, 12F, 0F); - GuageL4.setTextureSize(128, 128); - GuageL4.mirror = true; - setRotation(GuageL4, 0F, -1.570796F, 0F); - //Pipe Connectors - CCBottom = new ModelRenderer(this, 0, 0); - CCBottom.addBox(-3F, -9F, -3F, 6, 1, 6); - CCBottom.setRotationPoint(0F, 15F, 0F); - CCBottom.setTextureSize(128, 128); - CCBottom.mirror = true; - setRotation(CCBottom, 3.141593F, 0F, 0F); - CCRight = new ModelRenderer(this, 0, 0); - CCRight.addBox(-3F, -8F, -3F, 6, 2, 6); - CCRight.setRotationPoint(0F, 15F, 0F); - CCRight.setTextureSize(128, 128); - CCRight.mirror = true; - setRotation(CCRight, 0F, 0F, -1.570796F); - CCLeft = new ModelRenderer(this, 0, 0); - CCLeft.addBox(-3F, -8F, -3F, 6, 2, 6); - CCLeft.setRotationPoint(0F, 15F, 0F); - CCLeft.setTextureSize(128, 128); - CCLeft.mirror = true; - setRotation(CCLeft, 0F, 0F, 1.570796F); - CCFront = new ModelRenderer(this, 0, 0); - CCFront.addBox(-3F, -8F, -3F, 6, 2, 6); - CCFront.setRotationPoint(0F, 15F, 0F); - CCFront.setTextureSize(128, 128); - CCFront.mirror = true; - setRotation(CCFront, 1.570796F, 0F, 0F); - CCBack = new ModelRenderer(this, 0, 0); - CCBack.addBox(-3F, -8F, -3F, 6, 2, 6); - CCBack.setRotationPoint(0F, 15F, 0F); - CCBack.setTextureSize(128, 128); - CCBack.mirror = true; - setRotation(CCBack, -1.570796F, 0F, 0F); - CCTop = new ModelRenderer(this, 0, 0); - CCTop.addBox(-3F, -7F, -3F, 6, 1, 6); - CCTop.setRotationPoint(0F, 15F, 0F); - CCTop.setTextureSize(128, 128); - CCTop.mirror = true; - setRotation(CCTop, 0F, 0F, 0F); - } - - public void renderMain(TileEntityLTank te ,float f5) - { - //render regardless of sides - Mid.render(f5); - Corner.render(f5); - Corner2.render(f5); - Corner3.render(f5); - Corner4.render(f5); - C8.render(f5); - C7.render(f5); - C6.render(f5); - C5.render(f5); - C4.render(f5); - C.render(f5); - C3.render(f5); - C2.render(f5); - CCTop.render(f5);CCBottom.render(f5); - //Front - if(te.cc[2] instanceof TileEntityPipe) - { - CCFront.render(f5); - }else - { - GuageT.render(f5); - GuageB.render(f5); - Guage.render(f5); - GuageR.render(f5); - GuageGlass.render(f5); - GuageL.render(f5); - } - //back - if(te.cc[3] instanceof TileEntityPipe) - { - CCBack.render(f5); - }else - { - GuageT3.render(f5); - Guage3.render(f5); - Guage3.render(f5); - GuageR3.render(f5); - GuageGlass3.render(f5); - GuageL3.render(f5); - } - //right - if(te.cc[4] instanceof TileEntityPipe) - { - CCRight.render(f5); - }else - { - GuageT4.render(f5); - Guage4.render(f5); - Guage4.render(f5); - GuageR4.render(f5); - GuageGlass4.render(f5); - GuageL4.render(f5); - } - //left - if(te.cc[5] instanceof TileEntityPipe) - { - CCLeft.render(f5); - }else - { - GuageT2.render(f5); - Guage2.render(f5); - Guage2.render(f5); - GuageR2.render(f5); - GuageGlass2.render(f5); - GuageL2.render(f5); - - } - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java b/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java deleted file mode 100644 index 83587214..00000000 --- a/1.4.2/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java +++ /dev/null @@ -1,133 +0,0 @@ -package basicpipes.renderTank; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelLiquidTankCorner extends ModelBase -{ - //fields - ModelRenderer sOne; - ModelRenderer sTwo; - ModelRenderer d7; - ModelRenderer d5; - ModelRenderer d3; - ModelRenderer d4; - ModelRenderer d1; - ModelRenderer d6; - ModelRenderer d2; - ModelRenderer d8; - ModelRenderer d9; - ModelRenderer d10; - ModelRenderer face; - - public ModelLiquidTankCorner() - { - textureWidth = 128; - textureHeight = 128; - - sOne = new ModelRenderer(this, 0, 30); - sOne.addBox(-1F, 0F, -1F, 2, 16, 2); - sOne.setRotationPoint(-7F, 8F, 7F); - sOne.setTextureSize(128, 128); - sOne.mirror = true; - setRotation(sOne, 0F, 0F, 0F); - sTwo = new ModelRenderer(this, 0, 30); - sTwo.addBox(-1F, 0F, -1F, 2, 16, 2); - sTwo.setRotationPoint(-7F, 8F, -7F); - sTwo.setTextureSize(128, 128); - sTwo.mirror = true; - setRotation(sTwo, 0F, 0F, 0F); - d7 = new ModelRenderer(this, 43, 2); - d7.addBox(-1F, 0F, -1F, 2, 16, 12); - d7.setRotationPoint(-7F, 8F, -5F); - d7.setTextureSize(128, 128); - d7.mirror = true; - setRotation(d7, 0F, 0F, 0F); - d5 = new ModelRenderer(this, 9, 12); - d5.addBox(-1F, 0F, -1F, 14, 16, 2); - d5.setRotationPoint(-5F, 8F, 7F); - d5.setTextureSize(128, 128); - d5.mirror = true; - setRotation(d5, 0F, 0F, 0F); - d3 = new ModelRenderer(this, 9, 67); - d3.addBox(-1.5F, 0F, -1.3F, 20, 2, 2); - d3.setRotationPoint(-6F, 22F, -6F); - d3.setTextureSize(128, 128); - d3.mirror = true; - setRotation(d3, 0F, -0.7853982F, 0F); - d4 = new ModelRenderer(this, 9, 88); - d4.addBox(0F, 0F, -9F, 5, 2, 4); - d4.setRotationPoint(-6F, 22F, 6F); - d4.setTextureSize(128, 128); - d4.mirror = true; - setRotation(d4, 0F, 0F, 0F); - d1 = new ModelRenderer(this, 9, 67); - d1.addBox(-1.5F, 0F, -1.3F, 20, 2, 2); - d1.setRotationPoint(-6F, 8F, -6F); - d1.setTextureSize(128, 128); - d1.mirror = true; - setRotation(d1, 0F, -0.7853982F, 0F); - d6 = new ModelRenderer(this, 9, 75); - d6.addBox(-1.5F, 0F, -1.3F, 17, 2, 2); - d6.setRotationPoint(-6F, 22F, -4F); - d6.setTextureSize(128, 128); - d6.mirror = true; - setRotation(d6, 0F, -0.7853982F, 0F); - d2 = new ModelRenderer(this, 9, 80); - d2.addBox(0F, 0F, -5F, 9, 2, 5); - d2.setRotationPoint(-6F, 22F, 6F); - d2.setTextureSize(128, 128); - d2.mirror = true; - setRotation(d2, 0F, 0F, 0F); - d8 = new ModelRenderer(this, 9, 75); - d8.addBox(-1.5F, 0F, -1.3F, 17, 2, 2); - d8.setRotationPoint(-6F, 8F, -4F); - d8.setTextureSize(128, 128); - d8.mirror = true; - setRotation(d8, 0F, -0.7853982F, 0F); - d9 = new ModelRenderer(this, 9, 88); - d9.addBox(0F, 0F, -9F, 5, 2, 4); - d9.setRotationPoint(-6F, 8F, 6F); - d9.setTextureSize(128, 128); - d9.mirror = true; - setRotation(d9, 0F, 0F, 0F); - d10 = new ModelRenderer(this, 9, 80); - d10.addBox(0F, 0F, -5F, 9, 2, 5); - d10.setRotationPoint(-6F, 8F, 6F); - d10.setTextureSize(128, 128); - d10.mirror = true; - setRotation(d10, 0F, 0F, 0F); - face = new ModelRenderer(this, 0, 50); - face.addBox(-8.5F, 0F, 0F, 17, 14, 2); - face.setRotationPoint(0F, 9F, 0F); - face.setTextureSize(128, 128); - face.mirror = true; - setRotation(face, 0F, -0.7853982F, 0F); - } - - public void render(float f5) - { - sOne.render(f5); - sTwo.render(f5); - d7.render(f5); - d5.render(f5); - d3.render(f5); - d4.render(f5); - d1.render(f5); - d6.render(f5); - d2.render(f5); - d8.render(f5); - d9.render(f5); - d10.render(f5); - face.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/basicpipes/renderTank/RenderLTank.java b/1.4.2/src/minecraft/basicpipes/renderTank/RenderLTank.java deleted file mode 100644 index 10d87ef8..00000000 --- a/1.4.2/src/minecraft/basicpipes/renderTank/RenderLTank.java +++ /dev/null @@ -1,71 +0,0 @@ -package basicpipes.renderTank; - -import net.minecraft.src.ModelBase; -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import steampower.SteamPowerMain; - -import basicpipes.BasicPipesMain; -import basicpipes.ModelLargePipe; -import basicpipes.ModelPipe; -import basicpipes.LTanks.TileEntityLTank; -import basicpipes.conductors.TileEntityPipe; -import basicpipes.pipes.api.Liquid; -import basicpipes.pipes.api.MHelper; - - -public class RenderLTank extends TileEntitySpecialRenderer -{ - private Liquid type = Liquid.DEFUALT; - private ModelLiquidTank model; - private ModelLiquidTankCorner modelC; - private int pos = 0; - - public RenderLTank() - { - model = new ModelLiquidTank(); - modelC = new ModelLiquidTankCorner(); - } - - public void renderAModelAt(TileEntityLTank te, double d, double d1, double d2, float f) - { - type = te.getType(); - pos = Math.min(te.getStoredLiquid(type),4); - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - if(MHelper.corner(te) > 0) - { - bindTextureByName(BasicPipesMain.textureFile+"/tanks/LiquidTankCorner.png"); - int corner = MHelper.corner(te); - switch(corner) - { - case 2: GL11.glRotatef(270f, 0f, 1f, 0f);break; - case 3: GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 4: GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 1: GL11.glRotatef(180f, 0f, 1f, 0f);break; - } - modelC.render(0.0625F); - } - else - { - switch(type.ordinal()) - { - //case 0: bindTextureByName(BasicPipesMain.textureFile+"/pipes/SixSteamPipe.png");break; - default:bindTextureByName(BasicPipesMain.textureFile+"/tanks/LiquidTank"+pos+".png"); break; - } - model.renderMain(te, 0.0625F); - } - GL11.glPopMatrix(); - - } - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) { - this.renderAModelAt((TileEntityLTank)tileEntity, var2, var4, var6, var8); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/mcp.png b/1.4.2/src/minecraft/mcp.png deleted file mode 100644 index 8ebae880d0244f25a76a984a55729e4c0c9c3cf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6940 zcmV+%8{_1OP)N2bPDNB8 zb~7$DE;u(kfL#Cp8ktE%K~#8N?VU}MB*hVhduD_{BQs$bCbSqsW}1bTy2313VXQHh z?AdStZUCp?oUM6P^Yy%ZxJP7G6+^cai?Z&_it_OApBMfUS#|f%zkhoF#iuV%uYbS# z{Pfa2e{r9`|M}NH?)72}_g}qwb+1>BXIwYWnt#cE+27OmzdL}z!J%{R8K@)(&8~g! zHUE2XUh=QOb=lu}v+p+bnZM=xxAwmUChwxG1!fD(W)buPvoV<6xqvclNhJI7i_h-$ z%5j+TVqLKuKCX`_^!6JcSFeRhtdD?It!YyS5Ix+VW}A$Zx}xN!T}{BMEDyXTS?m@P2N zM!^EJV_W z+fGKl`Of4#n=fVb)Hl=9p|uR}_$q;1T$jsNPJtkQ{PD*Vpg5>xHGVdK8oI8f?C-z- z{zTX5rGfF;ufP8Kfd?P&3g>_LJ-UAHf>nIzUh=EYbUb(K_WS%VSyWxPYHT-OcfSh% zHD4vWBRuE1B3(OOKmvUqSxefr^VB$N645I=QH#p~mvA%;l&)Q8f1R02Uz6MM>KAbMf@Az;7 z_O)=IC{Wj37vczwN{8A#XJCTt(&>G7@AyckmwY-t_N)aR&cLLKLiAa;gHDGPn9OwO zvdQ&vjXgXDFcE<0CA;GPH*fCB!Z?0%D!`_(a8daMezg zJGVzAiZ+sN#|PjeUPn$00Qye9XZ=oBavJfG5ng48ZtQ8)6>Z73iX4y9&fQ<1uhuWU zc5AF?bbPq|X$>Q~N7mwWpTDDQVIm55$%3f|Ek1A8R#QuE!fYYqNthoUW z{S|od^6T_d=-vcOBt-3C9`@>*h(v;xLM8mp=-nB8(WxNO)eCTdCZF&40CaqQAIpv= z1Cv2Jua_vZ;sYK=U;-bkGi6FWBJX!{?bcZF*U389uer3ABQ!cb5==x_o5ZEGk(=Zs zn-H(EJ?y1h;}JPYf7plUV&_L_bbS0#VB#Q>z(I5Zu(V)O749+u=^_Tk0Vb|U-{B?f z=g*%#C}7rw@%by-awJj_(bbD+z@3l+7c~$E9-=A6dok<`erJ9?5ABe>IxpjNp)DsN zI&&FxYs~weHek5WMh5Pj)fzpF&$at}fST@gwT&bEtdToU^0NXPv)JHwh-x zwnnsFCgN{ITlCp*0F;V0^6+)LJbW!gCQethD;m;y#~*X~oWCcSbkPS92Xdhz^}*E&M_VVN3)Dv8nZhx#}Nc-LT#g|@LV{zK(!|9G_!|%r*z1T$3 z%=Pl+%aaXY|GrM<(0ZM>s@sFU8TZ#u{(SPmOZ>00Ki{OGnW>5cNag=TC+_RIr}gWz ze*d8Wdo7r_BX~68pyE5cM-?#S&gWsc-*?(52xVq#IwK^nudv>3&T2gxt2r+L6JL*Z zFHfCVeyfm?|GKeY#Cjj2!l`g9z4yy6 zzdRgt%3L{V6Pd`_^h!|5IW=F7JvwI=PrXo%p>}q?psRIw1mQe6P0gjT)J)takfF;!W4-vv82-u* zNlD;AOEQ*=9wCl55u7M%^DAo-ki)uG+)c zh4T#E>@2xH8LzR}U)L=4gek%_Fy9Yrx#DN z=8@I%N-nJ53&4D?;sx;XG@#Q*&hG}&@#2NPj_yeRT8Gnic_m2U^dnwaCu7;o0ev

_~`&Fa@&~$bKKN-Eu);~OF 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 i 1000) - { - displayWatt = roundTwoDecimals((double)watts/1000)+" MJ"; - } - else - { - displayWatt = watts+" KJ"; - } - - return displayWatt; - } - public static double roundTwoDecimals(double d) - { - DecimalFormat twoDForm = new DecimalFormat("#.##"); - return Double.valueOf(twoDForm.format(d)); - } -} diff --git a/1.4.2/src/minecraft/steampower/GUISteamPiston.java b/1.4.2/src/minecraft/steampower/GUISteamPiston.java deleted file mode 100644 index 61bb8bb8..00000000 --- a/1.4.2/src/minecraft/steampower/GUISteamPiston.java +++ /dev/null @@ -1,79 +0,0 @@ -package steampower; - -import net.minecraft.src.GuiContainer; -import net.minecraft.src.InventoryPlayer; -import net.minecraft.src.StatCollector; - -import org.lwjgl.opengl.GL11; - -import steampower.turbine.TileEntitySteamPiston; -import universalelectricity.electricity.ElectricInfo; -import universalelectricity.electricity.ElectricInfo.ElectricUnit; - - public class GUISteamPiston extends GuiContainer - { - private TileEntitySteamPiston tileEntity; - - private int containerWidth; - private int containerHeight; - - public GUISteamPiston(InventoryPlayer par1InventoryPlayer, TileEntitySteamPiston tileEntity) - { - super(new ContainerFake(par1InventoryPlayer, tileEntity)); - this.tileEntity = tileEntity; - } - - /** - * Draw the foreground layer for the GuiContainer (everything in front of the items) - */ - protected void drawGuiContainerForegroundLayer() - { - this.fontRenderer.drawString("Steam Piston Guage Read outs", 55, 6, 4210752); - this.fontRenderer.drawString("MeterReadings", 90, 33, 4210752); - String displayText = ""; - String displayText2 = ""; - String displayText3 = ""; - /** - if(tileEntity.connectedElectricUnit == null) - { - displayText = "Not Connected"; - } - else*/ - if(!tileEntity.running) - { - if(tileEntity.steam> 0) - { - displayText = "No Load"; - } - if(tileEntity.steam<= 0) - { - displayText = "No Steam"; - } - } - else - { - //displayText = ElectricUnit.getWattDisplay((int)(tileEntity.generateRate*20)); - displayText = "ForceOut: "+tileEntity.force+"N"; - displayText2 = "water" + "-" + tileEntity.water; - displayText3 = "steam" + "-" + tileEntity.steam; - } - - this.fontRenderer.drawString(displayText, (int)(105-displayText.length()*1), 45, 4210752); - this.fontRenderer.drawString(displayText2, (int)(105-displayText.length()*1), 55, 4210752); - this.fontRenderer.drawString(displayText3, (int)(105-displayText.length()*1), 65, 4210752); - this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the items) - */ - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - int var4 = this.mc.renderEngine.getTexture(SteamPowerMain.textureFile+"SteamGUI.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(var4); - containerWidth = (this.width - this.xSize) / 2; - containerHeight = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(containerWidth, containerHeight, 0, 0, this.xSize, this.ySize); - } - } diff --git a/1.4.2/src/minecraft/steampower/GuiBoiler.java b/1.4.2/src/minecraft/steampower/GuiBoiler.java deleted file mode 100644 index c6038f9f..00000000 --- a/1.4.2/src/minecraft/steampower/GuiBoiler.java +++ /dev/null @@ -1,94 +0,0 @@ -package steampower; -import java.text.DecimalFormat; - -import net.minecraft.src.GuiContainer; -import net.minecraft.src.InventoryPlayer; -import net.minecraft.src.StatCollector; - -import org.lwjgl.opengl.GL11; - -import steampower.boiler.TileEntityBoiler; -import basicpipes.pipes.api.Liquid; - -public class GuiBoiler extends GuiContainer -{ - private TileEntityBoiler boilerInventory; - - public GuiBoiler(InventoryPlayer par1InventoryPlayer, TileEntityBoiler par2TileEntityGrinder) - { - super(new ContainerFake(par1InventoryPlayer, par2TileEntityGrinder)); - this.boilerInventory = par2TileEntityGrinder; - } - - /** - * Draw the foreground layer for the GuiContainer (everythin in front of the items) - */ - 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("Heat Danger", (int)(105), 50, 4210752); - } - this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the items) - */ - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - int var4 = this.mc.renderEngine.getTexture(SteamPowerMain.textureFile+"BoilerGui.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(var4); - int var5 = (this.width - this.xSize) / 2; - int var6 = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize-1, this.ySize); - int var7; - int var8; - int var9; - int var10; - if (this.boilerInventory.getStoredLiquid(Liquid.WATER)> 0) - { - var7 = boilerInventory.getStoredLiquid(Liquid.WATER)*4 + 1; - this.drawTexturedModalRect(var5 + 29, var6 + 72 - var7, 176, 148 - var7, 23, var7); - } - if (this.boilerInventory.getStoredLiquid(Liquid.STEAM) > 0) - { - var8 = boilerInventory.getStoredLiquid(Liquid.STEAM)/14*4 + 1; - this.drawTexturedModalRect(var5 + 108, var6 + 72 - var8, 176, 90 - var8, 23, var8); - } - - float precentH = Math.min(boilerInventory.hullHeat/1000 + 1, 10); - var9 = (int) Math.min(precentH*3.0F,30); - this.drawTexturedModalRect(var5 + 59, var6 + 70 - var9, 199, 71 - var9, 9, var9); - float precentSH = this.boilerInventory.heat/1000; - var10 = (int) Math.round(precentSH*5.33); - this.drawTexturedModalRect(var5 + 78, var6 + 16, 176, 14, var10, 16); - //debug - this.fontRenderer.drawString("NonGraphic Debug", (int)(200), 90, 000000); - this.fontRenderer.drawString("Water:"+this.boilerInventory.water+"/14", (int)(200), 100, 000000); - this.fontRenderer.drawString("Steam:"+this.boilerInventory.steam+"/140", (int)(200), 110, 000000); - - } - public static String getWattDisplay(int watts) - { - String displayWatt; - if(watts > 1000) - { - displayWatt = roundTwoDecimals((double)watts/1000)+" MJ"; - } - else - { - displayWatt = watts+" kJ"; - } - - return displayWatt; - } - public static double roundTwoDecimals(double d) - { - DecimalFormat twoDForm = new DecimalFormat("#.##"); - return Double.valueOf(twoDForm.format(d)); - } -} diff --git a/1.4.2/src/minecraft/steampower/ItemRenderHelperS.java b/1.4.2/src/minecraft/steampower/ItemRenderHelperS.java deleted file mode 100644 index 247aa927..00000000 --- a/1.4.2/src/minecraft/steampower/ItemRenderHelperS.java +++ /dev/null @@ -1,62 +0,0 @@ -package steampower; - -import net.minecraft.src.Block; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.RenderBlocks; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -//ItemRenderHelperS.renderID -public class ItemRenderHelperS implements ISimpleBlockRenderingHandler { - public static ItemRenderHelperS instance = new ItemRenderHelperS(); - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - private ModelGenerator modelGen = new ModelGenerator(); - private ModelTank modelTank = new ModelTank(0f); - private ModelFurnace modelFurnace = new ModelFurnace(); - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - if(block.blockID == SteamPowerMain.genID) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float)1.3F, (float)0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(SteamPowerMain.textureFile+"Generator.png")); - modelGen.RenderMain(0.0725F); - GL11.glPopMatrix(); - } - if(block.blockID == SteamPowerMain.machine.blockID && metadata == 1) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float)1F, (float)0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(SteamPowerMain.textureFile+"tankTexture.png")); - modelTank.generalRender(0.0625F); - GL11.glPopMatrix(); - } - if(block.blockID == SteamPowerMain.machine.blockID && metadata > 1 && metadata < 6) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float)1F, (float)0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(SteamPowerMain.textureFile+"Furnace.png")); - modelFurnace.genRender(0.0625F); - GL11.glPopMatrix(); - } - } - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - public boolean shouldRender3DInInventory() { - - return true; - } - - public int getRenderId() - { - return renderID; - } -} diff --git a/1.4.2/src/minecraft/steampower/ModelCenterTank.java b/1.4.2/src/minecraft/steampower/ModelCenterTank.java deleted file mode 100644 index c8bc81cd..00000000 --- a/1.4.2/src/minecraft/steampower/ModelCenterTank.java +++ /dev/null @@ -1,53 +0,0 @@ -// Date: 8/14/2012 1:48:41 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelCenterTank extends ModelBase -{ - - ModelRenderer Block; - - public ModelCenterTank(float par1) - { - textureWidth = 128; - textureHeight = 128; - - - //block - Block = new ModelRenderer(this, 0, 0); - Block.addBox(0F, 0F, 0F, 16, 16, 16); - Block.setRotationPoint(-8F, 8F, -8F); - Block.setTextureSize(128, 32); - Block.mirror = true; - setRotation(Block, 0F, 0F, 0F); - } - public void renderBlock(float f5) - { - Block.render(f5); - } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/1.4.2/src/minecraft/steampower/ModelCornerTank.java b/1.4.2/src/minecraft/steampower/ModelCornerTank.java deleted file mode 100644 index b3bcd70d..00000000 --- a/1.4.2/src/minecraft/steampower/ModelCornerTank.java +++ /dev/null @@ -1,95 +0,0 @@ -// Date: 8/14/2012 1:48:41 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelCornerTank extends ModelBase -{ - //Corner - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape4; - - public ModelCornerTank(float par1) - { - textureWidth = 128; - textureHeight = 128; - - - //corner - Shape1 = new ModelRenderer(this, 0, 1); - Shape1.addBox(0F, 0F, 0F, 1, 16, 20); - Shape1.setRotationPoint(7F, 8F, -7F); - Shape1.setTextureSize(128, 128); - Shape1.mirror = true; - setRotation(Shape1, 0F, -0.7853982F, 0F); - Shape2 = new ModelRenderer(this, 44, 0); - Shape2.addBox(0F, 0F, 0F, 2, 16, 2); - Shape2.setRotationPoint(-8F, 8F, 6F); - Shape2.setTextureSize(128, 128); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 44, 0); - Shape3.addBox(0F, 0F, 0F, 2, 16, 2); - Shape3.setRotationPoint(6F, 8F, -8F); - Shape3.setTextureSize(128, 128); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 44); - Shape6.addBox(0F, 0F, 0F, 1, 15, 13); - Shape6.setRotationPoint(-8F, 9F, -7F); - Shape6.setTextureSize(128, 128); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 73); - Shape7.addBox(0F, 0F, 0F, 14, 15, 1); - Shape7.setRotationPoint(-8F, 9F, -8F); - Shape7.setTextureSize(128, 128); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 92); - Shape4.addBox(0F, 0F, 0F, 16, 1, 16); - Shape4.setRotationPoint(-8F, 8F, -8F); - Shape4.setTextureSize(128, 128); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - } - public void renderCorner(float f5) - { - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape6.render(f5); - Shape7.render(f5); - Shape4.render(f5); - } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/steampower/ModelEngine.java b/1.4.2/src/minecraft/steampower/ModelEngine.java deleted file mode 100644 index 449c6f17..00000000 --- a/1.4.2/src/minecraft/steampower/ModelEngine.java +++ /dev/null @@ -1,109 +0,0 @@ -// Date: 8/24/2012 1:44:37 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelEngine extends ModelBase -{ - //fields - ModelRenderer Base; - ModelRenderer top; - ModelRenderer TopPiston; - ModelRenderer BottomPiston; - ModelRenderer center; - ModelRenderer C1; - ModelRenderer C2; - - public ModelEngine() - { - textureWidth = 64; - textureHeight = 64; - - Base = new ModelRenderer(this, 0, 20); - Base.addBox(-6F, 0F, -6F, 12, 8, 12); - Base.setRotationPoint(0F, 16F, 0F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - top = new ModelRenderer(this, 0, 0); - top.addBox(-6F, 0F, -6F, 12, 8, 12); - top.setRotationPoint(0F, -8F, 0F); - top.setTextureSize(64, 64); - top.mirror = true; - setRotation(top, 0F, 0F, 0F); - TopPiston = new ModelRenderer(this, 0, 52); - TopPiston.addBox(-2F, 0F, -2F, 4, 8, 4); - TopPiston.setRotationPoint(0F, 0F, 0F); - TopPiston.setTextureSize(64, 64); - TopPiston.mirror = true; - setRotation(TopPiston, 0F, 0F, 0F); - BottomPiston = new ModelRenderer(this, 16, 52); - BottomPiston.addBox(-2F, 0F, -2F, 4, 8, 4); - BottomPiston.setRotationPoint(0F, 8F, 0F); - BottomPiston.setTextureSize(64, 64); - BottomPiston.mirror = true; - setRotation(BottomPiston, 0F, 0F, 0F); - center = new ModelRenderer(this, 32, 52); - center.addBox(-3F, 0F, -3F, 6, 6, 6); - //center.setRotationPoint(0F, 5F, 0F); - center.setTextureSize(64, 64); - center.mirror = true; - setRotation(center, 0F, 0F, 0F); - C1 = new ModelRenderer(this, 0, 41); - C1.addBox(-2F, -3F, 0F, 4, 6, 3); - C1.setRotationPoint(0F, 8F, 3F); - C1.setTextureSize(64, 64); - C1.mirror = true; - setRotation(C1, 0F, 0F, 0F); - C2 = new ModelRenderer(this, 15, 41); - C2.addBox(-2F, -3F, -3F, 4, 6, 3); - C2.setRotationPoint(0F, 8F, -3F); - C2.setTextureSize(64, 64); - C2.mirror = true; - setRotation(C2, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - //renderBot(f5); - //renderTop(f5); - } - public void renderBot(float f5) - { - Base.render(f5); - BottomPiston.render(f5); - } - public void renderTop(float f5) - { - top.render(f5); - TopPiston.render(f5); - C1.render(f5); - C2.render(f5); - } - public void renderMid(float f5,float p) - { - - center.setRotationPoint(0F, p, 0F); - center.render(f5); - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/1.4.2/src/minecraft/steampower/ModelFurnace.java b/1.4.2/src/minecraft/steampower/ModelFurnace.java deleted file mode 100644 index ec58045d..00000000 --- a/1.4.2/src/minecraft/steampower/ModelFurnace.java +++ /dev/null @@ -1,77 +0,0 @@ -// Date: 8/14/2012 3:02:31 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelFurnace extends ModelBase -{ - //fields - ModelRenderer Body; - ModelRenderer top; - ModelRenderer bottom; - ModelRenderer Shape1; - - 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(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) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - genRender(f5); - } - public void genRender(float f5) - { - Body.render(f5); - top.render(f5); - bottom.render(f5); - Shape1.render(f5); - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/steampower/ModelGenerator.java b/1.4.2/src/minecraft/steampower/ModelGenerator.java deleted file mode 100644 index 508294ac..00000000 --- a/1.4.2/src/minecraft/steampower/ModelGenerator.java +++ /dev/null @@ -1,131 +0,0 @@ -// Date: 8/27/2012 3:20:21 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelGenerator extends ModelBase -{ - //fields - ModelRenderer BasePlate; - ModelRenderer LeftConnection; - ModelRenderer RightConnection; - ModelRenderer Mid; - ModelRenderer Mid2; - ModelRenderer front; - ModelRenderer front2; - ModelRenderer front3; - ModelRenderer Mid3; - ModelRenderer FrontConnector; - - public ModelGenerator() - { - textureWidth = 128; - textureHeight = 128; - - BasePlate = new ModelRenderer(this, 0, 0); - BasePlate.addBox(-7F, 0F, -7F, 14, 1, 14); - BasePlate.setRotationPoint(0F, 23F, 0F); - BasePlate.setTextureSize(128, 128); - BasePlate.mirror = true; - setRotation(BasePlate, 0F, 0F, 0F); - LeftConnection = new ModelRenderer(this, 0, 112); - LeftConnection.addBox(-2F, -2F, -2F, 2, 4, 4); - LeftConnection.setRotationPoint(-6F, 16F, 0F); - LeftConnection.setTextureSize(128, 128); - LeftConnection.mirror = true; - setRotation(LeftConnection, 0F, 0F, 0F); - RightConnection = new ModelRenderer(this, 12, 112); - RightConnection.addBox(0F, -2F, -2F, 2, 4, 4); - RightConnection.setRotationPoint(6F, 16F, 0F); - RightConnection.setTextureSize(128, 128); - RightConnection.mirror = true; - setRotation(RightConnection, 0F, 0F, 0F); - Mid = new ModelRenderer(this, 0, 29); - Mid.addBox(-4F, 0F, -6F, 8, 12, 12); - Mid.setRotationPoint(0F, 10F, 0F); - Mid.setTextureSize(128, 128); - Mid.mirror = true; - setRotation(Mid, 0F, 0F, 0F); - Mid2 = new ModelRenderer(this, 0, 53); - Mid2.addBox(-6F, 0F, -6F, 12, 8, 12); - Mid2.setRotationPoint(0F, 12F, 0F); - Mid2.setTextureSize(128, 128); - Mid2.mirror = true; - setRotation(Mid2, 0F, 0F, 0F); - front = new ModelRenderer(this, 20, 15); - front.addBox(-2F, -4F, 0F, 4, 8, 1); - front.setRotationPoint(0F, 16F, -7F); - front.setTextureSize(128, 128); - front.mirror = true; - setRotation(front, 0F, 0F, 0F); - front2 = new ModelRenderer(this, 0, 24); - front2.addBox(-4F, -2F, 0F, 8, 4, 1); - front2.setRotationPoint(0F, 16F, -7F); - front2.setTextureSize(128, 128); - front2.mirror = true; - setRotation(front2, 0F, 0F, 0F); - front3 = new ModelRenderer(this, 0, 16); - front3.addBox(-3F, -3F, 0F, 6, 6, 1); - front3.setRotationPoint(0F, 16F, -7F); - front3.setTextureSize(128, 128); - front3.mirror = true; - setRotation(front3, 0F, 0F, 0F); - Mid3 = new ModelRenderer(this, 40, 29); - Mid3.addBox(-5F, -1F, -6F, 10, 10, 12); - Mid3.setRotationPoint(0F, 12F, 0F); - Mid3.setTextureSize(128, 128); - Mid3.mirror = true; - setRotation(Mid3, 0F, 0F, 0F); - FrontConnector = new ModelRenderer(this, 0, 120); - FrontConnector.addBox(-2F, 0F, -2F, 4, 4, 4); - FrontConnector.setRotationPoint(0F, 14F, -6F); - FrontConnector.setTextureSize(128, 128); - FrontConnector.mirror = true; - setRotation(FrontConnector, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - - } - public void RenderMain(float f5) - { - BasePlate.render(f5); - Mid.render(f5); - Mid2.render(f5); - front.render(f5); - front2.render(f5); - front3.render(f5); - Mid3.render(f5); - FrontConnector.render(f5); - } - public void RenderLeft(float f5) - { - LeftConnection.render(f5); - } - public void RenderRight(float f5) - { - RightConnection.render(f5); - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/steampower/ModelTank.java b/1.4.2/src/minecraft/steampower/ModelTank.java deleted file mode 100644 index ebe93a57..00000000 --- a/1.4.2/src/minecraft/steampower/ModelTank.java +++ /dev/null @@ -1,148 +0,0 @@ -// Date: 8/14/2012 1:48:41 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelTank extends ModelBase -{ - //One Block Tank - ModelRenderer TANK_WALL_1; - ModelRenderer TANK_WALL_2; - ModelRenderer TANK_WALL_3; - ModelRenderer TANK_WALL_4; - ModelRenderer TANK_SUPPORT_1; - ModelRenderer TANK_TOP_1; - ModelRenderer TANK_WALL_5; - ModelRenderer TANK_SUPPORT_2; - ModelRenderer TANK_SUPPORT_3; - ModelRenderer TANK_WALL_6; - ModelRenderer TANK_TOP_2; - ModelRenderer TANK_TOP_3; - ModelRenderer TANK_VALVE; - - public ModelTank(float par1) - { - textureWidth = 128; - textureHeight = 128; - - TANK_WALL_1 = new ModelRenderer(this, 0, 49); - TANK_WALL_1.addBox(0F, 0F, 0F, 1, 12, 8,par1); - TANK_WALL_1.setRotationPoint(6F, 12F, -4F); - TANK_WALL_1.setTextureSize(128, 128); - TANK_WALL_1.mirror = true; - setRotation(TANK_WALL_1, 0F, 0F, 0F); - TANK_WALL_2 = new ModelRenderer(this, 0, 70); - TANK_WALL_2.addBox(0F, 0F, 0F, 1, 12, 7,par1); - TANK_WALL_2.setRotationPoint(-8F, 12F, -4F); - TANK_WALL_2.setTextureSize(128, 128); - TANK_WALL_2.mirror = true; - setRotation(TANK_WALL_2, 0F, 0F, 0F); - TANK_WALL_3 = new ModelRenderer(this, 0, 34); - TANK_WALL_3.addBox(0F, 0F, 0F, 8, 12, 1,par1); - TANK_WALL_3.setRotationPoint(0F, 12F, 8F); - TANK_WALL_3.setTextureSize(128, 128); - TANK_WALL_3.mirror = true; - setRotation(TANK_WALL_3, 0F, 2.617994F, 0F); - TANK_WALL_4 = new ModelRenderer(this, 0, 34); - TANK_WALL_4.addBox(0F, 0F, 0F, 8, 12, 1,par1); - TANK_WALL_4.setRotationPoint(0F, 12F, -8F); - TANK_WALL_4.setTextureSize(128, 128); - TANK_WALL_4.mirror = true; - setRotation(TANK_WALL_4, 0F, -0.5235988F, 0F); - TANK_SUPPORT_1 = new ModelRenderer(this, 43, 22); - TANK_SUPPORT_1.addBox(-1F, 0F, -8F, 2, 14, 16,par1); - TANK_SUPPORT_1.setRotationPoint(0F, 10F, 0F); - TANK_SUPPORT_1.setTextureSize(128, 128); - TANK_SUPPORT_1.mirror = true; - setRotation(TANK_SUPPORT_1, 0F, 0F, 0F); - TANK_TOP_1 = new ModelRenderer(this, 43, 11); - TANK_TOP_1.addBox(-8F, 0F, -4F, 16, 2, 8,par1); - TANK_TOP_1.setRotationPoint(0F, 10F, 0F); - TANK_TOP_1.setTextureSize(128, 128); - TANK_TOP_1.mirror = true; - setRotation(TANK_TOP_1, 0F, 0F, 0F); - TANK_WALL_5 = new ModelRenderer(this, 0, 34); - TANK_WALL_5.addBox(0F, 0F, 0F, 8, 12, 1,par1); - TANK_WALL_5.setRotationPoint(0F, 12F, -7F); - TANK_WALL_5.setTextureSize(128, 128); - TANK_WALL_5.mirror = true; - setRotation(TANK_WALL_5, 0F, -2.617994F, 0F); - TANK_SUPPORT_2 = new ModelRenderer(this, 0, 0); - TANK_SUPPORT_2.addBox(-1F, 0F, -9F, 2, 14, 18,par1); - TANK_SUPPORT_2.setRotationPoint(0F, 10F, 0F); - TANK_SUPPORT_2.setTextureSize(128, 128); - TANK_SUPPORT_2.mirror = true; - setRotation(TANK_SUPPORT_2, 0F, 1.047198F, 0F); - TANK_SUPPORT_3 = new ModelRenderer(this, 0, 0); - TANK_SUPPORT_3.addBox(-1F, 0F, -9F, 2, 14, 18,par1); - TANK_SUPPORT_3.setRotationPoint(0F, 10F, 0F); - TANK_SUPPORT_3.setTextureSize(128, 128); - TANK_SUPPORT_3.mirror = true; - setRotation(TANK_SUPPORT_3, 0F, -1.047198F, 0F); - TANK_WALL_6 = new ModelRenderer(this, 0, 34); - TANK_WALL_6.addBox(0F, 0F, 0F, 8, 12, 1,par1); - TANK_WALL_6.setRotationPoint(0F, 12F, 7F); - TANK_WALL_6.setTextureSize(128, 128); - TANK_WALL_6.mirror = true; - setRotation(TANK_WALL_6, 0F, 0.5235988F, 0F); - TANK_TOP_2 = new ModelRenderer(this, 43, 0); - TANK_TOP_2.addBox(-6F, 0F, -4F, 12, 2, 8,par1); - TANK_TOP_2.setRotationPoint(0F, 10F, 0F); - TANK_TOP_2.setTextureSize(128, 128); - TANK_TOP_2.mirror = true; - setRotation(TANK_TOP_2, 0F, 1.047198F, 0F); - TANK_TOP_3 = new ModelRenderer(this, 43, 0); - TANK_TOP_3.addBox(-6F, 0F, -4F, 12, 2, 8,par1); - TANK_TOP_3.setRotationPoint(0F, 10F, 0F); - TANK_TOP_3.setTextureSize(128, 128); - TANK_TOP_3.mirror = true; - setRotation(TANK_TOP_3, 0F, -1.047198F, 0F); - TANK_VALVE = new ModelRenderer(this, 84, 0); - TANK_VALVE.addBox(0F, 0F, 0F, 2, 1, 2,par1); - TANK_VALVE.setRotationPoint(-1F, 9F, -1F); - TANK_VALVE.setTextureSize(128, 128); - TANK_VALVE.mirror = true; - setRotation(TANK_VALVE, 0F, 0F, 0F); - } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } - public void generalRender(float f5) - { - TANK_WALL_1.render(f5); - TANK_WALL_2.render(f5); - TANK_WALL_3.render(f5); - TANK_WALL_4.render(f5); - TANK_SUPPORT_1.render(f5); - TANK_TOP_1.render(f5); - TANK_WALL_5.render(f5); - TANK_SUPPORT_2.render(f5); - TANK_SUPPORT_3.render(f5); - TANK_WALL_6.render(f5); - TANK_TOP_2.render(f5); - TANK_TOP_3.render(f5); - TANK_VALVE.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/1.4.2/src/minecraft/steampower/RenderBoiler.java b/1.4.2/src/minecraft/steampower/RenderBoiler.java deleted file mode 100644 index 5ffe2a32..00000000 --- a/1.4.2/src/minecraft/steampower/RenderBoiler.java +++ /dev/null @@ -1,62 +0,0 @@ -package steampower; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import steampower.boiler.TileEntityBoiler; -import basicpipes.pipes.api.MHelper; - -public class RenderBoiler extends TileEntitySpecialRenderer -{ - int type = 0; - private ModelTank model; - private ModelCenterTank model2; - private ModelCornerTank model3; - - public RenderBoiler(float par1) - { - model = new ModelTank(par1); - model2 = new ModelCenterTank(par1); - model3 = new ModelCornerTank(par1); - } - - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - TileEntity[] connected = ((TileEntityBoiler)tileEntity).connectedBlocks; - int meta = 0; - if(connected[5] == null && connected[3] == null && connected[4] == null && connected[2] == null || ((TileEntityBoiler)tileEntity).tankCount < 2 ) - { - bindTextureByName(SteamPowerMain.textureFile+"tankTexture.png"); - model.generalRender(0.0625F); - } - else - if(MHelper.corner(tileEntity) == 0 || ((TileEntityBoiler)tileEntity).tankCount > 2) - { - bindTextureByName(SteamPowerMain.textureFile+"tankBlock.png"); - model2.renderBlock(0.0625F); - } - else - { - int corner = MHelper.corner(tileEntity); - bindTextureByName(SteamPowerMain.textureFile+"CornerTank.png"); - switch(corner) - { - case 1: GL11.glRotatef(270f, 0f, 1f, 0f);break; - case 2: GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 3: GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 4: GL11.glRotatef(180f, 0f, 1f, 0f);break; - } - model3.renderCorner(0.0625f); - - } - GL11.glPopMatrix(); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/steampower/RenderFurnace.java b/1.4.2/src/minecraft/steampower/RenderFurnace.java deleted file mode 100644 index 5513ae1e..00000000 --- a/1.4.2/src/minecraft/steampower/RenderFurnace.java +++ /dev/null @@ -1,37 +0,0 @@ -package steampower; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderFurnace extends TileEntitySpecialRenderer -{ - int type = 0; - private ModelFurnace model; - - public RenderFurnace() - { - model = new ModelFurnace(); - } - - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) { - bindTextureByName(SteamPowerMain.textureFile+"Furnace.png"); - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - int meta = ((TileEntityMachine) tileEntity).getDirection(); - switch(meta) - { - case 1:GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 2:GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 3:GL11.glRotatef(180f, 0f, 1f, 0f);break; - case 4:GL11.glRotatef(270f, 0f, 1f, 0f);break; - } - model.genRender(0.0625F); - GL11.glPopMatrix(); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/steampower/RenderGenerator.java b/1.4.2/src/minecraft/steampower/RenderGenerator.java deleted file mode 100644 index c919afd4..00000000 --- a/1.4.2/src/minecraft/steampower/RenderGenerator.java +++ /dev/null @@ -1,37 +0,0 @@ -package steampower; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderGenerator extends TileEntitySpecialRenderer -{ - int type = 0; - private ModelGenerator model; - - public RenderGenerator() - { - model = new ModelGenerator(); - } - - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) { - bindTextureByName(SteamPowerMain.textureFile+"Generator.png"); - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - switch(meta) - { - case 0:GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 1:GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 2:GL11.glRotatef(180f, 0f, 1f, 0f);break; - case 3:GL11.glRotatef(270f, 0f, 1f, 0f);break; - } - model.RenderMain(0.0625F); - GL11.glPopMatrix(); - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/steampower/SteamClientProxy.java b/1.4.2/src/minecraft/steampower/SteamClientProxy.java deleted file mode 100644 index 2d21e051..00000000 --- a/1.4.2/src/minecraft/steampower/SteamClientProxy.java +++ /dev/null @@ -1,34 +0,0 @@ -package steampower; - - -import net.minecraftforge.client.MinecraftForgeClient; -import steampower.boiler.TileEntityBoiler; -import steampower.burner.TileEntityFireBox; -import steampower.geared.RenderGearPiston; -import steampower.turbine.TileEntityGen; -import steampower.turbine.TileEntitySteamPiston; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class SteamClientProxy extends SteamProxy{ - - public void preInit() - { - MinecraftForgeClient.preloadTexture(SteamPowerMain.textureFile+"blocks.png"); - MinecraftForgeClient.preloadTexture(SteamPowerMain.textureFile+"Items.png"); - RenderingRegistry.registerBlockHandler(new ItemRenderHelperS()); - } - @Override - public void init() - { - ClientRegistry.registerTileEntity(TileEntityBoiler.class, "boiler", new RenderBoiler(0f)); - ClientRegistry.registerTileEntity(TileEntityFireBox.class, "fireBox", new RenderFurnace()); - ClientRegistry.registerTileEntity(TileEntitySteamPiston.class, "generator", new RenderGearPiston()); - ClientRegistry.registerTileEntity(TileEntityGen.class, "elecGen", new RenderGenerator()); - } - public void postInit() - { - - } - -} diff --git a/1.4.2/src/minecraft/steampower/geared/ModelGearPiston.java b/1.4.2/src/minecraft/steampower/geared/ModelGearPiston.java deleted file mode 100644 index ccc2c70e..00000000 --- a/1.4.2/src/minecraft/steampower/geared/ModelGearPiston.java +++ /dev/null @@ -1,381 +0,0 @@ -// Date: 10/1/2012 12:32:21 AM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - - - - - - -package steampower.geared; - -import net.minecraft.src.Entity; -import net.minecraft.src.ModelBase; -import net.minecraft.src.ModelRenderer; - -public class ModelGearPiston extends ModelBase -{ - //fields - ModelRenderer PistonCover; - ModelRenderer RSpiston; - ModelRenderer LSpiston; - ModelRenderer RodPiston; - ModelRenderer Base; - ModelRenderer Front; - ModelRenderer BackCC; - ModelRenderer RightPipe; - ModelRenderer FrontCC; - ModelRenderer LeftCC; - ModelRenderer FrontPipe; - ModelRenderer Right; - ModelRenderer RightCC; - ModelRenderer Back; - ModelRenderer BackPipe; - ModelRenderer Left; - ModelRenderer LeftPipe; - ModelRenderer RigthF4; - ModelRenderer LeftF4; - ModelRenderer LeftF3; - ModelRenderer LeftF2; - ModelRenderer LeftF1; - ModelRenderer RigthF3; - ModelRenderer RigthF2; - ModelRenderer RigthF1; - ModelRenderer RigthGCC; - ModelRenderer RightSlide; - ModelRenderer midRod; - ModelRenderer RightRod2; - ModelRenderer LeftGCC; - ModelRenderer LeftRod2; - ModelRenderer LeftSlide2; - - public ModelGearPiston() - { - textureWidth = 128; - textureHeight = 128; - - PistonCover = new ModelRenderer(this, 13, 31); - PistonCover.addBox(0F, -9F, -3F, 6, 10, 6); - PistonCover.setRotationPoint(-3F, 20F, 0F); - PistonCover.setTextureSize(128, 128); - PistonCover.mirror = true; - setRotation(PistonCover, 0F, 0F, 0F); - RSpiston = new ModelRenderer(this, 0, 32); - RSpiston.addBox(-3F, -2F, -2F, 1, 7, 4); - RSpiston.setRotationPoint(1F, 3F, 0F); - RSpiston.setTextureSize(128, 128); - RSpiston.mirror = true; - setRotation(RSpiston, 0F, 0F, 0F); - LSpiston = new ModelRenderer(this, 0, 32); - LSpiston.addBox(-1F, -2F, -2F, 1, 7, 4); - LSpiston.setRotationPoint(2F, 3F, 0F); - LSpiston.setTextureSize(128, 128); - LSpiston.mirror = true; - setRotation(LSpiston, 0F, 0F, 0F); - RodPiston = new ModelRenderer(this, 0, 59); - RodPiston.addBox(-1F, -2F, -1.5F, 2, 13, 3); - RodPiston.setRotationPoint(0F, 8F, 0F); - RodPiston.setTextureSize(128, 128); - RodPiston.mirror = true; - setRotation(RodPiston, 0F, 0F, 0F); - Base = new ModelRenderer(this, 12, 49); - Base.addBox(0F, 0F, 0F, 10, 5, 10); - Base.setRotationPoint(-5F, 19F, -5F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Front = new ModelRenderer(this, 28, 68); - Front.addBox(-3F, 0F, 0F, 6, 12, 1); - Front.setRotationPoint(0F, 12F, -7F); - Front.setTextureSize(128, 128); - Front.mirror = true; - setRotation(Front, 0F, 0F, 0F); - BackCC = new ModelRenderer(this, 43, 68); - BackCC.addBox(-2F, -2F, 1F, 4, 4, 1); - BackCC.setRotationPoint(0F, 16F, 6F); - BackCC.setTextureSize(128, 128); - BackCC.mirror = true; - setRotation(BackCC, 0F, 0F, 0F); - RightPipe = new ModelRenderer(this, 12, 87); - RightPipe.addBox(0F, 0F, -2F, 2, 10, 4); - RightPipe.setRotationPoint(-6F, 14F, 0F); - RightPipe.setTextureSize(128, 128); - RightPipe.mirror = true; - setRotation(RightPipe, 0F, 0F, 0F); - FrontCC = new ModelRenderer(this, 43, 68); - FrontCC.addBox(-2F, -2F, -1F, 4, 4, 1); - FrontCC.setRotationPoint(0F, 16F, -7F); - FrontCC.setTextureSize(128, 128); - FrontCC.mirror = true; - setRotation(FrontCC, 0F, 0F, 0F); - LeftCC = new ModelRenderer(this, 43, 74); - LeftCC.addBox(0F, -2F, -2F, 1, 4, 4); - LeftCC.setRotationPoint(7F, 16F, 0F); - LeftCC.setTextureSize(128, 128); - LeftCC.mirror = true; - setRotation(LeftCC, 0F, 0F, 0F); - FrontPipe = new ModelRenderer(this, 28, 82); - FrontPipe.addBox(-2F, 0F, 0F, 4, 10, 2); - FrontPipe.setRotationPoint(0F, 14F, -6F); - FrontPipe.setTextureSize(128, 128); - FrontPipe.mirror = true; - setRotation(FrontPipe, 0F, 0F, 0F); - Right = new ModelRenderer(this, 12, 68); - Right.addBox(0F, 0F, -3F, 1, 12, 6); - Right.setRotationPoint(-7F, 12F, 0F); - Right.setTextureSize(128, 128); - Right.mirror = true; - setRotation(Right, 0F, 0F, 0F); - RightCC = new ModelRenderer(this, 43, 74); - RightCC.addBox(-1F, -2F, -2F, 1, 4, 4); - RightCC.setRotationPoint(-7F, 16F, 0F); - RightCC.setTextureSize(128, 128); - RightCC.mirror = true; - setRotation(RightCC, 0F, 0F, 0F); - Back = new ModelRenderer(this, 28, 68); - Back.addBox(-3F, 0F, 0F, 6, 12, 1); - Back.setRotationPoint(0F, 12F, 6F); - Back.setTextureSize(128, 128); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - BackPipe = new ModelRenderer(this, 28, 82); - BackPipe.addBox(-2F, 0F, -2F, 4, 10, 2); - BackPipe.setRotationPoint(0F, 14F, 6F); - BackPipe.setTextureSize(128, 128); - BackPipe.mirror = true; - setRotation(BackPipe, 0F, 0F, 0F); - Left = new ModelRenderer(this, 12, 68); - Left.addBox(0F, 0F, -3F, 1, 12, 6); - Left.setRotationPoint(6F, 12F, 0F); - Left.setTextureSize(128, 128); - Left.mirror = true; - setRotation(Left, 0F, 0F, 0F); - LeftPipe = new ModelRenderer(this, 12, 87); - LeftPipe.addBox(-2F, 0F, -2F, 2, 10, 4); - LeftPipe.setRotationPoint(6F, 14F, 0F); - LeftPipe.setTextureSize(128, 128); - LeftPipe.mirror = true; - setRotation(LeftPipe, 0F, 0F, 0F); - RigthF4 = new ModelRenderer(this, 0, 56); - RigthF4.addBox(-2F, 1F, 1F, 2, 1, 1); - RigthF4.setRotationPoint(-8F, 0F, 0F); - RigthF4.setTextureSize(128, 128); - RigthF4.mirror = true; - setRotation(RigthF4, 0F, 0F, 0F); - LeftF4 = new ModelRenderer(this, 0, 56); - LeftF4.addBox(0F, 1F, 1F, 2, 1, 1); - LeftF4.setRotationPoint(8F, 0F, 0F); - LeftF4.setTextureSize(128, 128); - LeftF4.mirror = true; - setRotation(LeftF4, 0.7853982F, 0F, 0F); - LeftF3 = new ModelRenderer(this, 0, 56); - LeftF3.addBox(0F, 1F, -2F, 2, 1, 1); - LeftF3.setRotationPoint(8F, 0F, 0F); - LeftF3.setTextureSize(128, 128); - LeftF3.mirror = true; - setRotation(LeftF3, 0.7853982F, 0F, 0F); - LeftF2 = new ModelRenderer(this, 0, 56); - LeftF2.addBox(0F, -2F, -2F, 2, 1, 1); - LeftF2.setRotationPoint(8F, 0F, 0F); - LeftF2.setTextureSize(128, 128); - LeftF2.mirror = true; - setRotation(LeftF2, 0.7853982F, 0F, 0F); - LeftF1 = new ModelRenderer(this, 0, 56); - LeftF1.addBox(0F, -2F, 1F, 2, 1, 1); - LeftF1.setRotationPoint(8F, 0F, 0F); - LeftF1.setTextureSize(128, 128); - LeftF1.mirror = true; - setRotation(LeftF1, 0.7853982F, 0F, 0F); - RigthF3 = new ModelRenderer(this, 0, 56); - RigthF3.addBox(-2F, 1F, -2F, 2, 1, 1); - RigthF3.setRotationPoint(-8F, 0F, 0F); - RigthF3.setTextureSize(128, 128); - RigthF3.mirror = true; - setRotation(RigthF3, 0F, 0F, 0F); - RigthF2 = new ModelRenderer(this, 0, 56); - RigthF2.addBox(-2F, -2F, 1F, 2, 1, 1); - RigthF2.setRotationPoint(-8F, 0F, 0F); - RigthF2.setTextureSize(128, 128); - RigthF2.mirror = true; - setRotation(RigthF2, 0F, 0F, 0F); - RigthF1 = new ModelRenderer(this, 0, 56); - RigthF1.addBox(-2F, -2F, -2F, 2, 1, 1); - RigthF1.setRotationPoint(-8F, 0F, 0F); - RigthF1.setTextureSize(128, 128); - RigthF1.mirror = true; - setRotation(RigthF1, 0F, 0F, 0F); - RigthGCC = new ModelRenderer(this, 12, 18); - RigthGCC.addBox(-2F, -2F, -2F, 2, 4, 4); - RigthGCC.setRotationPoint(-6F, 0F, 0F); - RigthGCC.setTextureSize(128, 128); - RigthGCC.mirror = true; - setRotation(RigthGCC, 0F, 0F, 0F); - RightSlide = new ModelRenderer(this, 0, 44); - RightSlide.addBox(0F, -2F, -2F, 1, 7, 4); - RightSlide.setRotationPoint(-4F, 0F, 0F); - RightSlide.setTextureSize(128, 128); - RightSlide.mirror = true; - setRotation(RightSlide, 0F, 0F, 0F); - LeftSlide2 = new ModelRenderer(this, 0, 27); - LeftSlide2.addBox(0F, 2F, -1F, 6, 2, 2); - LeftSlide2.setRotationPoint(-3F, 0F, 0F); - LeftSlide2.setTextureSize(128, 128); - LeftSlide2.mirror = true; - setRotation(LeftSlide2, 0F, 0F, 0F); - RightRod2 = new ModelRenderer(this, 0, 20); - RightRod2.addBox(0F, -1.5F, -1.5F, 2, 3, 3); - RightRod2.setRotationPoint(-6F, 0F, 0F); - RightRod2.setTextureSize(128, 128); - RightRod2.mirror = true; - setRotation(RightRod2, 0F, 0F, 0F); - LeftGCC = new ModelRenderer(this, 24, 18); - LeftGCC.addBox(-1F, -2F, -2F, 2, 4, 4); - LeftGCC.setRotationPoint(7F, 0F, 0F); - LeftGCC.setTextureSize(128, 128); - LeftGCC.mirror = true; - setRotation(LeftGCC, 0.7853982F, 0F, 0F); - LeftRod2 = new ModelRenderer(this, 0, 20); - LeftRod2.addBox(-3F, -1.5F, -1.5F, 2, 3, 3); - LeftRod2.setRotationPoint(7F, 0F, 0F); - LeftRod2.setTextureSize(128, 128); - LeftRod2.mirror = true; - setRotation(LeftRod2, 0F, 0F, 0F); - midRod = new ModelRenderer(this, 0, 32); - midRod.addBox(-1F, -2F, -2F, 1, 7, 4); - midRod.setRotationPoint(4F, 0F, 0F); - midRod.setTextureSize(128, 128); - midRod.mirror = true; - setRotation(midRod, 0F, 0F, 0F); - } - public void renderBody(float f5) - { - Base.render(f5); - PistonCover.render(f5); - - } - public void renderGear(float f5) - { - //Rod connectors - LeftF4.render(f5); - LeftF3.render(f5); - LeftF2.render(f5); - LeftF1.render(f5); - RigthF4.render(f5); - RigthF3.render(f5); - RigthF2.render(f5); - RigthF1.render(f5); - RigthGCC.render(f5); - LeftGCC.render(f5); - } - public void renderR(float f5,int pos) - { - switch(pos) - { - case 0: - RSpiston.setRotationPoint(1F, 3F, 0F); - LSpiston.setRotationPoint(2F, 3F, 0F); - RodPiston.setRotationPoint(0F, 8F, 0F); - setRotation(RSpiston, 0F, 0F, 0F); - setRotation(LSpiston, 0F, 0F, 0F); - break; - case 1: - RodPiston.setRotationPoint(0F, 6F, 0F); - LSpiston.setRotationPoint(2F, 2F, 2F); - RSpiston.setRotationPoint(1F, 2F, 2F); - setRotation(LSpiston, -0.5235988F, 0F, 0F); - setRotation(RSpiston, -0.5235988F, 0F, 0F); - break; - case 2: - LSpiston.setRotationPoint(2F, 0F, 3F); - RSpiston.setRotationPoint(1F, 0F, 3F); - RodPiston.setRotationPoint(0F, 3F, 0F); - setRotation(RSpiston, -1.047198F, 0F, 0F); - setRotation(LSpiston, -1.047198F, 0F, 0F); - break; - case 3: - LSpiston.setRotationPoint(2F, -2F, 2F); - RSpiston.setRotationPoint(1F, -2F, 2F); - RodPiston.setRotationPoint(0F, 1F, 0F); - setRotation(LSpiston, -0.7853982F, 0F, 0F); - setRotation(RSpiston, -0.7853982F, 0F, 0F); - break; - case 4: - LSpiston.setRotationPoint(2F, -3F, 0F); - RSpiston.setRotationPoint(1F, -3F, 0F); - RodPiston.setRotationPoint(0F, 1F, 0F); - setRotation(LSpiston, 0F, 0F, 0F); - setRotation(RSpiston, 0F, 0F, 0F); - break; - case 5: - LSpiston.setRotationPoint(2F, -2F, -2F); - RSpiston.setRotationPoint(1F, -2F, -2F); - RodPiston.setRotationPoint(0F, 1F, 0F); - setRotation(LSpiston, 0.7853982F, 0F, 0F); - setRotation(RSpiston, 0.7853982F, 0F, 0F); - break; - case 6: - RSpiston.setRotationPoint(1F, 0F, -3F); - LSpiston.setRotationPoint(2F, 0F, -3F); - RodPiston.setRotationPoint(0F, 2F, 0F); - setRotation(RSpiston, 1.047198F, 0F, 0F); - setRotation(LSpiston, 1.047198F, 0F, 0F); - break; - case 7: - RodPiston.setRotationPoint(0F, 6F, 0F); - LSpiston.setRotationPoint(2F, 2F, -2F); - RSpiston.setRotationPoint(1F, 2F, -2F); - setRotation(LSpiston, 0.5235988F, 0F, 0F); - setRotation(RSpiston, 0.5235988F, 0F, 0F); - break; - } - //Piston Arm - RSpiston.render(f5); - LSpiston.render(f5); - RodPiston.render(f5); - //GearShaft - RightSlide.rotateAngleX = 0.7853982F * pos; - midRod.rotateAngleX = 0.7853982F * pos; - midRod.rotateAngleX = 0.7853982F * pos; - RightRod2.rotateAngleX = 0.7853982F * pos; - LeftRod2.rotateAngleX = 0.7853982F * pos; - LeftSlide2.rotateAngleX = 0.7853982F * pos; - RightSlide.render(f5); - midRod.render(f5); - RightRod2.render(f5); - LeftRod2.render(f5); - LeftSlide2.render(f5); - } - public void renderLeft(float f5) - { - Left.render(f5); - LeftPipe.render(f5); - LeftCC.render(f5); - } - public void renderRight(float f5) - { - Right.render(f5); - RightCC.render(f5); - RightPipe.render(f5); - } - public void renderFront(float f5) - { - Front.render(f5); - FrontCC.render(f5); - FrontPipe.render(f5); - } - public void renderBack(float f5) - { - Back.render(f5); - BackPipe.render(f5); - BackCC.render(f5); - } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/1.4.2/src/minecraft/steampower/geared/RenderGearPiston.java b/1.4.2/src/minecraft/steampower/geared/RenderGearPiston.java deleted file mode 100644 index 70c79aa1..00000000 --- a/1.4.2/src/minecraft/steampower/geared/RenderGearPiston.java +++ /dev/null @@ -1,51 +0,0 @@ -package steampower.geared; - -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -import steampower.SteamPowerMain; -import steampower.turbine.TileEntitySteamPiston; - -public class RenderGearPiston extends TileEntitySpecialRenderer -{ - private ModelGearPiston model; - - public RenderGearPiston() - { - model = new ModelGearPiston(); - } - public void renderTileEntityAt(TileEntitySteamPiston tileEntity, double d, double d1, double d2, float d3) { - bindTextureByName(SteamPowerMain.textureFile+"GearShaftPiston.png"); - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - - switch(meta) - { - case 1:GL11.glRotatef(0f, 0f, 1f, 0f);break; - case 2:GL11.glRotatef(90f, 0f, 1f, 0f);break; - case 3:GL11.glRotatef(180f, 0f, 1f, 0f);break; - case 0:GL11.glRotatef(270f, 0f, 1f, 0f);break; - } - model.renderGear(0.0625F); - model.renderR(0.0625F,tileEntity.pos); - model.renderBody(0.0625F); - model.renderBack(0.0625F); - model.renderFront(0.0625F); - model.renderLeft(0.0625F); - model.renderRight(0.0625F); - GL11.glPopMatrix(); - } - - - @Override - public void renderTileEntityAt(TileEntity var1, double d, double d1, - double d2, float d3) { - this.renderTileEntityAt(((TileEntitySteamPiston)var1), d, d1, d2, d3); - - } - -} \ No newline at end of file diff --git a/1.4.2/src/minecraft/textures/BoilerGui.png b/1.4.2/src/minecraft/textures/BoilerGui.png deleted file mode 100644 index f7ba4f4b5f930d630bc3c9ed7794b41482ac715d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmcIk`Bzid7Tz}rCX7iy1r*XW0xCE_^c8K4Tosf+p-3q+g(p}*Bp`}p1%#wleNKRj zK|qAqqJSuag;J0q51C{s(n19ZlYonPQjjt5PHca8?+pdk4i&(4b6rA*XTBaseVx{eaZd6tKq1f3JzW&xhzdgSR|le(g; zzQI1n!lKvs{V=oZ8sQ^GUFy5^53jraFN*d#n&qg(FO-&hWVpr3Kv#);rC)Orr)@vw zF=14`-ko4<|LR`w4gawAuF8nAwdI(D%%)4L_t)lEd*|2WlkclplP1JJ91g6+Ip_W3 z;|1B&yy`c)XZEt1o)oY0{N}W+$~dH|%IRm~hJBH9x>}2-up`>>NlD2DTU%Ss=hNxi zQw8Kg-{{pu-G4sVxg$N+K3i+^=FKN9Yg5hY7kc)tS}4}6e~m8 z+eh1J;5Y974HFvM3m)JQU(jnO2BvrQjT!$8(_n(==)yp0HAw_amx!;#&{)^iRn%F} zFO?NlMH`mwcRM(CQ<_DP+8tQzEz;=bo0pY6jR=Vxx9~_lxqq~^z&vEti2~+k>frmou4^mdchf?(T;zk%ZL~sZ zp4+3_yS;lNDuUXp=nx*JHKy!zzo{-w*56J{G26KIcG4isV?_v83SH+-^kGie!#a3A=}D6fh4g+~S6frG8DJ#vOIzZYE+GC0)?fm8#yKoZ??r2^Jx zWV9iqV(w#0=5o47)2AWl>)1tB{H$vqp$|VeJimq2|IVx6g1oPHNLZOlg?Fv9#qN*8 z+B^&L^EVQhzuyrA2k&%tahU_1W$~>}dBO#1U$=A6&`%mw(arLFvT1E3eWprNqI-2U zrywDMDjA{P7$-32R3DQ2#P`VYGfE{=uIVgzIy`7277_ze^8EQ$>H8ToZ@TZcXGBd1 zJa2k9Con|%c&pdKWbX3kg$-j|F0dng{Mv~fK{M1yFDf%6*8-JbKa~jK&twX65+T*g zfeTbMOhOisFEd08IFA%k*m<{4s(a%Ep|!I6wzpZV{*R-XXE;&2QHnnPbBSzXcy6Wn zvjMItBih6vfuZB3Bwboc%Bq%^cJq&w=Go6kbL@{NpVXzBS;U+&UVE05^v*q`KTyuy zr>Cl#y@hqc*LREiW9MMQnh(1xbgYiAx66E$I|Yt0DhVz~|JW1)4e-mcX#_{-`5_>| zFt!atSJyTSr{aJ>XhJ}Th7W(TqxNE{Y~oh+a){o5+UADrqhlpgQ-l{U_3tdqe|*}_ z-?3}griOjKaeD;bOJ0a~3*v^#F#(O){Q`3guivPxjqWg}f7RAQRG@(fU=|vmWqZH= zprl_GCI11KfgcJg_?n4|sYDnYm>il?lP}J=SnTBuknnH4Ed%ui+MW|KU$hVpJ^W2M zUErI}tJgh1517W|%L#pX=H6jU>kV7WPxJYounbt6DuB?yN9^)aCPG*Y5kCqFIS_yV z4g|zcfzMC@^S`E$KIu-r>25k#g!}1@`}S~~bF{>x#`JW`dV3PP`EA^uQA?&`b8&#A zWH23z(m;2VnX0EUPykm}sCEd@S<_Uo)I{q@Xw#9RkV5#Y=fdrTQ#bag4h&;$LA_dH zpN;An6ekxL3}eMJ{+1p;v12-oAkCH5r(Qa9RA0sBCI_=`37f%o|@?>=cANu(cl zuS_^=Y|49c!8p`%!9el}I7k*{F%QocZ@bpf*~u=8AJLGwy1TQr42}>BzkIs&cbRdP hpqBvurw6~dLYx}8H<9(l`!Yofo|V02{$ZaV{sSf1{bT?D diff --git a/1.4.2/src/minecraft/textures/CornerTank.png b/1.4.2/src/minecraft/textures/CornerTank.png deleted file mode 100644 index 43e1ddefa731bd31873530ed97455fc68aa1b1e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2658 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 diff --git a/1.4.2/src/minecraft/textures/Engine.png b/1.4.2/src/minecraft/textures/Engine.png deleted file mode 100644 index 0f68fe758befe90e39392f330cb363dd0cf91623..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1033 zcmV+k1or!hP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2iyq* z6&(Z01?N@(00W6hL_t(|+U;2}XcJKw{@>j-gEpmfGpk^rgD#mBN(Vub!L5UC64J%e zMH~u35IdA&agd@8Dy54{D+SR~u;64DMLI~_-Fq+Z<)yhF z!rgoK{Xe-c|NGznz968qQa*=4pgn(ofIy-dEKZMKe*{g_pxf<&rfGoje@>dsrh8v5 z7To(MZ+D4!FIJ{$EKZhXL8H-dugzxD{RG+4`ZhegGaHI87YneozC92Em@=TzXaL3- z5JG@4hOx0R-}6?h)q`JL-3n)p>DU*NJ!lh{WH% ze)W9UfYrr0V!Up*dp>IbX{#H$ZIHGGl#2y;@a&z>&x>DJ*>JZ=!!V>0K;3qVZiU<0 zh0Lq1{Ud1vh<+i_#(Q=!SbBTa@Z1DgmPLIQPzldX084ML5}um?o_$>fJU0P6y}b%} zZUT6Edlm4>HYmFj6lpaJq0LWUoZ`(sw1EMrO z+V}{e;iv&L8Xrykejap$)c_iek2b#SC7|3{z^qzm>&uVPB_PoR6HPGD1QSg#(F7As zFwq31ZG$6kKK5?qE)%n1=ipZ;+dRHuR;^YssSn6xGN>;#z-v!8Kb*>1b2kIWB;)ZN zR6n3}22?5)OzH!&*(`Skpr|iSdLbU)IJo2EV@%o}`>_NxZ>ji4x6TlP1D4sd=AgA9m3J{G8|1W z!~EJIoE@LV^ZE~(0Hr%YXU)f%46gv!ImE;V2RUWpUYKnrhE7 zpA^BU45-y=zDe2RffFz}Iq92}Js$a8fTr5B%#-XdmUg36nq(&l00000NkvXXu0mjf DZza#8 diff --git a/1.4.2/src/minecraft/textures/Furnace.png b/1.4.2/src/minecraft/textures/Furnace.png deleted file mode 100644 index a3eca67538223cc56f945fffdaad118a9a913a85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1455 zcmds1i&N5h5dVVZGbIXNX=&J{Tn2cVhL4m6#K)!KnP!4`(Us*J3_KyQv#ZHc=gLmY zGhdmCg}t=I6z;ODFsL~TO?>oFQX zbyz4V8UPp+!hpFcYMnC^+7kbrSft2*k>K#WCZXgnJLo4bn! z>&|G{3z25oVcW@OY6}yTw|{-U2nE1WTo{QMlk-BSj>>TAb~GE|{#mluD)Z;t$9IXz z;pn=v{Obv*2i4eu#N1GuIr#5Lnad@W`qNrgs10GA*J*Zn?aQDQWd9>fRC0yGp)`v6 zA+b7%Ttq6kj@hj=F<;W=|K{KWy{_loyGsty@#4{(!t_DOxmVU-B-&3GpW(i4h=G}d zU;yA?ImiQG32^;3Cqy}K=vP_hHx~1-^TcC=TiF9d`)@fphfew8`R%tRO4= zWfkAfmC{um)XbPUJ~)|J9M7bySX3dQ@WZ_&$%+8jS`1Y0+S|{$FHhPF+y(^2fQAv#B zv-GK*Q_pDp!_&kb!EADa&)YNF{cO@QT6*8Kd*F^^zb!REw7XRvT`epT!=2;pllo2svo*M`d&7?>Ri_TOQrkbw z<{QO|iB&QuZ_^zpa!*fBm+$aUF}mXp?rA@*vN296sWg23eBwM4|Ca3abtyUgz%Wu! zYdp0Xh(raC)7{Z%!(6=?68W)z0O5vy#fZCADTJCjV ztuvkp$=DDoYCZ7k1UXM<5(dc1?P@7UV95@=8NxCrSQO*9 z5$@cn3-Gm*Q5|yK12+fi@3izr-cn8WCfd1LMaYdx%)Si%TwA(qITPrQNDa$mf~G3z z!WQ48Jx9xH@MFV?U0+C5`TLFrwh4Tcf?1Dg7ewxBqN+T*d167>tQz9J6L4cmr3?ey>q$hqM85 zg0Wd7+C| zgW!U_%O?XxI14-?iy0XB4ude`@%$AjKtc8rPhVH|JDk$u;tDKFu5JJdHF~-@hGg7( zd)<)F!9k$)p=6*XMDB=8khCz+PQbgpkx8k-6SMm)EU!Ph8w4LEYxb$CpaV4e+znno_Pgg&ebxsLQ0Ce45_&F z_Kt1Pp#TxK3*vQB<_Fk}3~~;hisPQ1wQ%p$=z@|P4AL7C4a`#5loUB_j1(=G2X%;i zczW-5oQfjQR0#MxG3FPOJb(GkfA7D)xA#2rc;~u_+Y@f6{oZe5YbQTv?)rTFbAF-? z2SXZ)tNz95pRYetc3f0`ef6GIm(v)!QunV>&0vpWU}E^<6|{|IO_JILrWc;9C(1+@ zyz$`|J-?bo%VDR9?`9KU{g*yB~knRujJdN6h8pnc+cq`egf;CH~&cdGz?YLS2Rb?jirf%92GFoNSkV9ieE* ztiZs*z|_DXkS&@ZnV31` zJqkOneZbPX^XL65JM|l*FJ&?Ut#sJ!oFL6pAfeR0z5cp?!Hc(14BO)vSDpLwsPMQJ zqZY$NmDsfm%hMRGt}u1Uui*FL1_jSAOXd*X!ZapPpqmU%A6T}91;_$P0D}(_-7r$> Z2lMyImjd>!kbead@^tlcS?83{1OS^U6FL9@ diff --git a/1.4.2/src/minecraft/textures/Generator.png b/1.4.2/src/minecraft/textures/Generator.png deleted file mode 100644 index 3d52662b4363867c2de6b1000143900a1f2fffc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1423 zcmZ`(eKgYx82$~}FBC_7<;la~Sh8*NzzJbJ`z z3jGcQ0yZ?Knru9;G>uyND^jluRN~gQc$snlwSRDjd2ES(WP;V=#ty@uFtDp0Uo5a?flVJf)xZxv%#HLsc@V_h_7qT$ zQ1_4YifQ{~)DaghbJs8YMCGhgIae*40&W)z>dG;fh#TJX(?QI&Rj-%1qS-k3s;lF* z{t&(BhIgsEXlQu#!!evyAu_gP*t&{-A#_MK2I0eltT?WSseKrOX90+C@V7;UeNNCT zK~Zj_tJN(TOmygz{UV^ynyl~VQ@UN{B%wdI07jL(Aqgl9gm^M~%`al2wfP&DO2aH) zEd;vNDV|&OP+>IRqXMBES9E%fqt0q=p6ixV$-s3kue^McQS&1?0AyG0qEyfcteZ1w zp{3t8H(eaGO4uFznwkd^MGmSd9;7}emSKaweiM3q6O~>(Kks**e)CtJ3u9`f(b<;h z>gaQ=w8&m%W*ogveO6?zI=j->a#+rv?mQuB*n^UL;3Mu!cDSrlMqsduoX^e#KMSV> zBV+%R^RRhYw4At@aF6hmQXd4*RXnfN-NBZ3Y8d#%%(6;nq~y~bBlV+;#t7UcY^BI^ zm;NFP$x~1~ON-Hfa%oVY%=O%_X@d16YsvZ7o>m?deXkT=f$Hw&+f^X1D98H!Bqo8) z{3N18R&u{I847HmcfG)U8q5F9z->{wvG z$Fyi*RAFgYj^}j{mPlab9QS~Zg26T8VMj7yByBtz38%Y!Q{vX$=PnRDja~c8;!i)%uB?r*?(*~yeN-gw3zB)-}9kt%p#LI(yrm2&- zJrDI=KNWK_48_K_XN}SMgX+yj!5HKCWKg_dxXd4;ud)V+n+XF60_G`68;Y2qg%}th z_AhwCGd_&iXkM|Hp$I?A|JI%S`<2A71G8<`68E-#anETkhIz{su~^(yc&BPN{|^+`uS_=)UVT{nb^~Q%g5tE=WP_*w8tB zBuJ6^(iW7<+W&3!M7C&*IuJAud0t$D_&7DmXgoZhVxwu6!tBaM_*tUyoR3o~NTg4C zaa?Oiwe_0Wz?P)TB9shZvok~R10_@H%{-)vE>^8@3mOMmF>PIi;&%?h<7}}Nr%AW| E28)4(K>z>% diff --git a/1.4.2/src/minecraft/textures/GrinderGUI.png b/1.4.2/src/minecraft/textures/GrinderGUI.png deleted file mode 100644 index 498818ae1f6e4a365c24187fcaefdc6ffe170970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1284 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn`1yx4R3& ze-K=-cll(X2xoyuWHAE+-$4*&+%YlxEl`lX#M9T6{SK=HlQ~o8i^)w43@k04E{-7; zx8B}0^cQiIXn2_4dLuAGVzK>!84;O!iaWWIUH7+~JJc7nnbrPaA77Pq(e-R+r&156 z0wifAXi|c6_jZSjlmzmE&<$oI;M zXOy{pH^NNYSRO0d0%sg!tdZ!fLhWb=A`yu3~A&6nzI>npe?Zd$6YAH!I3_1Cw=w}zi=`tRN8 zn|kRZ$C6(%KF_x^RL;Bp>(?TUq;h8lmjhx9IqWQ8+Gu5i8J~>bS+!<1f$t{IS`a^S}?*6^k{xB>38o8Tvgf ztogT47oT|?4Vu7wBV_W?rorYsP~WZlM=XvloVlq(2TRi(dKmn}tdf z3Z?A(gd6oy7KUd^y4eC$2%R~F=7oANB}f2%wQ5=P;m5PG4gwSJh4n|9tVr> z6BmVO1_w~)*P2-&d|~AQh*MdgH8B~~F}^BzwYKn8-{X)3s3H~y0f=f8h5$n_&|Z}j zAl-i~&h!O0X38#Sx($h;ld=DdWj_l}OpOfdb5owo-5JN2^0)4O&IPGF2EXGcIdyzF kb!*=<0gDfs00;Iz4DXut%rjDsZva`~>FVdQ&MBb@0Q70SS^xk5 diff --git a/1.4.2/src/minecraft/textures/Items.png b/1.4.2/src/minecraft/textures/Items.png deleted file mode 100644 index 3a5c5cafe657afcad99e6de3daa51e66d7c4b2a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29075 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

lrdx^KPA8^8k`Zj?Lv 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 QOa#eGD}So~X!7lU0b{|gWB>pF diff --git a/1.4.2/src/minecraft/textures/SteamGUI.png b/1.4.2/src/minecraft/textures/SteamGUI.png deleted file mode 100644 index c68427369418297ae9a762b1f57959b01482cdf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3750 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 diff --git a/1.4.2/src/minecraft/textures/SteelPiston.png b/1.4.2/src/minecraft/textures/SteelPiston.png deleted file mode 100644 index 0f68fe758befe90e39392f330cb363dd0cf91623..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1033 zcmV+k1or!hP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2iyq* z6&(Z01?N@(00W6hL_t(|+U;2}XcJKw{@>j-gEpmfGpk^rgD#mBN(Vub!L5UC64J%e zMH~u35IdA&agd@8Dy54{D+SR~u;64DMLI~_-Fq+Z<)yhF z!rgoK{Xe-c|NGznz968qQa*=4pgn(ofIy-dEKZMKe*{g_pxf<&rfGoje@>dsrh8v5 z7To(MZ+D4!FIJ{$EKZhXL8H-dugzxD{RG+4`ZhegGaHI87YneozC92Em@=TzXaL3- z5JG@4hOx0R-}6?h)q`JL-3n)p>DU*NJ!lh{WH% ze)W9UfYrr0V!Up*dp>IbX{#H$ZIHGGl#2y;@a&z>&x>DJ*>JZ=!!V>0K;3qVZiU<0 zh0Lq1{Ud1vh<+i_#(Q=!SbBTa@Z1DgmPLIQPzldX084ML5}um?o_$>fJU0P6y}b%} zZUT6Edlm4>HYmFj6lpaJq0LWUoZ`(sw1EMrO z+V}{e;iv&L8Xrykejap$)c_iek2b#SC7|3{z^qzm>&uVPB_PoR6HPGD1QSg#(F7As zFwq31ZG$6kKK5?qE)%n1=ipZ;+dRHuR;^YssSn6xGN>;#z-v!8Kb*>1b2kIWB;)ZN zR6n3}22?5)OzH!&*(`Skpr|iSdLbU)IJo2EV@%o}`>_NxZ>ji4x6TlP1D4sd=AgA9m3J{G8|1W z!~EJIoE@LV^ZE~(0Hr%YXU)f%46gv!ImE;V2RUWpUYKnrhE7 zpA^BU45-y=zDe2RffFz}Iq92}Js$a8fTr5B%#-XdmUg36nq(&l00000NkvXXu0mjf DZza#8 diff --git a/1.4.2/src/minecraft/textures/blocks.png b/1.4.2/src/minecraft/textures/blocks.png deleted file mode 100644 index a2286ff26383c240c22524ae12cc3f7f4243f14e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22475 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%0AbMeZq%L-(Jd-Vy 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 WV**nd(hB$(kd4LhqoqgAUH>ok(3-da diff --git a/1.4.2/src/minecraft/textures/pipes/DefaultPipe.png b/1.4.2/src/minecraft/textures/pipes/DefaultPipe.png deleted file mode 100644 index 05cb6ff1ead8095fba54f0530b3febf09e3f333f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 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 VQv-q^vG)J~002ovPDHLkV1fs?P%8ic diff --git a/1.4.2/src/minecraft/textures/pipes/SteamPipe.png b/1.4.2/src/minecraft/textures/pipes/SteamPipe.png deleted file mode 100644 index 05cb6ff1ead8095fba54f0530b3febf09e3f333f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 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 diff --git a/1.4.2/src/minecraft/textures/pumps/Pump.png b/1.4.2/src/minecraft/textures/pumps/Pump.png deleted file mode 100644 index dd4712087f17d30c5dd42f286ccf1cde0f48d0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 735 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oZ=j2raQdqeHj>-;yqm)Ln>~) zy>l?@wt)mgLgkdZY^m!nh+M9|zp(Ym1^2fLTi?o->8st;?m3jVyFy($dD1bxqD3C} z%Zp@|F1eQf^1te2EuWC<<+&XzGViUDs88Qq*Y#`fvWm*ubxvyQihihX+x;wf{_fbT z^MB>U-ru^B>BpUYEL~w|JAa8RXAqjf6n6jL*WJ>CRs_ z1{MbKNVa2o?~{V{)Fv^@czx37;Zy`{wNz@We&z`()a7s-0& ztUGvHF)=3)4z`+Z^tI9o)c+cu-KUAdg0WAOxOK4ikI`t@-Z;13}M_<`I007K<-!XB9jX=AXUIqh-P{ zr5Y5vN7)*x?prmKHk`T1W5jxcXA*Nj83T}F@nTwdLh!)_X|raP##*y{;}sVe0^Uh7 z3NVOBGrX#O&2Wv;DBbvkNP@8kpTkW?ASI;1$pTDY=)hw0e>qK;?GG1*cYvfkUHx3v IIVCg!00Z7KVE_OC diff --git a/1.4.2/src/minecraft/textures/pumps/WaterPump.png b/1.4.2/src/minecraft/textures/pumps/WaterPump.png deleted file mode 100644 index c59427b9d7a5fb5a0bcdfd87dc572f0aaf90d7d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 733 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!oXldXIwia})-o_K#d^9phE&{o zd&e;Ewt)ykz$%VCq8z)@dYBcf^B(e8X0<;PyUTp=-HWXp7j(OgJOx;GPh&c@?BsW~ z$Ysp#f0X{KvxX-w+Eth1?Be@5?C1~c^RuU~xS!n>zutcJgwEMA|2p5U`+4cP+_kUM z?V_*u=dNMcwN z!;Vu%24$7vvx^KT$~*{}WPXM@XKr7D&8&lo~sOw!7vt(dmU~FJ;U?@1JmEae) zFC;bK+?8+c|9!1? z;JmCmAJ^~yU%|3^OKHPWnd*BVZWPzWR-b2_cm9$0!T0a$`Q`rWM+DUegfg7j@jE}i z{>$^W<0)3GK0B-1b9uf?_Awkb{iAt2We)R%A0i9h7z3Rxz%V76t*<^?fBF4`kB@MC z*i)IgefP3@o9x}$YmUrh5@1Nbww5DG(q{b&@#=S979M6~P?)OaV3sed&?0cCZa>%W zzgeFujkp>T+5Iim4hu3cI;>CF&G)K2(FIl$Sc-ZX4dmACzFs`p;p9S<03nWWQzn_}!)X&#Hk^N!%O)ztaLQJh zfvF*h*;Wr>XE|&$nR3`pGHO^eZ7GJM@v%J7 diff --git a/1.4.2/src/minecraft/textures/tankBlock.png b/1.4.2/src/minecraft/textures/tankBlock.png deleted file mode 100644 index 21b97d4c5a4126ae7d0dd46dcbe118bad20f6b75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2478 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 P3?%L8>gTe~DWM4fP^b7L diff --git a/1.4.2/src/minecraft/textures/tanks/GUITurret.png b/1.4.2/src/minecraft/textures/tanks/GUITurret.png deleted file mode 100644 index ab367dbb75ab11df7cd8c85ffda82f85c34d06b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1208 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn`1yx4R3& ze-K=-cll(X2xoyuWHAE+-$4*&+%YlxEl`lX#M9T6{SFr!2d|*`Kf68#1{MoX7srr_ zTW{|y%oh%nIqSTipz$@2JPTFh}rWl57gqxtsAJC~{qRDxx_4LC$N zSQwp~lujHjXfAo|^}Fir?tSOo6Td}Qysj-SZ;luIw}Pp}Iq?6&`|tH_pZxh_^Sk-Z zO8tMUivC`nxO%_Fs{P6zzFqv?n*Js3PU(dG%nu$d4_y&+y=pI77ilZiX#7-@E_szsKlsYFlk$yETIYC>^jc2%s_6UHDPYcxn^R;)@!; zX3t>G)NBcjjb$o9(3Z9tr1Q;S)76LuTE^zpmba4`p`$QIZ$Z#-lG$;e(#3)61 zg5}Bc3vGL)8x>s5m?~Mo(UhRstIwFrYNp<5xjDKqGMM3&yaP{k{@KpC$=Vy-(P9xE zRv?A|gF7$?Qci>=6i=G(T%E(ZtT>1D8_+tSTT;q@pU-;JBG9!+W7W%&R|Sffts9aI xBrJHX4s##4I>YwBsfiaZp4S6rdD?)S#`sn4)7Ymkf4c@`fv2mV%Q~loCIA9jjS2t& diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTank.png b/1.4.2/src/minecraft/textures/tanks/LiquidTank.png deleted file mode 100644 index 446b443d90dab18984ac1d9f993f26d74c6815c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 614 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!TpZ%^A}@|=t^u0z%+tj&q~g}w zJBE3;4Mf-;95=c9B$`9hYU%fkcDVz`PcvF=`MzSgLYw}An|HdxV$WO)TjIc^qq1#Z zKBvOz4#mGUOEfQOveoSPedC+#|G&?}-~ZfwSC3Wv`M0Iw^SAZi4VW^!wrJ0~?C?)c zcXzNbH83RbT(B2-W4rGBe!0w78UOE|{r%x>0;6cc3%B{NYk*FKfpZV<&-%M--R+M5 zr*{JlI)Cl+^x|W)c7^PDUvH!zeRx_N<1XF(Z$4PAV{zWyeoX3?sY%M2yhWdOe*azT z;$q_a`HgL8Y5k|2#rKwM%Y9#^@8T6L`k*W1YVGXLRz-30dH>FLWJKrwyYhDF*Ryx0 z?T=b}$~!k+b;YXo!}tB$1q>`1f~V>&p7QVd9fet+tyaA{csBl(!iOD98xAnc>0=B4 z!x^8W58Tf9Ia_37=bZljWgcp?rwcZ`+jG$SyhRD)3Wn*6tXEz!IlE$7yxP)JDpS1* zp2jxJUw)ajU>%pi*TRDD6F=SfzP~k{y_>tCo0r>c=hyn5e@d^pir%lU37*KqB*?(R z!05mr0H+#0dlsL6d;aWZW>HiL7!MY581#eCzpM**=D*|M_74L|db;|#taD0e0ssrv B04@Lk diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTank0.png b/1.4.2/src/minecraft/textures/tanks/LiquidTank0.png deleted file mode 100644 index 821f9a02880771dff7838456c0ec2855b8084c30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!TpZ$7l6CE^-+-oE@^o&e&W zk8SK+c=Yp|rCC=0KL5U3@h@$2XX9*R%dd~J_O5AHy8EX2apk<-lgwWoR25)gVMuOx z)|l|Pu=d~Ij#~HM{rvt1w>JxhG;EWuUH6$0=rky>Xumt_ug&?@0{^C$ufKMB@z*~u z=dAmsCz}6jKF{fE8#abFRGs#>uKA|zc>CSLb+^iRx4zsoTch^f+cIe}a#eqN;`zEDT}<+FAHr=@4*XWfaqACv#{@=KGwA*P{C zIxT2Ra01PEQL?4*C<EF2a){Q!x#f&?^ZdjQ?9_6&fBfKA_fxU= z>v_-fxrsA~OS`Qpe_dZ)D_;_L^!fGnt`va|1_cHV2BroCHOF73Dz83cp6m)V38*qy daADHoU)fcY=Y2>Jo>B>t^mO%eS?83{1OV7Z?H>RD diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTank1.png b/1.4.2/src/minecraft/textures/tanks/LiquidTank1.png deleted file mode 100644 index 4d427d6a945b2b38807a20ed480aa3a816c99162..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!TpZ$7T)!-jXaG(5zGJdmphH9f_;=iD1DgV}zbF}pV{Z87`! zJy*%HPw3|U`#tG4o`#R^p8cJd@%z2~_vYXE+i#1^nfvja4;}6*c~WvFDTe;_P=P!&b@!l!}AZ{J;OP3?0mtm zwKdoJ8r{+yt-~Yeg(?9%qTQ<9CbMfCxv%k;YU8iyCter*N^{v{K z%hts(F*-09ut~^q@X1|&9^YqDy5;}7SG7M%H#Be+ym6cVss`vt81Q@ea^~M%>vnhi z?=Qcf|8Ab``S^2^*{>Eqa;~3Tc~ffJ7p@EWKU3S!*Qr`;tIk-Hyt}PWa`WsJHSh1{ zi3!TSG(S&eQ;W`C6H0iBXsTVIkQjf)HJtOT6Fmtf9(9|`*-qx zuD-fz&sE;grd3h)d#4!~7%~J;)muE}-}O5Rvx*--)2|fR5ziPA!?4fwT)e#Y!F=b2 z)Uby4{p;u7d8^9yU<1ia&q8I=dQixG)GXurL6F4o>;0pS9g?Z=TJr#lY0SpuoU^M!~`mgFdjjiebT{ V1y$vLce8*bJzf1=);T3K0RW@L{lNeL diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTank3.png b/1.4.2/src/minecraft/textures/tanks/LiquidTank3.png deleted file mode 100644 index dec251e778d615c39b4322b14e74d15da86f8856..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!TpZ$-dT+&xt$?Py_jGX#skrs_ zj$__s2NAXh=1bqqiH>kxbI3N~B6ETAx{J&k8mb?JUeyr)V71x#L7vsp!nvoWCAA*8 zzkTBq3$G_XpZ6MnQ#r~gpJ!L*{QLi(zqS>B%69u6yt%XP_0jgTwe})QH-7(iz4Wcm zyp`I^9T)@{Vwid2Ir!e0Ka1}(`I`0r?$zHPUMDb$J_vA@e_a7|Bnif&>bKb?`W; zpWP#!D*F=>mH?lx2BPjOaUdIluv>FVdQ I&MBb@0DJWUh5!Hn diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTank4.png b/1.4.2/src/minecraft/textures/tanks/LiquidTank4.png deleted file mode 100644 index f11129168a716278165b1cc3ad15834caf45e91a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 614 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!TpZ$-a;MKZPXn6r%+tj&q~g}w zJBE3;4Mf-;95=c9B$`9hYU%fkcDVz`PcvF=`MzSgLYw}An|HdxV$WO)TjIc^qq1#Z zKBvOz4#mGUOEfQOveoSPedC+#|G&?}-~ZfwSC3Wv`M0Iw^SAZi4VW^!wrJ0~?C?)c zcXzNbH83RbT(B2-W4rGBe!0w78UOE|{r%x>0;6cc3%B{NYk*FKfpZV<&-%M--R+M5 zr*{JlI)Cl+^x|W)c7^PDUvH!zeRx_N<1XF(Z$4PAV{zWyeoX3?sY%M2yhWdOe*azT z;$q_a`HgL8Y5k|2#rKwM%Y9#^@8T6L`k*W1YVGXLRz-30dH>FLWJKrwyYhDF*Ryx0 z?T=b}$~!k+b;YXo!}tB$1q>`1f~V>&p7QVd9fet+tyaA{csBl(!iOD98xAnc>0=B4 z!x^8W58Tf9Ia_37=bZljWgcp?rwcZ`+jG$SyhRD)3Wn*6tXEz!IlE$7yxP)JDpS1* zp2jxJUw)ajU>%pi*TRDD6F=SfzP~k{y_>tCo0r>c=hyn5e@d^pir%lU37*KqB*?(R z!05mr0H+#0dlsL6d;aWZW>HiL7!MY581#eCzpM**=D*|M_74L|db;|#taD0e0su5Y B073u& diff --git a/1.4.2/src/minecraft/textures/tanks/LiquidTankCorner.png b/1.4.2/src/minecraft/textures/tanks/LiquidTankCorner.png deleted file mode 100644 index 7e7c581cfde59c9d0003c9e7871a9f0e226b6a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!T%1h867Q$$lmbn$^K@|xskrs_ zu4CRI0|AGN5``l7*~DZ_xp(xw7b+7}aP3r;Y5TEPHb{KwUrA}&HP}pS0`CKPd|^FgY-AFfb}Gurx5dIK1;&x4r+hsN$k@rV9~W6;JhjnS@WUAXK0z zzmZb6|Mv42J`7cJ7_!T6&R|hvV8W`D;eh&IegK+uVTQ+z+myqvLSX~IHLu-0jCc`!g1e( z?$m=4+gZTwFW^f^&R}BLc%E^a9;e$*RR%@{hCMu6)Il22z=}^SRVy84-}t|hA0*@H L>gTe~DWM4fj_idZ diff --git a/src/common/dark/SteamPower/ItemRenderHelperS.java b/src/common/dark/SteamPower/ItemRenderHelperS.java index d198f53c..568fd4b2 100644 --- a/src/common/dark/SteamPower/ItemRenderHelperS.java +++ b/src/common/dark/SteamPower/ItemRenderHelperS.java @@ -22,7 +22,7 @@ public class ItemRenderHelperS implements ISimpleBlockRenderingHandler { private ModelFurnace modelFurnace = new ModelFurnace(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - if(block.blockID == SteamPowerMain.machine.blockID && metadata == 4) + if(block.blockID == SteamPowerMain.heaters.blockID && metadata == 4) { GL11.glPushMatrix(); GL11.glTranslatef((float) 0.0F, (float)1F, (float)0.0F); @@ -31,7 +31,7 @@ public class ItemRenderHelperS implements ISimpleBlockRenderingHandler { modelTank.generalRender(0.0625F); GL11.glPopMatrix(); } - if(block.blockID == SteamPowerMain.machine.blockID && metadata >= 0 && metadata <= 3) + if(block.blockID == SteamPowerMain.heaters.blockID && metadata >= 0 && metadata <= 3) { GL11.glPushMatrix(); GL11.glTranslatef((float) 0.0F, (float)1F, (float)0.0F); diff --git a/src/common/dark/SteamPower/SteamPowerMain.java b/src/common/dark/SteamPower/SteamPowerMain.java index 5d01a020..e17072c2 100644 --- a/src/common/dark/SteamPower/SteamPowerMain.java +++ b/src/common/dark/SteamPower/SteamPowerMain.java @@ -22,22 +22,24 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import dark.BasicUtilities.BasicUtilitiesMain; +import dark.SteamPower.boiler.BlockBoiler; +import dark.SteamPower.firebox.BlockHeaters; import dark.SteamPower.steamengine.BlockSteamPiston; import dark.SteamPower.steamengine.ItemSteamPiston; -import dark.SteamPower.steamengine.TileEntitytopGen; -@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9", dependencies = "after:basicPipes") +@Mod(modid = "SteamPower", name = "Steam Power", version = "0.2.3", dependencies = "after:basicPipes") @NetworkMod(channels = - { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) + { SteamPowerMain.channel }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) public class SteamPowerMain { - static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/SteamPower.cfg"))); + static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "SteamPower.cfg"))); public static final String channel = "SPpack"; public static String textureFile = "/dark/SteamPower/textures/"; // Blocks and items - public static Block machine = new SteamMachines(Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, "MachinesID", 3030).value)).setBlockName("machine"); - public static Block engine = new BlockSteamPiston(Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, "SteamEngineID", 3031).value)).setBlockName("SteamEngien"); - public static Item itemEngine = new ItemSteamPiston(Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, "EngineItem", 30308).value)).setItemName("SteamEngine"); + public static Block heaters = new BlockHeaters(Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, "Burners", 3030).value)).setBlockName("machine"); + public static Block piston = new BlockSteamPiston(Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, "SteamPiston", 3031).value)).setBlockName("SteamEngien"); + public static Block boilers = new BlockBoiler(Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, "Boilers", 3032).value)).setBlockName("machine"); + public static Item itemEngine = new ItemSteamPiston(Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, "SteamPistonItem", 30308).value)).setItemName("SteamEngine"); public static SteamPowerMain instance; @@ -53,20 +55,26 @@ public class SteamPowerMain { instance = this; NetworkRegistry.instance().registerGuiHandler(this, this.proxy); + proxy.preInit(); - GameRegistry.registerBlock(machine); - GameRegistry.registerBlock(engine); + + GameRegistry.registerBlock(heaters); + GameRegistry.registerBlock(piston); + GameRegistry.registerBlock(boilers); } @Init public void load(FMLInitializationEvent evt) { proxy.init(); - GameRegistry.registerTileEntity(TileEntitytopGen.class, "gentop"); - // Names............... - LanguageRegistry.addName((new ItemStack(machine, 1, 4)), "Boiler"); - LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "FireBox"); - LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), "SteamPiston"); + + // Burner Names + + LanguageRegistry.addName((new ItemStack(heaters, 1, 0)), BlockHeaters.Burners.values()[0].name); + // Boiler Names + LanguageRegistry.addName((new ItemStack(boilers, 1, 0)), BlockBoiler.Boilers.values()[0].name); + // Steam Piston Name + LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), "Steam Piston"); } @@ -74,28 +82,22 @@ public class SteamPowerMain public void postInit(FMLPostInitializationEvent event) { proxy.postInit(); - try - { - // Boiler - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(machine, 1, 4), new Object[] - { "TT", "VV", "TT", 'T', new ItemStack(BasicUtilitiesMain.parts, 1, 6), 'V', new ItemStack(BasicUtilitiesMain.parts, 1, 7) })); - // Furnace - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(machine, 1, 0), new Object[] - { "@", "F", 'F', Block.stoneOvenIdle, '@', "plateSteel" })); - // SteamPiston - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(itemEngine, 1, 0), new Object[] - { "GGG", "VPV", "@T@", - 'T', new ItemStack(BasicUtilitiesMain.parts, 1, 1), - 'G', BasicUtilitiesMain.rod, '@', "plateSteel", - 'P', Block.pistonBase, - 'V', new ItemStack(BasicUtilitiesMain.parts, 1, 7), - 'M', "motor" })); - } - catch (Exception e) - { - e.printStackTrace(); - System.out.print("UE based recipes not loaded"); - } + + // Boiler basic + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(boilers, 1, 0), new Object[] + { "TT", "VV", "TT", 'T', new ItemStack(BasicUtilitiesMain.parts, 1, 6), 'V', new ItemStack(BasicUtilitiesMain.parts, 1, 7) })); + // Burner Coal + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(heaters, 1, 0), new Object[] + { "@", "F", 'F', Block.stoneOvenIdle, '@', "plateSteel" })); + // SteamPiston + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(itemEngine, 1, 0), new Object[] + { "GGG", "VPV", "@T@", + 'T', new ItemStack(BasicUtilitiesMain.parts, 1, 1), + 'G', BasicUtilitiesMain.rod, '@', "plateSteel", + 'P', Block.pistonBase, + 'V', new ItemStack(BasicUtilitiesMain.parts, 1, 7), + 'M', "motor" })); + } } diff --git a/src/common/dark/SteamPower/boiler/BlockBoiler.java b/src/common/dark/SteamPower/boiler/BlockBoiler.java new file mode 100644 index 00000000..c8074359 --- /dev/null +++ b/src/common/dark/SteamPower/boiler/BlockBoiler.java @@ -0,0 +1,117 @@ +package dark.SteamPower.boiler; + +import java.util.List; + +import net.minecraft.src.CreativeTabs; +import net.minecraft.src.EntityLiving; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.ItemStack; +import net.minecraft.src.Material; +import net.minecraft.src.MathHelper; +import net.minecraft.src.TileEntity; +import net.minecraft.src.World; +import universalelectricity.prefab.BlockMachine; +import dark.Library.Util.MetaGroupingHelper; +import dark.Library.prefab.TileEntityMachine; +import dark.SteamPower.ItemRenderHelperS; + +public class BlockBoiler extends BlockMachine +{ + + /** + * Quick enum to help sort out meta data info + */ + public enum Boilers + { + Basic("Boiler", TileEntityBoiler.class, -1), + e("", null, -1), + ee("", null, -1), + eee("", null, -1); + + public String name; + public Class ent; + public int gui; + + private Boilers(String name, Class tileEntity, int gui) + { + this.name = name; + this.gui = gui; + this.ent = tileEntity; + } + } + + public BlockBoiler(int par1) + { + super("Boilers", par1, Material.iron); + this.setRequiresSelfNotify(); + this.setCreativeTab(CreativeTabs.tabBlock); + this.setHardness(1f); + this.setResistance(3f); + } + + @Override + public int damageDropped(int metadata) + { + return MetaGroupingHelper.getGroupStartMeta(MetaGroupingHelper.getGrouping(metadata)); + } + + /** + * Called upon block activation (left or right click on the block.). The + * three integers represent x,y,z of the block. + */ + @Override + public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player) + { + return false; + } + + @Override + public TileEntity createNewTileEntity(World var1, int meta) + { + try + { + return Boilers.values()[MetaGroupingHelper.getGrouping(meta)].ent.newInstance(); + } + catch (Exception e) + { + e.printStackTrace(); + return null; + } + } + + /** + * Called when the block is placed in the world. + */ + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving user) + { + int angle = MathHelper.floor_double((user.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int metadata = world.getBlockMetadata(x, y, z); + TileEntityMachine ent = (TileEntityMachine) world.getBlockTileEntity(x, y, z); + // world.setBlockMetadata(x, y, z, angle); + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public int getRenderType() + { + return ItemRenderHelperS.renderID; + } + + @Override + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) + { + par3List.add(new ItemStack(par1, 1, 0)); + } +} diff --git a/src/common/dark/SteamPower/boiler/TileEntityBoiler.java b/src/common/dark/SteamPower/boiler/TileEntityBoiler.java index 6553f1e1..0a3a47a4 100644 --- a/src/common/dark/SteamPower/boiler/TileEntityBoiler.java +++ b/src/common/dark/SteamPower/boiler/TileEntityBoiler.java @@ -1,4 +1,5 @@ package dark.SteamPower.boiler; + import net.minecraft.src.Block; import net.minecraft.src.EntityPlayer; import net.minecraft.src.INetworkManager; @@ -11,256 +12,258 @@ import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; import dark.BasicUtilities.api.IProducer; +import dark.BasicUtilities.api.IReadOut; import dark.BasicUtilities.api.IStorageTank; import dark.BasicUtilities.api.Liquid; import dark.BasicUtilities.api.MHelper; import dark.Library.prefab.TileEntityMachine; import dark.SteamPower.SteamPowerMain; -public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiver,IProducer, IStorageTank +public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiver, IProducer, IStorageTank, IReadOut { - public int steam = 0; - public int water = 0; - public int heat = 0; - public int hullHeat = 0; - public int heatMax = 4500; - public TileEntity[] connectedBlocks = {null,null,null,null,null,null}; - public int tankCount = 0; - public int tickCount = 0; - - //----------------------------- - //Update stuff - //----------------------------- - @Override - public void updateEntity() - { - //update connection list used for rendering - this.connectedBlocks = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - this.tankCount = 0; - for(int i =0; i < connectedBlocks.length; i++) - { - if(connectedBlocks[i] != null) - { - tankCount++; - } - }//end connection update - if(tickCount++ >= 10 && !worldObj.isRemote) - { - tickCount = 0; - - TileEntity ent = worldObj.getBlockTileEntity(xCoord, yCoord-1, zCoord); - if(ent instanceof IProducer && ((IProducer) ent).canProduceLiquid(Liquid.HEAT, ForgeDirection.UP)) - { - this.heat = (int) Math.min(((IProducer)ent).onProduceLiquid(Liquid.HEAT, 250, ForgeDirection.UP)+this.heat,4500); - }else - if(worldObj.getBlockId(xCoord, yCoord-1, zCoord) == Block.lavaStill.blockID) - { - this.heat = Math.min(90+heat,2000); - } - if(hullHeat < 10000) - { - int mHeat = 10000 - hullHeat; - int hHeat = mHeat - Math.max((mHeat - this.heat),0); - hullHeat = Math.min(hullHeat + hHeat,10000); - this.heat -=hHeat; - }else - { - if(heat >= 2000 && this.water >= 1 && this.steam < this.getLiquidCapacity(Liquid.STEAM)) - { - this.water--; - this.steam = Math.min(this.steam +20,this.getLiquidCapacity(Liquid.STEAM)); - this.heat -= 2000; - } - this.hullHeat-=5; - } - this.water = MHelper.shareLiquid(worldObj,xCoord, yCoord, zCoord,this.water,this.getLiquidCapacity(Liquid.WATER), Liquid.WATER); - this.steam = MHelper.shareLiquid(worldObj,xCoord, yCoord, zCoord,this.steam,this.getLiquidCapacity(Liquid.STEAM), Liquid.STEAM); - } - super.updateEntity(); - } - //----------------------------- - //Liquid stuff - //----------------------------- - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) - { - if(type == Liquid.WATER) - { - if(this.water < this.getLiquidCapacity(Liquid.WATER)) - { - int rej = Math.max((this.water + vol) - this.getLiquidCapacity(Liquid.WATER), 0); - this.water += vol - rej; - return rej; - } - else - { - TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord+1, zCoord); - if( te instanceof IStorageTank) - { - return ((IStorageTank)te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); - } - } - }else - if(type == Liquid.STEAM) - { - if(this.steam < this.getLiquidCapacity(Liquid.STEAM)) - { - int rej = Math.max((this.steam + vol) - this.getLiquidCapacity(Liquid.STEAM), 0); - this.steam += vol - rej; - return rej; - } - else - { - TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord-1, zCoord); - if( te instanceof IStorageTank) - { - return ((IStorageTank)te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); - } - } - } - return vol; - } + public int steam = 0; + public int water = 0; + public int heat = 0; + public int hullHeat = 0; + public int heatMax = 4500; + public TileEntity[] connectedBlocks = + { null, null, null, null, null, null }; + public int tankCount = 0; + public int tickCount = 0; - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection s) { - if(type == Liquid.WATER) - { - return true; - }else - if(type == Liquid.STEAM && s == ForgeDirection.UNKNOWN) - { - return true; - } - return false; - } - - @Override - public int getStoredLiquid(Liquid type) { - if(type == Liquid.WATER) - { - return this.water; - }else - if(type == Liquid.STEAM) - { - return this.steam; - } - return 0; - } - - @Override - public int getLiquidCapacity(Liquid type) { - if(type == Liquid.WATER) - { - return 14; - }else - if(type == Liquid.STEAM) - { - return 140; - } - return 0; - } - - @Override - public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.STEAM) - { - //TODO setup the actual math for this - if(vol < this.steam) - { - this.steam -= vol; - return vol; - }else - if(this.steam >= 1) - { - this.steam -= 1; - return 1; - } - } - return 0; - } - - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } - - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } - - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.STEAM) - { - return 100; - } - return 0; - } - //----------------------------- - //Data - //----------------------------- - public Object[] getSendData() - { - return new Object[]{this.water,this.steam,this.heat,this.hullHeat}; - } - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput dataStream) { - try{ - this.water = dataStream.readInt(); - this.steam = dataStream.readInt(); - this.heat = dataStream.readInt(); - this.hullHeat = dataStream.readInt(); - }catch(Exception e) - { - e.printStackTrace(); - } - - } - @Override - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("water", this.water); - par1NBTTagCompound.setInteger("steam", this.steam); - par1NBTTagCompound.setInteger("heat", this.heat); - par1NBTTagCompound.setInteger("hullHeat", this.hullHeat); - } - - @Override - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.water = par1NBTTagCompound.getInteger("water"); - this.steam = par1NBTTagCompound.getInteger("steam"); - this.heat = par1NBTTagCompound.getInteger("heat"); - this.hullHeat = par1NBTTagCompound.getInteger("hullHeat"); - } + // ----------------------------- + // Update stuff + // ----------------------------- @Override - public boolean needUpdate() - { + public void updateEntity() + { + // update connection list used for rendering + this.connectedBlocks = MHelper.getSourounding(worldObj, xCoord, yCoord, zCoord); + this.tankCount = 0; + for (int i = 0; i < connectedBlocks.length; i++) + { + if (connectedBlocks[i] != null) + { + tankCount++; + } + }// end connection update + if (tickCount++ >= 10 && !worldObj.isRemote) + { + tickCount = 0; + + TileEntity ent = worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord); + if (ent instanceof IProducer && ((IProducer) ent).canProduceLiquid(Liquid.HEAT, ForgeDirection.UP)) + { + this.heat = (int) Math.min(((IProducer) ent).onProduceLiquid(Liquid.HEAT, 250, ForgeDirection.UP) + this.heat, 4500); + } + else if (worldObj.getBlockId(xCoord, yCoord - 1, zCoord) == Block.lavaStill.blockID) + { + this.heat = Math.min(90 + heat, 2000); + } + if (hullHeat < 10000) + { + int mHeat = 10000 - hullHeat; + int hHeat = mHeat - Math.max((mHeat - this.heat), 0); + hullHeat = Math.min(hullHeat + hHeat, 10000); + this.heat -= hHeat; + } + else + { + if (heat >= 2000 && this.water >= 1 && this.steam < this.getLiquidCapacity(Liquid.STEAM)) + { + this.water--; + this.steam = Math.min(this.steam + 20, this.getLiquidCapacity(Liquid.STEAM)); + this.heat -= 2000; + } + this.hullHeat -= 5; + } + this.water = MHelper.shareLiquid(worldObj, xCoord, yCoord, zCoord, this.water, this.getLiquidCapacity(Liquid.WATER), Liquid.WATER); + this.steam = MHelper.shareLiquid(worldObj, xCoord, yCoord, zCoord, this.steam, this.getLiquidCapacity(Liquid.STEAM), Liquid.STEAM); + } + super.updateEntity(); + } + + // ----------------------------- + // Liquid stuff + // ----------------------------- + @Override + public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) + { + if (type == Liquid.WATER) + { + if (this.water < this.getLiquidCapacity(Liquid.WATER)) + { + int rej = Math.max((this.water + vol) - this.getLiquidCapacity(Liquid.WATER), 0); + this.water += vol - rej; + return rej; + } + else + { + TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); + if (te instanceof IStorageTank) { return ((IStorageTank) te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); } + } + } + else if (type == Liquid.STEAM) + { + if (this.steam < this.getLiquidCapacity(Liquid.STEAM)) + { + int rej = Math.max((this.steam + vol) - this.getLiquidCapacity(Liquid.STEAM), 0); + this.steam += vol - rej; + return rej; + } + else + { + TileEntity te = worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord); + if (te instanceof IStorageTank) { return ((IStorageTank) te).onReceiveLiquid(type, vol, ForgeDirection.UNKNOWN); } + } + } + return vol; + } + + @Override + public boolean canRecieveLiquid(Liquid type, ForgeDirection s) + { + if (type == Liquid.WATER) + { + return true; + } + else if (type == Liquid.STEAM && s == ForgeDirection.UNKNOWN) { return true; } return false; } + + @Override + public int getStoredLiquid(Liquid type) + { + if (type == Liquid.WATER) + { + return this.water; + } + else if (type == Liquid.STEAM) { return this.steam; } + return 0; + } + + @Override + public int getLiquidCapacity(Liquid type) + { + if (type == Liquid.WATER) + { + return 14; + } + else if (type == Liquid.STEAM) { return 140; } + return 0; + } + + @Override + public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) + { + if (type == Liquid.STEAM) + { + // TODO setup the actual math for this + if (vol < this.steam) + { + this.steam -= vol; + return vol; + } + else if (this.steam >= 1) + { + this.steam -= 1; + return 1; + } + } + return 0; + } + + @Override + public boolean canProduceLiquid(Liquid type, ForgeDirection side) + { + if (type == Liquid.STEAM) { return true; } + return false; + } + + @Override + public boolean canProducePresure(Liquid type, ForgeDirection side) + { + if (type == Liquid.STEAM) { return true; } + return false; + } + + @Override + public int presureOutput(Liquid type, ForgeDirection side) + { + if (type == Liquid.STEAM) { return 100; } + return 0; + } + + // ----------------------------- + // Data + // ----------------------------- + public Object[] getSendData() + { + return new Object[] + { this.water, this.steam, this.heat, this.hullHeat }; + } + + @Override + public void handlePacketData(INetworkManager network, int packetType, + Packet250CustomPayload packet, EntityPlayer player, + ByteArrayDataInput dataStream) + { + try + { + this.water = dataStream.readInt(); + this.steam = dataStream.readInt(); + this.heat = dataStream.readInt(); + this.hullHeat = dataStream.readInt(); + } + catch (Exception e) + { + e.printStackTrace(); + } + + } + + @Override + public void writeToNBT(NBTTagCompound par1NBTTagCompound) + { + super.writeToNBT(par1NBTTagCompound); + par1NBTTagCompound.setInteger("water", this.water); + par1NBTTagCompound.setInteger("steam", this.steam); + par1NBTTagCompound.setInteger("heat", this.heat); + par1NBTTagCompound.setInteger("hullHeat", this.hullHeat); + } + + @Override + public void readFromNBT(NBTTagCompound par1NBTTagCompound) + { + super.readFromNBT(par1NBTTagCompound); + this.water = par1NBTTagCompound.getInteger("water"); + this.steam = par1NBTTagCompound.getInteger("steam"); + this.heat = par1NBTTagCompound.getInteger("heat"); + this.hullHeat = par1NBTTagCompound.getInteger("hullHeat"); + } + + @Override + public boolean needUpdate() + { + return false; + } + @Override public int getSizeInventory() { return 0; } + @Override public String getChannel() { return SteamPowerMain.channel; } - - + + @Override + public String getMeterReading(EntityPlayer user, ForgeDirection side) + { + return this.water + "B WATER " + this.steam + "B STEAM " + this.heat + "/" + this.heatMax + " Heat"; + } + } diff --git a/src/common/dark/SteamPower/boiler/TileEntityBoilerPipe.java b/src/common/dark/SteamPower/boiler/TileEntityBoilerPipe.java new file mode 100644 index 00000000..0c1b81bf --- /dev/null +++ b/src/common/dark/SteamPower/boiler/TileEntityBoilerPipe.java @@ -0,0 +1,8 @@ +package dark.SteamPower.boiler; + +import net.minecraft.src.TileEntity; + +public class TileEntityBoilerPipe extends TileEntity +{ + +} diff --git a/src/common/dark/SteamPower/SteamMachines.java b/src/common/dark/SteamPower/firebox/BlockHeaters.java similarity index 56% rename from src/common/dark/SteamPower/SteamMachines.java rename to src/common/dark/SteamPower/firebox/BlockHeaters.java index 97ec78f7..d3e575e5 100644 --- a/src/common/dark/SteamPower/SteamMachines.java +++ b/src/common/dark/SteamPower/firebox/BlockHeaters.java @@ -1,25 +1,45 @@ -package dark.SteamPower; +package dark.SteamPower.firebox; -import java.util.Random; +import java.util.List; import net.minecraft.src.CreativeTabs; -import net.minecraft.src.EntityItem; import net.minecraft.src.EntityLiving; import net.minecraft.src.EntityPlayer; import net.minecraft.src.ItemStack; import net.minecraft.src.Material; import net.minecraft.src.MathHelper; -import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; import net.minecraft.src.World; +import dark.Library.Util.MetaGroupingHelper; import dark.Library.prefab.TileEntityMachine; -import dark.SteamPower.boiler.TileEntityBoiler; -import dark.SteamPower.firebox.TileEntityFireBox; +import dark.SteamPower.ItemRenderHelperS; +import dark.SteamPower.SteamPowerMain; -public class SteamMachines extends universalelectricity.prefab.BlockMachine +public class BlockHeaters extends universalelectricity.prefab.BlockMachine { + /** + * Quick enum to help sort out meta data info + */ + public enum Burners + { + Coal("FireBox", TileEntityFireBox.class, 0), + Liquid("LiquidBurner", TileEntityLiquidBurner.class, -1), + Lava("LavaBuffer", TileEntityLavaBuffer.class, -1), + Bio("BioFurnace", null, -1); - public SteamMachines(int par1) + public String name; + public Class ent; + public int gui; + + private Burners(String name, Class tileEntity, int gui) + { + this.name = name; + this.gui = gui; + this.ent = tileEntity; + } + } + + public BlockHeaters(int par1) { super("machine", par1, Material.iron); this.setRequiresSelfNotify(); @@ -31,7 +51,7 @@ public class SteamMachines extends universalelectricity.prefab.BlockMachine @Override public int damageDropped(int metadata) { - return metadata; + return MetaGroupingHelper.getGroupStartMeta(MetaGroupingHelper.getGrouping(metadata)); } /** @@ -55,9 +75,15 @@ public class SteamMachines extends universalelectricity.prefab.BlockMachine @Override public TileEntity createNewTileEntity(World var1, int meta) { - if (meta < 4) { return new TileEntityFireBox();} - if (meta == 4){return new TileEntityBoiler();} - return null; + try + { + return Burners.values()[MetaGroupingHelper.getGrouping(meta)].ent.newInstance(); + } + catch (Exception e) + { + e.printStackTrace(); + return null; + } } /** @@ -69,12 +95,13 @@ public class SteamMachines extends universalelectricity.prefab.BlockMachine int angle = MathHelper.floor_double((user.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int metadata = world.getBlockMetadata(x, y, z); TileEntityMachine ent = (TileEntityMachine) world.getBlockTileEntity(x, y, z); - - if(ent instanceof TileEntityFireBox) + + if (ent instanceof TileEntityFireBox) { - world.setBlockMetadata(x, y, z, angle); + world.setBlockMetadata(x, y, z, angle); } } + @Override public boolean isOpaqueCube() { @@ -93,4 +120,9 @@ public class SteamMachines extends universalelectricity.prefab.BlockMachine return ItemRenderHelperS.renderID; } + @Override + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) + { + par3List.add(new ItemStack(par1, 1, 0)); + } } diff --git a/src/common/dark/SteamPower/firebox/TileEntityFireBox.java b/src/common/dark/SteamPower/firebox/TileEntityFireBox.java index dfc98f6b..7c0fd4d1 100644 --- a/src/common/dark/SteamPower/firebox/TileEntityFireBox.java +++ b/src/common/dark/SteamPower/firebox/TileEntityFireBox.java @@ -30,7 +30,6 @@ public class TileEntityFireBox extends TileEntityMachine implements IPacketRecei { null, null, null, null, null, null }; private int connectedUnits = 0; public static int maxGenerateRate = 250; - // Current generation rate based on hull heat. In TICKS. public int generateRate = 0; int count = 0; public int itemCookTime = 0; @@ -243,14 +242,14 @@ public class TileEntityFireBox extends TileEntityMachine implements IPacketRecei @Override public int onProduceLiquid(Liquid type, int maxVol, ForgeDirection side) { - if(type == Liquid.HEAT){return Math.min(this.generateRate,maxVol);} + if (type == Liquid.HEAT) { return Math.min(this.generateRate, maxVol); } return 0; } @Override public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.HEAT){return true;} + if (type == Liquid.HEAT) { return true; } return false; } diff --git a/src/common/dark/SteamPower/firebox/TileEntityLavaBuffer.java b/src/common/dark/SteamPower/firebox/TileEntityLavaBuffer.java new file mode 100644 index 00000000..75d021f8 --- /dev/null +++ b/src/common/dark/SteamPower/firebox/TileEntityLavaBuffer.java @@ -0,0 +1,8 @@ +package dark.SteamPower.firebox; + +import net.minecraft.src.TileEntity; + +public class TileEntityLavaBuffer extends TileEntity +{ + +} diff --git a/src/common/dark/SteamPower/firebox/TileEntityLiquidBurner.java b/src/common/dark/SteamPower/firebox/TileEntityLiquidBurner.java new file mode 100644 index 00000000..e0026d5c --- /dev/null +++ b/src/common/dark/SteamPower/firebox/TileEntityLiquidBurner.java @@ -0,0 +1,8 @@ +package dark.SteamPower.firebox; + +import net.minecraft.src.TileEntity; + +public class TileEntityLiquidBurner extends TileEntity +{ + +} diff --git a/src/common/dark/SteamPower/steamengine/BlockSteamPiston.java b/src/common/dark/SteamPower/steamengine/BlockSteamPiston.java index 4646e632..0669ac2f 100644 --- a/src/common/dark/SteamPower/steamengine/BlockSteamPiston.java +++ b/src/common/dark/SteamPower/steamengine/BlockSteamPiston.java @@ -97,7 +97,7 @@ public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine public TileEntity createNewTileEntity(World world, int metadata) { if (metadata >= 0 && metadata < 4) { return new TileEntitySteamPiston(); } - if (metadata == 14) { return new TileEntitytopGen(); } + if (metadata == 14) {} return null; } diff --git a/src/common/dark/SteamPower/steamengine/ItemSteamPiston.java b/src/common/dark/SteamPower/steamengine/ItemSteamPiston.java index f7a0cd14..7564094f 100644 --- a/src/common/dark/SteamPower/steamengine/ItemSteamPiston.java +++ b/src/common/dark/SteamPower/steamengine/ItemSteamPiston.java @@ -41,7 +41,7 @@ public class ItemSteamPiston extends Item { else { ++y; - Block piston = SteamPowerMain.engine; + Block piston = SteamPowerMain.piston; if (player.canPlayerEdit(x, y, z, par7, stak) && player.canPlayerEdit(x, y + 1, z, par7, stak)) { diff --git a/src/common/dark/SteamPower/steamengine/TileEntitySteamPiston.java b/src/common/dark/SteamPower/steamengine/TileEntitySteamPiston.java index 48991925..29ba1cf3 100644 --- a/src/common/dark/SteamPower/steamengine/TileEntitySteamPiston.java +++ b/src/common/dark/SteamPower/steamengine/TileEntitySteamPiston.java @@ -11,289 +11,295 @@ import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; import dark.BasicUtilities.api.IConsumer; -import dark.BasicUtilities.api.IProducer; import dark.BasicUtilities.api.IForce; +import dark.BasicUtilities.api.IProducer; +import dark.BasicUtilities.api.IReadOut; import dark.BasicUtilities.api.Liquid; import dark.Library.prefab.TileEntityMachine; import dark.SteamPower.SteamPowerMain; -public class TileEntitySteamPiston extends TileEntityMachine implements IPacketReceiver,IConsumer,IProducer,IForce +public class TileEntitySteamPiston extends TileEntityMachine implements IPacketReceiver, IConsumer, IProducer, IForce, IReadOut { - public int force = 0; - public int aForce = 0; - public int bForce = 0; - private int frictionLoad = 10; - public int steam = 0; - public int water = 0; - public int maxWater = 2; - public int maxSteam = 10; - public int pos = 0; //max at 7 - private int tickCount = 0; - private int runTime = 0; - private int genRate = 0;//max 100 - private int posCount = 0; - public int tCount = 0; - private ForgeDirection frontDir; - public TileEntity ff; - public TileEntity bb; - private int pWater = 0; + public int force = 0; + public int aForce = 0; + public int bForce = 0; + private int frictionLoad = 10; + public int steam = 0; + public int water = 0; + public int maxWater = 2; + public int maxSteam = 10; + public int pos = 0; // max at 7 + private int tickCount = 0; + private int runTime = 0; + private int genRate = 0;// max 100 + private int posCount = 0; + public int tCount = 0; + private ForgeDirection frontDir; + public TileEntity ff; + public TileEntity bb; + private int pWater = 0; private int pSteam = 0; private int pForce = 0; public int pCount = 0; - public boolean running= false; - - @Override - public void updateEntity() - { - super.updateEntity(); - if(tickCount++ >=10) - {tickCount = 0; - //this.pos += 1; if(pos >= 8){pos = 0;} - //++tCount;if(tCount > 120){tCount = 0;} - - int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - int nMeta = 0; - - switch(meta) - { - case 0: nMeta = 2;break; - case 1: nMeta = 5;break; - case 2: nMeta = 3;break; - case 3: nMeta = 4;break; - } - frontDir = ForgeDirection.getOrientation(nMeta); - ff = worldObj.getBlockTileEntity(xCoord+frontDir.offsetX, yCoord+1, zCoord+frontDir.offsetZ); - bb = worldObj.getBlockTileEntity(xCoord+frontDir.getOpposite().offsetX, yCoord+1, zCoord+frontDir.getOpposite().offsetZ); - if(this.runTime > 0) - { - this.running = true; - }else - { - this.running = false; - } - if(this.running) - { - int countA = 10 - (genRate/10); - if(posCount++ >=countA) - { - posCount = 0; - pos += 1;if(pos > 7){pos =0;} - } - } - if(!worldObj.isRemote) - { - if(this.runTime < 1 && this.steam > 0) - { - this.steam--; - this.runTime=60; - } - if(bb instanceof IForce) - { - if(((IForce) bb).canOutputSide(frontDir)) - { - this.bForce = ((IForce) bb).getForce(); - }else - if( bb instanceof TileEntitySteamPiston) - { - if(((TileEntitySteamPiston) bb).getMeta() == this.getMeta()) - { - this.bForce = ((TileEntitySteamPiston) bb).getForce(); - } - } - else - { - this.bForce = 0; - } - } - if(this.runTime > 0) - { - genRate=Math.min(genRate + 1, 100); - this.runTime-=1; - this.force = Math.min(genRate * 10,1000); - this.aForce = Math.max(force - this.frictionLoad+bForce,0); - } - if(runTime == 0 && this.steam == 0) - { - genRate = Math.max(genRate--, 0); - force= Math.max(force-=10, 0);; - } - - if(ff instanceof IForce) - { - if(((IForce) ff).canInputSide(frontDir.getOpposite())) - { - ((IForce) ff).applyForce(this.aForce); - }else - { - - } - } - pWater = this.water; - pSteam = this.steam; - pForce = this.force; - - - } - } - } - - - //------------------- - //Liquid and mechanical stuff - //---------------- - @Override - public int getForceSide(ForgeDirection side) { - return aForce; - } + public boolean running = false; - @Override - public boolean canOutputSide(ForgeDirection side) { - if(frontDir.getOpposite() == side) - { - return true; - } - return false; - } + @Override + public void updateEntity() + { + super.updateEntity(); + if (tickCount++ >= 10) + { + tickCount = 0; + // this.pos += 1; if(pos >= 8){pos = 0;} + // ++tCount;if(tCount > 120){tCount = 0;} - @Override - public boolean canInputSide(ForgeDirection side) { - if(frontDir == side) - { - return true; - } - return false; - } + int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + int nMeta = 0; - @Override - public int applyForce(int force) { - this.bForce = force; - return aForce; - } + switch (meta) + { + case 0: + nMeta = 2; + break; + case 1: + nMeta = 5; + break; + case 2: + nMeta = 3; + break; + case 3: + nMeta = 4; + break; + } + frontDir = ForgeDirection.getOrientation(nMeta); + ff = worldObj.getBlockTileEntity(xCoord + frontDir.offsetX, yCoord + 1, zCoord + frontDir.offsetZ); + bb = worldObj.getBlockTileEntity(xCoord + frontDir.getOpposite().offsetX, yCoord + 1, zCoord + frontDir.getOpposite().offsetZ); + if (this.runTime > 0) + { + this.running = true; + } + else + { + this.running = false; + } + if (this.running) + { + int countA = 10 - (genRate / 10); + if (posCount++ >= countA) + { + posCount = 0; + pos += 1; + if (pos > 7) + { + pos = 0; + } + } + } + if (!worldObj.isRemote) + { + if (this.runTime < 1 && this.steam > 0) + { + this.steam--; + this.runTime = 60; + } + if (bb instanceof IForce) + { + if (((IForce) bb).canOutputSide(frontDir)) + { + this.bForce = ((IForce) bb).getForce(); + } + else if (bb instanceof TileEntitySteamPiston) + { + if (((TileEntitySteamPiston) bb).getMeta() == this.getMeta()) + { + this.bForce = ((TileEntitySteamPiston) bb).getForce(); + } + } + else + { + this.bForce = 0; + } + } + if (this.runTime > 0) + { + genRate = Math.min(genRate + 1, 100); + this.runTime -= 1; + this.force = Math.min(genRate * 10, 1000); + this.aForce = Math.max(force - this.frictionLoad + bForce, 0); + } + if (runTime == 0 && this.steam == 0) + { + genRate = Math.max(genRate--, 0); + force = Math.max(force -= 10, 0); + ; + } - @Override - public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.WATER) - { - if(this.water > 0) - { - this.water -= 1; - return 1; - } - } - return 0; - } + if (ff instanceof IForce) + { + if (((IForce) ff).canInputSide(frontDir.getOpposite())) + { + ((IForce) ff).applyForce(this.aForce); + } + else + { - @Override - public boolean canProduceLiquid(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } + } + } + pWater = this.water; + pSteam = this.steam; + pForce = this.force; - @Override - public boolean canProducePresure(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return true; - } - return false; - } + } + } + } - @Override - public int presureOutput(Liquid type, ForgeDirection side) { - if(type == Liquid.WATER) - { - return 32; - } - return 0; - } + // ------------------- + // Liquid and mechanical stuff + // ---------------- + @Override + public int getForceSide(ForgeDirection side) + { + return aForce; + } - @Override - public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) { - if(type == Liquid.STEAM) - { - int rejectedSteam = Math.max((this.steam + vol) - this.maxSteam, 0); - this.steam += vol - rejectedSteam; - return rejectedSteam; - } - return 0; - } + @Override + public boolean canOutputSide(ForgeDirection side) + { + if (frontDir.getOpposite() == side) { return true; } + return false; + } - @Override - public boolean canRecieveLiquid(Liquid type, ForgeDirection forgeDirection) { - if(type == Liquid.STEAM) - { - return true; - } - return false; - } + @Override + public boolean canInputSide(ForgeDirection side) + { + if (frontDir == side) { return true; } + return false; + } - @Override - public int getStoredLiquid(Liquid type) { - if(type == Liquid.WATER) - { - return this.water; - }else - if(type == Liquid.STEAM) - { - return this.steam; - } - return 0; - } + @Override + public int applyForce(int force) + { + this.bForce = force; + return aForce; + } - @Override - public int getLiquidCapacity(Liquid type) { - if(type == Liquid.WATER) - { - return this.maxWater; - }else - if(type == Liquid.STEAM) - { - return this.maxSteam; - } - return 0; - } - //------------------- - //Data - //---------------- - public Object[] getSendData() - { - return new Object[]{steam,water,force,aForce,genRate,runTime}; - } - public boolean needUpdate() - { - if(this.pForce != this.force || this.pWater != this.water || this.pSteam != this.steam) - { - return true; - } - return false; - } - @Override - public void handlePacketData(INetworkManager network, int packetType, - Packet250CustomPayload packet, EntityPlayer player, - ByteArrayDataInput dataStream) { - try - { - this.steam = dataStream.readInt(); - this.water = dataStream.readInt(); - this.force = dataStream.readInt(); - this.aForce = dataStream.readInt(); - this.genRate= dataStream.readInt(); - this.runTime = dataStream.readInt(); - ++pCount; - } - catch(Exception e) - { - System.out.print("SteamPistonDataFail"); - e.printStackTrace(); - } - - } - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); + @Override + public int onProduceLiquid(Liquid type, int vol, ForgeDirection side) + { + if (type == Liquid.WATER) + { + if (this.water > 0) + { + this.water -= 1; + return 1; + } + } + return 0; + } + + @Override + public boolean canProduceLiquid(Liquid type, ForgeDirection side) + { + if (type == Liquid.WATER) { return true; } + return false; + } + + @Override + public boolean canProducePresure(Liquid type, ForgeDirection side) + { + if (type == Liquid.WATER) { return true; } + return false; + } + + @Override + public int presureOutput(Liquid type, ForgeDirection side) + { + if (type == Liquid.WATER) { return 32; } + return 0; + } + + @Override + public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) + { + if (type == Liquid.STEAM) + { + int rejectedSteam = Math.max((this.steam + vol) - this.maxSteam, 0); + this.steam += vol - rejectedSteam; + return rejectedSteam; + } + return 0; + } + + @Override + public boolean canRecieveLiquid(Liquid type, ForgeDirection forgeDirection) + { + if (type == Liquid.STEAM) { return true; } + return false; + } + + @Override + public int getStoredLiquid(Liquid type) + { + if (type == Liquid.WATER) + { + return this.water; + } + else if (type == Liquid.STEAM) { return this.steam; } + return 0; + } + + @Override + public int getLiquidCapacity(Liquid type) + { + if (type == Liquid.WATER) + { + return this.maxWater; + } + else if (type == Liquid.STEAM) { return this.maxSteam; } + return 0; + } + + // ------------------- + // Data + // ---------------- + public Object[] getSendData() + { + return new Object[] + { steam, water, force, aForce, genRate, runTime }; + } + + public boolean needUpdate() + { + if (this.pForce != this.force || this.pWater != this.water || this.pSteam != this.steam) { return true; } + return false; + } + + @Override + public void handlePacketData(INetworkManager network, int packetType, + Packet250CustomPayload packet, EntityPlayer player, + ByteArrayDataInput dataStream) + { + try + { + this.steam = dataStream.readInt(); + this.water = dataStream.readInt(); + this.force = dataStream.readInt(); + this.aForce = dataStream.readInt(); + this.genRate = dataStream.readInt(); + this.runTime = dataStream.readInt(); + ++pCount; + } + catch (Exception e) + { + System.out.print("SteamPistonDataFail"); + e.printStackTrace(); + } + + } + + public void readFromNBT(NBTTagCompound par1NBTTagCompound) + { + super.readFromNBT(par1NBTTagCompound); this.runTime = par1NBTTagCompound.getInteger("time"); this.genRate = par1NBTTagCompound.getInteger("gen"); this.steam = par1NBTTagCompound.getInteger("steam"); @@ -306,30 +312,31 @@ public class TileEntitySteamPiston extends TileEntityMachine implements IPacketR public void writeToNBT(NBTTagCompound par1NBTTagCompound) { super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("time", (int)this.runTime); - par1NBTTagCompound.setInteger("gen", (int)this.genRate); - par1NBTTagCompound.setInteger("steam", (int)this.steam); - par1NBTTagCompound.setInteger("water", (int)this.water); - + par1NBTTagCompound.setInteger("time", (int) this.runTime); + par1NBTTagCompound.setInteger("gen", (int) this.genRate); + par1NBTTagCompound.setInteger("steam", (int) this.steam); + par1NBTTagCompound.setInteger("water", (int) this.water); + } + @Override + public int getAnimationPos() + { + // TODO Auto-generated method stub + return this.pos; + } - @Override - public int getAnimationPos() { - // TODO Auto-generated method stub - return this.pos; - } - - - @Override - public int getForce() { - // TODO Auto-generated method stub - return this.force; - } - public int getMeta() { - return worldObj.getBlockMetadata(xCoord, yCoord, zCoord); - } + @Override + public int getForce() + { + // TODO Auto-generated method stub + return this.force; + } + public int getMeta() + { + return worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + } @Override public String getChannel() @@ -337,10 +344,15 @@ public class TileEntitySteamPiston extends TileEntityMachine implements IPacketR return SteamPowerMain.channel; } - @Override public int getSizeInventory() { return 0; } + + @Override + public String getMeterReading(EntityPlayer user, ForgeDirection side) + { + return this.aForce+"N Out "+this.bForce+"N In"; + } } diff --git a/src/common/dark/SteamPower/steamengine/TileEntitytopGen.java b/src/common/dark/SteamPower/steamengine/TileEntitytopGen.java deleted file mode 100644 index afdf94b9..00000000 --- a/src/common/dark/SteamPower/steamengine/TileEntitytopGen.java +++ /dev/null @@ -1,32 +0,0 @@ -package dark.SteamPower.steamengine; - -import dark.Library.prefab.TileEntityMachine; -import dark.SteamPower.SteamPowerMain; - -public class TileEntitytopGen extends TileEntityMachine { - - @Override - public Object[] getSendData() - { - return null; - } - - @Override - public boolean needUpdate() - { - return false; - } - - @Override - public String getChannel() - { - return SteamPowerMain.channel; - } - - @Override - public int getSizeInventory() - { - return 0; - } - -}