diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java index 7d008ac5..1864d81f 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java @@ -85,7 +85,7 @@ public class NetworkFluidContainers extends NetworkFluidTiles /* Fill all tanks on this level */ for (INetworkFluidPart part : parts) { - ((INetworkFluidPart) part).drainTankContent(0, Integer.MAX_VALUE, true); + part.drainTankContent(0, Integer.MAX_VALUE, true); fillStack.amount -= part.fillTankContent(0, FluidHelper.getStack(fillStack, fillvolume), true); } } diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java index 38e42274..a159adaf 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java @@ -45,6 +45,7 @@ public class NetworkPipes extends NetworkFluidTiles return new NetworkPipes(this.color); } + @Override public boolean isPartOfNetwork(TileEntity ent) { return super.isPartOfNetwork(ent) || this.pressureLoads.containsKey(ent) || this.pressureProducers.containsKey(ent); diff --git a/src/dark/fluid/client/ClientProxy.java b/src/dark/fluid/client/ClientProxy.java index cbdd786d..f2bfdc61 100644 --- a/src/dark/fluid/client/ClientProxy.java +++ b/src/dark/fluid/client/ClientProxy.java @@ -14,6 +14,7 @@ import dark.fluid.client.render.RenderSink; import dark.fluid.client.render.RenderTank; import dark.fluid.client.render.pipe.RenderPipe; import dark.fluid.common.CommonProxy; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityReleaseValve; import dark.fluid.common.machines.TileEntitySink; @@ -45,9 +46,9 @@ public class ClientProxy extends CommonProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityConstructionPump.class, new RenderConstructionPump()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank()); - MinecraftForgeClient.registerItemRenderer(FluidMech.recipeLoader.blockPipe.blockID, new ItemRenderHelper()); - MinecraftForgeClient.registerItemRenderer(FluidMech.recipeLoader.blockGenPipe.blockID, new ItemRenderHelper()); - MinecraftForgeClient.registerItemRenderer(FluidMech.recipeLoader.blockReleaseValve.blockID, new ItemRenderHelper()); + MinecraftForgeClient.registerItemRenderer(FMRecipeLoader.blockPipe.blockID, new ItemRenderHelper()); + MinecraftForgeClient.registerItemRenderer(FMRecipeLoader.blockGenPipe.blockID, new ItemRenderHelper()); + MinecraftForgeClient.registerItemRenderer(FMRecipeLoader.blockReleaseValve.blockID, new ItemRenderHelper()); RenderingRegistry.registerBlockHandler(new BlockRenderHelper()); } diff --git a/src/dark/fluid/client/render/BlockRenderHelper.java b/src/dark/fluid/client/render/BlockRenderHelper.java index 293cfe92..98700fc6 100644 --- a/src/dark/fluid/client/render/BlockRenderHelper.java +++ b/src/dark/fluid/client/render/BlockRenderHelper.java @@ -12,10 +12,12 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelConstructionPump; import dark.fluid.client.model.ModelPump; import dark.fluid.client.model.ModelSink; import dark.fluid.client.model.ModelTankSide; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; import dark.mech.client.model.ModelGearRod; import dark.mech.client.model.ModelGenerator; @@ -36,26 +38,26 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glPushMatrix(); - if (block.blockID == FluidMech.recipeLoader.blockMachine.blockID && metadata < 4) + if (block.blockID == FMRecipeLoader.blockMachine.blockID && metadata < 4) { - GL11.glTranslatef((float) 0.0F, (float) 1.1F, (float) 0.0F); + GL11.glTranslatef(0.0F, 1.1F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "pumps/WaterPump.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pumps/WaterPump.png")); modelPump.render(0.0725F); modelPump.renderMotion(0.0725F, 0); } - else if (block.blockID == FluidMech.recipeLoader.blockSink.blockID) + else if (block.blockID == FMRecipeLoader.blockSink.blockID) { - GL11.glTranslatef((float) 0.0F, (float) .8F, (float) 0.0F); + GL11.glTranslatef(0.0F, .8F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "Sink.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "Sink.png")); sink.render(0.0565F); } - else if (block.blockID == FluidMech.recipeLoader.blockTank.blockID) + else if (block.blockID == FMRecipeLoader.blockTank.blockID) { FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.getDomain(), metadata == 1 ? "/textures/blocks/obsidian.png" : "/textures/blocks/iron_block.png")); - GL11.glTranslatef((float) 0.0F, (float) -0.9F, (float) 0.0F); + GL11.glTranslatef(0.0F, -0.9F, 0.0F); tank.render(0.0625F, false, false, false, false); GL11.glRotatef(90f, 0f, 1f, 0f); tank.render(0.0625F, false, false, false, false); @@ -64,25 +66,25 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler GL11.glRotatef(90f, 0f, 1f, 0f); tank.render(0.0625F, false, false, false, false); } - if (block.blockID == FluidMech.recipeLoader.blockRod.blockID) + if (block.blockID == FMRecipeLoader.blockRod.blockID) { - GL11.glTranslatef((float) 0.0F, (float) 1.5F, (float) 0.0F); + GL11.glTranslatef(0.0F, 1.5F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "mechanical/GearRod.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "mechanical/GearRod.png")); modelRod.render(0.0825F, 0); } - else if (block.blockID == FluidMech.recipeLoader.blockGenerator.blockID) + else if (block.blockID == FMRecipeLoader.blockGenerator.blockID) { - GL11.glTranslatef((float) 0.0F, (float) 1.0F, (float) 0.0F); + GL11.glTranslatef(0.0F, 1.0F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "mechanical/Generator.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "mechanical/Generator.png")); modelGen.render(null); } - else if (block.blockID == FluidMech.recipeLoader.blockConPump.blockID && metadata < 4) + else if (block.blockID == FMRecipeLoader.blockConPump.blockID && metadata < 4) { - GL11.glTranslatef((float) 0.0F, (float) 1.2F, (float) 0.0F); + GL11.glTranslatef(0.0F, 1.2F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "ConstructionPump.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "ConstructionPump.png")); conPump.render(0.0725F); conPump.renderMotor(0.0725F); @@ -90,17 +92,20 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler GL11.glPopMatrix(); } + @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { return false; } + @Override public boolean shouldRender3DInInventory() { return true; } + @Override public int getRenderId() { return renderID; diff --git a/src/dark/fluid/client/render/ItemRenderHelper.java b/src/dark/fluid/client/render/ItemRenderHelper.java index 9bf1d75d..f2f58e8f 100644 --- a/src/dark/fluid/client/render/ItemRenderHelper.java +++ b/src/dark/fluid/client/render/ItemRenderHelper.java @@ -10,8 +10,10 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelReleaseValve; import dark.fluid.client.render.pipe.RenderPipe; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; @SideOnly(Side.CLIENT) @@ -35,11 +37,11 @@ public class ItemRenderHelper implements IItemRenderer @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if (item.itemID == FluidMech.recipeLoader.blockPipe.blockID || item.itemID == FluidMech.recipeLoader.blockGenPipe.blockID) + if (item.itemID == FMRecipeLoader.blockPipe.blockID || item.itemID == FMRecipeLoader.blockGenPipe.blockID) { this.renderPipeItem((RenderBlocks) data[0], item, type == ItemRenderType.EQUIPPED); } - if (item.itemID == FluidMech.recipeLoader.blockReleaseValve.blockID) + if (item.itemID == FMRecipeLoader.blockReleaseValve.blockID) { this.renderReleaseValve((RenderBlocks) data[0], item.getItemDamage(), type == ItemRenderType.EQUIPPED); } @@ -73,7 +75,7 @@ public class ItemRenderHelper implements IItemRenderer public void renderReleaseValve(RenderBlocks renderer, int meta, boolean equ) { GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(pipe.getTexture(FluidMech.recipeLoader.blockPipe.blockID, 15)); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(pipe.getTexture(FMRecipeLoader.blockPipe.blockID, 15)); if (!equ) { GL11.glTranslatef(0.5F, -0.5F, 0.5F); @@ -88,7 +90,7 @@ public class ItemRenderHelper implements IItemRenderer pipe.SixPipe.renderBack(); pipe.SixPipe.renderMiddle(); } - FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "ReleaseValve.png")); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "ReleaseValve.png")); GL11.glRotatef(180f, 0f, 0f, 1f); if (!equ) { diff --git a/src/dark/fluid/client/render/RenderBoiler.java b/src/dark/fluid/client/render/RenderBoiler.java index 0b5fe467..dde99201 100644 --- a/src/dark/fluid/client/render/RenderBoiler.java +++ b/src/dark/fluid/client/render/RenderBoiler.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.core.prefab.helpers.ConnectionHelper; import dark.fluid.client.model.ModelCenterTank; import dark.fluid.client.model.ModelCornerTank; @@ -41,18 +42,18 @@ public class RenderBoiler extends RenderTileMachine int meta = 0; if (connected[5] == null && connected[3] == null && connected[4] == null && connected[2] == null || ((TileEntityBoiler) tileEntity).tankCount < 2) { - bindTextureByName(FluidMech.instance.PREFIX, FluidMech.MODEL_DIRECTORY + "tankTexture.png"); + bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "tankTexture.png"); model.generalRender(0.0625F); } else if (ConnectionHelper.corner(tileEntity) == 0 || ((TileEntityBoiler) tileEntity).tankCount > 2) { - bindTextureByName(FluidMech.instance.PREFIX, FluidMech.MODEL_DIRECTORY + "tankBlock.png"); + bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "tankBlock.png"); model2.renderBlock(0.0625F); } else { int corner = ConnectionHelper.corner(tileEntity); - bindTextureByName(FluidMech.instance.PREFIX, FluidMech.MODEL_DIRECTORY + "CornerTank.png"); + bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "CornerTank.png"); switch (corner) { case 1: diff --git a/src/dark/fluid/client/render/RenderConstructionPump.java b/src/dark/fluid/client/render/RenderConstructionPump.java index 0a3dbe99..4f81395e 100644 --- a/src/dark/fluid/client/render/RenderConstructionPump.java +++ b/src/dark/fluid/client/render/RenderConstructionPump.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelConstructionPump; import dark.fluid.common.FluidMech; import dark.fluid.common.pump.TileEntityConstructionPump; @@ -58,7 +59,7 @@ public class RenderConstructionPump extends RenderTileMachine @Override public ResourceLocation getTexture(int block, int meta) { - return new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "ConstructionPump.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "ConstructionPump.png"); } } \ No newline at end of file diff --git a/src/dark/fluid/client/render/RenderFurnace.java b/src/dark/fluid/client/render/RenderFurnace.java index 4c2ac973..8da548af 100644 --- a/src/dark/fluid/client/render/RenderFurnace.java +++ b/src/dark/fluid/client/render/RenderFurnace.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelFurnace; import dark.fluid.common.FluidMech; @@ -25,7 +26,7 @@ public class RenderFurnace extends RenderTileMachine @Override public void renderTileEntityAt(TileEntity te, double d, double d1, double d2, float d3) { - bindTextureByName(FluidMech.instance.PREFIX, FluidMech.MODEL_DIRECTORY + "Furnace.png"); + bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "Furnace.png"); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); diff --git a/src/dark/fluid/client/render/RenderGearPiston.java b/src/dark/fluid/client/render/RenderGearPiston.java index 2942c0cc..4933770b 100644 --- a/src/dark/fluid/client/render/RenderGearPiston.java +++ b/src/dark/fluid/client/render/RenderGearPiston.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelGearPiston; import dark.fluid.common.FluidMech; import dark.mech.common.machines.TileEntitySteamPiston; @@ -24,7 +25,7 @@ public class RenderGearPiston extends RenderTileMachine public void renderTileEntityAt(TileEntitySteamPiston tileEntity, double d, double d1, double d2, float d3) { - bindTextureByName(FluidMech.instance.PREFIX, FluidMech.MODEL_DIRECTORY + "GearShaftPiston.png"); + bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "GearShaftPiston.png"); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); diff --git a/src/dark/fluid/client/render/RenderPump.java b/src/dark/fluid/client/render/RenderPump.java index fd8a82f4..2643f4d5 100644 --- a/src/dark/fluid/client/render/RenderPump.java +++ b/src/dark/fluid/client/render/RenderPump.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelPump; import dark.fluid.common.FluidMech; import dark.fluid.common.pump.TileEntityStarterPump; @@ -64,7 +65,7 @@ public class RenderPump extends RenderTileMachine @Override public ResourceLocation getTexture(int block, int meta) { - return new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "pumps/WaterPump.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pumps/WaterPump.png"); } } \ No newline at end of file diff --git a/src/dark/fluid/client/render/RenderReleaseValve.java b/src/dark/fluid/client/render/RenderReleaseValve.java index 40f08b38..d0b5618b 100644 --- a/src/dark/fluid/client/render/RenderReleaseValve.java +++ b/src/dark/fluid/client/render/RenderReleaseValve.java @@ -9,6 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; import dark.core.interfaces.ColorCode; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelLargePipe; import dark.fluid.client.model.ModelReleaseValve; import dark.fluid.common.FluidMech; @@ -51,7 +52,7 @@ public class RenderReleaseValve extends RenderTileMachine if (ents[4] != null) SixPipe.renderLeft(); SixPipe.renderMiddle(); - bindTextureByName(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "ReleaseValve.png"); + bindTextureByName(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "ReleaseValve.png"); if (ents[1] == null) valve.render(); GL11.glPopMatrix(); @@ -60,7 +61,7 @@ public class RenderReleaseValve extends RenderTileMachine public static String getPipeTexture(int meta) { - return FluidMech.MODEL_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png"; + return ModPrefab.MODEL_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png"; } @Override @@ -72,6 +73,6 @@ public class RenderReleaseValve extends RenderTileMachine @Override public ResourceLocation getTexture(int block, int meta) { - return new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "pipes/" + ColorCode.get(15).getName() + "Pipe.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/" + ColorCode.get(15).getName() + "Pipe.png"); } } \ No newline at end of file diff --git a/src/dark/fluid/client/render/RenderSink.java b/src/dark/fluid/client/render/RenderSink.java index ef88473e..0543f0d7 100644 --- a/src/dark/fluid/client/render/RenderSink.java +++ b/src/dark/fluid/client/render/RenderSink.java @@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; +import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelSink; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntitySink; @@ -82,7 +83,7 @@ public class RenderSink extends RenderTileMachine @Override public ResourceLocation getTexture(int block, int meta) { - return new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "Sink.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "Sink.png"); } } \ No newline at end of file diff --git a/src/dark/fluid/client/render/pipe/RenderPipe.java b/src/dark/fluid/client/render/pipe/RenderPipe.java index 12bf487d..5fe6d2eb 100644 --- a/src/dark/fluid/client/render/pipe/RenderPipe.java +++ b/src/dark/fluid/client/render/pipe/RenderPipe.java @@ -12,8 +12,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.client.renders.RenderTileMachine; import dark.core.interfaces.ColorCode; +import dark.core.prefab.ModPrefab; import dark.core.prefab.helpers.FluidHelper; import dark.fluid.client.model.ModelLargePipe; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; import dark.fluid.common.pipes.TileEntityPipe; import dark.fluid.common.pipes.addon.IPipeExtention; @@ -37,7 +39,7 @@ public class RenderPipe extends RenderTileMachine GL11.glScalef(1.0F, -1F, -1F); int meta = 0; - int blockID = FluidMech.recipeLoader.blockPipe.blockID; + int blockID = FMRecipeLoader.blockPipe.blockID; if (te instanceof TileEntityPipe) { @@ -50,7 +52,7 @@ public class RenderPipe extends RenderTileMachine // Pipes extension rendering for (int i = 0; i < 6; i++) { - IPipeExtention extention = (IPipeExtention) pipe.subEntities[i]; + IPipeExtention extention = pipe.subEntities[i]; if (extention != null) { Object ob; @@ -85,7 +87,7 @@ public class RenderPipe extends RenderTileMachine public ResourceLocation getTexture(int block, int meta) { String name = ""; - if (block == FluidMech.recipeLoader.blockPipe.blockID) + if (block == FMRecipeLoader.blockPipe.blockID) { Fluid stack = FluidHelper.getStackForColor(ColorCode.get(meta)); name = stack != null ? stack.getName() : ""; @@ -94,7 +96,7 @@ public class RenderPipe extends RenderTileMachine { name = ColorCode.get(meta).getName(); } - return new ResourceLocation(FluidMech.instance.DOMAIN, FluidMech.MODEL_DIRECTORY + "pipes/" + name + "Pipe.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/" + name + "Pipe.png"); } public void render(int blockID, int meta, boolean[] side) diff --git a/src/dark/fluid/common/FMRecipeLoader.java b/src/dark/fluid/common/FMRecipeLoader.java index fd349379..c12ff866 100644 --- a/src/dark/fluid/common/FMRecipeLoader.java +++ b/src/dark/fluid/common/FMRecipeLoader.java @@ -53,7 +53,7 @@ public class FMRecipeLoader extends RecipeLoader this.registerTanks(); // generator - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] { "@T@", "OVO", "@T@", 'T', new ItemStack(blockRod, 1), '@', "plateSteel", 'O', "basicCircuit", 'V', "motor" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(FMRecipeLoader.blockGenerator, 1), new Object[] { "@T@", "OVO", "@T@", 'T', new ItemStack(blockRod, 1), '@', "plateSteel", 'O', "basicCircuit", 'V', "motor" })); // mechanical rod GameRegistry.addRecipe(new ItemStack(blockRod, 1), new Object[] { "I@I", 'I', Item.ingotIron, '@', new ItemStack(CoreRecipeLoader.itemParts, 1, Parts.Iron.ordinal()) }); diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index dfd654db..cd4898f4 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -90,6 +90,7 @@ public class FluidMech extends ModPrefab /* LOGGER - EXTENDS FORGE'S LOG SYSTEM */ public static Logger FMLog = Logger.getLogger(FluidMech.MOD_NAME); + @Override @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -101,6 +102,7 @@ public class FluidMech extends ModPrefab proxy.preInit(); } + @Override @EventHandler public void init(FMLInitializationEvent event) { @@ -112,6 +114,7 @@ public class FluidMech extends ModPrefab } + @Override @EventHandler public void postInit(FMLPostInitializationEvent event) { @@ -219,7 +222,7 @@ public class FluidMech extends ModPrefab meta.url = "http://www.universalelectricity.com/fluidmechanics"; - meta.logoFile = FluidMech.TEXTURE_DIRECTORY + "FM_Banner.png"; + meta.logoFile = ModPrefab.TEXTURE_DIRECTORY + "FM_Banner.png"; meta.version = DarkMain.VERSION; meta.authorList = Arrays.asList(new String[] { "DarkGuardsman AKA DarkCow" }); meta.credits = "Please see the website."; @@ -229,6 +232,7 @@ public class FluidMech extends ModPrefab public static final CreativeTabs TabFluidMech = new CreativeTabs("Hydraulics") { + @Override public ItemStack getIconItemStack() { return new ItemStack(FMRecipeLoader.blockPipe, 1, 4); diff --git a/src/dark/fluid/common/machines/BlockReleaseValve.java b/src/dark/fluid/common/machines/BlockReleaseValve.java index 321917e3..2258f926 100644 --- a/src/dark/fluid/common/machines/BlockReleaseValve.java +++ b/src/dark/fluid/common/machines/BlockReleaseValve.java @@ -13,6 +13,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.Pair; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockReleaseValve extends BlockFM @@ -78,7 +79,7 @@ public class BlockReleaseValve extends BlockFM @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(FluidMech.recipeLoader.blockReleaseValve, 1, 0); + return new ItemStack(FMRecipeLoader.blockReleaseValve, 1, 0); } @Override diff --git a/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java index d1853450..4f604561 100644 --- a/src/dark/fluid/common/machines/TileEntityTank.java +++ b/src/dark/fluid/common/machines/TileEntityTank.java @@ -61,7 +61,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand { if (ticks % refreshRate == 0) { - this.refreshRate = ((int) random.nextInt(5) * 40) + 20; + this.refreshRate = (random.nextInt(5) * 40) + 20; this.refresh(); } } @@ -278,6 +278,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand } } + @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() { @@ -290,6 +291,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand return this.connectedBlocks; } + @Override public int getTankSize() { return FluidContainerRegistry.BUCKET_VOLUME * (BlockTank.tankVolume > 0 ? BlockTank.tankVolume : 1); diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index c2c0f806..cdb45f89 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -18,6 +18,7 @@ import dark.api.fluid.INetworkPipe; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.helpers.Pair; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockPipe extends BlockFM @@ -84,7 +85,7 @@ public class BlockPipe extends BlockFM @Override public TileEntity createNewTileEntity(World var1) { - if (this.blockID == FluidMech.recipeLoader.blockGenPipe.blockID) + if (this.blockID == FMRecipeLoader.blockGenPipe.blockID) { return new TileEntityGenericPipe(); } @@ -104,7 +105,7 @@ public class BlockPipe extends BlockFM { for (int i = 0; i < 16; i++) { - if (this.blockID == FluidMech.recipeLoader.blockGenPipe.blockID || FluidHelper.hasRestrictedStack(i)) + if (this.blockID == FMRecipeLoader.blockGenPipe.blockID || FluidHelper.hasRestrictedStack(i)) { par3List.add(new ItemStack(par1, 1, i)); } @@ -136,7 +137,7 @@ public class BlockPipe extends BlockFM @Override public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) { - if (this.blockID == FluidMech.recipeLoader.blockGenPipe.blockID) + if (this.blockID == FMRecipeLoader.blockGenPipe.blockID) { int meta = world.getBlockMetadata(x, y, z); if (meta != colour) diff --git a/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java index 1f9fde8f..a68578d2 100644 --- a/src/dark/fluid/common/pipes/ItemBlockPipe.java +++ b/src/dark/fluid/common/pipes/ItemBlockPipe.java @@ -3,6 +3,7 @@ package dark.fluid.common.pipes; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class ItemBlockPipe extends ItemBlock @@ -24,7 +25,7 @@ public class ItemBlockPipe extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemStack) { - if (itemStack.itemID == FluidMech.recipeLoader.blockPipe.blockID) + if (itemStack.itemID == FMRecipeLoader.blockPipe.blockID) { return "tile.rpipe." + itemStack.getItemDamage(); } diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index bdcdc56e..bc9e6809 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -99,11 +99,11 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, } if (!worldObj.isRemote) { - if (ticks % ((int) random.nextInt(5) * 40 + 20) == 0) + if (ticks % (random.nextInt(5) * 40 + 20) == 0) { this.refresh(); } - if (ticks % ((int) random.nextInt(5) * 60 + 20) == 0) + if (ticks % (random.nextInt(5) * 60 + 20) == 0) { for (int i = 0; i < 6; i++) { @@ -554,6 +554,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, return false; } + @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() { diff --git a/src/dark/fluid/common/pump/BlockConstructionPump.java b/src/dark/fluid/common/pump/BlockConstructionPump.java index 21324a47..967fafc3 100644 --- a/src/dark/fluid/common/pump/BlockConstructionPump.java +++ b/src/dark/fluid/common/pump/BlockConstructionPump.java @@ -22,6 +22,7 @@ import dark.core.prefab.helpers.Pair; import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockConstructionPump extends BlockFM @@ -90,13 +91,13 @@ public class BlockConstructionPump extends BlockFM @SideOnly(Side.CLIENT) public int getRenderType() { - return BlockRenderHelper.instance.renderID; + return BlockRenderHelper.renderID; } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(FluidMech.recipeLoader.blockConPump, 1, 0); + return new ItemStack(FMRecipeLoader.blockConPump, 1, 0); } @Override @@ -116,6 +117,7 @@ public class BlockConstructionPump extends BlockFM par3List.add(new ItemStack(par1, 1, 0)); } + @Override public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { if (!world.isRemote) diff --git a/src/dark/fluid/common/pump/BlockDrain.java b/src/dark/fluid/common/pump/BlockDrain.java index e7e5a6b8..ce0949db 100644 --- a/src/dark/fluid/common/pump/BlockDrain.java +++ b/src/dark/fluid/common/pump/BlockDrain.java @@ -81,6 +81,7 @@ public class BlockDrain extends BlockFM TileEntity entity = world.getBlockTileEntity(x, y, z); } + @Override public boolean onSneakUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { if (!world.isRemote) @@ -106,6 +107,7 @@ public class BlockDrain extends BlockFM return true; } + @Override public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { if (!world.isRemote) diff --git a/src/dark/fluid/common/pump/BlockPumpMachine.java b/src/dark/fluid/common/pump/BlockPumpMachine.java index 69ebd1b7..0620132a 100644 --- a/src/dark/fluid/common/pump/BlockPumpMachine.java +++ b/src/dark/fluid/common/pump/BlockPumpMachine.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockPumpMachine extends BlockFM @@ -67,7 +68,7 @@ public class BlockPumpMachine extends BlockFM if (meta < 4) { - return new ItemStack(FluidMech.recipeLoader.blockMachine, 1, 0); + return new ItemStack(FMRecipeLoader.blockMachine, 1, 0); } return null; diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index b78f4141..af82f543 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -99,7 +99,7 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements { for (IFluidHandler tank : ((NetworkFluidTiles) ((INetworkPipe) inputTile).getTileNetwork()).connectedTanks) { - if (tank instanceof IDrain && !ignoreList.contains((IDrain) tank)) + if (tank instanceof IDrain && !ignoreList.contains(tank)) { drain = (IDrain) tank; break; diff --git a/src/dark/fluid/common/pump/TileEntityDrain.java b/src/dark/fluid/common/pump/TileEntityDrain.java index 28672da8..b6dcc644 100644 --- a/src/dark/fluid/common/pump/TileEntityDrain.java +++ b/src/dark/fluid/common/pump/TileEntityDrain.java @@ -204,6 +204,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand return ForgeDirection.getOrientation(meta); } + @Override public void setDirection(ForgeDirection direction) { if (direction != null && direction != this.getDirection()) diff --git a/src/dark/mech/common/machines/BlockGenerator.java b/src/dark/mech/common/machines/BlockGenerator.java index 76282c62..1f890efe 100644 --- a/src/dark/mech/common/machines/BlockGenerator.java +++ b/src/dark/mech/common/machines/BlockGenerator.java @@ -16,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockGenerator extends BlockFM @@ -38,7 +39,7 @@ public class BlockGenerator extends BlockFM public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(FluidMech.recipeLoader.blockGenerator, 1); + return new ItemStack(FMRecipeLoader.blockGenerator, 1); } @Override diff --git a/src/dark/mech/common/machines/BlockRod.java b/src/dark/mech/common/machines/BlockRod.java index 26be91d7..1912a2fb 100644 --- a/src/dark/mech/common/machines/BlockRod.java +++ b/src/dark/mech/common/machines/BlockRod.java @@ -16,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; +import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; public class BlockRod extends BlockFM @@ -88,7 +89,7 @@ public class BlockRod extends BlockFM @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(FluidMech.recipeLoader.blockRod, 1, 0); + return new ItemStack(FMRecipeLoader.blockRod, 1, 0); } @Override