diff --git a/src/main/java/com/hbm/interfaces/IFluidSource.java b/src/main/java/com/hbm/interfaces/IFluidSource.java index e00e2f7cc..b3b8def87 100644 --- a/src/main/java/com/hbm/interfaces/IFluidSource.java +++ b/src/main/java/com/hbm/interfaces/IFluidSource.java @@ -2,16 +2,16 @@ package com.hbm.interfaces; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; public interface IFluidSource extends IFluidContainer { - void fillFluidInit(FluidTypeTheOldOne type); + void fillFluidInit(FluidType type); - void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type); + void fillFluid(int x, int y, int z, boolean newTact, FluidType type); boolean getTact(); - List getFluidList(FluidTypeTheOldOne type); - void clearFluidList(FluidTypeTheOldOne type); + List getFluidList(FluidType type); + void clearFluidList(FluidType type); } diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index a3cab1d3f..30437c2a0 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -114,30 +114,27 @@ public class FluidType { public boolean needsLeadContainer() { return this.traits.contains(FluidTrait.LEAD_CONTAINER); } - - //shitty wrapper delegates, go! - @Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here - public static FluidType[] values() { - return Fluids.metaOrder.toArray(new FluidType[0]); - } - @Deprecated //reason: not an enum, asshole, use the registry - public static FluidType getEnum(int i) { - return Fluids.fromID(i); - } - @Deprecated //reason: the more time you waste reading this the less time is there for you to use that fucking registry already - public static com.hbm.inventory.fluid.FluidType getEnumFromName(String s) { - for(int i = 0; i < FluidType.values().length; i++) - if(FluidType.values()[i].getName().equals(s)) - return FluidType.values()[i]; - return Fluids.NONE; - } - @Deprecated //reason: not an enum, again, fuck you - public int ordinal() { - return this.getID(); - } + /** + * Called when the tile entity is broken, effectively voiding the fluids. + * @param te + * @param tank + */ public void onTankBroken(TileEntity te, FluidTank tank) { } + /** + * Called by the tile entity's update loop. Also has an arg for the fluid tank for possible tanks using child-classes that are shielded or treated differently. + * @param te + * @param tank + */ public void onTankUpdate(TileEntity te, FluidTank tank) { } + /** + * For when the tile entity is releasing this fluid into the world, either by an overflow or (by proxy) when broken. + * @param te + * @param tank + * @param overflowAmount + */ + public void onFluidRelease(TileEntity te, FluidTank tank, int overflowAmount) { } + //public void onFluidTransmit(FluidNetwork net) { } public static enum FluidTrait { AMAT, @@ -147,4 +144,27 @@ public class FluidType { LEAD_CONTAINER, NO_ID; } + + //shitty wrapper delegates, go! + //only used for compatibility purposes, these will be removed soon + //don't use these, dumbfuck + @Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here + public static FluidType[] values() { + return Fluids.metaOrder.toArray(new FluidType[0]); + } + @Deprecated //reason: not an enum, asshole, use the registry + public static FluidType getEnum(int i) { + return Fluids.fromID(i); + } + @Deprecated //reason: the more time you waste reading this the less time is there for you to use that fucking registry already + public static FluidType getEnumFromName(String s) { + for(int i = 0; i < FluidType.values().length; i++) + if(FluidType.values()[i].getName().equals(s)) + return FluidType.values()[i]; + return Fluids.NONE; + } + @Deprecated //reason: not an enum, again, fuck you + public int ordinal() { + return this.getID(); + } } diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 30f6a0ae7..fda984f89 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -228,7 +228,7 @@ public class Fluids { metaOrder.add(PLASMA_BF); if(idMapping.size() != metaOrder.size()) { - throw new IllegalStateException("A severe error has occoured during NTM's fluid registering process! The MetaOrder and Mappings are inconsistent! Mapping size: " + idMapping.size()+ " / MetaORder size: " + metaOrder.size()); + throw new IllegalStateException("A severe error has occoured during NTM's fluid registering process! The MetaOrder and Mappings are inconsistent! Mapping size: " + idMapping.size()+ " / MetaOrder size: " + metaOrder.size()); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index 242bfe035..767cbb2d7 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -10,6 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineDiesel; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.util.I18nUtil; @@ -43,7 +44,7 @@ public class GUIMachineDiesel extends GuiInfoContainer { List text = new ArrayList(); text.add(EnumChatFormatting.YELLOW + "Accepted Fuels:"); - for(Entry entry : TileEntityMachineDiesel.fuels.entrySet()) { + for(Entry entry : TileEntityMachineDiesel.fuels.entrySet()) { text.add(" " + I18nUtil.resolveKey(entry.getKey().getUnlocalizedName()) + " (" + entry.getValue() + " HE/t)"); } this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text.toArray(new String[0])); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java index ad0629fab..7b405b6d7 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineSelenium; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; @@ -43,7 +44,7 @@ public class GUIMachineSelenium extends GuiInfoContainer { List text = new ArrayList(); text.add(EnumChatFormatting.YELLOW + "Accepted Fuels:"); - for(Entry entry : TileEntityMachineDiesel.fuels.entrySet()) { + for(Entry entry : TileEntityMachineDiesel.fuels.entrySet()) { text.add(" " + I18nUtil.resolveKey(entry.getKey().getUnlocalizedName()) + " (" + entry.getValue() + " HE/t)"); } diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 224cc9192..037d354f9 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -13,6 +13,8 @@ import com.hbm.interfaces.Spaghetti; import com.hbm.inventory.FluidContainer; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidStack; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemChemistryTemplate; import com.hbm.items.machine.ItemFluidIcon; @@ -154,29 +156,23 @@ public class MachineRecipes { } //return: FluidType, amount produced, amount required, heat required (°C * 100) - @SuppressWarnings("incomplete-switch") - public static Object[] getBoilerOutput(FluidTypeTheOldOne type) { + public static Object[] getBoilerOutput(FluidType type) { - switch(type) { - case WATER: return new Object[] { FluidTypeTheOldOne.STEAM, 500, 5, 10000 }; - case STEAM: return new Object[] { FluidTypeTheOldOne.HOTSTEAM, 5, 50, 30000 }; - case HOTSTEAM: return new Object[] { FluidTypeTheOldOne.SUPERHOTSTEAM, 5, 50, 45000 }; - case OIL: return new Object[] { FluidTypeTheOldOne.HOTOIL, 5, 5, 35000 }; - } + if(type == Fluids.WATER) return new Object[] { Fluids.STEAM, 500, 5, 10000 }; + if(type == Fluids.STEAM) return new Object[] { Fluids.HOTSTEAM, 5, 50, 30000 }; + if(type == Fluids.HOTSTEAM) return new Object[] { Fluids.SUPERHOTSTEAM, 5, 50, 45000 }; + if(type == Fluids.OIL) return new Object[] { Fluids.HOTOIL, 5, 5, 35000 }; return null; } //return: FluidType, amount produced, amount required, HE produced - @SuppressWarnings("incomplete-switch") - public static Object[] getTurbineOutput(FluidTypeTheOldOne type) { + public static Object[] getTurbineOutput(FluidType type) { - switch(type) { - case STEAM: return new Object[] { FluidTypeTheOldOne.SPENTSTEAM, 5, 500, 50 }; - case HOTSTEAM: return new Object[] { FluidTypeTheOldOne.STEAM, 50, 5, 100 }; - case SUPERHOTSTEAM: return new Object[] { FluidTypeTheOldOne.HOTSTEAM, 50, 5, 150 }; - case ULTRAHOTSTEAM: return new Object[] { FluidTypeTheOldOne.SUPERHOTSTEAM, 50, 5, 250 }; - } + if(type == Fluids.STEAM) return new Object[] { Fluids.SPENTSTEAM, 5, 500, 50 }; + if(type == Fluids.HOTSTEAM) return new Object[] { Fluids.STEAM, 50, 5, 100 }; + if(type == Fluids.SUPERHOTSTEAM) return new Object[] { Fluids.HOTSTEAM, 50, 5, 150 }; + if(type == Fluids.ULTRAHOTSTEAM) return new Object[] { Fluids.SUPERHOTSTEAM, 50, 5, 250 }; return null; } diff --git a/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java index daf7eb3a1..ba32a3e00 100644 --- a/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Map; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.util.Tuple.Quartet; @@ -38,19 +40,19 @@ public class RefineryRecipes { public static final int kero_crack_petro = 60; //why didn't i use fluid stacks here? was there a reason? - private static Map> fractions = new HashMap(); - private static Map> cracking = new HashMap(); + private static Map> fractions = new HashMap(); + private static Map> cracking = new HashMap(); public static Map getRefineryRecipe() { Map recipes = new HashMap(); - recipes.put(ItemFluidIcon.make(FluidTypeTheOldOne.HOTOIL, 1000), + recipes.put(ItemFluidIcon.make(Fluids.HOTOIL, 1000), new ItemStack[] { - ItemFluidIcon.make(FluidTypeTheOldOne.HEAVYOIL, oil_frac_heavy * 10), - ItemFluidIcon.make(FluidTypeTheOldOne.NAPHTHA, oil_frac_naph * 10), - ItemFluidIcon.make(FluidTypeTheOldOne.LIGHTOIL, oil_frac_light * 10), - ItemFluidIcon.make(FluidTypeTheOldOne.PETROLEUM, oil_frac_petro * 10), + ItemFluidIcon.make(Fluids.HEAVYOIL, oil_frac_heavy * 10), + ItemFluidIcon.make(Fluids.NAPHTHA, oil_frac_naph * 10), + ItemFluidIcon.make(Fluids.LIGHTOIL, oil_frac_light * 10), + ItemFluidIcon.make(Fluids.PETROLEUM, oil_frac_petro * 10), new ItemStack(ModItems.sulfur, 1) }); return recipes; @@ -71,11 +73,11 @@ public class RefineryRecipes { cracking.put(FluidTypeTheOldOne.KEROSENE, new Quartet(FluidTypeTheOldOne.PETROLEUM, FluidTypeTheOldOne.NONE, kero_crack_petro, 0)); } - public static Quartet getFractions(FluidTypeTheOldOne oil) { + public static Quartet getFractions(FluidType oil) { return fractions.get(oil); } - public static Quartet getCracking(FluidTypeTheOldOne oil) { + public static Quartet getCracking(FluidType oil) { return cracking.get(oil); } } diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIcon.java b/src/main/java/com/hbm/items/machine/ItemFluidIcon.java index b0d8cfff0..c56817d07 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIcon.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIcon.java @@ -2,6 +2,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -52,7 +53,7 @@ public class ItemFluidIcon extends Item { return stack; } - public static ItemStack make(FluidTypeTheOldOne fluid, int i) { + public static ItemStack make(FluidType fluid, int i) { return addQuantity(new ItemStack(ModItems.fluid_icon, 1, fluid.ordinal()), i); } diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java index b3bde0087..e928f451b 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java @@ -6,6 +6,8 @@ import java.util.Objects; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import com.hbm.util.I18nUtil; @@ -71,18 +73,18 @@ public class ItemFluidIdentifier extends Item { list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("info.templatefolder", I18nUtil.resolveKey(ModItems.template_folder.getUnlocalizedName() + ".name"))); list.add(""); list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".info")); - list.add(" " + I18n.format(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())); + list.add(" " + I18n.format(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName())); list.add(""); list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage0")); list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage1")); list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage2")); } - public static FluidTypeTheOldOne getType(ItemStack stack) { + public static FluidType getType(ItemStack stack) { if(stack != null && stack.getItem() instanceof ItemFluidIdentifier) - return FluidTypeTheOldOne.getEnum(stack.getItemDamage()); + return Fluids.fromID(stack.getItemDamage()); else - return FluidTypeTheOldOne.NONE; + return Fluids.NONE; } @Override @@ -91,7 +93,7 @@ public class ItemFluidIdentifier extends Item { if(te instanceof TileEntityFluidDuct) { if(!world.isRemote) { TileEntityFluidDuct duct = (TileEntityFluidDuct) te; - FluidTypeTheOldOne type = FluidTypeTheOldOne.getEnum(stack.getItemDamage()); + FluidType type = Fluids.fromID(stack.getItemDamage()); if (player.isSneaking()) markDuctsRecursively(world, x, y, z, type); else duct.type = type; } @@ -101,15 +103,15 @@ public class ItemFluidIdentifier extends Item { return false; } - private void markDuctsRecursively(World world, int x, int y, int z, FluidTypeTheOldOne type) { + private void markDuctsRecursively(World world, int x, int y, int z, FluidType type) { markDuctsRecursively(world, x, y, z, type, 64); } - private void markDuctsRecursively(World world, int x, int y, int z, FluidTypeTheOldOne type, int maxRecursion) { + private void markDuctsRecursively(World world, int x, int y, int z, FluidType type, int maxRecursion) { TileEntity start = world.getTileEntity(x, y, z); if (!(start instanceof TileEntityFluidDuct)) return; TileEntityFluidDuct startDuct = (TileEntityFluidDuct) start; - FluidTypeTheOldOne oldType = startDuct.type; + FluidType oldType = startDuct.type; if (oldType == type) return; // prevent infinite loops startDuct.type = type; @@ -158,7 +160,7 @@ public class ItemFluidIdentifier extends Item { if(p_82790_2_ == 0) { return 16777215; } else { - int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor(); + int j = Fluids.fromID(stack.getItemDamage()).getColor(); if(j < 0) { j = 16777215; diff --git a/src/main/java/com/hbm/items/machine/ItemFluidTank.java b/src/main/java/com/hbm/items/machine/ItemFluidTank.java index 5c8347044..e30794774 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidTank.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidTank.java @@ -2,6 +2,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +28,7 @@ public class ItemFluidTank extends Item { for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) { - FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[i]; + FluidType type = FluidTypeTheOldOne.values()[i]; if(type.hasNoContainer()) continue; diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 625b390d5..a1ebb30d6 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -383,7 +383,7 @@ public class Library { */ } - public static void transmitFluid(int x, int y, int z, boolean newTact, IFluidSource that, World worldObj, FluidTypeTheOldOne type) { + public static void transmitFluid(int x, int y, int z, boolean newTact, IFluidSource that, World worldObj, FluidType type) { Block block = worldObj.getBlock(x, y, z); TileEntity tileentity = worldObj.getTileEntity(x, y, z); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index fbba00c57..90c217f1d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -69,6 +69,7 @@ import com.hbm.handler.imc.IMCHandler; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.hazard.HazardRegistry; import com.hbm.inventory.*; +import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.*; import com.hbm.inventory.recipes.anvil.AnvilRecipes; import com.hbm.items.ModItems; @@ -261,6 +262,7 @@ public class MainRegistry { loadConfig(PreEvent); HbmPotion.init(); + Fluids.init(); ModBlocks.mainRegistry(); ModItems.mainRegistry(); proxy.registerRenderInfo(); diff --git a/src/main/java/com/hbm/packet/AuxButtonPacket.java b/src/main/java/com/hbm/packet/AuxButtonPacket.java index 526680a9f..531453c66 100644 --- a/src/main/java/com/hbm/packet/AuxButtonPacket.java +++ b/src/main/java/com/hbm/packet/AuxButtonPacket.java @@ -3,6 +3,7 @@ package com.hbm.packet; import com.hbm.config.MobConfig; import com.hbm.entity.mob.EntityDuck; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.TileEntityTickingBase; @@ -104,7 +105,7 @@ public class AuxButtonPacket implements IMessage { reactor.rods = m.value; if(m.id == 1) { - FluidTypeTheOldOne type = FluidTypeTheOldOne.STEAM; + FluidType type = FluidTypeTheOldOne.STEAM; int fill = reactor.tanks[2].getFill(); switch(m.value) { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 33983de1a..244f3a84a 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -6,15 +6,17 @@ import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; + import net.minecraft.tileentity.TileEntity; public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct { - public FluidTypeTheOldOne type = FluidTypeTheOldOne.GAS; + public FluidType type = FluidTypeTheOldOne.GAS; public List uoteab = new ArrayList(); @Override - public FluidTypeTheOldOne getType() { + public FluidType getType() { return type; } diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java index d9bceaf73..3b8785b54 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -17,7 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityOilDuct extends TileEntity implements IFluidDuct { public ForgeDirection[] connections = new ForgeDirection[6]; - public FluidTypeTheOldOne type = FluidTypeTheOldOne.OIL; + public FluidType type = FluidTypeTheOldOne.OIL; public List uoteab = new ArrayList(); public TileEntityOilDuct() { @@ -74,7 +75,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct { } @Override - public FluidTypeTheOldOne getType() { + public FluidType getType() { return type; } } diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index b833353e0..d87d1d9f0 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -6,16 +6,17 @@ import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.tileentity.TileEntity; public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct { - public FluidTypeTheOldOne type = FluidTypeTheOldOne.OIL; + public FluidType type = FluidTypeTheOldOne.OIL; public List uoteab = new ArrayList(); @Override - public FluidTypeTheOldOne getType() { + public FluidType getType() { return type; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java index 08865760c..5fc48e1ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -8,6 +8,8 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCatalyst; import com.hbm.items.machine.ItemSatChip; @@ -389,28 +391,19 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } } - private int getCoolingStrength(FluidTypeTheOldOne type) { + private int getCoolingStrength(FluidType type) { - if(type == FluidTypeTheOldOne.WATER) - return 5; - if(type == FluidTypeTheOldOne.OIL) - return 15; - if(type == FluidTypeTheOldOne.COOLANT) - return this.heat / 250; - if(type == FluidTypeTheOldOne.CRYOGEL) - return this.heat > heat/2 ? 25 : 5; + if(type == FluidTypeTheOldOne.WATER) return 5; + if(type == FluidTypeTheOldOne.OIL) return 15; + if(type == FluidTypeTheOldOne.COOLANT) return this.heat / 250; + if(type == FluidTypeTheOldOne.CRYOGEL) return this.heat > heat/2 ? 25 : 5; return 0; } - private int getFuelPower(FluidTypeTheOldOne type) { - switch(type) { - case DEUTERIUM: - return 50; - case TRITIUM: - return 75; - default: - return 0; - } + private int getFuelPower(FluidType type) { + if(type == Fluids.DEUTERIUM) return 50; + if(type == Fluids.TRITIUM) return 75; + return 0; } private float calcField(int a, int b, int c, int d) { @@ -477,7 +470,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -491,7 +484,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -503,7 +496,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -523,7 +516,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 4 && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index 6c0e562a2..18d2bf7a6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -364,13 +365,13 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -378,7 +379,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -391,7 +392,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index cb326efec..ccb2500fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -10,6 +10,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -378,13 +379,13 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -392,7 +393,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -405,7 +406,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java index af254f45b..fedd3debb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -8,7 +8,9 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.FluidType.FluidTrait; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import com.hbm.main.ModEventHandler; import com.hbm.tileentity.TileEntityMachineBase; @@ -106,7 +108,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } //For when Tom's firestorm hits a barrel full of water - if(tank.getTankType() == FluidTypeTheOldOne.WATER && ModEventHandler.fire > 0) { + if(tank.getTankType() == Fluids.WATER && ModEventHandler.fire > 0) { int light = this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, this.xCoord, this.yCoord, this.zCoord); if(light > 7) { @@ -126,12 +128,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(mode == 2 || mode == 3) return 0; @@ -140,7 +142,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type); @@ -150,7 +152,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -164,24 +166,24 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return this.list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { this.list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index 43e8bc91c..fa5dd0725 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.NBTPacket; @@ -138,7 +139,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); dir = dir.getRotation(ForgeDirection.UP); @@ -148,7 +149,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -158,7 +159,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -166,7 +167,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -176,7 +177,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -190,7 +191,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -205,12 +206,12 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list2; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list2.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java index 2602c02c9..e976a1319 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java @@ -8,6 +8,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.main.ModEventHandler; @@ -81,14 +82,14 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) fillFluid(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, getTact(), type); } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -103,7 +104,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -111,7 +112,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -121,7 +122,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -135,7 +136,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -150,12 +151,12 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 814ed9193..edac4345b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.ModDamageSource; import com.hbm.tileentity.TileEntityMachineBase; @@ -186,13 +187,13 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -200,7 +201,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -213,7 +214,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java index 24cbef208..0f4c48940 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.tileentity.TileEntityMachineBase; import cpw.mods.fml.relauncher.Side; @@ -102,7 +103,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -112,7 +113,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if (type.name().equals(tanks[1].getTankType().name())) @@ -120,7 +121,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -136,7 +137,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if (index < 2 && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index ba70a574f..6ba038f2d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -91,13 +92,13 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -105,7 +106,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -118,7 +119,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java index 27683e245..65f5098e4 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java @@ -7,6 +7,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; @@ -111,14 +112,14 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) fillFluid(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, getTact(), type); } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -133,7 +134,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -141,7 +142,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -151,7 +152,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -165,7 +166,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -180,12 +181,12 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 309bf1955..7df6da5da 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IReactor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -391,13 +392,13 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 3 && tanks[index] != null) tanks[index].setTankType(type); } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) tanks[1].setFill(i); else if(type.name().equals(tanks[2].getTankType().name())) @@ -405,7 +406,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return tanks[1].getFill(); else if(type.name().equals(tanks[2].getTankType().name())) @@ -415,7 +416,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return tanks[1].getMaxFill(); else if(type.name().equals(tanks[2].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index 7fcc31542..ec9eabdfe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IReactor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -1202,13 +1203,13 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 3 && tanks[index] != null) tanks[index].setTankType(type); } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -1218,7 +1219,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -1230,7 +1231,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index d37c88d2d..07a48b9db 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.inventory.recipes.FusionRecipes; import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; @@ -316,7 +317,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if (type.name().equals(tanks[1].getTankType().name())) @@ -326,7 +327,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if (index < 2 && tanks[index] != null) tanks[index].setTankType(type); @@ -345,7 +346,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -357,13 +358,13 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(xCoord, yCoord - 3, zCoord, getTact(), type); fillFluid(xCoord, yCoord + 3, zCoord, getTact(), type); } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -377,17 +378,17 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java index dec566311..3aa65b08d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java @@ -1,6 +1,6 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ public class TileEntityMachineBAT9000 extends TileEntityBarrel { } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord + 3, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord + 3, getTact(), type); fillFluid(this.xCoord + 1, this.yCoord, this.zCoord - 3, getTact(), type); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index a25bb6375..4844691fb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -10,6 +10,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxGaugePacket; @@ -326,7 +327,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); @@ -337,7 +338,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -352,7 +353,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -360,7 +361,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -370,7 +371,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -384,7 +385,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -399,12 +400,12 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 29474054a..b2159af26 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -10,6 +10,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -325,7 +326,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); @@ -336,7 +337,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -351,7 +352,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -359,7 +360,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -369,7 +370,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -383,7 +384,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -398,12 +399,12 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index f22ce9f93..ce596a277 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -7,6 +7,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -339,22 +340,22 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 3eb55cee5..64b82d077 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -11,6 +11,7 @@ import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidStack; import com.hbm.inventory.FluidTank; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemChemistryTemplate; @@ -907,13 +908,13 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 4 && tanks[index] != null) tanks[index].setTankType(type); } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -925,7 +926,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -939,7 +940,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -949,7 +950,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { int meta = worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); if(meta == 5) { fillFluid(this.xCoord - 2, this.yCoord, this.zCoord, getTact(), type); @@ -981,7 +982,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -995,7 +996,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[2].getTankType().name())) return list1; if(type.name().equals(tanks[3].getTankType().name())) @@ -1004,7 +1005,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[2].getTankType().name())) list1.clear(); if(type.name().equals(tanks[3].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java index ea4de75b5..1af2db7bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -19,6 +19,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -313,18 +314,18 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @@ -334,7 +335,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index 478b4b8f4..1c64db698 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -7,6 +7,7 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; @@ -265,12 +266,12 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { tank.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -280,12 +281,12 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return tank.getFill(); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return tank.getMaxFill(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index 81fd939e0..62be4306b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -14,6 +14,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.CyclotronRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; @@ -359,7 +360,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == FluidTypeTheOldOne.COOLANT) coolant.setFill(fill); else if(type == FluidTypeTheOldOne.AMAT) @@ -367,7 +368,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index == 0) coolant.setTankType(type); else if(index == 1) @@ -380,7 +381,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.COOLANT) return coolant.getFill(); else if(type == FluidTypeTheOldOne.AMAT) @@ -390,7 +391,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(xCoord + 3, yCoord, zCoord + 1, getTact(), type); fillFluid(xCoord + 3, yCoord, zCoord - 1, getTact(), type); @@ -404,7 +405,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -414,17 +415,17 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.COOLANT) return coolant.getMaxFill(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index a4e6937cc..381dbb94c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -105,7 +106,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE tank.loadTank(0, 1, slots); tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); - FluidTypeTheOldOne type = tank.getTankType(); + FluidType type = tank.getTankType(); if(type.name().equals(FluidTypeTheOldOne.NITAN.name())) powerCap = maxPower * 10; else @@ -133,7 +134,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE return getHEFromFuel() > 0; } - public static final HashMap fuels = new HashMap(); + public static final HashMap fuels = new HashMap(); static { fuels.put(FluidTypeTheOldOne.HYDROGEN, 10); @@ -147,7 +148,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE } public int getHEFromFuel() { - FluidTypeTheOldOne type = tank.getTankType(); + FluidType type = tank.getTankType(); Integer value = fuels.get(type); return value != null ? value : 0; } @@ -199,22 +200,22 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index 6681ce846..3318ecfcf 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -103,12 +104,12 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(mode == 2 || mode == 3) return 0; @@ -117,7 +118,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 2, this.yCoord, this.zCoord - 1, getTact(), type); fillFluid(this.xCoord + 2, this.yCoord, this.zCoord + 1, getTact(), type); fillFluid(this.xCoord - 2, this.yCoord, this.zCoord - 1, getTact(), type); @@ -129,7 +130,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -143,23 +144,23 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return this.list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { this.list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index ae9f16cc1..268b1a992 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -5,10 +5,11 @@ import java.util.Collections; import java.util.List; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.GasCentrifugeRecipes; import com.hbm.inventory.recipes.GasCentrifugeRecipes.PseudoFluidType; import com.hbm.inventory.recipes.MachineRecipes; @@ -54,7 +55,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I public TileEntityMachineGasCent() { super(6); - tank = new FluidTank(FluidTypeTheOldOne.UF6, 2000, 0); + tank = new FluidTank(Fluids.UF6, 2000, 0); inputTank = new PseudoFluidTank(PseudoFluidType.NUF6, 8000); outputTank = new PseudoFluidTank(PseudoFluidType.LEUF6, 8000); } @@ -284,7 +285,6 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I data.setString("outputType", outputTank.getTankType().toString()); this.networkPack(data, 50); - PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); PacketDispatcher.wrapper.sendToAllAround(new LoopedSoundPacket(xCoord, yCoord, zCoord), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); } } @@ -318,30 +318,26 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } public void setTankType(int in) { if(slots[in] != null && slots[in].getItem() instanceof ItemFluidIdentifier) { - FluidTypeTheOldOne newType = ItemFluidIdentifier.getType(slots[in]); + FluidType newType = ItemFluidIdentifier.getType(slots[in]); if(tank.getTankType() != newType) { tank.setTankType(newType); tank.setFill(0); - switch(newType) { - case UF6: + if(newType == Fluids.UF6) { inputTank.setTankType(PseudoFluidType.NUF6); outputTank.setTankType(PseudoFluidType.NUF6.getOutputFluid()); - break; - case PUF6: + } + if(newType == Fluids.PUF6) { inputTank.setTankType(PseudoFluidType.PF6); outputTank.setTankType(PseudoFluidType.PF6.getOutputFluid()); - break; - default: - break; } } return; @@ -349,17 +345,17 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index e7f8a251b..e6d9f682d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -10,6 +10,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFuelRod; import com.hbm.lib.Library; @@ -519,7 +520,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -529,7 +530,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -537,7 +538,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -553,7 +554,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 579664b6b..f98b025c8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -8,6 +8,7 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRTGPellet; import com.hbm.lib.Library; @@ -191,7 +192,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } public static final int coalGenRate = 50; - public static final HashMap fuels = new HashMap(); + public static final HashMap fuels = new HashMap(); static { fuels.put(FluidTypeTheOldOne.SMEAR, 50); @@ -209,7 +210,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } public int getPowerFromFuel() { - FluidTypeTheOldOne type = tanks[1].getTankType(); + FluidType type = tanks[1].getTankType(); Integer value = fuels.get(type); return value != null ? value : 0; } @@ -220,7 +221,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == FluidTypeTheOldOne.WATER) tanks[0].setFill(fill); @@ -231,7 +232,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tanks[index].setTankType(type); } @@ -241,7 +242,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { for(int i = 0; i < 3; i++) if(tanks[i].getTankType() == type) @@ -251,7 +252,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { for(int i = 0; i < 3; i++) if(tanks[i].getTankType() == type) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java index c247f7738..f51d66855 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java @@ -8,6 +8,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -258,7 +259,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type); @@ -268,7 +269,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -288,13 +289,13 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 3 && tanks[index] != null) tanks[index].setTankType(type); } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -304,7 +305,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -316,7 +317,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -328,7 +329,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return list1; if(type.name().equals(tanks[1].getTankType().name())) @@ -339,7 +340,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) list1.clear(); if(type.name().equals(tanks[1].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index 6e5bcae53..6bbe7b20c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -144,7 +145,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); dir = dir.getRotation(ForgeDirection.UP); @@ -154,7 +155,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -169,7 +170,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -177,7 +178,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -187,7 +188,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -201,7 +202,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -216,12 +217,12 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list2; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list2.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index 41e5eb983..ac56d6409 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -11,6 +11,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.CentrifugeRecipes; import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.inventory.recipes.ShredderRecipes; @@ -604,13 +605,13 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == FluidTypeTheOldOne.OIL) tank.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -620,14 +621,14 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.OIL) return tank.getFill(); return 0; } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(xCoord + 2, yCoord, zCoord, this.getTact(), type); fillFluid(xCoord - 2, yCoord, zCoord, this.getTact(), type); @@ -636,7 +637,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -650,12 +651,12 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java index 8d255a1e4..561c2b10e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.BlockDummyable; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,7 +24,7 @@ public class TileEntityMachineOrbus extends TileEntityBarrel { public void checkFluidInteraction() { } //NO! @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset).getOpposite(); ForgeDirection d2 = dir.getRotation(ForgeDirection.DOWN); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java index 947df06b0..c6d4a027e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java @@ -9,6 +9,7 @@ import com.hbm.blocks.machine.MachineITER; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -147,7 +148,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme //if(plasma.getFill() > 0) // return; - List types = new ArrayList() {{ add(tanks[0].getTankType()); add(tanks[1].getTankType()); }}; + List types = new ArrayList() {{ add(tanks[0].getTankType()); add(tanks[1].getTankType()); }}; if(types.contains(FluidTypeTheOldOne.DEUTERIUM) && types.contains(FluidTypeTheOldOne.TRITIUM)) { plasma.setTankType(FluidTypeTheOldOne.PLASMA_DT); @@ -202,7 +203,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -214,7 +215,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if (type.name().equals(tanks[1].getTankType().name())) @@ -224,7 +225,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -245,7 +246,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if (index < 2 && tanks[index] != null) tanks[index].setTankType(type); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 452771ffc..f5077e96f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -216,7 +217,7 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -229,12 +230,12 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 0a4d60061..8223f2101 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -13,6 +13,8 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFuelRod; import com.hbm.lib.Library; @@ -662,7 +664,6 @@ public class TileEntityMachineReactorLarge extends TileEntity } } - @SuppressWarnings("incomplete-switch") private void generateSteam() { //function of SHS produced per tick @@ -674,16 +675,9 @@ public class TileEntityMachineReactorLarge extends TileEntity double water = steam; - switch(tanks[2].getTankType()) { - case STEAM: - water /= 100D; - break; - case HOTSTEAM: - water /= 10; - break; - case SUPERHOTSTEAM: - break; - } + FluidType type = tanks[2].getTankType(); + if(type == Fluids.STEAM) water /= 100D; + if(type == Fluids.HOTSTEAM) water /= 10; tanks[0].setFill(tanks[0].getFill() - (int)Math.ceil(water)); tanks[2].setFill(tanks[2].getFill() + (int)Math.floor(steam)); @@ -758,12 +752,12 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { if(worldObj.getBlock(xCoord - 2, yCoord, zCoord) == ModBlocks.reactor_hatch) fillFluid(this.xCoord - 3, this.yCoord, this.zCoord, getTact(), type); @@ -792,7 +786,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -802,7 +796,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if (type.name().equals(tanks[1].getTankType().name())) @@ -812,7 +806,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -830,7 +824,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if (index < 3 && tanks[index] != null) tanks[index].setTankType(type); } @@ -846,12 +840,12 @@ public class TileEntityMachineReactorLarge extends TileEntity } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index 2e5d9464f..bb4ba65e0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -223,7 +224,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide tank.loadTank(9, 10, slots); tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); - FluidTypeTheOldOne type = tank.getTankType(); + FluidType type = tank.getTankType(); if(type.name().equals(FluidTypeTheOldOne.NITAN.name())) powerCap = maxPower * 10; else @@ -256,7 +257,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide return getHEFromFuel() > 0; } - public static final HashMap fuels = new HashMap(); + public static final HashMap fuels = new HashMap(); static { fuels.put(FluidTypeTheOldOne.SMEAR, 50); @@ -274,7 +275,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide } public int getHEFromFuel() { - FluidTypeTheOldOne type = tank.getTankType(); + FluidType type = tank.getTankType(); Integer value = fuels.get(type); return value != null ? value : 0; } @@ -326,22 +327,22 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index 54fe96a7a..f9ef4f6c9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -8,6 +8,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -261,7 +262,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); @@ -272,7 +273,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -287,7 +288,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -295,7 +296,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -305,7 +306,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); @@ -319,7 +320,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -334,12 +335,12 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list2; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list2.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index e4bb3de24..6910172d6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -10,6 +10,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; @@ -499,22 +500,22 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index 8c93e73fa..51a87709a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -218,7 +219,7 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -231,12 +232,12 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index f4fe54beb..3a76bf278 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -19,6 +19,8 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemZirnoxBreedingRod; import com.hbm.items.machine.ItemZirnoxRod; @@ -379,12 +381,12 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); ForgeDirection rot = dir.getRotation(ForgeDirection.UP); @@ -403,34 +405,24 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF return false; } - public int getMaxFluidFill(FluidTypeTheOldOne type) { - switch (type) { - case SUPERHOTSTEAM: return steam.getMaxFill(); - case CARBONDIOXIDE: return carbonDioxide.getMaxFill(); - case WATER: return water.getMaxFill(); - default: return 0; - } + public int getMaxFluidFill(FluidType type) { + if(type == Fluids.SUPERHOTSTEAM) return steam.getMaxFill(); + if(type == Fluids.CARBONDIOXIDE) return carbonDioxide.getMaxFill(); + if(type == Fluids.WATER) return water.getMaxFill(); + return 0; } - public void setFluidFill(int i, FluidTypeTheOldOne type) { - switch (type) { - case SUPERHOTSTEAM: steam.setFill(i); - break; - case CARBONDIOXIDE: carbonDioxide.setFill(i); - break; - case WATER: water.setFill(i); - break; - default: break; - } + public void setFluidFill(int i, FluidType type) { + if(type == Fluids.SUPERHOTSTEAM) steam.setFill(i); + if(type == Fluids.CARBONDIOXIDE) carbonDioxide.setFill(i); + if(type == Fluids.WATER) water.setFill(i); } - public int getFluidFill(FluidTypeTheOldOne type) { - switch (type) { - case SUPERHOTSTEAM: return steam.getFill(); - case CARBONDIOXIDE: return carbonDioxide.getFill(); - case WATER: return water.getFill(); - default: return 0; - } + public int getFluidFill(FluidType type) { + if(type == Fluids.SUPERHOTSTEAM) return steam.getFill(); + if(type == Fluids.CARBONDIOXIDE) return carbonDioxide.getFill(); + if(type == Fluids.WATER) return water.getFill(); + return 0; } public void setFillstate(int fill, int index) { @@ -445,7 +437,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF } } - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { switch (index) { case 0: steam.setTankType(type); break; @@ -466,11 +458,11 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF return list; } - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java index d12580985..6aafa0e15 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java @@ -8,6 +8,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.SILEXRecipes; import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe; import com.hbm.items.ModItems; @@ -114,7 +115,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce return (currentFill * i) / maxFill; } - public static final HashMap fluidConversion = new HashMap(); + public static final HashMap fluidConversion = new HashMap(); static { fluidConversion.put(FluidTypeTheOldOne.UF6, new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.UF6.ordinal())); @@ -285,14 +286,14 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == tank.getTankType()) tank.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -302,7 +303,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == tank.getTankType()) return tank.getFill(); @@ -311,7 +312,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == tank.getTankType()) return tank.getMaxFill(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java index 7a53dc2f7..2fc26b6d7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -73,7 +74,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == FluidTypeTheOldOne.WATER) water.setFill(fill); if(type == FluidTypeTheOldOne.STEAM) @@ -81,7 +82,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index == 0) water.setTankType(type); if(index == 1) @@ -94,7 +95,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.WATER) return water.getFill(); if(type == FluidTypeTheOldOne.STEAM) @@ -104,13 +105,13 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord, this.yCoord + 3, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord - 1, this.zCoord, getTact(), type); } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -120,7 +121,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.WATER) return water.getMaxFill(); if(type == FluidTypeTheOldOne.STEAM) @@ -130,12 +131,12 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index 31f3e8920..aa74c0ada 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; @@ -356,7 +357,7 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -372,7 +373,7 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(fill); else if (type.name().equals(tanks[1].getTankType().name())) @@ -380,7 +381,7 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if (index < 2 && tanks[index] != null) tanks[index].setTankType(type); } @@ -395,7 +396,7 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index 020a3bacd..9a10128ed 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -11,6 +11,7 @@ import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.special.ItemWasteLong; import com.hbm.items.special.ItemWasteShort; @@ -223,7 +224,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord - 1, this.zCoord, getTact(), type); @@ -233,12 +234,12 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == tanks[0].getTankType()) return tanks[0].getFill(); else if(type == tanks[1].getTankType()) @@ -248,7 +249,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type == tanks[0].getTankType()) tanks[0].setFill(i); else if(type == tanks[1].getTankType()) @@ -256,7 +257,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type == tanks[0].getTankType()) return list; if(type == tanks[1].getTankType()) @@ -266,7 +267,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type == tanks[0].getTankType()) this.list.clear(); if(type == tanks[1].getTankType()) @@ -280,7 +281,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java index 7b79ab806..7af05fefb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; @@ -42,7 +43,7 @@ public class TileEntityTowerLarge extends TileEntityCondenser { } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(int i = 2; i <= 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java index 4fec8ab5f..10df2b276 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java @@ -1,7 +1,8 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; @@ -14,8 +15,8 @@ public class TileEntityTowerSmall extends TileEntityCondenser { public TileEntityTowerSmall() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 1000, 0); - tanks[1] = new FluidTank(FluidTypeTheOldOne.WATER, 1000, 1); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 1000, 0); + tanks[1] = new FluidTank(Fluids.WATER, 1000, 1); } @Override @@ -42,7 +43,7 @@ public class TileEntityTowerSmall extends TileEntityCondenser { } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(int i = 2; i <= 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java index 4e60136d2..de1ae98fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -13,6 +13,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.IReactor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCapacitor; import com.hbm.items.special.WatzFuel; @@ -705,12 +706,12 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 4, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord - 4, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord, this.zCoord + 4, getTact(), type); @@ -719,27 +720,27 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return tank.getFill(); } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { tank.setFill(i); } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list1; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list1.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java index e00111faf..9e69fcb01 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java @@ -9,6 +9,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.lib.Library; import com.hbm.util.Tuple.Quartet; @@ -55,7 +56,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl private void crack() { - Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); if(quart != null) { @@ -77,7 +78,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl private void setupTanks() { - Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); if(quart != null) { tanks[1].setTankType(FluidTypeTheOldOne.STEAM); @@ -114,7 +115,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { for(FluidTank tank : tanks) { if(tank.getTankType() == type) { tank.setFill(fill); @@ -123,7 +124,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { this.tanks[index].setTankType(type); } @@ -133,7 +134,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { for(FluidTank tank : tanks) { if(tank.getTankType() == type) { return tank.getFill(); @@ -143,7 +144,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == tanks[0].getTankType()) return tanks[0].getMaxFill(); else if(type == tanks[1].getTankType()) @@ -153,7 +154,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); ForgeDirection rot = dir.getRotation(ForgeDirection.UP); @@ -170,7 +171,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -180,7 +181,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[2].getTankType().name())) return list1; if(type.name().equals(tanks[3].getTankType().name())) @@ -189,7 +190,7 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[2].getTankType().name())) list1.clear(); if(type.name().equals(tanks[3].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java index bb8681e93..c05b2babe 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java @@ -4,6 +4,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.world.feature.OilSpot; import net.minecraft.block.Block; @@ -103,7 +104,7 @@ public class TileEntityMachineFrackingTower extends TileEntityOilDrillBase imple } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord, this.zCoord - 1, getTact(), type); @@ -111,7 +112,7 @@ public class TileEntityMachineFrackingTower extends TileEntityOilDrillBase imple } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type == tanks[2].getTankType() ? tanks[2].getMaxFill() : 0; } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java index 0775961d3..e04f41a0b 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java @@ -7,6 +7,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.lib.Library; import com.hbm.util.Tuple.Quartet; @@ -76,7 +77,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid private void setupTanks() { - Quartet quart = RefineryRecipes.getFractions(tanks[0].getTankType()); + Quartet quart = RefineryRecipes.getFractions(tanks[0].getTankType()); if(quart != null) { tanks[1].setTankType(quart.getW()); @@ -90,7 +91,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid private void fractionate() { - Quartet quart = RefineryRecipes.getFractions(tanks[0].getTankType()); + Quartet quart = RefineryRecipes.getFractions(tanks[0].getTankType()); if(quart != null) { @@ -132,7 +133,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { for(FluidTank tank : tanks) { if(tank.getTankType() == type) { tank.setFill(fill); @@ -141,7 +142,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { this.tanks[index].setTankType(type); } @@ -151,7 +152,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { for(FluidTank tank : tanks) { if(tank.getTankType() == type) { return tank.getFill(); @@ -161,7 +162,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else @@ -169,7 +170,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(int i = 2; i < 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); @@ -178,7 +179,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -188,7 +189,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return list1; if(type.name().equals(tanks[2].getTankType().name())) @@ -197,7 +198,7 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) list1.clear(); if(type.name().equals(tanks[2].getTankType().name())) diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java index 5aac0f95f..4369bed53 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java @@ -10,6 +10,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; @@ -274,22 +275,22 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java index 232bacc6b..875ed8cb2 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.machine.oil; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import net.minecraft.block.Block; @@ -83,7 +84,7 @@ public class TileEntityMachineOilWell extends TileEntityOilDrillBase { } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord - 2, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord + 2, this.yCoord, this.zCoord, getTact(), type); fillFluid(this.xCoord, this.yCoord, this.zCoord - 2, getTact(), type); diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java index fe4592181..7e3453859 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java @@ -2,7 +2,7 @@ package com.hbm.tileentity.machine.oil; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -122,7 +122,7 @@ public class TileEntityMachinePumpjack extends TileEntityOilDrillBase { } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); ForgeDirection rot = dir.getRotation(ForgeDirection.DOWN); diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java index 722612483..cd1193e7b 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java @@ -9,6 +9,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -348,7 +349,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord + 1, this.yCoord, this.zCoord - 2, getTact(), type); fillFluid(this.xCoord + 1, this.yCoord, this.zCoord + 2, getTact(), type); fillFluid(this.xCoord - 1, this.yCoord, this.zCoord - 2, getTact(), type); @@ -361,7 +362,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -375,7 +376,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -391,7 +392,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -405,7 +406,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return list1; if(type.name().equals(tanks[2].getTankType().name())) @@ -418,7 +419,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) list1.clear(); if(type.name().equals(tanks[2].getTankType().name())) @@ -430,7 +431,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else @@ -444,7 +445,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < 5 && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java index bfb22ae3f..c506b4076 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java @@ -10,6 +10,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; @@ -258,12 +259,12 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { for(FluidTank tank : tanks) { if(type == tank.getTankType()) { return tank.getFill(); @@ -274,7 +275,7 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { for(FluidTank tank : tanks) { if(type == tank.getTankType()) { tank.setFill(i); @@ -284,7 +285,7 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return this.list1; if(type.name().equals(tanks[1].getTankType().name())) @@ -293,7 +294,7 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) list1.clear(); if(type.name().equals(tanks[1].getTankType().name())) @@ -307,7 +308,7 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index < tanks.length && tanks[index] != null) tanks[index].setTankType(type); } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java index 6e2660501..8da8e3994 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java @@ -5,11 +5,12 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; -import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IControlReceiver; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; @@ -26,8 +27,8 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I public TileEntityRBMKBoiler() { super(0); - feed = new FluidTank(FluidTypeTheOldOne.WATER, 10000, 0); - steam = new FluidTank(FluidTypeTheOldOne.STEAM, 1000000, 1); + feed = new FluidTank(Fluids.WATER, 10000, 0); + steam = new FluidTank(Fluids.STEAM, 1000000, 1); } @Override @@ -65,30 +66,24 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I super.updateEntity(); } - public double getHeatFromSteam(FluidTypeTheOldOne type) { - - switch(type) { - case STEAM: return 100D; - case HOTSTEAM: return 300D; - case SUPERHOTSTEAM: return 450D; - case ULTRAHOTSTEAM: return 600D; - default: return 0D; - } + public double getHeatFromSteam(FluidType type) { + if(type == Fluids.STEAM) return 100D; + if(type == Fluids.HOTSTEAM) return 300D; + if(type == Fluids.SUPERHOTSTEAM) return 450D; + if(type == Fluids.ULTRAHOTSTEAM) return 600D; + return 0D; } - public double getFactorFromSteam(FluidTypeTheOldOne type) { - - switch(type) { - case STEAM: return 1D; - case HOTSTEAM: return 10D; - case SUPERHOTSTEAM: return 100D; - case ULTRAHOTSTEAM: return 1000D; - default: return 0D; - } + public double getFactorFromSteam(FluidType type) { + if(type == Fluids.STEAM) return 1D; + if(type == Fluids.HOTSTEAM) return 10D; + if(type == Fluids.SUPERHOTSTEAM) return 100D; + if(type == Fluids.ULTRAHOTSTEAM) return 1000D; + return 0D; } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord, this.yCoord + RBMKDials.getColumnHeight(worldObj) + 1, this.zCoord, getTact(), type); @@ -113,7 +108,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -122,7 +117,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I public boolean getTact() { return worldObj.getTotalWorldTime() % 2 == 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type == feed.getTankType()) feed.setFill(i); @@ -131,7 +126,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == feed.getTankType()) return feed.getFill(); @@ -142,7 +137,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == feed.getTankType()) return feed.getMaxFill(); @@ -162,7 +157,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index == 0) feed.setTankType(type); @@ -180,12 +175,12 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } @@ -210,18 +205,16 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I return Vec3.createVectorHelper(xCoord - player.posX, yCoord - player.posY, zCoord - player.posZ).lengthVector() < 20; } - @SuppressWarnings("incomplete-switch") //shut the up @Override public void receiveControl(NBTTagCompound data) { if(data.hasKey("compression")) { - switch(steam.getTankType()) { - case STEAM: steam.setTankType(FluidTypeTheOldOne.HOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case HOTSTEAM: steam.setTankType(FluidTypeTheOldOne.SUPERHOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case SUPERHOTSTEAM: steam.setTankType(FluidTypeTheOldOne.ULTRAHOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case ULTRAHOTSTEAM: steam.setTankType(FluidTypeTheOldOne.STEAM); steam.setFill(Math.min(steam.getFill() * 1000, steam.getMaxFill())); break; - } + FluidType type = steam.getTankType(); + if(type == Fluids.STEAM) { steam.setTankType(Fluids.HOTSTEAM); steam.setFill(steam.getFill() / 10); } + if(type == Fluids.HOTSTEAM) { steam.setTankType(Fluids.SUPERHOTSTEAM); steam.setFill(steam.getFill() / 10); } + if(type == Fluids.SUPERHOTSTEAM) { steam.setTankType(Fluids.ULTRAHOTSTEAM); steam.setFill(steam.getFill() / 10); } + if(type == Fluids.ULTRAHOTSTEAM) { steam.setTankType(Fluids.STEAM); steam.setFill(Math.min(steam.getFill() * 1000, steam.getMaxFill())); } this.markDirty(); } @@ -251,7 +244,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I data.setInteger("maxWater", this.feed.getMaxFill()); data.setInteger("steam", this.steam.getFill()); data.setInteger("maxSteam", this.steam.getMaxFill()); - data.setShort("type", (short)this.steam.getTankType().ordinal()); + data.setShort("type", (short)this.steam.getTankType().getID()); return data; } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java index 9b57e36f1..2fe88d234 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import net.minecraft.entity.Entity; @@ -104,13 +105,13 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidAc } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == tank.getTankType()) tank.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @@ -120,12 +121,12 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidAc } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type == tank.getTankType() ? tank.getFill() : 0; } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type == tank.getTankType() ? tank.getMaxFill() : 0; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java index c0737dedb..a4f08bccb 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java @@ -6,6 +6,7 @@ import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; @@ -67,12 +68,12 @@ public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == FluidTypeTheOldOne.WATER) water.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index == 0) water.setTankType(type); } @@ -82,13 +83,13 @@ public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.WATER) return water.getFill(); return 0; } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { if(type == FluidTypeTheOldOne.WATER) return water.getMaxFill(); return 0; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java index 3030e4e75..8f7994e32 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java @@ -11,6 +11,7 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.lib.Library; @@ -147,7 +148,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { fillFluid(this.xCoord, this.yCoord + RBMKDials.getColumnHeight(worldObj) + 1, this.zCoord, getTact(), type); if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.rbmk_loader) { @@ -171,7 +172,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -187,14 +188,14 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { if(type == gas.getTankType()) gas.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { if(index == 0) gas.setTankType(type); @@ -206,7 +207,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { if(type == gas.getTankType()) return gas.getFill(); @@ -215,12 +216,12 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java index b70f988dd..919dd788f 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java @@ -8,6 +8,7 @@ import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import net.minecraft.block.Block; @@ -73,12 +74,12 @@ public class TileEntityRBMKOutlet extends TileEntity implements IFluidSource { } @Override - public void setFluidFill(int fill, FluidTypeTheOldOne type) { + public void setFluidFill(int fill, FluidType type) { steam.setFill(fill); } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { steam.setTankType(type); } @@ -88,18 +89,18 @@ public class TileEntityRBMKOutlet extends TileEntity implements IFluidSource { } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return steam.getFill(); } @Override - public void fillFluidInit(FluidTypeTheOldOne type) { + public void fillFluidInit(FluidType type) { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) fillFluid(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY, this.zCoord + dir.offsetZ, getTact(), type); } @Override - public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) { + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @@ -108,12 +109,12 @@ public class TileEntityRBMKOutlet extends TileEntity implements IFluidSource { public boolean getTact() { return worldObj.getTotalWorldTime() % 2 == 0; } @Override - public List getFluidList(FluidTypeTheOldOne type) { + public List getFluidList(FluidType type) { return this.list; } @Override - public void clearFluidList(FluidTypeTheOldOne type) { + public void clearFluidList(FluidType type) { this.list.clear(); } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java index 5c053d4fb..b0098f5b7 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java @@ -8,6 +8,7 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; @@ -138,22 +139,22 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl } @Override - public void setType(FluidTypeTheOldOne type, int index) { + public void setType(FluidType type, int index) { tank.setTankType(type); } @Override - public int getMaxFluidFill(FluidTypeTheOldOne type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getFluidFill(FluidTypeTheOldOne type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setFluidFill(int i, FluidTypeTheOldOne type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); }