diff --git a/src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java b/src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java index 7b191e64a..4cc6d7193 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java @@ -2,7 +2,8 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; import com.hbm.handler.MultiblockHandlerXR; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticCracker; @@ -69,7 +70,7 @@ public class MachineCatalyticCracker extends BlockDummyable { player.addChatComponentMessage(new ChatComponentTranslation("hbmfluid." + cracker.tanks[i].getTankType().getName().toLowerCase()).appendSibling(new ChatComponentText(": " + cracker.tanks[i].getFill() + "/" + cracker.tanks[i].getMaxFill() + "mB"))); } else { - FluidType type = FluidType.values()[player.getHeldItem().getItemDamage()]; + FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage()); cracker.tanks[0].setTankType(type); cracker.markDirty(); player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!")); diff --git a/src/main/java/com/hbm/blocks/machine/MachineChungus.java b/src/main/java/com/hbm/blocks/machine/MachineChungus.java index 59e9a0728..eb7edb807 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineChungus.java +++ b/src/main/java/com/hbm/blocks/machine/MachineChungus.java @@ -1,8 +1,9 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.handler.MultiblockHandlerXR; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityChungus; @@ -55,35 +56,27 @@ public class MachineChungus extends BlockDummyable { world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.chungusLever", 1.5F, 1.0F); if(!world.isRemote) { - switch(entity.tanks[0].getTankType()) { - case STEAM: - entity.tanks[0].setTankType(FluidType.HOTSTEAM); - entity.tanks[1].setTankType(FluidType.STEAM); + FluidType type = entity.tanks[0].getTankType(); + if(type == Fluids.STEAM) { + entity.tanks[0].setTankType(Fluids.HOTSTEAM); + entity.tanks[1].setTankType(Fluids.STEAM); entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); entity.tanks[1].setFill(0); - break; - - case HOTSTEAM: - entity.tanks[0].setTankType(FluidType.SUPERHOTSTEAM); - entity.tanks[1].setTankType(FluidType.HOTSTEAM); + } else if(type == Fluids.HOTSTEAM) { + entity.tanks[0].setTankType(Fluids.SUPERHOTSTEAM); + entity.tanks[1].setTankType(Fluids.HOTSTEAM); entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); entity.tanks[1].setFill(0); - break; - - case SUPERHOTSTEAM: - entity.tanks[0].setTankType(FluidType.ULTRAHOTSTEAM); - entity.tanks[1].setTankType(FluidType.SUPERHOTSTEAM); + } else if(type == Fluids.SUPERHOTSTEAM) { + entity.tanks[0].setTankType(Fluids.ULTRAHOTSTEAM); + entity.tanks[1].setTankType(Fluids.SUPERHOTSTEAM); entity.tanks[0].setFill(entity.tanks[0].getFill() / 10); entity.tanks[1].setFill(0); - break; - - default: - case ULTRAHOTSTEAM: - entity.tanks[0].setTankType(FluidType.STEAM); - entity.tanks[1].setTankType(FluidType.SPENTSTEAM); + } else { + entity.tanks[0].setTankType(Fluids.STEAM); + entity.tanks[1].setTankType(Fluids.SPENTSTEAM); entity.tanks[0].setFill(Math.min(entity.tanks[0].getFill() * 1000, entity.tanks[0].getMaxFill())); entity.tanks[1].setFill(0); - break; } entity.markDirty(); diff --git a/src/main/java/com/hbm/blocks/machine/MachineFractionTower.java b/src/main/java/com/hbm/blocks/machine/MachineFractionTower.java index 407db3044..fec788228 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFractionTower.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFractionTower.java @@ -1,7 +1,8 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower; @@ -71,7 +72,7 @@ public class MachineFractionTower extends BlockDummyable { if(world.getTileEntity(pos[0], pos[1] - 3, pos[2]) instanceof TileEntityMachineFractionTower) { player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + "You can only change the type in the bottom segment!")); } else { - FluidType type = FluidType.values()[player.getHeldItem().getItemDamage()]; + FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage()); frac.tanks[0].setTankType(type); frac.markDirty(); player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!")); diff --git a/src/main/java/com/hbm/crafting/ArmorRecipes.java b/src/main/java/com/hbm/crafting/ArmorRecipes.java index 4bf8f3328..6abe1805b 100644 --- a/src/main/java/com/hbm/crafting/ArmorRecipes.java +++ b/src/main/java/com/hbm/crafting/ArmorRecipes.java @@ -2,7 +2,7 @@ package com.hbm.crafting; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.OreDictManager; import static com.hbm.inventory.OreDictManager.*; import com.hbm.items.ModItems; @@ -79,7 +79,7 @@ public class ArmorRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.ajro_boots, 1), new Object[] { ModItems.ajr_boots, KEY_RED, KEY_BLACK }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_helmet, 1), new Object[] { "SBS", " C ", " I ", 'S', Items.string, 'B', new ItemStack(Blocks.wool, 1, 15), 'C', ModItems.circuit_targeting_tier4, 'I', STAR.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate, 1), new Object[] { "N N", "MSM", "NCN", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_plate, 'C', ModItems.circuit_targeting_tier5 }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.XENON.ordinal()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.XENON.ordinal()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_legs, 1), new Object[] { "MBM", "NSN", "N N", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_legs, 'B', ModBlocks.block_starmetal }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_boots, 1), new Object[] { "N N", "BSB", 'N', ModItems.plate_armor_lunar, 'S', ModItems.starmetal_boots, 'B', ModBlocks.block_starmetal }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.hev_helmet, 1), new Object[] { "PPC", "PBP", "IFI", 'P', ModItems.plate_armor_hev, 'C', ModItems.circuit_targeting_tier4, 'B', ModItems.titanium_helmet, 'I', ModItems.plate_polymer, 'F', ModItems.gas_mask_filter }); diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index e528e7dcd..2b3950b0c 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -1,7 +1,7 @@ package com.hbm.crafting; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.OreDictManager; import static com.hbm.inventory.OreDictManager.*; import com.hbm.items.ModItems; @@ -136,7 +136,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92), new Object[] { "DDD", "SSC", " R", 'D', ModItems.plate_dineutronium, 'S', STAR.ingot(), 'C', ModItems.circuit_targeting_tier6, 'R', ModItems.gun_revolver_schrabidium }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b93), new Object[] { "PCE", "SEB", "PCE", 'P', ModItems.plate_dineutronium, 'C', ModItems.weaponized_starblaster_cell, 'E', ModItems.component_emitter, 'B', ModItems.gun_b92, 'S', ModItems.singularity_spark }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92_ammo, 1), new Object[] { "PSP", "ESE", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'E', ModItems.powder_spark_mix }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi, 1), new Object[] { "SMS", " PB", " P ", 'S', STEEL.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', STEEL.plate(), 'B', ModItems.bolt_dura_steel }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_silencer, 1), new Object[] { "P ", " P ", " U", 'P', POLYMER.ingot(), 'U', ModItems.gun_uzi }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_saturnite, 1), new Object[] { "SMS", " PB", " P ", 'S', BIGMT.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', BIGMT.plate(), 'B', ModItems.bolt_tungsten }); @@ -216,7 +216,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_calamity, 12), new Object[] { " I ", "GCG", " P ", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_actionexpress, 12), new Object[] { " I", "GC", " P", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_nuke, 1), new Object[] { " WP", "SEP", " WP", 'W', ModItems.wire_aluminium, 'P', STEEL.plate(), 'S', ModItems.hull_small_steel, 'E', ModItems.ingot_semtex }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_lead_full, 1, FluidType.WATZ.ordinal()) }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_lead_full, 1, FluidTypeTheOldOne.WATZ.ordinal()) }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart_nerf, 16), new Object[] { "I", "I", 'I', ModItems.plate_polymer }); //Folly shells @@ -307,7 +307,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fuel_vaporizer, 1), new Object[] { "PSP", "SNS", "PSP", 'P', P_WHITE.ingot(), 'S', ModItems.crystal_sulfur, 'N', ModItems.ammo_fuel_napalm }); //Fire Extingusisher Tanks - CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext, 1), new Object[] { " P ", "BDB", " P ", 'P', STEEL.plate(), 'B', ModItems.bolt_tungsten, 'D', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.ordinal()) }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext, 1), new Object[] { " P ", "BDB", " P ", 'P', STEEL.plate(), 'B', ModItems.bolt_tungsten, 'D', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.WATER.ordinal()) }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext_foam, 1), new Object[] { " N ", "NFN", " N ", 'N', KNO.dust(), 'F', ModItems.ammo_fireext }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext_sand, 1), new Object[] { "NNN", "NFN", "NNN", 'N', ModBlocks.sand_boron, 'F', ModItems.ammo_fireext }); @@ -339,7 +339,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mirv, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_smart, 'C', ModItems.grenade_generic }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', BIGMT.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_burst, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_breach, 'C', ModItems.grenade_generic }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()) }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()) }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.nuclear_waste_pearl), new Object[] { "WWW", "WFW", "WWW", 'W', ModItems.nuclear_waste_tiny, 'F', ModBlocks.block_fallout }); //CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_nuke), new Object[] { "CGC", "CGC", "PAP", 'C', ModBlocks.det_charge, 'G', ModItems.grenade_mk2, 'P', ALLOY.plate(), 'A', Blocks.anvil }); diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index d9050065a..d4adf7ab3 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -5,103 +5,113 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.FluidType.FluidTrait; +import com.hbm.inventory.fluid.Fluids; import com.hbm.render.util.EnumSymbol; public class FluidTypeHandler { - public static enum FluidTrait { - AMAT, - CORROSIVE, - CORROSIVE_2, - LEAD_CONTAINER, - NO_CONTAINER, - NO_ID; - } - - public static enum FluidType { - NONE (0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"), + @Deprecated //you might spot this deprecated annotation and thing "oh goodie, that's something for me to remove and replace!" + //no. + //if you tough any of this i promise you will regret being born + //deprecated means "avoid using in the future" not "fuck with this with your heart's content" + //hands off. if you can read this, close this class now. + public static class FluidTypeTheOldOne extends com.hbm.inventory.fluid.FluidType { - WATER (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"), - STEAM (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100), - HOTSTEAM (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300), - SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450), - ULTRAHOTSTEAM (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600), - COOLANT (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"), + /*WATER = new FluidType (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"), + STEAM = new FluidType (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100), + HOTSTEAM = new FluidType (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300), + SUPERHOTSTEAM = new FluidType (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450), + ULTRAHOTSTEAM = new FluidType (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600), + COOLANT = new FluidType (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"), - LAVA (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200), + LAVA = new FluidType (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200), - DEUTERIUM (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"), - TRITIUM (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"), + DEUTERIUM = new FluidType (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"), + TRITIUM = new FluidType (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"), - OIL (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"), - HOTOIL (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350), + OIL = new FluidType (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"), + HOTOIL = new FluidType (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350), - HEAVYOIL (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"), - BITUMEN (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"), - SMEAR (0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"), - HEATINGOIL (0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"), + HEAVYOIL = new FluidType (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"), + BITUMEN = new FluidType (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"), + SMEAR = new FluidType (0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"), + HEATINGOIL = new FluidType (0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"), - RECLAIMED (0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"), - PETROIL (0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"), + RECLAIMED = new FluidType (0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"), + PETROIL = new FluidType (0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"), - LUBRICANT (0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"), + LUBRICANT = new FluidType (0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"), - NAPHTHA (0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"), - DIESEL (0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"), + NAPHTHA = new FluidType (0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"), + DIESEL = new FluidType (0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"), - LIGHTOIL (0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"), - KEROSENE (0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"), + LIGHTOIL = new FluidType (0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"), + KEROSENE = new FluidType (0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"), - GAS (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"), - PETROLEUM (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"), - LPG (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"), + GAS = new FluidType (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"), + PETROLEUM = new FluidType (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"), + LPG = new FluidType (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"), - BIOGAS (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"), - BIOFUEL (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"), + BIOGAS = new FluidType (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"), + BIOFUEL = new FluidType (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"), - NITAN (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"), + NITAN = new FluidType (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE), - PUF6 (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - SAS3 (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - SCHRABIDIC (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + UF6 = new FluidType (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE), + PUF6 = new FluidType (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + SAS3 = new FluidType (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + SCHRABIDIC = new FluidType (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - AMAT (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT), - ASCHRAB (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT), + AMAT = new FluidType (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT), + ASCHRAB = new FluidType (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT), - ACID (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE), - WATZ (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - CRYOGEL (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170), + ACID = new FluidType (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE), + WATZ = new FluidType (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + CRYOGEL = new FluidType (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170), - HYDROGEN (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"), - OXYGEN (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"), - XENON (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"), - BALEFIRE (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + HYDROGEN = new FluidType (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"), + OXYGEN = new FluidType (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"), + XENON = new FluidType (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"), + BALEFIRE = new FluidType (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - MERCURY (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"), - PAIN (0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE), + MERCURY = new FluidType (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"), + PAIN = new FluidType (0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE), - WASTEFLUID (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER), - WASTEGAS (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER), + WASTEFLUID = new FluidType (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER), + WASTEGAS = new FluidType (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER), - GASOLINE (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"), - SPENTSTEAM (0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam"), - FRACKSOL (0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE), + GASOLINE = new FluidType (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"), + SPENTSTEAM = new FluidType (0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam"), + FRACKSOL = new FluidType (0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE), - PLASMA_DT (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_HD (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_HT (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_XM (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_BF (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_DH3 (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_DT = new FluidType (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_HD = new FluidType (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_HT = new FluidType (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_XM = new FluidType (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_BF = new FluidType (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_DH3 = new FluidType (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - HELIUM3 (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"), - DEATH (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - ETHANOL (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"), - HEAVYWATER (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), - CARBONDIOXIDE (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); + HELIUM3 = new FluidType (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"), + DEATH = new FluidType (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + ETHANOL = new FluidType (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"), + HEAVYWATER = new FluidType (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), + CARBONDIOXIDE = new FluidType (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide");*/ + + public static FluidType NONE = Fluids.NONE, WATER = Fluids.WATER, STEAM = Fluids.STEAM, HOTSTEAM = Fluids.HOTSTEAM, + SUPERHOTSTEAM = Fluids.SUPERHOTSTEAM, ULTRAHOTSTEAM = Fluids.ULTRAHOTSTEAM, COOLANT = Fluids.COOLANT, LAVA = Fluids.LAVA, DEUTERIUM = Fluids.DEUTERIUM, + TRITIUM = Fluids.TRITIUM, OIL = Fluids.OIL, HOTOIL = Fluids.HOTOIL, HEAVYOIL = Fluids.HEAVYOIL, BITUMEN = Fluids.BITUMEN, SMEAR = Fluids.SMEAR, + HEATINGOIL = Fluids.HEATINGOIL, RECLAIMED = Fluids.RECLAIMED, PETROIL = Fluids.PETROIL, LUBRICANT = Fluids.LUBRICANT, NAPHTHA = Fluids.NAPHTHA, + DIESEL = Fluids.DIESEL, LIGHTOIL = Fluids.LIGHTOIL, KEROSENE = Fluids.KEROSENE, GAS = Fluids.GAS, PETROLEUM = Fluids.PETROLEUM, LPG = Fluids.LPG, + BIOGAS = Fluids.BIOGAS, BIOFUEL = Fluids.BIOFUEL, NITAN = Fluids.NITAN, UF6 = Fluids.UF6, PUF6 = Fluids.PUF6, SAS3 = Fluids.SAS3, SCHRABIDIC = Fluids.SCHRABIDIC, + AMAT = Fluids.AMAT, ASCHRAB = Fluids.ASCHRAB, ACID = Fluids.ACID, WATZ = Fluids.WATZ, CRYOGEL = Fluids.CRYOGEL, HYDROGEN = Fluids.HYDROGEN, OXYGEN = Fluids.OXYGEN, + XENON = Fluids.XENON, BALEFIRE = Fluids.BALEFIRE, MERCURY = Fluids.MERCURY, PAIN = Fluids.PAIN, WASTEFLUID = Fluids.WASTEFLUID, WASTEGAS = Fluids.WASTEGAS, + GASOLINE = Fluids.GASOLINE, SPENTSTEAM = Fluids.SPENTSTEAM, FRACKSOL = Fluids.FRACKSOL, PLASMA_DT = Fluids.PLASMA_DT, PLASMA_HD = Fluids.PLASMA_HD, + PLASMA_HT = Fluids.PLASMA_HT, PLASMA_XM = Fluids.PLASMA_XM, PLASMA_BF = Fluids.PLASMA_BF, PLASMA_DH3 = Fluids.PLASMA_DH3, HELIUM3 = Fluids.HELIUM3, + DEATH = Fluids.DEATH, ETHANOL = Fluids.ETHANOL, HEAVYWATER = Fluids.HEAVYWATER, CARBONDIOXIDE = Fluids.CARBONDIOXIDE; - //Approximate HEX Color of the fluid, used for pipe rendering + /*//Approximate HEX Color of the fluid, used for pipe rendering private int color; //X position of the fluid on the sheet, the "row" private int textureX; @@ -123,99 +133,30 @@ public class FluidTypeHandler { public int reactivity; public EnumSymbol symbol; public int temperature; - public List traits = new ArrayList(); + public List traits = new ArrayList();*/ - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { + private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) { this(color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]); } - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { + private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) { this(color, x, y, sheet, p, f, r, symbol, name, 0, traits); } - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { + private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) { this(color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]); } - private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { - this.color = color; - this.textureX = x; - this.textureY = y; - this.name = name; - this.sheetID = sheet; - this.poison = p; - this.flammability = f; - this.reactivity = r; - this.symbol = symbol; - this.temperature = temperature; - Collections.addAll(this.traits, traits); - } - - public int getColor() { - return this.color; - } - public int getMSAColor() { - return this.color; - } - public int textureX() { - return this.textureX; - } - public int textureY() { - return this.textureY; - } - public int getSheetID() { - return this.sheetID; - } - public String getUnlocalizedName() { - return this.name; + private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { + super(color, x, y, sheet, p, f, r, symbol, name, temperature, traits); } - public static FluidType getEnum(int i) { - if(i < FluidType.values().length) - return FluidType.values()[i]; - else - return FluidType.NONE; - } - - 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 FluidType.NONE; - } - - public int getID() { - return Arrays.asList(FluidType.values()).indexOf(this); - } - - public String getName() { - return this.toString(); - } - - public boolean isHot() { - return this.temperature >= 100; - } - - public boolean isCorrosive() { - return this.traits.contains(FluidTrait.CORROSIVE) || this.traits.contains(FluidTrait.CORROSIVE_2); - } - - public boolean isAntimatter() { - return this.traits.contains(FluidTrait.AMAT); - } - - public boolean hasNoContainer() { - return this.traits.contains(FluidTrait.NO_CONTAINER); + /*public static com.hbm.inventory.fluid.FluidType[] values() { + return Fluids.metaOrder.toArray(new com.hbm.inventory.fluid.FluidType[0]); } public boolean needsLeadContainer() { return this.traits.contains(FluidTrait.LEAD_CONTAINER); - } - - public boolean hasNoID() { - return this.traits.contains(FluidTrait.NO_ID); - } + }*/ }; } diff --git a/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java b/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java index f6c554438..17b23be39 100644 --- a/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.gui.GUICrystallizer; import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.inventory.recipes.MachineRecipes; @@ -31,7 +31,7 @@ public class CrystallizerRecipeHandler extends TemplateRecipeHandler { public RecipeSet(Object input, ItemStack result) { this.input = new PositionedStack(input, 75, 24); - this.acid = new PositionedStack(ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired), 39, 24); + this.acid = new PositionedStack(ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired), 39, 24); this.result = new PositionedStack(result, 135, 24); } @@ -126,7 +126,7 @@ public class CrystallizerRecipeHandler extends TemplateRecipeHandler { for (Map.Entry recipe : recipes.entrySet()) { if(NEIServerUtils.areStacksSameTypeCrafting(ingredient, ItemFluidIcon.addQuantity( - new ItemStack(ModItems.fluid_icon, 1, FluidType.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) { + new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) { if(recipe.getKey() instanceof ItemStack) { this.arecipes.add(new RecipeSet(recipe.getKey(), (ItemStack)recipe.getValue())); diff --git a/src/main/java/com/hbm/interfaces/IFluidAcceptor.java b/src/main/java/com/hbm/interfaces/IFluidAcceptor.java index 42dfda4a8..e013ec71b 100644 --- a/src/main/java/com/hbm/interfaces/IFluidAcceptor.java +++ b/src/main/java/com/hbm/interfaces/IFluidAcceptor.java @@ -1,6 +1,6 @@ package com.hbm.interfaces; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; public interface IFluidAcceptor extends IFluidContainer { diff --git a/src/main/java/com/hbm/interfaces/IFluidContainer.java b/src/main/java/com/hbm/interfaces/IFluidContainer.java index 9fc527bbf..7143ca1bc 100644 --- a/src/main/java/com/hbm/interfaces/IFluidContainer.java +++ b/src/main/java/com/hbm/interfaces/IFluidContainer.java @@ -2,8 +2,8 @@ package com.hbm.interfaces; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; public interface IFluidContainer { diff --git a/src/main/java/com/hbm/interfaces/IFluidDuct.java b/src/main/java/com/hbm/interfaces/IFluidDuct.java index da4fd3d15..fa9811f4b 100644 --- a/src/main/java/com/hbm/interfaces/IFluidDuct.java +++ b/src/main/java/com/hbm/interfaces/IFluidDuct.java @@ -1,6 +1,6 @@ package com.hbm.interfaces; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; public interface IFluidDuct { diff --git a/src/main/java/com/hbm/interfaces/IFluidSource.java b/src/main/java/com/hbm/interfaces/IFluidSource.java index bfc68b260..b3b8def87 100644 --- a/src/main/java/com/hbm/interfaces/IFluidSource.java +++ b/src/main/java/com/hbm/interfaces/IFluidSource.java @@ -2,7 +2,7 @@ package com.hbm.interfaces; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; public interface IFluidSource extends IFluidContainer { diff --git a/src/main/java/com/hbm/interfaces/IPartiallyFillable.java b/src/main/java/com/hbm/interfaces/IPartiallyFillable.java index 590302c5f..57ebd39a4 100644 --- a/src/main/java/com/hbm/interfaces/IPartiallyFillable.java +++ b/src/main/java/com/hbm/interfaces/IPartiallyFillable.java @@ -1,6 +1,6 @@ package com.hbm.interfaces; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/FluidContainer.java b/src/main/java/com/hbm/inventory/FluidContainer.java index 0e59382fd..662c8c39e 100644 --- a/src/main/java/com/hbm/inventory/FluidContainer.java +++ b/src/main/java/com/hbm/inventory/FluidContainer.java @@ -1,6 +1,6 @@ package com.hbm.inventory; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index 2e1481605..6827880d5 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import net.minecraft.init.Items; @@ -16,61 +17,61 @@ public class FluidContainerRegistry { public static List allContainers = new ArrayList(); public static void register() { - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), FluidType.SCHRABIDIC, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), Fluids.WATER, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), Fluids.LAVA, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), Fluids.WATZ, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), Fluids.SCHRABIDIC, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_oil), new ItemStack(ModItems.canister_empty), FluidType.OIL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_smear), new ItemStack(ModItems.canister_empty), FluidType.SMEAR, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heavyoil), new ItemStack(ModItems.canister_empty), FluidType.HEAVYOIL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_bitumen), new ItemStack(ModItems.canister_empty), FluidType.BITUMEN, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heatingoil), new ItemStack(ModItems.canister_empty), FluidType.HEATINGOIL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_reoil), new ItemStack(ModItems.canister_empty), FluidType.RECLAIMED, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_petroil), new ItemStack(ModItems.canister_empty), FluidType.PETROIL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_canola), new ItemStack(ModItems.canister_empty), FluidType.LUBRICANT, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_naphtha), new ItemStack(ModItems.canister_empty), FluidType.NAPHTHA, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fuel), new ItemStack(ModItems.canister_empty), FluidType.DIESEL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_ethanol), new ItemStack(ModItems.canister_empty), FluidType.ETHANOL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), FluidType.GASOLINE, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fracksol), new ItemStack(ModItems.canister_empty), FluidType.FRACKSOL, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), FluidType.LPG, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), FluidType.OXYGEN, 10000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_oil), new ItemStack(ModItems.canister_empty), Fluids.OIL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_smear), new ItemStack(ModItems.canister_empty), Fluids.SMEAR, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heavyoil), new ItemStack(ModItems.canister_empty), Fluids.HEAVYOIL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_bitumen), new ItemStack(ModItems.canister_empty), Fluids.BITUMEN, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heatingoil), new ItemStack(ModItems.canister_empty), Fluids.HEATINGOIL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_reoil), new ItemStack(ModItems.canister_empty), Fluids.RECLAIMED, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_petroil), new ItemStack(ModItems.canister_empty), Fluids.PETROIL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_canola), new ItemStack(ModItems.canister_empty), Fluids.LUBRICANT, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_naphtha), new ItemStack(ModItems.canister_empty), Fluids.NAPHTHA, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fuel), new ItemStack(ModItems.canister_empty), Fluids.DIESEL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), Fluids.LIGHTOIL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), Fluids.KEROSENE, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), Fluids.BIOFUEL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_ethanol), new ItemStack(ModItems.canister_empty), Fluids.ETHANOL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), Fluids.GASOLINE, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fracksol), new ItemStack(ModItems.canister_empty), Fluids.FRACKSOL, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), Fluids.NITAN, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), Fluids.GAS, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), Fluids.PETROLEUM, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), Fluids.LPG, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), Fluids.BIOGAS, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), Fluids.DIESEL, 10000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), Fluids.KEROSENE, 10000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), Fluids.OXYGEN, 10000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), null, FluidType.OIL, 250)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, FluidType.PETROLEUM, 250)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), null, Fluids.OIL, 250)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, Fluids.PETROLEUM, 250)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_uf6), new ItemStack(ModItems.cell_empty), FluidType.UF6, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_puf6), new ItemStack(ModItems.cell_empty), FluidType.PUF6, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_antimatter), new ItemStack(ModItems.cell_empty), FluidType.AMAT, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), FluidType.ASCHRAB, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), FluidType.SAS3, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bottle_mercury), new ItemStack(Items.glass_bottle), FluidType.MERCURY, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.nugget_mercury), null, FluidType.MERCURY, 125)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), Fluids.DEUTERIUM, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), Fluids.TRITIUM, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_uf6), new ItemStack(ModItems.cell_empty), Fluids.UF6, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_puf6), new ItemStack(ModItems.cell_empty), Fluids.PUF6, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_antimatter), new ItemStack(ModItems.cell_empty), Fluids.AMAT, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), Fluids.ASCHRAB, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), Fluids.SAS3, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bottle_mercury), new ItemStack(Items.glass_bottle), Fluids.MERCURY, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.nugget_mercury), null, Fluids.MERCURY, 125)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 3), new ItemStack(ModItems.tank_waste, 1, 2), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 4), new ItemStack(ModItems.tank_waste, 1, 3), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 5), new ItemStack(ModItems.tank_waste, 1, 4), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 6), new ItemStack(ModItems.tank_waste, 1, 5), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 7), new ItemStack(ModItems.tank_waste, 1, 6), FluidType.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 8), new ItemStack(ModItems.tank_waste, 1, 7), FluidType.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 3), new ItemStack(ModItems.tank_waste, 1, 2), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 4), new ItemStack(ModItems.tank_waste, 1, 3), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 5), new ItemStack(ModItems.tank_waste, 1, 4), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 6), new ItemStack(ModItems.tank_waste, 1, 5), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 7), new ItemStack(ModItems.tank_waste, 1, 6), Fluids.WATZ, 8000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 8), new ItemStack(ModItems.tank_waste, 1, 7), Fluids.WATZ, 8000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_hydrogen), new ItemStack(ModItems.particle_empty), FluidType.HYDROGEN, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_amat), new ItemStack(ModItems.particle_empty), FluidType.AMAT, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_aschrab), new ItemStack(ModItems.particle_empty), FluidType.ASCHRAB, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_hydrogen), new ItemStack(ModItems.particle_empty), Fluids.HYDROGEN, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_amat), new ItemStack(ModItems.particle_empty), Fluids.AMAT, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_aschrab), new ItemStack(ModItems.particle_empty), Fluids.ASCHRAB, 1000)); for(int i = 1; i < FluidType.values().length; i++) { @@ -79,13 +80,13 @@ public class FluidContainerRegistry { if(type.hasNoContainer()) continue; - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, i), new ItemStack(ModItems.fluid_tank_lead_empty), FluidType.getEnum(i), 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, i), new ItemStack(ModItems.fluid_tank_lead_empty), Fluids.fromID(i), 1000)); if(type.needsLeadContainer()) continue; - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), FluidType.getEnum(i), 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), FluidType.getEnum(i), 16000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), Fluids.fromID(i), 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), Fluids.fromID(i), 16000)); } } @@ -93,7 +94,7 @@ public class FluidContainerRegistry { allContainers.add(con); } - public static int getFluidContent(ItemStack stack, FluidType type) { + public static int getFluidContent(ItemStack stack, com.hbm.inventory.fluid.FluidType type) { if(stack == null) return 0; @@ -114,7 +115,7 @@ public class FluidContainerRegistry { public static FluidType getFluidType(ItemStack stack) { if(stack == null) - return FluidType.NONE; + return Fluids.NONE; ItemStack sta = stack.copy(); sta.stackSize = 1; @@ -124,7 +125,7 @@ public class FluidContainerRegistry { return container.type; } - return FluidType.NONE; + return Fluids.NONE; } public static ItemStack getFullContainer(ItemStack stack, FluidType type) { diff --git a/src/main/java/com/hbm/inventory/FluidStack.java b/src/main/java/com/hbm/inventory/FluidStack.java index 6a1be9e49..f6dc75723 100644 --- a/src/main/java/com/hbm/inventory/FluidStack.java +++ b/src/main/java/com/hbm/inventory/FluidStack.java @@ -1,6 +1,6 @@ package com.hbm.inventory; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; public class FluidStack { diff --git a/src/main/java/com/hbm/inventory/FluidTank.java b/src/main/java/com/hbm/inventory/FluidTank.java index 9d0bd3f3d..5808d9ed5 100644 --- a/src/main/java/com/hbm/inventory/FluidTank.java +++ b/src/main/java/com/hbm/inventory/FluidTank.java @@ -4,9 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.handler.ArmorModHandler; -import com.hbm.handler.FluidTypeHandler.FluidTrait; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IPartiallyFillable; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.FluidType.FluidTrait; +import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.gui.GuiInfoContainer; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIdentifier; @@ -44,7 +45,7 @@ public class FluidTank { public void setTankType(FluidType type) { - if(this.type.name().equals(type.name())) + if(this.type == type) return; this.type = type; @@ -85,26 +86,26 @@ public class FluidTank { //Fills tank from canisters public void loadTank(int in, int out, ItemStack[] slots) { - FluidType inType = FluidType.NONE; + FluidType inType = Fluids.NONE; if(slots[in] != null) { //TODO: add IPartiallyFillable case for unloading inType = FluidContainerRegistry.getFluidType(slots[in]); - if(slots[in].getItem() == ModItems.fluid_barrel_infinite && type != FluidType.NONE) { + if(slots[in].getItem() == ModItems.fluid_barrel_infinite && type != Fluids.NONE) { this.fluid = this.maxFluid; return; } - if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) { + if(slots[in].getItem() == ModItems.inf_water && this.type == Fluids.WATER) { this.fluid += 50; if(this.fluid > this.maxFluid) this.fluid = this.maxFluid; return; } - if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.name().equals(FluidType.WATER.name())) { + if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type == Fluids.WATER) { this.fluid += 500; if(this.fluid > this.maxFluid) this.fluid = this.maxFluid; @@ -117,7 +118,7 @@ public class FluidTank { return; } - if(slots[in] != null && inType.name().equals(type.name()) && fluid + FluidContainerRegistry.getFluidContent(slots[in], type) <= maxFluid) { + if(slots[in] != null && inType.getName().equals(type.getName()) && fluid + FluidContainerRegistry.getFluidContent(slots[in], type) <= maxFluid) { if(slots[out] == null) { fluid += FluidContainerRegistry.getFluidContent(slots[in], type); slots[out] = FluidContainerRegistry.getEmptyContainer(slots[in]); @@ -181,14 +182,14 @@ public class FluidTank { return; } - if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) { + if(slots[in].getItem() == ModItems.inf_water && this.type.getName().equals(Fluids.WATER.name())) { this.fluid -= 50; if(this.fluid < 0) this.fluid = 0; return; } - if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.name().equals(FluidType.WATER.name())) { + if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.getName().equals(Fluids.WATER.name())) { this.fluid -= 500; if(this.fluid < 0) this.fluid = 0; @@ -232,7 +233,7 @@ public class FluidTank { if(slots[in] != null && slots[out] == null && slots[in].getItem() instanceof ItemFluidIdentifier) { FluidType newType = ItemFluidIdentifier.getType(slots[in]); - if(!type.name().equals(newType.name())) { + if(!type.getName().equals(newType.getName())) { type = newType; slots[out] = slots[in].copy(); slots[in] = null; @@ -303,7 +304,7 @@ public class FluidTank { if(max > 0) maxFluid = nbt.getInteger(s + "_max"); type = FluidType.getEnum(nbt.getInteger(s + "_type")); - if(type.name().equals(FluidType.NONE.name())) + if(type.getName().equals(Fluids.NONE.name())) type = FluidType.getEnumFromName(nbt.getString(s + "_type")); } diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java b/src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java index e163f931b..fe72884a3 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.SlotMachineOutput; import com.hbm.inventory.SlotUpgrade; @@ -84,11 +84,11 @@ public class ContainerMachineCyclotron extends Container { if(!this.mergeItemStack(stack, 13, 14, true)) return null; - } else if(FluidContainerRegistry.getFluidContent(stack, FluidType.COOLANT) > 0) { + } else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.COOLANT) > 0) { if(!this.mergeItemStack(stack, 11, 12, true)) return null; - } else if(FluidContainerRegistry.getFullContainer(stack, FluidType.AMAT) != null) { + } else if(FluidContainerRegistry.getFullContainer(stack, FluidTypeTheOldOne.AMAT) != null) { if(!this.mergeItemStack(stack, 9, 10, true)) return null; diff --git a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java index 110394329..b3cd49ead 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.SlotMachineOutput; import com.hbm.items.machine.ItemZirnoxRod; @@ -78,11 +78,11 @@ public class ContainerReactorZirnox extends Container { } } else { - if(FluidContainerRegistry.getFluidContent(stack, FluidType.CARBONDIOXIDE) > 0) { + if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.CARBONDIOXIDE) > 0) { if(!this.mergeItemStack(stack, 24, 25, true)) return null; - } else if(FluidContainerRegistry.getFluidContent(stack, FluidType.WATER) > 0) { + } else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0) { if(!this.mergeItemStack(stack, 25, 26, true)) return null; diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index e0958616f..30437c2a0 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -1,7 +1,6 @@ package com.hbm.inventory.fluid; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -67,6 +66,7 @@ public class FluidType { public int getColor() { return this.color; } + @Deprecated public int getMSAColor() { return this.color; } @@ -83,6 +83,10 @@ public class FluidType { return this.name; } + public String name() { + return getName(); + } + public String getName() { return this.toString(); } @@ -106,15 +110,61 @@ public class FluidType { public boolean hasNoID() { return this.traits.contains(FluidTrait.NO_ID); } + + public boolean needsLeadContainer() { + return this.traits.contains(FluidTrait.LEAD_CONTAINER); + } + /** + * 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, CORROSIVE, CORROSIVE_2, NO_CONTAINER, + 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 7196fe673..fda984f89 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.google.common.collect.HashBiMap; import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.render.util.EnumSymbol; @@ -62,12 +61,18 @@ public class Fluids { public static FluidType PLASMA_DT; public static FluidType PLASMA_HD; public static FluidType PLASMA_HT; + public static FluidType PLASMA_DH3; public static FluidType PLASMA_XM; public static FluidType PLASMA_BF; public static FluidType CARBONDIOXIDE; - - public static final HashMap idMapping = new HashMap(); - public static final List metaOrder = new ArrayList(); + public static FluidType HELIUM3; + public static FluidType DEATH; + public static FluidType ETHANOL; + public static FluidType HEAVYWATER; + + private static final HashMap idMapping = new HashMap(); + private static final HashMap nameMapping = new HashMap(); + protected static final List metaOrder = new ArrayList(); public static void init() { @@ -140,6 +145,11 @@ public class Fluids { PLASMA_BF = new FluidType(0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); // v v v v v v v v CARBONDIOXIDE = new FluidType(0x404040, 6, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); + PLASMA_DH3 = new FluidType(0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID); + HELIUM3 = new FluidType(0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"); + DEATH = new FluidType(0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER); + ETHANOL = new FluidType(0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"); + HEAVYWATER = new FluidType(0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE //AND DON'T FORGET THE META DOWN HERE @@ -149,6 +159,7 @@ public class Fluids { metaOrder.add(NONE); //vanilla metaOrder.add(WATER); + metaOrder.add(HEAVYWATER); metaOrder.add(LAVA); //steams metaOrder.add(STEAM); @@ -162,6 +173,7 @@ public class Fluids { metaOrder.add(CRYOGEL); //pure elements, cyogenic gasses metaOrder.add(HYDROGEN); + metaOrder.add(HELIUM3); metaOrder.add(OXYGEN); metaOrder.add(DEUTERIUM); metaOrder.add(TRITIUM); @@ -184,6 +196,7 @@ public class Fluids { metaOrder.add(GAS); metaOrder.add(PETROLEUM); metaOrder.add(LPG); + metaOrder.add(ETHANOL); metaOrder.add(BIOGAS); metaOrder.add(BIOFUEL); metaOrder.add(GASOLINE); @@ -196,6 +209,7 @@ public class Fluids { metaOrder.add(SAS3); metaOrder.add(SCHRABIDIC); metaOrder.add(PAIN); + metaOrder.add(DEATH); metaOrder.add(WATZ); //solutions and working fluids metaOrder.add(FRACKSOL); @@ -209,13 +223,61 @@ public class Fluids { metaOrder.add(PLASMA_DT); metaOrder.add(PLASMA_HD); metaOrder.add(PLASMA_HT); + metaOrder.add(PLASMA_DH3); metaOrder.add(PLASMA_XM); 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()); + } } - public static int registerSelf(FluidType fluid) { + protected static int registerSelf(FluidType fluid) { int id = idMapping.size(); idMapping.put(id, fluid); + nameMapping.put(fluid.getName(), fluid); return id; } + + public static FluidType fromID(int id) { + FluidType fluid = idMapping.get(id); + + if(fluid == null) + fluid = Fluids.NONE; + + return fluid; + } + + public static FluidType fromName(String name) { + FluidType fluid = nameMapping.get(name); + + if(fluid == null) + fluid = Fluids.NONE; + + return fluid; + } + + public static FluidType[] getAll() { + return getInOrder(false); + } + + public static FluidType[] getInNiceOrder() { + return getInOrder(true); + } + + private static FluidType[] getInOrder(final boolean nice) { + FluidType[] all = new FluidType[idMapping.size()]; + + for(int i = 0; i < all.length; i++) { + FluidType type = nice ? metaOrder.get(i) : idMapping.get(i); + + if(type == null) { + throw new IllegalStateException("A severe error has occoured with NTM's fluid system! Fluid of the ID " + i + " has returned NULL in the registry!"); + } + + all[i] = type; + } + + return all; + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java index 25a97e2d1..e16cb2f54 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java @@ -2,7 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineBoiler; import com.hbm.lib.RefStrings; @@ -58,7 +58,7 @@ public class GUIMachineBoiler extends GuiInfoContainer { " of boiling points reached" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1); - if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { String[] text2 = new String[] { "Error: Liquid can not be boiled!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2); @@ -94,7 +94,7 @@ public class GUIMachineBoiler extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3); - if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java index 222255699..3862c6b5f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java @@ -2,7 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineBoilerElectric; import com.hbm.lib.RefStrings; @@ -52,7 +52,7 @@ public class GUIMachineBoilerElectric extends GuiInfoContainer { " of boiling points reached" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1); - if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { String[] text2 = new String[] { "Error: Liquid can not be boiled!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2); @@ -93,7 +93,7 @@ public class GUIMachineBoilerElectric extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3); - if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index f102ba32e..767cbb2d7 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -7,9 +7,10 @@ import java.util.Map.Entry; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java index 961b446ef..1d64663fe 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java @@ -2,7 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineLargeTurbine; import com.hbm.lib.RefStrings; @@ -33,7 +33,7 @@ public class GUIMachineLargeTurbine extends GuiInfoContainer { turbine.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52); turbine.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52); - if(turbine.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(turbine.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { String[] text2 = new String[] { "Error: Invalid fluid!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2); @@ -56,23 +56,23 @@ public class GUIMachineLargeTurbine extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(turbine.tanks[0].getTankType().name().equals(FluidType.STEAM.name())) { + if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.STEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); } - if(turbine.tanks[0].getTankType().name().equals(FluidType.HOTSTEAM.name())) { + if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); } - if(turbine.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) { + if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); } - if(turbine.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) { + if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); } int i = (int)turbine.getPowerScaled(34); drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i); - if(turbine.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(turbine.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java index 6c254346c..7b405b6d7 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -6,9 +6,10 @@ import java.util.Map.Entry; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java index 85381e4d5..5e94626d0 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java @@ -2,7 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineTurbine; import com.hbm.lib.RefStrings; @@ -33,7 +33,7 @@ public class GUIMachineTurbine extends GuiInfoContainer { diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52); diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52); - if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { String[] text2 = new String[] { "Error: Invalid fluid!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2); @@ -56,23 +56,23 @@ public class GUIMachineTurbine extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(diFurnace.tanks[0].getTankType().name().equals(FluidType.STEAM.name())) { + if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.STEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14); } - if(diFurnace.tanks[0].getTankType().name().equals(FluidType.HOTSTEAM.name())) { + if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14); } - if(diFurnace.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) { + if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14); } - if(diFurnace.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) { + if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) { drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14); } int i = (int)diFurnace.getPowerScaled(34); drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i); - if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKBoiler.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKBoiler.java index 07bbe11d4..ccb041d18 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRBMKBoiler.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKBoiler.java @@ -3,6 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerRBMKBoiler; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.RefStrings; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; @@ -57,7 +59,6 @@ public class GUIRBMKBoiler extends GuiInfoContainer { this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } - @SuppressWarnings("incomplete-switch") //shut up @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -74,11 +75,10 @@ public class GUIRBMKBoiler extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 91, guiTop + 65 - j, 190, 24 - j, 4, j); - switch(boiler.steam.getTankType()) { - case STEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58); break; - case HOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58); break; - case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58); break; - case ULTRAHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58); break; - } + FluidType type = boiler.steam.getTankType(); + if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58); + if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58); + if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58); + if(type == Fluids.ULTRAHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java index 3a8d1b72d..b863425a4 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.lib.RefStrings; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; @@ -276,13 +276,13 @@ public class GUIRBMKConsole extends GuiScreen { int fs = (int)Math.ceil((col.data.getInteger("steam")) * 8 / col.data.getDouble("maxSteam")); drawTexturedModalRect(guiLeft + x + 6, guiTop + y + size - fs - 1, 46, 191 - fs, 3, fs); - if(col.data.getShort("type") == FluidType.STEAM.ordinal()) + if(col.data.getShort("type") == FluidTypeTheOldOne.STEAM.ordinal()) drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 1, 44, 183, 2, 2); - if(col.data.getShort("type") == FluidType.HOTSTEAM.ordinal()) + if(col.data.getShort("type") == FluidTypeTheOldOne.HOTSTEAM.ordinal()) drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 3, 44, 185, 2, 2); - if(col.data.getShort("type") == FluidType.SUPERHOTSTEAM.ordinal()) + if(col.data.getShort("type") == FluidTypeTheOldOne.SUPERHOTSTEAM.ordinal()) drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 5, 44, 187, 2, 2); - if(col.data.getShort("type") == FluidType.ULTRAHOTSTEAM.ordinal()) + if(col.data.getShort("type") == FluidTypeTheOldOne.ULTRAHOTSTEAM.ordinal()) drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 7, 44, 189, 2, 2); break; diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java index ccc64c3bf..20c15920d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -4,6 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerReactorMultiblock; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; @@ -27,7 +29,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer { this.ySize = 222; } - @SuppressWarnings("incomplete-switch") @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); @@ -71,18 +72,16 @@ public class GUIReactorMultiblock extends GuiInfoContainer { String s = "0"; - switch(diFurnace.tanks[2].getTankType()) { - case STEAM: s = "1x"; break; - case HOTSTEAM:s = "10x"; break; - case SUPERHOTSTEAM: s = "100x"; break; - } + FluidType type = diFurnace.tanks[2].getTankType(); + if(type == Fluids.STEAM) s = "1x"; + if(type == Fluids.HOTSTEAM) s = "10x"; + if(type == Fluids.SUPERHOTSTEAM) s = "100x"; String[] text4 = new String[] { "Steam compression switch", "Current compression level: " + s}; this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 63, guiTop + 107, 14, 18, mouseX, mouseY, text4); } - @SuppressWarnings("incomplete-switch") protected void mouseClicked(int x, int y, int i) { super.mouseClicked(x, y, i); @@ -108,11 +107,10 @@ public class GUIReactorMultiblock extends GuiInfoContainer { mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); int c = 0; - switch(diFurnace.tanks[2].getTankType()) { - case STEAM: c = 0; break; - case HOTSTEAM: c = 1; break; - case SUPERHOTSTEAM: c = 2; break; - } + FluidType type = diFurnace.tanks[2].getTankType(); + if(type == Fluids.STEAM) c = 0; + if(type == Fluids.HOTSTEAM) c = 1; + if(type == Fluids.SUPERHOTSTEAM) c = 2; PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord, c, 1)); } @@ -126,7 +124,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer { this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } - @SuppressWarnings("incomplete-switch") @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -151,12 +148,12 @@ public class GUIReactorMultiblock extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 50, guiTop + 17, 208, 50 + s * 18, 22, 18); else drawTexturedModalRect(guiLeft + 50, guiTop + 17, 230, 50 + (s - 8) * 18, 22, 18); + - switch(diFurnace.tanks[2].getTankType()) { - case STEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18); break; - case HOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18); break; - case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18); break; - } + FluidType type = diFurnace.tanks[2].getTankType(); + if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18); + if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18); + if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18); if(diFurnace.hasHullHeat()) { int i = diFurnace.getHullHeatScaled(88); @@ -181,10 +178,8 @@ public class GUIReactorMultiblock extends GuiInfoContainer { int offset = 234; - switch(diFurnace.tanks[2].getTankType()) { - case HOTSTEAM: offset += 4; break; - case SUPERHOTSTEAM: offset += 8; break; - } + if(type == Fluids.HOTSTEAM) offset += 4; + if(type == Fluids.SUPERHOTSTEAM) offset += 8; drawTexturedModalRect(guiLeft + 80, guiTop + 108, 0, offset, i, 4); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java index a85f81984..77dd185a1 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactorZirnox; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityReactorZirnox; @@ -17,8 +16,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; public class GUIReactorZirnox extends GuiInfoContainer { - - //fuck you + + // fuck you private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID, "textures/gui/reactors/gui_zirnox.png"); private TileEntityReactorZirnox zirnox; @@ -43,45 +42,40 @@ public class GUIReactorZirnox extends GuiInfoContainer { String[] info = new String[] { "CO2 transfers heat from the core", "to the water. This will boil", "the water into steam.", "Water Consumption Rate:", "100 mB/t", "2000 mB/s" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, info); - String[] info2 = new String[] { "Pressure can be reduced by", - "reducing the amount of CO2", - "in the reactor." }; + String[] info2 = new String[] { "Pressure can be reduced by", "reducing the amount of CO2", "in the reactor." }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, info2); if(zirnox.water.getFill() <= 0) { - String[] warn1 = new String[] { "Error: Water is required for", - "the reactor to function properly!" }; + String[] warn1 = new String[] { "Error: Water is required for", "the reactor to function properly!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn1); } if(zirnox.carbonDioxide.getFill() < 4000) { - String[] warn2 = new String[] { "Error: CO2 is required for", - "the reactor to function properly!" }; + String[] warn2 = new String[] { "Error: CO2 is required for", "the reactor to function properly!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn2); } } protected void mouseClicked(int x, int y, int i) { - super.mouseClicked(x, y, i); - + super.mouseClicked(x, y, i); + NBTTagCompound control = new NBTTagCompound(); + if(guiLeft + 144 <= x && guiLeft + 144 + 14 > x && guiTop + 35 < y && guiTop + 35 + 14 >= y) { + control.setBoolean("control", true); - if(guiLeft + 144 <= x && guiLeft + 144 + 14 > x && guiTop + 35 < y && guiTop + 35 + 14 >= y) { - control.setBoolean("control", true); - - PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); - } - - if(guiLeft + 151 <= x && guiLeft + 151 + 36 > x && guiTop + 51 < y && guiTop + 51 + 36 >= y) { - control.setBoolean("vent", true); //sus impostre like amogus - PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); } - } + + if(guiLeft + 151 <= x && guiLeft + 151 + 36 > x && guiTop + 51 < y && guiTop + 51 + 36 >= y) { + control.setBoolean("vent", true); // sus impostre like amogus + + PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); + } + } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { @@ -101,25 +95,25 @@ public class GUIReactorZirnox extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 160, guiTop + 108, 238, 0 + 12 * s, 18, 12); int c = zirnox.getGaugeScaled(6, 1); - drawTexturedModalRect(guiLeft + 142, guiTop + 108, 238, 0 + 12 * c, 18, 12); + drawTexturedModalRect(guiLeft + 142, guiTop + 108, 238, 0 + 12 * c, 18, 12); int w = zirnox.getGaugeScaled(6, 2); - drawTexturedModalRect(guiLeft + 178, guiTop + 108, 238, 0 + 12 * w, 18, 12); + drawTexturedModalRect(guiLeft + 178, guiTop + 108, 238, 0 + 12 * w, 18, 12); - int h = zirnox.getGaugeScaled(12, 3); - drawTexturedModalRect(guiLeft + 160, guiTop + 33, 220, 0 + 18 * h, 18, 17); + int h = zirnox.getGaugeScaled(12, 3); + drawTexturedModalRect(guiLeft + 160, guiTop + 33, 220, 0 + 18 * h, 18, 17); int p = zirnox.getGaugeScaled(12, 4); - drawTexturedModalRect(guiLeft + 178, guiTop + 33, 220, 0 + 18 * p, 18, 17); + drawTexturedModalRect(guiLeft + 178, guiTop + 33, 220, 0 + 18 * p, 18, 17); if(zirnox.isOn) { - for(int x = 0; x < 4; x++) - for(int y = 0; y < 4; y++) - drawTexturedModalRect(guiLeft + 7 + 36 * x, guiTop + 15 + 36 * y, 238, 238, 18, 18); - for(int x = 0; x < 3; x++) - for(int y = 0; y < 3; y++) - drawTexturedModalRect(guiLeft + 25 + 36 * x, guiTop + 33 + 36 * y, 238, 238, 18, 18); - drawTexturedModalRect(guiLeft + 142, guiTop + 15, 220, 238, 18, 18); + for(int x = 0; x < 4; x++) + for(int y = 0; y < 4; y++) + drawTexturedModalRect(guiLeft + 7 + 36 * x, guiTop + 15 + 36 * y, 238, 238, 18, 18); + for(int x = 0; x < 3; x++) + for(int y = 0; y < 3; y++) + drawTexturedModalRect(guiLeft + 25 + 36 * x, guiTop + 33 + 36 * y, 238, 238, 18, 18); + drawTexturedModalRect(guiLeft + 142, guiTop + 15, 220, 238, 18, 18); } this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); diff --git a/src/main/java/com/hbm/inventory/gui/GUISILEX.java b/src/main/java/com/hbm/inventory/gui/GUISILEX.java index caf7fc797..8a068f448 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISILEX.java +++ b/src/main/java/com/hbm/inventory/gui/GUISILEX.java @@ -2,7 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.container.ContainerSILEX; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; @@ -67,7 +67,7 @@ public class GUISILEX extends GuiInfoContainer { if(silex.tank.getFill() > 0) { - if(silex.tank.getTankType() == FluidType.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType())) { + if(silex.tank.getTankType() == FluidTypeTheOldOne.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType())) { drawTexturedModalRect(guiLeft + 43, guiTop + 53, 176, 118, 54, 9); } else { drawTexturedModalRect(guiLeft + 43, guiTop + 53, 176, 109, 54, 9); @@ -81,6 +81,6 @@ public class GUISILEX extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 26, guiTop + 124 - f, 176, 109 - f, 16, f); int i = silex.getFluidScaled(52); - drawTexturedModalRect(guiLeft + 44, guiTop + 54, 176, silex.tank.getTankType() == FluidType.ACID ? 43 : 50, i, 7); + drawTexturedModalRect(guiLeft + 44, guiTop + 54, 176, silex.tank.getTankType() == FluidTypeTheOldOne.ACID ? 43 : 50, i, 7); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index 3a5332be5..08897ae48 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -7,7 +7,7 @@ import java.util.List; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; @@ -66,8 +66,8 @@ public class GUIScreenTemplateFolder extends GuiScreen { allStacks.add(new ItemStack(ModItems.siren_track, 1, i)); } // Fluid IDs - for(int i = 1; i < FluidType.values().length; i++) { - if(!FluidType.values()[i].hasNoID()) { + for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) { + if(!FluidTypeTheOldOne.values()[i].hasNoID()) { allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i)); } } diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index bccb60632..3ebdb4733 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -20,7 +20,7 @@ import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.OreDictManager; import static com.hbm.inventory.OreDictManager.*; import com.hbm.inventory.RecipesCommon; @@ -165,7 +165,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.entanglement_kit, 1), new AStack[] {new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new OreDictStack(PB.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 4), new ComparableStack(ModItems.singularity_counter_resonant, 1), new ComparableStack(ModItems.singularity_super_heated, 1), new ComparableStack(ModItems.powder_power, 4), },200); makeRecipe(new ComparableStack(ModItems.dysfunctional_reactor, 1), new AStack[] {new OreDictStack(STEEL.plate(), 15), new OreDictStack(PB.ingot(), 5), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack("dyeBrown", 3), },200); makeRecipe(new ComparableStack(ModItems.missile_assembly, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 1), new ComparableStack(ModItems.hull_small_aluminium, 4), new OreDictStack(STEEL.ingot(), 2), new OreDictStack(TI.plate(), 6), new ComparableStack(ModItems.wire_aluminium, 6), new ComparableStack(ModItems.canister_kerosene, 3), new ComparableStack(ModItems.circuit_targeting_tier1, 1), },200); - makeRecipe(new ComparableStack(ModItems.missile_carrier, 1), new AStack[] {new ComparableStack(ModItems.fluid_barrel_full, 16, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_medium, 4), new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.hull_big_titanium, 6), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.hull_small_aluminium, 12), new OreDictStack(TI.plate(), 24), new ComparableStack(ModItems.plate_polymer, 128), new ComparableStack(ModBlocks.det_cord, 8), new ComparableStack(ModItems.circuit_targeting_tier3, 12), new ComparableStack(ModItems.circuit_targeting_tier4, 3), },4800); + makeRecipe(new ComparableStack(ModItems.missile_carrier, 1), new AStack[] {new ComparableStack(ModItems.fluid_barrel_full, 16, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_medium, 4), new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.hull_big_titanium, 6), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.hull_small_aluminium, 12), new OreDictStack(TI.plate(), 24), new ComparableStack(ModItems.plate_polymer, 128), new ComparableStack(ModBlocks.det_cord, 8), new ComparableStack(ModItems.circuit_targeting_tier3, 12), new ComparableStack(ModItems.circuit_targeting_tier4, 3), },4800); makeRecipe(new ComparableStack(ModItems.warhead_generic_small, 1), new AStack[] {new OreDictStack(TI.plate(), 5), new OreDictStack(STEEL.plate(), 3), new ComparableStack(Blocks.tnt, 2), },100); makeRecipe(new ComparableStack(ModItems.warhead_generic_medium, 1), new AStack[] {new OreDictStack(TI.plate(), 8), new OreDictStack(STEEL.plate(), 5), new ComparableStack(Blocks.tnt, 4), },150); makeRecipe(new ComparableStack(ModItems.warhead_generic_large, 1), new AStack[] {new OreDictStack(TI.plate(), 15), new OreDictStack(STEEL.plate(), 8), new ComparableStack(Blocks.tnt, 8), },200); @@ -191,15 +191,15 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.thruster_medium, 1), new AStack[] {new ComparableStack(ModItems.thruster_small, 1), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.hull_small_steel, 1), new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.wire_copper, 4), },150); makeRecipe(new ComparableStack(ModItems.thruster_large, 1), new AStack[] {new ComparableStack(ModItems.thruster_medium, 1), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.wire_red_copper, 4), },200); makeRecipe(new ComparableStack(ModItems.thruster_nuclear, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModBlocks.deco_pipe_quad, 3), new ComparableStack(ModItems.board_copper, 6), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModBlocks.reactor_research, 1), },600); - makeRecipe(new ComparableStack(ModItems.sat_base, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.photo_panel, 24), new ComparableStack(ModItems.board_copper, 12), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },500); + makeRecipe(new ComparableStack(ModItems.sat_base, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.photo_panel, 24), new ComparableStack(ModItems.board_copper, 12), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },500); makeRecipe(new ComparableStack(ModItems.sat_head_mapper, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.hull_small_steel, 3), new ComparableStack(ModItems.plate_desh, 2), new ComparableStack(ModItems.circuit_gold, 2), new ComparableStack(ModItems.plate_polymer, 12), new OreDictStack(REDSTONE.dust(), 6), new ComparableStack(Items.diamond, 1), new ComparableStack(Blocks.glass_pane, 6), },400); makeRecipe(new ComparableStack(ModItems.sat_head_scanner, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 6), new OreDictStack(TI.plate(), 32), new ComparableStack(ModItems.plate_desh, 6), new ComparableStack(ModItems.magnetron, 6), new ComparableStack(ModItems.coil_advanced_torus, 2), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.plate_polymer, 6), new ComparableStack(Items.diamond, 1), },400); makeRecipe(new ComparableStack(ModItems.sat_head_radar, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(TI.plate(), 32), new ComparableStack(ModItems.magnetron, 12), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.wire_red_copper, 16), new ComparableStack(ModItems.coil_gold, 3), new ComparableStack(ModItems.circuit_gold, 5), new ComparableStack(Items.diamond, 1), },400); makeRecipe(new ComparableStack(ModItems.sat_head_laser, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(W.ingot(), 16), new OreDictStack(POLYMER.ingot(), 6), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.board_copper, 24), new ComparableStack(ModItems.circuit_targeting_tier5, 2), new OreDictStack(REDSTONE.dust(), 16), new ComparableStack(Items.diamond, 5), new ComparableStack(Blocks.glass_pane, 16), },450); makeRecipe(new ComparableStack(ModItems.sat_head_resonator, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 32), new OreDictStack(POLYMER.ingot(), 48), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.crystal_xen, 1), new OreDictStack(STAR.ingot(), 7), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.circuit_targeting_tier6, 2), },1000); - makeRecipe(new ComparableStack(ModItems.sat_foeq, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(TI.plate(), 12), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.HYDROGEN.ordinal()), new ComparableStack(ModItems.photo_panel, 16), new ComparableStack(ModItems.thruster_nuclear, 1), new ComparableStack(ModItems.ingot_uranium_fuel, 6), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },1200); - makeRecipe(new ComparableStack(ModItems.sat_miner, 1), new AStack[] {new OreDictStack(BIGMT.plate(), 24), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.centrifuge_element, 4), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600); - makeRecipe(new ComparableStack(ModItems.sat_lunar_miner, 1), new AStack[] {new ComparableStack(ModItems.ingot_meteorite, 24), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600); + makeRecipe(new ComparableStack(ModItems.sat_foeq, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(TI.plate(), 12), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.HYDROGEN.ordinal()), new ComparableStack(ModItems.photo_panel, 16), new ComparableStack(ModItems.thruster_nuclear, 1), new ComparableStack(ModItems.ingot_uranium_fuel, 6), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },1200); + makeRecipe(new ComparableStack(ModItems.sat_miner, 1), new AStack[] {new OreDictStack(BIGMT.plate(), 24), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.centrifuge_element, 4), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600); + makeRecipe(new ComparableStack(ModItems.sat_lunar_miner, 1), new AStack[] {new ComparableStack(ModItems.ingot_meteorite, 24), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600); makeRecipe(new ComparableStack(ModItems.chopper_head, 1), new AStack[] {new ComparableStack(ModBlocks.reinforced_glass, 2), new ComparableStack(ModBlocks.fwatz_computer, 1), new OreDictStack(CMB.ingot(), 22), new ComparableStack(ModItems.wire_magnetized_tungsten, 4), },300); makeRecipe(new ComparableStack(ModItems.chopper_gun, 1), new AStack[] {new OreDictStack(CMB.plate(), 4), new OreDictStack(CMB.ingot(), 2), new ComparableStack(ModItems.wire_tungsten, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 1), new ComparableStack(ModItems.motor, 1), },150); makeRecipe(new ComparableStack(ModItems.chopper_torso, 1), new AStack[] {new OreDictStack(CMB.ingot(), 26), new ComparableStack(ModBlocks.fwatz_computer, 1), new ComparableStack(ModItems.wire_magnetized_tungsten, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.chopper_blades, 2), },350); diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index f602d152a..fb10944f4 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.FluidStack; import static com.hbm.inventory.OreDictManager.*; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import net.minecraft.init.Blocks; @@ -69,157 +69,157 @@ public class ChemplantRecipes { public static void registerFuelProcessing() { recipes.add(new ChemRecipe("FP_HEAVYOIL", 50) - .inputFluids(new FluidStack(1000, FluidType.HEAVYOIL)) + .inputFluids(new FluidStack(1000, Fluids.HEAVYOIL)) .outputFluids( - new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidType.BITUMEN), - new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidType.SMEAR) + new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, Fluids.BITUMEN), + new FluidStack(RefineryRecipes.heavy_frac_smear * 10, Fluids.SMEAR) )); recipes.add(new ChemRecipe("FP_SMEAR", 50) - .inputFluids(new FluidStack(1000, FluidType.SMEAR)) + .inputFluids(new FluidStack(1000, Fluids.SMEAR)) .outputFluids( - new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidType.HEATINGOIL), - new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidType.LUBRICANT) + new FluidStack(RefineryRecipes.smear_frac_heat * 10, Fluids.HEATINGOIL), + new FluidStack(RefineryRecipes.smear_frac_lube * 10, Fluids.LUBRICANT) )); recipes.add(new ChemRecipe("FP_NAPHTHA", 50) - .inputFluids(new FluidStack(1000, FluidType.NAPHTHA)) + .inputFluids(new FluidStack(1000, Fluids.NAPHTHA)) .outputFluids( - new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidType.HEATINGOIL), - new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidType.DIESEL) + new FluidStack(RefineryRecipes.napht_frac_heat * 10, Fluids.HEATINGOIL), + new FluidStack(RefineryRecipes.napht_frac_diesel * 10, Fluids.DIESEL) )); recipes.add(new ChemRecipe("FP_LIGHTOIL", 50) - .inputFluids(new FluidStack(1000, FluidType.LIGHTOIL)) + .inputFluids(new FluidStack(1000, Fluids.LIGHTOIL)) .outputFluids( - new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidType.DIESEL), - new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidType.KEROSENE) + new FluidStack(RefineryRecipes.light_frac_diesel * 10, Fluids.DIESEL), + new FluidStack(RefineryRecipes.light_frac_kero * 10, Fluids.KEROSENE) )); recipes.add(new ChemRecipe("FR_REOIL", 30) - .inputFluids(new FluidStack(1000, FluidType.SMEAR)) - .outputFluids(new FluidStack(800, FluidType.RECLAIMED))); + .inputFluids(new FluidStack(1000, Fluids.SMEAR)) + .outputFluids(new FluidStack(800, Fluids.RECLAIMED))); recipes.add(new ChemRecipe("FR_PETROIL", 30) .inputFluids( - new FluidStack(800, FluidType.RECLAIMED), - new FluidStack(200, FluidType.LUBRICANT)) - .outputFluids(new FluidStack(1000, FluidType.PETROIL))); + new FluidStack(800, Fluids.RECLAIMED), + new FluidStack(200, Fluids.LUBRICANT)) + .outputFluids(new FluidStack(1000, Fluids.PETROIL))); } public static void registerFuelCracking() { recipes.add(new ChemRecipe("FC_BITUMEN", 100) .inputFluids( - new FluidStack(1200, FluidType.BITUMEN), - new FluidStack(2400, FluidType.STEAM)) + new FluidStack(1200, Fluids.BITUMEN), + new FluidStack(2400, Fluids.STEAM)) .outputFluids( - new FluidStack(1000, FluidType.OIL), - new FluidStack(200, FluidType.PETROLEUM))); + new FluidStack(1000, Fluids.OIL), + new FluidStack(200, Fluids.PETROLEUM))); recipes.add(new ChemRecipe("FC_I_NAPHTHA", 150) .inputFluids( - new FluidStack(1400, FluidType.SMEAR), - new FluidStack(800, FluidType.WATER)) - .outputFluids(new FluidStack(800, FluidType.NAPHTHA))); + new FluidStack(1400, Fluids.SMEAR), + new FluidStack(800, Fluids.WATER)) + .outputFluids(new FluidStack(800, Fluids.NAPHTHA))); recipes.add(new ChemRecipe("FC_GAS_PETROLEUM", 100) .inputFluids( - new FluidStack(1800, FluidType.GAS), - new FluidStack(1200, FluidType.WATER)) - .outputFluids(new FluidStack(800, FluidType.PETROLEUM))); + new FluidStack(1800, Fluids.GAS), + new FluidStack(1200, Fluids.WATER)) + .outputFluids(new FluidStack(800, Fluids.PETROLEUM))); recipes.add(new ChemRecipe("FC_DIESEL_KEROSENE", 150) .inputFluids( - new FluidStack(1200, FluidType.DIESEL), - new FluidStack(2000, FluidType.STEAM)) - .outputFluids(new FluidStack(400, FluidType.KEROSENE))); + new FluidStack(1200, Fluids.DIESEL), + new FluidStack(2000, Fluids.STEAM)) + .outputFluids(new FluidStack(400, Fluids.KEROSENE))); recipes.add(new ChemRecipe("FC_KEROSENE_PETROLEUM", 150) .inputFluids( - new FluidStack(1400, FluidType.KEROSENE), - new FluidStack(2000, FluidType.STEAM)) - .outputFluids(new FluidStack(800, FluidType.PETROLEUM))); + new FluidStack(1400, Fluids.KEROSENE), + new FluidStack(2000, Fluids.STEAM)) + .outputFluids(new FluidStack(800, Fluids.PETROLEUM))); } public static void registerCoalCracking() { recipes.add(new ChemRecipe("CC_OIL", 150) .inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4)) - .inputFluids(new FluidStack(1400, FluidType.STEAM)) - .outputFluids(new FluidStack(2000, FluidType.OIL))); + .inputFluids(new FluidStack(1400, Fluids.STEAM)) + .outputFluids(new FluidStack(2000, Fluids.OIL))); recipes.add(new ChemRecipe("CC_I", 200) .inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4)) - .inputFluids(new FluidStack(1800, FluidType.WATER)) - .outputFluids(new FluidStack(1600, FluidType.SMEAR))); + .inputFluids(new FluidStack(1800, Fluids.WATER)) + .outputFluids(new FluidStack(1600, Fluids.SMEAR))); recipes.add(new ChemRecipe("CC_HEATING", 250) .inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4)) - .inputFluids(new FluidStack(2000, FluidType.STEAM)) - .outputFluids(new FluidStack(1800, FluidType.HEATINGOIL))); + .inputFluids(new FluidStack(2000, Fluids.STEAM)) + .outputFluids(new FluidStack(1800, Fluids.HEATINGOIL))); recipes.add(new ChemRecipe("CC_HEAVY", 200) .inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4)) - .inputFluids(new FluidStack(1400, FluidType.WATER)) - .outputFluids(new FluidStack(1800, FluidType.HEAVYOIL))); + .inputFluids(new FluidStack(1400, Fluids.WATER)) + .outputFluids(new FluidStack(1800, Fluids.HEAVYOIL))); recipes.add(new ChemRecipe("CC_NAPHTHA", 300) .inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4)) - .inputFluids(new FluidStack(2400, FluidType.STEAM)) - .outputFluids(new FluidStack(2000, FluidType.NAPHTHA))); + .inputFluids(new FluidStack(2400, Fluids.STEAM)) + .outputFluids(new FluidStack(2000, Fluids.NAPHTHA))); } public static void registerSolidFuel() { recipes.add(new ChemRecipe("SF_OIL", 20) - .inputFluids(new FluidStack(350, FluidType.OIL)) + .inputFluids(new FluidStack(350, Fluids.OIL)) .outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1))); recipes.add(new ChemRecipe("SF_HEAVYOIL", 20) - .inputFluids(new FluidStack(250, FluidType.HEAVYOIL)) + .inputFluids(new FluidStack(250, Fluids.HEAVYOIL)) .outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1))); recipes.add(new ChemRecipe("SF_SMEAR", 20) - .inputFluids(new FluidStack(200, FluidType.SMEAR)) + .inputFluids(new FluidStack(200, Fluids.SMEAR)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_HEATINGOIL", 20) - .inputFluids(new FluidStack(100, FluidType.HEATINGOIL)) + .inputFluids(new FluidStack(100, Fluids.HEATINGOIL)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_RECLAIMED", 20) - .inputFluids(new FluidStack(200, FluidType.RECLAIMED)) + .inputFluids(new FluidStack(200, Fluids.RECLAIMED)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_PETROIL", 20) - .inputFluids(new FluidStack(250, FluidType.PETROIL)) + .inputFluids(new FluidStack(250, Fluids.PETROIL)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_LUBRICANT", 20) - .inputFluids(new FluidStack(250, FluidType.LUBRICANT)) + .inputFluids(new FluidStack(250, Fluids.LUBRICANT)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_NAPHTHA", 20) - .inputFluids(new FluidStack(300, FluidType.NAPHTHA)) + .inputFluids(new FluidStack(300, Fluids.NAPHTHA)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_DIESEL", 20) - .inputFluids(new FluidStack(400, FluidType.DIESEL)) + .inputFluids(new FluidStack(400, Fluids.DIESEL)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_LIGHTOIL", 20) - .inputFluids(new FluidStack(450, FluidType.LIGHTOIL)) + .inputFluids(new FluidStack(450, Fluids.LIGHTOIL)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_KEROSENE", 20) - .inputFluids(new FluidStack(550, FluidType.KEROSENE)) + .inputFluids(new FluidStack(550, Fluids.KEROSENE)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_GAS", 20) - .inputFluids(new FluidStack(750, FluidType.GAS)) + .inputFluids(new FluidStack(750, Fluids.GAS)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_PETROLEUM", 20) - .inputFluids(new FluidStack(600, FluidType.PETROLEUM)) + .inputFluids(new FluidStack(600, Fluids.PETROLEUM)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_BIOGAS", 20) - .inputFluids(new FluidStack(3500, FluidType.BIOGAS)) + .inputFluids(new FluidStack(3500, Fluids.BIOGAS)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1))); recipes.add(new ChemRecipe("SF_BIOFUEL", 20) - .inputFluids(new FluidStack(1500, FluidType.BIOFUEL)) + .inputFluids(new FluidStack(1500, Fluids.BIOFUEL)) .outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));; } public static void registerOtherOil() { recipes.add(new ChemRecipe("BP_BIOGAS", 200) .inputItems(new ComparableStack(ModItems.biomass, 16)) - .outputFluids(new FluidStack(4000, FluidType.BIOGAS))); + .outputFluids(new FluidStack(4000, Fluids.BIOGAS))); recipes.add(new ChemRecipe("BP_BIOFUEL", 100) - .inputFluids(new FluidStack(2000, FluidType.BIOGAS)) - .outputFluids(new FluidStack(1000, FluidType.BIOFUEL))); + .inputFluids(new FluidStack(2000, Fluids.BIOGAS)) + .outputFluids(new FluidStack(1000, Fluids.BIOFUEL))); recipes.add(new ChemRecipe("LPG", 100) - .inputFluids(new FluidStack(2000, FluidType.PETROLEUM)) - .outputFluids(new FluidStack(1000, FluidType.LPG))); + .inputFluids(new FluidStack(2000, Fluids.PETROLEUM)) + .outputFluids(new FluidStack(1000, Fluids.LPG))); recipes.add(new ChemRecipe("OIL_SAND", 200) .inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new ComparableStack(ModItems.oil_tar, 1)) .outputItems(new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4)) - .outputFluids(new FluidStack(1000, FluidType.BITUMEN))); + .outputFluids(new FluidStack(1000, Fluids.BITUMEN))); recipes.add(new ChemRecipe("ASPHALT", 100) .inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6)) - .inputFluids(new FluidStack(1000, FluidType.BITUMEN)) + .inputFluids(new FluidStack(1000, Fluids.BITUMEN)) .outputItems(new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4))); } diff --git a/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java index 66c1f3fb5..7f72baf6e 100644 --- a/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java @@ -1,77 +1,82 @@ package com.hbm.inventory.recipes; import java.util.HashMap; +import java.util.Map.Entry; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import net.minecraft.item.ItemStack; public class FusionRecipes { + public static HashMap chances = new HashMap(); + static { + chances.put(Fluids.PLASMA_DT, 1200); + chances.put(Fluids.PLASMA_DH3, 600); + chances.put(Fluids.PLASMA_HD, 1200); + chances.put(Fluids.PLASMA_HT, 1200); + chances.put(Fluids.PLASMA_XM, 1200); + chances.put(Fluids.PLASMA_BF, 150); + } + public static int getByproductChance(FluidType plasma) { - - switch(plasma) { - case PLASMA_DT: return 1200; - case PLASMA_DH3: return 600; - case PLASMA_HD: return 1200; - case PLASMA_HT: return 1200; - case PLASMA_XM: return 2400; - case PLASMA_BF: return 150; - default: return 0; - } + Integer chance = chances.get(plasma); + return chance != null ? chance : 0; + } + + public static HashMap levels = new HashMap(); + static { + levels.put(Fluids.PLASMA_DT, 1); + levels.put(Fluids.PLASMA_DH3, 2); + levels.put(Fluids.PLASMA_HD, 1); + levels.put(Fluids.PLASMA_HT, 1); + levels.put(Fluids.PLASMA_XM, 3); + levels.put(Fluids.PLASMA_BF, 4); } public static int getBreedingLevel(FluidType plasma) { - - switch(plasma) { - case PLASMA_DT: return 1; - case PLASMA_DH3: return 2; - case PLASMA_HD: return 1; - case PLASMA_HT: return 1; - case PLASMA_XM: return 3; - case PLASMA_BF: return 4; - default: return 0; - } + Integer level = levels.get(plasma); + return level != null ? level : 0; + } + + public static HashMap byproducts = new HashMap(); + static { + byproducts.put(Fluids.PLASMA_DT, new ItemStack(ModItems.pellet_charged)); + byproducts.put(Fluids.PLASMA_DH3, new ItemStack(ModItems.pellet_charged)); + byproducts.put(Fluids.PLASMA_HD, new ItemStack(ModItems.pellet_charged)); + byproducts.put(Fluids.PLASMA_HT, new ItemStack(ModItems.pellet_charged)); + byproducts.put(Fluids.PLASMA_XM, new ItemStack(ModItems.powder_chlorophyte)); + byproducts.put(Fluids.PLASMA_BF, new ItemStack(ModItems.powder_balefire)); } public static ItemStack getByproduct(FluidType plasma) { - - switch(plasma) { - case PLASMA_DT: return new ItemStack(ModItems.pellet_charged); - case PLASMA_DH3: return new ItemStack(ModItems.pellet_charged); - case PLASMA_HD: return new ItemStack(ModItems.pellet_charged); - case PLASMA_HT: return new ItemStack(ModItems.pellet_charged); - case PLASMA_XM: return new ItemStack(ModItems.powder_chlorophyte); - case PLASMA_BF: return new ItemStack(ModItems.powder_balefire); - default: return null; - } + ItemStack byproduct = byproducts.get(plasma); + return byproduct != null ? byproduct.copy() : null; + } + + public static HashMap steamprod = new HashMap(); + static { + steamprod.put(Fluids.PLASMA_DT, 30); + steamprod.put(Fluids.PLASMA_DH3, 50); + steamprod.put(Fluids.PLASMA_HD, 20); + steamprod.put(Fluids.PLASMA_HT, 25); + steamprod.put(Fluids.PLASMA_XM, 60); + steamprod.put(Fluids.PLASMA_BF, 160); } public static int getSteamProduction(FluidType plasma) { - - switch(plasma) { - case PLASMA_DT: return 30; - case PLASMA_DH3: return 50; - case PLASMA_HD: return 20; - case PLASMA_HT: return 25; - case PLASMA_XM: return 60; - case PLASMA_BF: return 160; - default: return 0; - } + Integer steam = steamprod.get(plasma); + return steam != null ? steam : 0; } public static HashMap getRecipes() { HashMap map = new HashMap(); - - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_DT.ordinal()), getByproduct(FluidType.PLASMA_DT)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_DH3.ordinal()), getByproduct(FluidType.PLASMA_DH3)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HD.ordinal()), getByproduct(FluidType.PLASMA_HD)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HT.ordinal()), getByproduct(FluidType.PLASMA_HT)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_XM.ordinal()), getByproduct(FluidType.PLASMA_XM)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_BF.ordinal()), getByproduct(FluidType.PLASMA_BF)); - + for(Entry entry : byproducts.entrySet()) { + map.put(new ItemStack(ModItems.fluid_icon, 1, entry.getKey().getID()), entry.getValue().copy()); + } return map; } diff --git a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java index 45cc2cce0..39c477129 100644 --- a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java @@ -5,7 +5,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -14,7 +16,7 @@ import net.minecraft.item.ItemStack; public class GasCentrifugeRecipes { public static enum PseudoFluidType { - NONE (0, 0, "NONE", "Empty", false, null), + NONE (0, 0, "NONE", "Empty", false, (ItemStack)null), NUF6 (400, 300, "LEUF6", "Natural UF6", false, new ItemStack(ModItems.nugget_u238, 1)), LEUF6 (300, 200, "MEUF6", "Low Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)), @@ -69,39 +71,30 @@ public class GasCentrifugeRecipes { public static List getGasCentOutputs(FluidType fluid) { List outputs = new ArrayList(4); - switch(fluid) { - case UF6: + if(fluid == Fluids.UF6) { outputs.add(new ItemStack(ModItems.nugget_u238, 11)); outputs.add(new ItemStack(ModItems.nugget_u235, 1)); outputs.add(new ItemStack(ModItems.fluorite, 4)); - return outputs; - case PUF6: + } else if(fluid == Fluids.PUF6) { outputs.add(new ItemStack(ModItems.nugget_pu238, 3)); outputs.add(new ItemStack(ModItems.nugget_pu_mix, 6)); outputs.add(new ItemStack(ModItems.fluorite, 3)); - return outputs; - default: - return null; } + return outputs; } public static int getQuantityRequired(FluidType fluid) { - switch(fluid) { - case UF6: - return 1200; - case PUF6: - return 900; - default: - return 0; - } + if(fluid == Fluids.UF6) return 1200; + if(fluid == Fluids.PUF6)return 900; + return 0; } public static Map getGasCentrifugeRecipes() { Map recipes = new HashMap(); for(int i = 0; i < FluidType.values().length; i++) { - if(getGasCentOutputs(FluidType.getEnum(i)) != null) { - List out = getGasCentOutputs(FluidType.getEnum(i)); + if(getGasCentOutputs(Fluids.fromID(i)) != null) { + List out = getGasCentOutputs(Fluids.fromID(i)); ItemStack[] outputs = new ItemStack[4]; for(int j = 0; j < out.size(); j++) { @@ -112,7 +105,7 @@ public class GasCentrifugeRecipes { outputs[j] = new ItemStack(ModItems.nothing); ItemStack input = new ItemStack(ModItems.fluid_icon, 1, i); - ItemFluidIcon.addQuantity(input, getQuantityRequired(FluidType.getEnum(i))); + ItemFluidIcon.addQuantity(input, getQuantityRequired(Fluids.fromID(i))); recipes.put(input, outputs); } diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 415d7670c..037d354f9 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -8,11 +8,13 @@ import java.util.List; import java.util.Map; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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(FluidType type) { - switch(type) { - case WATER: return new Object[] { FluidType.STEAM, 500, 5, 10000 }; - case STEAM: return new Object[] { FluidType.HOTSTEAM, 5, 50, 30000 }; - case HOTSTEAM: return new Object[] { FluidType.SUPERHOTSTEAM, 5, 50, 45000 }; - case OIL: return new Object[] { FluidType.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(FluidType type) { - switch(type) { - case STEAM: return new Object[] { FluidType.SPENTSTEAM, 5, 500, 50 }; - case HOTSTEAM: return new Object[] { FluidType.STEAM, 50, 5, 100 }; - case SUPERHOTSTEAM: return new Object[] { FluidType.HOTSTEAM, 50, 5, 150 }; - case ULTRAHOTSTEAM: return new Object[] { FluidType.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; } @@ -1137,7 +1133,7 @@ public class MachineRecipes { FluidStack[] fluidIn = MachineRecipes.getFluidInputFromTempate(inputs[6]); for(int j = 0; j < fluidIn.length; j++) if(fluidIn[j] != null) - inputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(fluidIn[j].type)), fluidIn[j].fill); + inputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(fluidIn[j].type)), fluidIn[j].fill); ItemStack[] listOut = MachineRecipes.getChemOutputFromTempate(inputs[6]); for(int j = 0; j < listOut.length; j++) @@ -1147,7 +1143,7 @@ public class MachineRecipes { FluidStack[] fluidOut = MachineRecipes.getFluidOutputFromTempate(inputs[6]); for(int j = 0; j < fluidOut.length; j++) if(fluidOut[j] != null) - outputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(fluidOut[j].type)), fluidOut[j].fill); + outputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(fluidOut[j].type)), fluidOut[j].fill); for(int j = 0; j < inputs.length; j++) if(inputs[j] == null) @@ -1167,8 +1163,8 @@ public class MachineRecipes { Map recipes = new HashMap(); - for(int i = 0; i < FluidType.values().length; i++) { - Object[] outs = getBoilerOutput(FluidType.getEnum(i)); + for(int i = 0; i < FluidTypeTheOldOne.values().length; i++) { + Object[] outs = getBoilerOutput(FluidTypeTheOldOne.getEnum(i)); if(outs != null) { @@ -1176,7 +1172,7 @@ public class MachineRecipes { in.stackTagCompound = new NBTTagCompound(); in.stackTagCompound.setInteger("fill", (Integer) outs[2]); - ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidType)outs[0]).getID()); + ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidTypeTheOldOne)outs[0]).getID()); out.stackTagCompound = new NBTTagCompound(); out.stackTagCompound.setInteger("fill", (Integer) outs[1]); @@ -1386,248 +1382,248 @@ public class MachineRecipes { switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) { case FP_HEAVYOIL: - input[0] = new FluidStack(1000, FluidType.HEAVYOIL); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.HEAVYOIL); break; case FP_SMEAR: - input[0] = new FluidStack(1000, FluidType.SMEAR); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR); break; case FP_NAPHTHA: - input[0] = new FluidStack(1000, FluidType.NAPHTHA); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.NAPHTHA); break; case FP_LIGHTOIL: - input[0] = new FluidStack(1000, FluidType.LIGHTOIL); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.LIGHTOIL); break; case FR_REOIL: - input[0] = new FluidStack(1000, FluidType.SMEAR); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR); break; case FR_PETROIL: - input[0] = new FluidStack(800, FluidType.RECLAIMED); - input[1] = new FluidStack(200, FluidType.LUBRICANT); + input[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED); + input[1] = new FluidStack(200, FluidTypeTheOldOne.LUBRICANT); break; case FC_BITUMEN: - input[0] = new FluidStack(1200, FluidType.BITUMEN); - input[1] = new FluidStack(2400, FluidType.STEAM); + input[0] = new FluidStack(1200, FluidTypeTheOldOne.BITUMEN); + input[1] = new FluidStack(2400, FluidTypeTheOldOne.STEAM); break; case FC_I_NAPHTHA: - input[0] = new FluidStack(1400, FluidType.SMEAR); - input[1] = new FluidStack(800, FluidType.WATER); + input[0] = new FluidStack(1400, FluidTypeTheOldOne.SMEAR); + input[1] = new FluidStack(800, FluidTypeTheOldOne.WATER); break; case FC_GAS_PETROLEUM: - input[0] = new FluidStack(1800, FluidType.GAS); - input[1] = new FluidStack(1200, FluidType.WATER); + input[0] = new FluidStack(1800, FluidTypeTheOldOne.GAS); + input[1] = new FluidStack(1200, FluidTypeTheOldOne.WATER); break; case FC_DIESEL_KEROSENE: - input[0] = new FluidStack(1200, FluidType.DIESEL); - input[1] = new FluidStack(2000, FluidType.STEAM); + input[0] = new FluidStack(1200, FluidTypeTheOldOne.DIESEL); + input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM); break; case FC_KEROSENE_PETROLEUM: - input[0] = new FluidStack(1400, FluidType.KEROSENE); - input[1] = new FluidStack(2000, FluidType.STEAM); + input[0] = new FluidStack(1400, FluidTypeTheOldOne.KEROSENE); + input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM); break; case CC_I: - input[0] = new FluidStack(1800, FluidType.WATER); + input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER); break; case CC_OIL: - input[0] = new FluidStack(1400, FluidType.STEAM); + input[0] = new FluidStack(1400, FluidTypeTheOldOne.STEAM); break; case CC_HEATING: - input[0] = new FluidStack(2000, FluidType.STEAM); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.STEAM); break; case CC_HEAVY: - input[0] = new FluidStack(1400, FluidType.WATER); + input[0] = new FluidStack(1400, FluidTypeTheOldOne.WATER); break; case CC_NAPHTHA: - input[0] = new FluidStack(2400, FluidType.STEAM); + input[0] = new FluidStack(2400, FluidTypeTheOldOne.STEAM); break; case ASPHALT: - input[0] = new FluidStack(1000, FluidType.BITUMEN); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN); break; case CONCRETE: - input[0] = new FluidStack(2000, FluidType.WATER); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER); break; case CONCRETE_ASBESTOS: - input[0] = new FluidStack(2000, FluidType.WATER); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER); break; case COOLANT: - input[0] = new FluidStack(1800, FluidType.WATER); + input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER); break; case CRYOGEL: - input[0] = new FluidStack(1800, FluidType.COOLANT); + input[0] = new FluidStack(1800, FluidTypeTheOldOne.COOLANT); break; case DESH: if(GeneralConfig.enableBabyMode) { - input[0] = new FluidStack(200, FluidType.LIGHTOIL); + input[0] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL); } else { - input[0] = new FluidStack(200, FluidType.MERCURY); - input[1] = new FluidStack(200, FluidType.LIGHTOIL); + input[0] = new FluidStack(200, FluidTypeTheOldOne.MERCURY); + input[1] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL); } break; case PEROXIDE: - input[0] = new FluidStack(1000, FluidType.WATER); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER); break; case CIRCUIT_4: - input[0] = new FluidStack(400, FluidType.ACID); - input[1] = new FluidStack(200, FluidType.PETROLEUM); + input[0] = new FluidStack(400, FluidTypeTheOldOne.ACID); + input[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM); break; case CIRCUIT_5: - input[0] = new FluidStack(800, FluidType.ACID); - input[1] = new FluidStack(200, FluidType.MERCURY); + input[0] = new FluidStack(800, FluidTypeTheOldOne.ACID); + input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY); break; case SF_OIL: - input[0] = new FluidStack(350, FluidType.OIL); + input[0] = new FluidStack(350, FluidTypeTheOldOne.OIL); break; case SF_HEAVYOIL: - input[0] = new FluidStack(250, FluidType.HEAVYOIL); + input[0] = new FluidStack(250, FluidTypeTheOldOne.HEAVYOIL); break; case SF_SMEAR: - input[0] = new FluidStack(200, FluidType.SMEAR); + input[0] = new FluidStack(200, FluidTypeTheOldOne.SMEAR); break; case SF_HEATINGOIL: - input[0] = new FluidStack(100, FluidType.HEATINGOIL); + input[0] = new FluidStack(100, FluidTypeTheOldOne.HEATINGOIL); break; case SF_RECLAIMED: - input[0] = new FluidStack(200, FluidType.RECLAIMED); + input[0] = new FluidStack(200, FluidTypeTheOldOne.RECLAIMED); break; case SF_PETROIL: - input[0] = new FluidStack(250, FluidType.PETROIL); + input[0] = new FluidStack(250, FluidTypeTheOldOne.PETROIL); break; case SF_LUBRICANT: - input[0] = new FluidStack(250, FluidType.LUBRICANT); + input[0] = new FluidStack(250, FluidTypeTheOldOne.LUBRICANT); break; case SF_NAPHTHA: - input[0] = new FluidStack(300, FluidType.NAPHTHA); + input[0] = new FluidStack(300, FluidTypeTheOldOne.NAPHTHA); break; case SF_DIESEL: - input[0] = new FluidStack(400, FluidType.DIESEL); + input[0] = new FluidStack(400, FluidTypeTheOldOne.DIESEL); break; case SF_LIGHTOIL: - input[0] = new FluidStack(450, FluidType.LIGHTOIL); + input[0] = new FluidStack(450, FluidTypeTheOldOne.LIGHTOIL); break; case SF_KEROSENE: - input[0] = new FluidStack(550, FluidType.KEROSENE); + input[0] = new FluidStack(550, FluidTypeTheOldOne.KEROSENE); break; case SF_GAS: - input[0] = new FluidStack(750, FluidType.GAS); + input[0] = new FluidStack(750, FluidTypeTheOldOne.GAS); break; case SF_PETROLEUM: - input[0] = new FluidStack(600, FluidType.PETROLEUM); + input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM); break; case SF_BIOGAS: - input[0] = new FluidStack(3500, FluidType.BIOGAS); + input[0] = new FluidStack(3500, FluidTypeTheOldOne.BIOGAS); break; case SF_BIOFUEL: - input[0] = new FluidStack(1500, FluidType.BIOFUEL); + input[0] = new FluidStack(1500, FluidTypeTheOldOne.BIOFUEL); break; case POLYMER: - input[0] = new FluidStack(600, FluidType.PETROLEUM); + input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM); break; case DEUTERIUM: - input[0] = new FluidStack(4000, FluidType.WATER); + input[0] = new FluidStack(4000, FluidTypeTheOldOne.WATER); break; case STEAM: - input[0] = new FluidStack(1000, FluidType.WATER); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER); break; case LPG: - input[0] = new FluidStack(2000, FluidType.PETROLEUM); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.PETROLEUM); break; case BP_BIOFUEL: - input[0] = new FluidStack(2000, FluidType.BIOGAS); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.BIOGAS); break; case YELLOWCAKE: - input[0] = new FluidStack(500, FluidType.ACID); + input[0] = new FluidStack(500, FluidTypeTheOldOne.ACID); break; case UF6: - input[0] = new FluidStack(1000, FluidType.WATER); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER); break; case PUF6: - input[0] = new FluidStack(1000, FluidType.WATER); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER); break; case SAS3: - input[0] = new FluidStack(2000, FluidType.ACID); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.ACID); break; case NITAN: - input[0] = new FluidStack(600, FluidType.KEROSENE); - input[1] = new FluidStack(200, FluidType.MERCURY); + input[0] = new FluidStack(600, FluidTypeTheOldOne.KEROSENE); + input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY); break; case OIL_SAND: - input[0] = new FluidStack(400, FluidType.BITUMEN); + input[0] = new FluidStack(400, FluidTypeTheOldOne.BITUMEN); break; case CORDITE: - input[0] = new FluidStack(200, FluidType.HEATINGOIL); + input[0] = new FluidStack(200, FluidTypeTheOldOne.HEATINGOIL); break; case KEVLAR: - input[0] = new FluidStack(100, FluidType.PETROLEUM); + input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM); break; case SOLID_FUEL: - input[0] = new FluidStack(200, FluidType.PETROLEUM); + input[0] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM); break; case ELECTROLYSIS: - input[0] = new FluidStack(8000, FluidType.WATER); + input[0] = new FluidStack(8000, FluidTypeTheOldOne.WATER); break; case XENON: - input[0] = new FluidStack(0, FluidType.NONE); + input[0] = new FluidStack(0, FluidTypeTheOldOne.NONE); break; case XENON_OXY: - input[0] = new FluidStack(250, FluidType.OXYGEN); + input[0] = new FluidStack(250, FluidTypeTheOldOne.OXYGEN); break; case SATURN: - input[0] = new FluidStack(100, FluidType.ACID); - input[1] = new FluidStack(50, FluidType.MERCURY); + input[0] = new FluidStack(100, FluidTypeTheOldOne.ACID); + input[1] = new FluidStack(50, FluidTypeTheOldOne.MERCURY); break; case BALEFIRE: - input[0] = new FluidStack(6000, FluidType.KEROSENE); + input[0] = new FluidStack(6000, FluidTypeTheOldOne.KEROSENE); break; case SCHRABIDIC: - input[0] = new FluidStack(8000, FluidType.SAS3); - input[1] = new FluidStack(6000, FluidType.ACID); + input[0] = new FluidStack(8000, FluidTypeTheOldOne.SAS3); + input[1] = new FluidStack(6000, FluidTypeTheOldOne.ACID); break; case SCHRABIDATE: - input[0] = new FluidStack(250, FluidType.SCHRABIDIC); + input[0] = new FluidStack(250, FluidTypeTheOldOne.SCHRABIDIC); break; case COLTAN_CLEANING: - input[0] = new FluidStack(250, FluidType.ACID); - input[1] = new FluidStack(500, FluidType.HYDROGEN); + input[0] = new FluidStack(250, FluidTypeTheOldOne.ACID); + input[1] = new FluidStack(500, FluidTypeTheOldOne.HYDROGEN); break; case COLTAN_PAIN: - input[0] = new FluidStack(1000, FluidType.GAS); - input[1] = new FluidStack(500, FluidType.OXYGEN); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS); + input[1] = new FluidStack(500, FluidTypeTheOldOne.OXYGEN); break; case COLTAN_CRYSTAL: - input[0] = new FluidStack(1000, FluidType.PAIN); - input[1] = new FluidStack(500, FluidType.ACID); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN); + input[1] = new FluidStack(500, FluidTypeTheOldOne.ACID); break; case VIT_LIQUID: - input[0] = new FluidStack(1000, FluidType.WASTEFLUID); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEFLUID); break; case VIT_GAS: - input[0] = new FluidStack(1000, FluidType.WASTEGAS); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEGAS); break; case TEL: - input[0] = new FluidStack(100, FluidType.PETROLEUM); - input[1] = new FluidStack(1000, FluidType.STEAM); + input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM); + input[1] = new FluidStack(1000, FluidTypeTheOldOne.STEAM); break; case GASOLINE: - input[0] = new FluidStack(10000, FluidType.PETROIL); + input[0] = new FluidStack(10000, FluidTypeTheOldOne.PETROIL); break; case FRACKSOL: - input[0] = new FluidStack(100, FluidType.PETROLEUM); - input[1] = new FluidStack(1000, FluidType.WATER); + input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM); + input[1] = new FluidStack(1000, FluidTypeTheOldOne.WATER); break; case OSMIRIDIUM_DEATH: - input[0] = new FluidStack(1000, FluidType.ACID); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.ACID); break; case METH: - input[0] = new FluidStack(400, FluidType.LUBRICANT); - input[1] = new FluidStack(400, FluidType.ACID); + input[0] = new FluidStack(400, FluidTypeTheOldOne.LUBRICANT); + input[1] = new FluidStack(400, FluidTypeTheOldOne.ACID); break; case CO2: - input[0] = new FluidStack(1000, FluidType.GAS); + input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS); break; case HEAVY_ELECTROLYSIS: - input[0] = new FluidStack(8000, FluidType.HEAVYWATER); + input[0] = new FluidStack(8000, FluidTypeTheOldOne.HEAVYWATER); break; case DUCRETE: - input[0] = new FluidStack(2000, FluidType.WATER); + input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER); default: break; } @@ -1813,152 +1809,152 @@ public class MachineRecipes { switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) { case FP_HEAVYOIL: - output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidType.BITUMEN); - output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidType.SMEAR); + output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidTypeTheOldOne.BITUMEN); + output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidTypeTheOldOne.SMEAR); break; case FP_SMEAR: - output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidType.HEATINGOIL); - output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidType.LUBRICANT); + output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL); + output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidTypeTheOldOne.LUBRICANT); break; case FP_NAPHTHA: - output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidType.HEATINGOIL); - output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidType.DIESEL); + output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL); + output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidTypeTheOldOne.DIESEL); break; case FP_LIGHTOIL: - output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidType.DIESEL); - output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidType.KEROSENE); + output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidTypeTheOldOne.DIESEL); + output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidTypeTheOldOne.KEROSENE); break; case FR_REOIL: - output[0] = new FluidStack(800, FluidType.RECLAIMED); + output[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED); break; case FR_PETROIL: - output[0] = new FluidStack(1000, FluidType.PETROIL); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.PETROIL); break; case FC_BITUMEN: - output[0] = new FluidStack(1000, FluidType.OIL); - output[1] = new FluidStack(200, FluidType.PETROLEUM); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.OIL); + output[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM); break; case FC_I_NAPHTHA: - output[0] = new FluidStack(800, FluidType.NAPHTHA); + output[0] = new FluidStack(800, FluidTypeTheOldOne.NAPHTHA); break; case FC_GAS_PETROLEUM: - output[0] = new FluidStack(800, FluidType.PETROLEUM); + output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM); break; case FC_DIESEL_KEROSENE: - output[0] = new FluidStack(400, FluidType.KEROSENE); + output[0] = new FluidStack(400, FluidTypeTheOldOne.KEROSENE); break; case FC_KEROSENE_PETROLEUM: - output[0] = new FluidStack(800, FluidType.PETROLEUM); + output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM); break; case CC_OIL: - output[0] = new FluidStack(2000, FluidType.OIL); + output[0] = new FluidStack(2000, FluidTypeTheOldOne.OIL); break; case CC_I: - output[0] = new FluidStack(1600, FluidType.SMEAR); + output[0] = new FluidStack(1600, FluidTypeTheOldOne.SMEAR); break; case CC_HEATING: - output[0] = new FluidStack(1800, FluidType.HEATINGOIL); + output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEATINGOIL); break; case CC_HEAVY: - output[0] = new FluidStack(1800, FluidType.HEAVYOIL); + output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEAVYOIL); break; case CC_NAPHTHA: - output[0] = new FluidStack(2000, FluidType.NAPHTHA); + output[0] = new FluidStack(2000, FluidTypeTheOldOne.NAPHTHA); break; case COOLANT: - output[0] = new FluidStack(2000, FluidType.COOLANT); + output[0] = new FluidStack(2000, FluidTypeTheOldOne.COOLANT); break; case CRYOGEL: - output[0] = new FluidStack(2000, FluidType.CRYOGEL); + output[0] = new FluidStack(2000, FluidTypeTheOldOne.CRYOGEL); break; case PEROXIDE: - output[0] = new FluidStack(800, FluidType.ACID); + output[0] = new FluidStack(800, FluidTypeTheOldOne.ACID); break; case DEUTERIUM: - output[0] = new FluidStack(500, FluidType.DEUTERIUM); + output[0] = new FluidStack(500, FluidTypeTheOldOne.DEUTERIUM); break; case STEAM: - output[0] = new FluidStack(1000, FluidType.STEAM); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.STEAM); break; case BP_BIOGAS: - output[0] = new FluidStack(4000, FluidType.BIOGAS); + output[0] = new FluidStack(4000, FluidTypeTheOldOne.BIOGAS); break; case BP_BIOFUEL: - output[0] = new FluidStack(1000, FluidType.BIOFUEL); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.BIOFUEL); break; case LPG: - output[0] = new FluidStack(1000, FluidType.LPG); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.LPG); break; case UF6: - output[0] = new FluidStack(1200, FluidType.UF6); + output[0] = new FluidStack(1200, FluidTypeTheOldOne.UF6); break; case PUF6: - output[0] = new FluidStack(900, FluidType.PUF6); + output[0] = new FluidStack(900, FluidTypeTheOldOne.PUF6); break; case SAS3: - output[0] = new FluidStack(1000, FluidType.SAS3); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.SAS3); break; case NITAN: - output[0] = new FluidStack(1000, FluidType.NITAN); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.NITAN); break; case OIL_SAND: - output[0] = new FluidStack(1000, FluidType.BITUMEN); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN); break; case DYN_SCHRAB: - output[0] = new FluidStack(50, FluidType.WATZ); + output[0] = new FluidStack(50, FluidTypeTheOldOne.WATZ); break; case DYN_EUPH: - output[0] = new FluidStack(100, FluidType.WATZ); + output[0] = new FluidStack(100, FluidTypeTheOldOne.WATZ); break; case DYN_DNT: - output[0] = new FluidStack(150, FluidType.WATZ); + output[0] = new FluidStack(150, FluidTypeTheOldOne.WATZ); break; case ELECTROLYSIS: - output[0] = new FluidStack(400, FluidType.HYDROGEN); - output[1] = new FluidStack(400, FluidType.OXYGEN); + output[0] = new FluidStack(400, FluidTypeTheOldOne.HYDROGEN); + output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN); break; case XENON: - output[0] = new FluidStack(50, FluidType.XENON); + output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON); break; case XENON_OXY: - output[0] = new FluidStack(50, FluidType.XENON); + output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON); break; case BALEFIRE: - output[0] = new FluidStack(8000, FluidType.BALEFIRE); + output[0] = new FluidStack(8000, FluidTypeTheOldOne.BALEFIRE); break; case SCHRABIDIC: - output[0] = new FluidStack(16000, FluidType.SCHRABIDIC); + output[0] = new FluidStack(16000, FluidTypeTheOldOne.SCHRABIDIC); break; case COLTAN_CLEANING: - output[0] = new FluidStack(500, FluidType.WATER); + output[0] = new FluidStack(500, FluidTypeTheOldOne.WATER); break; case COLTAN_PAIN: - output[0] = new FluidStack(1000, FluidType.PAIN); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN); break; case COLTAN_CRYSTAL: - output[0] = new FluidStack(250, FluidType.WATER); + output[0] = new FluidStack(250, FluidTypeTheOldOne.WATER); break; case GASOLINE: - output[0] = new FluidStack(12000, FluidType.GASOLINE); + output[0] = new FluidStack(12000, FluidTypeTheOldOne.GASOLINE); break; case FRACKSOL: - output[0] = new FluidStack(1000, FluidType.FRACKSOL); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.FRACKSOL); break; case HELIUM3: - output[0] = new FluidStack(1000, FluidType.HELIUM3); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.HELIUM3); break; case OSMIRIDIUM_DEATH: - output[0] = new FluidStack(1000, FluidType.DEATH); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.DEATH); break; case ETHANOL: - output[0] = new FluidStack(1000, FluidType.ETHANOL); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.ETHANOL); break; case CO2: - output[0] = new FluidStack(1000, FluidType.CARBONDIOXIDE); + output[0] = new FluidStack(1000, FluidTypeTheOldOne.CARBONDIOXIDE); break; case HEAVY_ELECTROLYSIS: - output[0] = new FluidStack(400, FluidType.DEUTERIUM); - output[1] = new FluidStack(400, FluidType.OXYGEN); + output[0] = new FluidStack(400, FluidTypeTheOldOne.DEUTERIUM); + output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN); break; default: break; @@ -1972,7 +1968,7 @@ public class MachineRecipes { for(FluidContainer con : FluidContainerRegistry.allContainers) { if(con != null) { - ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(con.type)); + ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(con.type)); fluid.stackTagCompound = new NBTTagCompound(); fluid.stackTagCompound.setInteger("fill", con.content); map.put(fluid, con.fullContainer); diff --git a/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java index 4f89ff546..ba32a3e00 100644 --- a/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java @@ -3,7 +3,9 @@ package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.Map; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -45,30 +47,30 @@ public class RefineryRecipes { Map recipes = new HashMap(); - recipes.put(ItemFluidIcon.make(FluidType.HOTOIL, 1000), + recipes.put(ItemFluidIcon.make(Fluids.HOTOIL, 1000), new ItemStack[] { - ItemFluidIcon.make(FluidType.HEAVYOIL, oil_frac_heavy * 10), - ItemFluidIcon.make(FluidType.NAPHTHA, oil_frac_naph * 10), - ItemFluidIcon.make(FluidType.LIGHTOIL, oil_frac_light * 10), - ItemFluidIcon.make(FluidType.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; } public static void registerFractions() { - fractions.put(FluidType.HEAVYOIL, new Quartet(FluidType.BITUMEN, FluidType.SMEAR, heavy_frac_bitu, heavy_frac_smear)); - fractions.put(FluidType.SMEAR, new Quartet(FluidType.HEATINGOIL, FluidType.LUBRICANT, smear_frac_heat, smear_frac_lube)); - fractions.put(FluidType.NAPHTHA, new Quartet(FluidType.HEATINGOIL, FluidType.DIESEL, napht_frac_heat, napht_frac_diesel)); - fractions.put(FluidType.LIGHTOIL, new Quartet(FluidType.DIESEL, FluidType.KEROSENE, light_frac_diesel, light_frac_kero)); + fractions.put(FluidTypeTheOldOne.HEAVYOIL, new Quartet(FluidTypeTheOldOne.BITUMEN, FluidTypeTheOldOne.SMEAR, heavy_frac_bitu, heavy_frac_smear)); + fractions.put(FluidTypeTheOldOne.SMEAR, new Quartet(FluidTypeTheOldOne.HEATINGOIL, FluidTypeTheOldOne.LUBRICANT, smear_frac_heat, smear_frac_lube)); + fractions.put(FluidTypeTheOldOne.NAPHTHA, new Quartet(FluidTypeTheOldOne.HEATINGOIL, FluidTypeTheOldOne.DIESEL, napht_frac_heat, napht_frac_diesel)); + fractions.put(FluidTypeTheOldOne.LIGHTOIL, new Quartet(FluidTypeTheOldOne.DIESEL, FluidTypeTheOldOne.KEROSENE, light_frac_diesel, light_frac_kero)); } public static void registerCracking() { - cracking.put(FluidType.BITUMEN, new Quartet(FluidType.OIL, FluidType.PETROLEUM, bitumen_crack_oil, bitumen_crack_petro)); - cracking.put(FluidType.SMEAR, new Quartet(FluidType.NAPHTHA, FluidType.PETROLEUM, smear_crack_napht, smear_crack_petro)); - cracking.put(FluidType.GAS, new Quartet(FluidType.PETROLEUM, FluidType.NONE, gas_crack_petro, 0)); - cracking.put(FluidType.DIESEL, new Quartet(FluidType.KEROSENE, FluidType.PETROLEUM, diesel_crack_kero, diesel_crack_petro)); - cracking.put(FluidType.KEROSENE, new Quartet(FluidType.PETROLEUM, FluidType.NONE, kero_crack_petro, 0)); + cracking.put(FluidTypeTheOldOne.BITUMEN, new Quartet(FluidTypeTheOldOne.OIL, FluidTypeTheOldOne.PETROLEUM, bitumen_crack_oil, bitumen_crack_petro)); + cracking.put(FluidTypeTheOldOne.SMEAR, new Quartet(FluidTypeTheOldOne.NAPHTHA, FluidTypeTheOldOne.PETROLEUM, smear_crack_napht, smear_crack_petro)); + cracking.put(FluidTypeTheOldOne.GAS, new Quartet(FluidTypeTheOldOne.PETROLEUM, FluidTypeTheOldOne.NONE, gas_crack_petro, 0)); + cracking.put(FluidTypeTheOldOne.DIESEL, new Quartet(FluidTypeTheOldOne.KEROSENE, FluidTypeTheOldOne.PETROLEUM, diesel_crack_kero, diesel_crack_petro)); + cracking.put(FluidTypeTheOldOne.KEROSENE, new Quartet(FluidTypeTheOldOne.PETROLEUM, FluidTypeTheOldOne.NONE, kero_crack_petro, 0)); } public static Quartet getFractions(FluidType oil) { diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index 1f3076313..4e8aeaab6 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; import com.hbm.items.special.ItemWasteLong; @@ -26,7 +26,7 @@ public class SILEXRecipes { public static void register() { - itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.UF6.ordinal()), new ComparableStack(ModItems.ingot_uranium)); + itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.UF6.ordinal()), new ComparableStack(ModItems.ingot_uranium)); dictTranslation.put("dustUranium", "ingotUranium"); recipes.put("ingotUranium", new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 1)) @@ -43,7 +43,7 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am242), 6)) ); - itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium)); + itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium)); dictTranslation.put("dustPlutonium", "ingotPlutonium"); recipes.put("ingotPlutonium", new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 3)) @@ -76,7 +76,7 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cobalt), 3)) ); - recipes.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.DEATH.ordinal()), new SILEXRecipe(1000, 1000) + recipes.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.DEATH.ordinal()), new SILEXRecipe(1000, 1000) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_impure_osmiridium), 1)) ); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 537583db0..bbda3f971 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -5,9 +5,9 @@ import com.hbm.handler.BucketHandler; import com.hbm.handler.ToolAbility; import com.hbm.handler.ToolAbility.LuckAbility; import com.hbm.handler.WeaponAbility; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.handler.guncfg.*; import com.hbm.interfaces.ICustomWarhead.SaltedFuel.HalfLifeType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.items.armor.*; import com.hbm.items.bomb.*; import com.hbm.items.food.*; @@ -3064,7 +3064,7 @@ public class ModItems { pellet_rtg_depleted = new ItemRTGPelletDepleted().setUnlocalizedName("pellet_rtg_depleted").setCreativeTab(MainRegistry.controlTab); //TODO: add localization; uncrafting recipes; make radiation scale with depletion for rtgs pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); - pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); + pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); pellet_rtg_weak = new ItemRTGPellet(5).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(1.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); pellet_rtg_polonium = new ItemRTGPellet(25).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); pellet_rtg_actinium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); @@ -5226,10 +5226,10 @@ public class ModItems { australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); - jetpack_boost = new JetpackBooster(FluidType.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); - jetpack_break = new JetpackBreak(FluidType.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break"); - jetpack_fly = new JetpackRegular(FluidType.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly"); - jetpack_vector = new JetpackVectorized(FluidType.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector"); + jetpack_boost = new JetpackBooster(Fluids.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); + jetpack_break = new JetpackBreak(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break"); + jetpack_fly = new JetpackRegular(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly"); + jetpack_vector = new JetpackVectorized(Fluids.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector"); wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk"); wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp"); diff --git a/src/main/java/com/hbm/items/armor/JetpackBase.java b/src/main/java/com/hbm/items/armor/JetpackBase.java index cb38d4537..c701fecc5 100644 --- a/src/main/java/com/hbm/items/armor/JetpackBase.java +++ b/src/main/java/com/hbm/items/armor/JetpackBase.java @@ -3,8 +3,8 @@ package com.hbm.items.armor; import java.util.List; import com.hbm.handler.ArmorModHandler; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IPartiallyFillable; +import com.hbm.inventory.fluid.FluidType; import com.hbm.render.model.ModelJetPack; import com.hbm.util.ArmorUtil; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/items/armor/JetpackBooster.java b/src/main/java/com/hbm/items/armor/JetpackBooster.java index c12faafb4..09b90947b 100644 --- a/src/main/java/com/hbm/items/armor/JetpackBooster.java +++ b/src/main/java/com/hbm/items/armor/JetpackBooster.java @@ -3,7 +3,7 @@ package com.hbm.items.armor; import java.util.List; import com.hbm.extprop.HbmPlayerProps; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/items/armor/JetpackBreak.java b/src/main/java/com/hbm/items/armor/JetpackBreak.java index e6e816b2d..340fd2f09 100644 --- a/src/main/java/com/hbm/items/armor/JetpackBreak.java +++ b/src/main/java/com/hbm/items/armor/JetpackBreak.java @@ -3,7 +3,7 @@ package com.hbm.items.armor; import java.util.List; import com.hbm.extprop.HbmPlayerProps; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/items/armor/JetpackRegular.java b/src/main/java/com/hbm/items/armor/JetpackRegular.java index f7b64cc04..cbf04933b 100644 --- a/src/main/java/com/hbm/items/armor/JetpackRegular.java +++ b/src/main/java/com/hbm/items/armor/JetpackRegular.java @@ -3,7 +3,7 @@ package com.hbm.items.armor; import java.util.List; import com.hbm.extprop.HbmPlayerProps; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/items/armor/JetpackVectorized.java b/src/main/java/com/hbm/items/armor/JetpackVectorized.java index 838700e6e..d95312f80 100644 --- a/src/main/java/com/hbm/items/armor/JetpackVectorized.java +++ b/src/main/java/com/hbm/items/armor/JetpackVectorized.java @@ -3,7 +3,7 @@ package com.hbm.items.armor; import java.util.List; import com.hbm.extprop.HbmPlayerProps; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/items/machine/ItemFluidDuct.java b/src/main/java/com/hbm/items/machine/ItemFluidDuct.java index feda809e5..43c496ba9 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidDuct.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidDuct.java @@ -3,7 +3,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; @@ -32,7 +32,7 @@ public class ItemFluidDuct extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (int i = 1; i < FluidType.values().length; ++i) + for (int i = 1; i < FluidTypeTheOldOne.values().length; ++i) { list.add(new ItemStack(item, 1, i)); } @@ -47,7 +47,7 @@ public class ItemFluidDuct extends Item { public String getItemStackDisplayName(ItemStack stack) { String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); - String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); if (s1 != null) { @@ -89,7 +89,7 @@ public class ItemFluidDuct extends Item { } else { - int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor(); if (j < 0) { @@ -150,7 +150,7 @@ public class ItemFluidDuct extends Item { world.setBlock(x, y, z, ModBlocks.fluid_duct); if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) { - ((TileEntityFluidDuct)world.getTileEntity(x, y, z)).type = FluidType.getEnum(stack.getItemDamage()); + ((TileEntityFluidDuct)world.getTileEntity(x, y, z)).type = FluidTypeTheOldOne.getEnum(stack.getItemDamage()); } world.playSoundEffect(x, y, z, "hbm:block.pipePlaced", 1.0F, 0.65F + world.rand.nextFloat() * 0.2F); diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIcon.java b/src/main/java/com/hbm/items/machine/ItemFluidIcon.java index faf1991c1..c56817d07 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIcon.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIcon.java @@ -1,7 +1,8 @@ package com.hbm.items.machine; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -28,7 +29,7 @@ public class ItemFluidIcon extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (int i = 0; i < FluidType.values().length; ++i) + for (int i = 0; i < FluidTypeTheOldOne.values().length; ++i) { list.add(new ItemStack(item, 1, i)); } @@ -66,7 +67,7 @@ public class ItemFluidIcon extends Item { public String getItemStackDisplayName(ItemStack stack) { - String s = (I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + String s = (I18n.format(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); if (s != null) { @@ -100,7 +101,7 @@ public class ItemFluidIcon extends Item { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { - int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor(); if (j < 0) { j = 16777215; diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java index 807e1180e..e928f451b 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java @@ -4,8 +4,10 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -55,8 +57,8 @@ public class ItemFluidIdentifier extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for(int i = 0; i < FluidType.values().length; ++i) { - if(!FluidType.values()[i].hasNoID()) { + for(int i = 0; i < FluidTypeTheOldOne.values().length; ++i) { + if(!FluidTypeTheOldOne.values()[i].hasNoID()) { list.add(new ItemStack(item, 1, i)); } } @@ -71,7 +73,7 @@ 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(FluidType.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")); @@ -80,9 +82,9 @@ public class ItemFluidIdentifier extends Item { public static FluidType getType(ItemStack stack) { if(stack != null && stack.getItem() instanceof ItemFluidIdentifier) - return FluidType.getEnum(stack.getItemDamage()); + return Fluids.fromID(stack.getItemDamage()); else - return FluidType.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; - FluidType type = FluidType.getEnum(stack.getItemDamage()); + FluidType type = Fluids.fromID(stack.getItemDamage()); if (player.isSneaking()) markDuctsRecursively(world, x, y, z, type); else duct.type = type; } @@ -158,7 +160,7 @@ public class ItemFluidIdentifier extends Item { if(p_82790_2_ == 0) { return 16777215; } else { - int j = FluidType.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 2e6401d9c..e30794774 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidTank.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidTank.java @@ -1,7 +1,8 @@ package com.hbm.items.machine; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -25,9 +26,9 @@ public class ItemFluidTank extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for(int i = 1; i < FluidType.values().length; i++) { + for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) { - FluidType type = FluidType.values()[i]; + FluidType type = FluidTypeTheOldOne.values()[i]; if(type.hasNoContainer()) continue; @@ -45,7 +46,7 @@ public class ItemFluidTank extends Item { public String getItemStackDisplayName(ItemStack stack) { String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); - String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); + String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim(); if(s1 != null) { s = s + " " + s1; @@ -85,7 +86,7 @@ public class ItemFluidTank extends Item { if(p_82790_2_ == 0) { return 16777215; } else { - int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor(); + int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor(); if(j < 0) { j = 16777215; diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java index 3459aadb9..95cec1a1d 100644 --- a/src/main/java/com/hbm/items/special/ItemStarterKit.java +++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java @@ -3,7 +3,7 @@ package com.hbm.items.special; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemBattery; import com.hbm.items.machine.ItemBreedingRod.BreedingRodType; @@ -200,7 +200,7 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg_weak, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_empty, 32)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, FluidType.COOLANT.getID())); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, FluidTypeTheOldOne.COOLANT.getID())); player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway_strong, 4)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.radx, 4)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.pill_iodine, 1)); @@ -249,8 +249,8 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.reactor_core, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_empty, 64)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 16, FluidType.WATER.getID())); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidType.COOLANT.getID())); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 16, FluidTypeTheOldOne.WATER.getID())); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidTypeTheOldOne.COOLANT.getID())); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_assembler, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_chemplant, 3)); player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_gascent, 2)); diff --git a/src/main/java/com/hbm/items/special/ItemSyringe.java b/src/main/java/com/hbm/items/special/ItemSyringe.java index e9686d194..f38b1b8ba 100644 --- a/src/main/java/com/hbm/items/special/ItemSyringe.java +++ b/src/main/java/com/hbm/items/special/ItemSyringe.java @@ -7,7 +7,7 @@ import com.hbm.config.VersatileConfig; import com.hbm.explosion.ExplosionLarge; import com.hbm.extprop.HbmLivingProps; import com.hbm.handler.ArmorModHandler; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IPartiallyFillable; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGunBase; @@ -285,7 +285,7 @@ public class ItemSyringe extends Item { IPartiallyFillable fillable = (IPartiallyFillable) jetpack.getItem(); - if(fillable.getType(jetpack) != FluidType.KEROSENE) + if(fillable.getType(jetpack) != FluidTypeTheOldOne.KEROSENE) return stack; int fill = Math.min(fillable.getFill(jetpack) + 1000, fillable.getMaxFill(jetpack)); diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index b29f23634..a1ebb30d6 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -10,11 +10,12 @@ import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.entity.projectile.EntityChopperMine; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidDuct; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.Spaghetti; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityProxyBase; import com.hbm.tileentity.TileEntityProxyInventory; diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index a68b2b89a..3e58b9d5b 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -7,7 +7,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.crafting.*; import com.hbm.crafting.handlers.*; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.OreDictManager; import static com.hbm.inventory.OreDictManager.*; @@ -401,7 +401,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.barbed_wire, 16), new Object[] { "AIA", "I I", "AIA", 'A', ModItems.wire_aluminium, 'I', IRON.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_fire, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', P_RED.dust() }); addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_poison, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_poison }); - addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()) }); + addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()) }); addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_wither, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(Items.skull, 1, 1) }); addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_ultradeath, 4), new Object[] { "BCB", "CIC", "BCB", 'B', ModBlocks.barbed_wire, 'C', ModItems.powder_cloud, 'I', ModItems.nuclear_waste }); @@ -505,8 +505,8 @@ public class CraftingManager { addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "RPR", "CPC", 'W', ModItems.wire_copper, 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() }); addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potato), new Object[] { Items.potato, ModItems.wire_aluminium, ModItems.wire_copper }); addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potatos), new Object[] { ItemBattery.getFullBattery(ModItems.battery_potato), ModItems.turret_chip, REDSTONE.dust() }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', CU.plate(), 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.getID()), 'I', ModItems.plate_polymer }); - addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.WATER.getID()), 'I', POLYMER.ingot() }); + addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', CU.plate(), 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.WATER.getID()), 'I', ModItems.plate_polymer }); + addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.WATER.getID()), 'I', POLYMER.ingot() }); addRecipeAuto(new ItemStack(ModItems.battery_sc_uranium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', U238.billet(), 'P', PB.plate(), 'C', ModItems.thermo_element }); addRecipeAuto(new ItemStack(ModItems.battery_sc_technetium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', TC99.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_uranium }); @@ -571,7 +571,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.singularity_spark, 1), new Object[] { "XBX", "ACA", "XBX", 'X', ModItems.plate_dineutronium, 'A', ModItems.singularity_counter_resonant, 'B', ModItems.singularity_super_heated, 'C', ModItems.black_hole }); addRecipeAuto(new ItemStack(ModItems.ams_core_sing, 1), new Object[] { "EAE", "ASA", "EAE", 'E', ModItems.plate_euphemium, 'A', ModItems.cell_anti_schrabidium, 'S', ModItems.singularity }); addRecipeAuto(new ItemStack(ModItems.ams_core_wormhole, 1), new Object[] { "DPD", "PSP", "DPD", 'D', ModItems.plate_dineutronium, 'P', ModItems.powder_spark_mix, 'S', ModItems.singularity }); - addRecipeAuto(new ItemStack(ModItems.ams_core_eyeofharmony, 1), new Object[] { "ALA", "LSL", "ALA", 'A', ModItems.plate_dalekanium, 'L', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.LAVA.getID()), 'S', ModItems.black_hole }); + addRecipeAuto(new ItemStack(ModItems.ams_core_eyeofharmony, 1), new Object[] { "ALA", "LSL", "ALA", 'A', ModItems.plate_dalekanium, 'L', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.LAVA.getID()), 'S', ModItems.black_hole }); addRecipeAuto(new ItemStack(ModItems.ams_core_thingy), new Object[] { "NSN", "NGN", "G G", 'N', GOLD.nugget(), 'G', GOLD.ingot(), 'S', ModItems.battery_spark_cell_10000 }); addRecipeAuto(new ItemStack(ModItems.photo_panel), new Object[] { " G ", "IPI", " C ", 'G', KEY_ANYPANE, 'I', ModItems.plate_polymer, 'P', NETHERQUARTZ.dust(), 'C', ModItems.circuit_aluminium }); addRecipeAuto(new ItemStack(ModBlocks.machine_satlinker), new Object[] { "PSP", "SCS", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'C', ModItems.sat_chip }); @@ -640,7 +640,7 @@ public class CraftingManager { addShapelessAuto(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) }); addShapelessAuto(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) }); - for (int i = 1; i < FluidType.values().length; ++i) + for (int i = 1; i < FluidTypeTheOldOne.values().length; ++i) { addShapelessAuto(new ItemStack(ModItems.fluid_duct, 1, i), new Object[] { new ItemStack(ModBlocks.fluid_duct, 1), new ItemStack(ModItems.fluid_identifier, 1, i) }); @@ -732,7 +732,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.upgrade_smelter, 1), new Object[] { "PHP", "CUC", "DTD", 'P', CU.plate(), 'H', Blocks.hopper, 'C', ModItems.coil_tungsten, 'U', ModItems.upgrade_template, 'D', ModItems.coil_copper, 'T', ModBlocks.machine_transformer }); addRecipeAuto(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', TI.plate(), 'T', ModBlocks.machine_transformer }); addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', POLYMER.ingot(), 'T', ModBlocks.machine_transformer }); - addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer }); + addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer }); addRecipeAuto(new ItemStack(ModItems.upgrade_screm, 1), new Object[] { "SUS", "SCS", "SUS", 'S', STEEL.plate(), 'U', ModItems.upgrade_template, 'C', ModItems.crystal_xen }); addRecipeAuto(new ItemStack(ModItems.upgrade_gc_speed, 1), new Object[] {"TCT", "HUH", "TCT", 'T', ModItems.nugget_bismuth, 'C', ModItems.coil_copper, 'H', ModItems.coil_tungsten, 'U', ModItems.upgrade_template}); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 25c7157cb..90c217f1d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -62,13 +62,14 @@ import com.hbm.entity.particle.*; import com.hbm.entity.projectile.*; import com.hbm.entity.qic.EntitySPV; import com.hbm.handler.*; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.handler.imc.IMCCentrifuge; import com.hbm.handler.imc.IMCCrystallizer; 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(); @@ -784,7 +786,7 @@ public class MainRegistry { achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", -3, 1, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat(); achImpossible = new Achievement("achievement.impossible", "impossible", 18, 10, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); - achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat(); + achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat(); achFreytag = new Achievement("achievement.freytag", "freytag", 0, -4, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat(); achPotato = new Achievement("achievement.potato", "potato", -2, -2, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat(); achC44 = new Achievement("achievement.c44", "c44", 2, -4, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat(); diff --git a/src/main/java/com/hbm/packet/AuxButtonPacket.java b/src/main/java/com/hbm/packet/AuxButtonPacket.java index 9524aa208..531453c66 100644 --- a/src/main/java/com/hbm/packet/AuxButtonPacket.java +++ b/src/main/java/com/hbm/packet/AuxButtonPacket.java @@ -2,7 +2,8 @@ package com.hbm.packet; import com.hbm.config.MobConfig; import com.hbm.entity.mob.EntityDuck; -import com.hbm.handler.FluidTypeHandler.FluidType; +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,13 +105,13 @@ public class AuxButtonPacket implements IMessage { reactor.rods = m.value; if(m.id == 1) { - FluidType type = FluidType.STEAM; + FluidType type = FluidTypeTheOldOne.STEAM; int fill = reactor.tanks[2].getFill(); switch(m.value) { - case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break; + case 0: type = FluidTypeTheOldOne.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 1: type = FluidTypeTheOldOne.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 2: type = FluidTypeTheOldOne.STEAM; fill = (int)Math.floor(fill * 100); break; } if(fill > reactor.tanks[2].getMaxFill()) diff --git a/src/main/java/com/hbm/packet/TEFluidPacket.java b/src/main/java/com/hbm/packet/TEFluidPacket.java index 405b19cc5..8736bdd17 100644 --- a/src/main/java/com/hbm/packet/TEFluidPacket.java +++ b/src/main/java/com/hbm/packet/TEFluidPacket.java @@ -1,8 +1,9 @@ package com.hbm.packet; import java.util.Arrays; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.fluid.FluidType; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -19,10 +20,7 @@ public class TEFluidPacket implements IMessage { int index; int type; - public TEFluidPacket() - { - - } + public TEFluidPacket() { } public TEFluidPacket(int x, int y, int z, int fill, int index, FluidType type) { diff --git a/src/main/java/com/hbm/packet/TEFluidPipePacket.java b/src/main/java/com/hbm/packet/TEFluidPipePacket.java index 0348b8ff0..2ead7e76c 100644 --- a/src/main/java/com/hbm/packet/TEFluidPipePacket.java +++ b/src/main/java/com/hbm/packet/TEFluidPipePacket.java @@ -1,6 +1,6 @@ package com.hbm.packet; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java b/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java index 462d2fad3..fcc4d174e 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java @@ -2,7 +2,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.main.ResourceManager; import com.hbm.render.util.DiamondPronter; import com.hbm.render.util.EnumSymbol; @@ -33,7 +34,7 @@ public class RenderBAT9000 extends TileEntitySpecialRenderer { FluidType type = bat.tank.getTankType(); - if(type != null && type != FluidType.NONE) { + if(type != null && type != Fluids.NONE) { RenderHelper.disableStandardItemLighting(); GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/render/tileentity/RenderChemplant.java b/src/main/java/com/hbm/render/tileentity/RenderChemplant.java index f4da2d336..784c916d3 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderChemplant.java +++ b/src/main/java/com/hbm/render/tileentity/RenderChemplant.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.render.loader.HmfController; import com.hbm.tileentity.machine.TileEntityMachineChemplant; @@ -77,7 +77,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(-0.625, 0, 0.625); - if(!chem.tanks[0].getTankType().name().equals(FluidType.NONE.name()) && chem.isProgressing) + if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing) GL11.glRotatef(-rotation, 0F, 1F, 0F); else GL11.glRotatef(-45, 0F, 1F, 0F); @@ -88,7 +88,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(0.625, 0, 0.625); - if(!chem.tanks[1].getTankType().name().equals(FluidType.NONE.name()) && chem.isProgressing) + if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing) GL11.glRotatef(rotation, 0F, 1F, 0F); else GL11.glRotatef(45, 0F, 1F, 0F); @@ -114,7 +114,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer { int color = 0; GL11.glDisable(GL11.GL_LIGHTING); - if(!chem.tanks[0].getTankType().name().equals(FluidType.NONE.name())) { + if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { GL11.glPushMatrix(); if(chem.isProgressing) @@ -138,7 +138,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } - if(!chem.tanks[1].getTankType().name().equals(FluidType.NONE.name())) { + if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) { GL11.glPushMatrix(); if(chem.isProgressing) diff --git a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java index 1d6429a6e..7b788108e 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java @@ -2,7 +2,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.render.util.DiamondPronter; import com.hbm.render.util.EnumSymbol; import com.hbm.tileentity.machine.TileEntityBarrel; @@ -25,7 +26,7 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer { TileEntityBarrel barrel = (TileEntityBarrel)te; FluidType type = barrel.tank.getTankType(); - if(type != FluidType.NONE) { + if(type != Fluids.NONE) { RenderHelper.disableStandardItemLighting(); GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretBase.java b/src/main/java/com/hbm/render/tileentity/RenderTurretBase.java index 63dbe3493..a76e0d09b 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretBase.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretBase.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretBaseNT; diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java b/src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java index 1968d9b23..5f7a4a0c0 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java @@ -2,7 +2,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.Fluids; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretBrandon; @@ -23,7 +24,7 @@ public class RenderTurretBrandon extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, Fluids.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java b/src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java index 4fb835bcf..6b20575aa 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretChekhov; @@ -23,7 +23,7 @@ public class RenderTurretChekhov extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java b/src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java index 37b200fe3..738bcd839 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretChekhov; @@ -23,7 +23,7 @@ public class RenderTurretFriendly extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_friendly_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java b/src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java index 819bcb63c..b4cd518f1 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretHoward; @@ -23,7 +23,7 @@ public class RenderTurretHoward extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java b/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java index ee8fdf29d..c586b4fe3 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretHowardDamaged; diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java b/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java index c12ebe9b5..2c41029a6 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretJeremy; @@ -23,7 +23,7 @@ public class RenderTurretJeremy extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java b/src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java index 47dc91bc8..c0d56326b 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.render.util.BeamPronter; import com.hbm.render.util.BeamPronter.EnumBeamType; @@ -27,7 +27,7 @@ public class RenderTurretMaxwell extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java b/src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java index 4ce18b9ce..ae63633d1 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretRichard; @@ -23,7 +23,7 @@ public class RenderTurretRichard extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java b/src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java index 2e2b071f6..9de2fd697 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java @@ -2,7 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.main.ResourceManager; import com.hbm.render.util.BeamPronter; import com.hbm.render.util.BeamPronter.EnumBeamType; @@ -27,7 +27,7 @@ public class RenderTurretTauon extends RenderTurretBase { GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - this.renderConnectors(turret, true, false, FluidType.NONE); + this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE); bindTexture(ResourceManager.turret_base_tex); ResourceManager.turret_chekhov.renderPart("Base"); diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java index fcc1b8868..67cb91f9d 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java @@ -2,9 +2,9 @@ package com.hbm.tileentity; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType; import api.hbm.energy.IEnergyConnector; import api.hbm.energy.IEnergyUser; diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index 8db572585..481ac57b5 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.missile.EntityMissileCustom; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.handler.MissileStruct; 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.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; @@ -57,8 +58,8 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven public TileEntityCompactLauncher() { slots = new ItemStack[8]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.NONE, 25000, 0); - tanks[1] = new FluidTank(FluidType.NONE, 25000, 1); + tanks[0] = new FluidTank(Fluids.NONE, 25000, 0); + tanks[1] = new FluidTank(Fluids.NONE, 25000, 1); } @Override @@ -425,19 +426,19 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven switch((FuelType)fuselage.attributes[0]) { case KEROSENE: - tanks[0].setTankType(FluidType.KEROSENE); - tanks[1].setTankType(FluidType.ACID); + tanks[0].setTankType(Fluids.KEROSENE); + tanks[1].setTankType(Fluids.ACID); break; case HYDROGEN: - tanks[0].setTankType(FluidType.HYDROGEN); - tanks[1].setTankType(FluidType.OXYGEN); + tanks[0].setTankType(Fluids.HYDROGEN); + tanks[1].setTankType(Fluids.OXYGEN); break; case XENON: - tanks[0].setTankType(FluidType.XENON); + tanks[0].setTankType(Fluids.XENON); break; case BALEFIRE: - tanks[0].setTankType(FluidType.BALEFIRE); - tanks[1].setTankType(FluidType.ACID); + tanks[0].setTankType(Fluids.BALEFIRE); + tanks[1].setTankType(Fluids.ACID); break; default: break; } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 2ffe01b9a..168d01a83 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.missile.EntityMissileCustom; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.handler.MissileStruct; 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.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; @@ -56,8 +57,8 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory public TileEntityLaunchTable() { slots = new ItemStack[8]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.NONE, 100000, 0); - tanks[1] = new FluidTank(FluidType.NONE, 100000, 1); + tanks[0] = new FluidTank(Fluids.NONE, 100000, 0); + tanks[1] = new FluidTank(Fluids.NONE, 100000, 1); padSize = PartSize.SIZE_10; height = 10; } @@ -402,19 +403,19 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory switch((FuelType)fuselage.attributes[0]) { case KEROSENE: - tanks[0].setTankType(FluidType.KEROSENE); - tanks[1].setTankType(FluidType.ACID); + tanks[0].setTankType(Fluids.KEROSENE); + tanks[1].setTankType(Fluids.ACID); break; case HYDROGEN: - tanks[0].setTankType(FluidType.HYDROGEN); - tanks[1].setTankType(FluidType.OXYGEN); + tanks[0].setTankType(Fluids.HYDROGEN); + tanks[1].setTankType(Fluids.OXYGEN); break; case XENON: - tanks[0].setTankType(FluidType.XENON); + tanks[0].setTankType(Fluids.XENON); break; case BALEFIRE: - tanks[0].setTankType(FluidType.BALEFIRE); - tanks[1].setTankType(FluidType.ACID); + tanks[0].setTankType(Fluids.BALEFIRE); + tanks[1].setTankType(Fluids.ACID); break; default: break; } diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java index a22a9c03a..08985c43b 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java @@ -5,8 +5,9 @@ import java.util.Arrays; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPipePacket; @@ -21,7 +22,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEntityFluidDuct extends TileEntity implements IFluidDuct { public ForgeDirection[] connections = new ForgeDirection[6]; - public FluidType type = FluidType.NONE; + public FluidType type = Fluids.NONE; public List uoteab = new ArrayList(); public TileEntityFluidDuct() { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java index 20ac78f87..9d9638597 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java @@ -4,8 +4,9 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -15,61 +16,62 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityGasDuct extends TileEntity implements IFluidDuct { - + public ForgeDirection[] connections = new ForgeDirection[6]; - public FluidType type = FluidType.GAS; + public FluidType type = Fluids.GAS; public List uoteab = new ArrayList(); - - public TileEntityGasDuct() { - - } - + @Override public void updateEntity() { - - //if(!worldObj.isRemote) - // PacketDispatcher.wrapper.sendToAll(new TEFluidPipePacket(xCoord, yCoord, zCoord, type)); - this.updateConnections(); } - + public void updateConnections() { - if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord + 1, zCoord, type)) connections[0] = ForgeDirection.UP; - else connections[0] = null; - - if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord - 1, zCoord, type)) connections[1] = ForgeDirection.DOWN; - else connections[1] = null; - - if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord - 1, type)) connections[2] = ForgeDirection.NORTH; - else connections[2] = null; - - if(Library.checkFluidConnectables(this.worldObj, xCoord + 1, yCoord, zCoord, type)) connections[3] = ForgeDirection.EAST; - else connections[3] = null; - - if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord + 1, type)) connections[4] = ForgeDirection.SOUTH; - else connections[4] = null; - - if(Library.checkFluidConnectables(this.worldObj, xCoord - 1, yCoord, zCoord, type)) connections[5] = ForgeDirection.WEST; - else connections[5] = null; + if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord + 1, zCoord, type)) + connections[0] = ForgeDirection.UP; + else + connections[0] = null; + + if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord - 1, zCoord, type)) + connections[1] = ForgeDirection.DOWN; + else + connections[1] = null; + + if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord - 1, type)) + connections[2] = ForgeDirection.NORTH; + else + connections[2] = null; + + if(Library.checkFluidConnectables(this.worldObj, xCoord + 1, yCoord, zCoord, type)) + connections[3] = ForgeDirection.EAST; + else + connections[3] = null; + + if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord + 1, type)) + connections[4] = ForgeDirection.SOUTH; + else + connections[4] = null; + + if(Library.checkFluidConnectables(this.worldObj, xCoord - 1, yCoord, zCoord, type)) + connections[5] = ForgeDirection.WEST; + else + connections[5] = null; } - @Override - public void readFromNBT(NBTTagCompound nbt) - { + @Override + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - type = FluidType.GAS; - } + type = Fluids.GAS; + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { + @Override + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - } - + } + @Override @SideOnly(Side.CLIENT) - public double getMaxRenderDistanceSquared() - { + public double getMaxRenderDistanceSquared() { return 65536.0D; } diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 6c258d0b0..244f3a84a 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -4,13 +4,15 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.handler.FluidTypeHandler.FluidType; +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 FluidType type = FluidType.GAS; + public FluidType type = FluidTypeTheOldOne.GAS; public List uoteab = new ArrayList(); @Override diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java index 8479d9a67..3b8785b54 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -4,8 +4,9 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.handler.FluidTypeHandler.FluidType; +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 FluidType type = FluidType.OIL; + public FluidType type = FluidTypeTheOldOne.OIL; public List uoteab = new ArrayList(); public TileEntityOilDuct() { @@ -57,7 +58,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct { public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - type = FluidType.OIL; + type = FluidTypeTheOldOne.OIL; } @Override diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index a11c9ad58..d87d1d9f0 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -4,14 +4,15 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.handler.FluidTypeHandler.FluidType; +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 FluidType type = FluidType.OIL; + public FluidType type = FluidTypeTheOldOne.OIL; public List uoteab = new ArrayList(); @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java index 390c4423e..5fc48e1ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -4,10 +4,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -60,10 +62,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF public TileEntityAMSBase() { slots = new ItemStack[16]; tanks = new FluidTank[4]; - tanks[0] = new FluidTank(FluidType.COOLANT, 8000, 0); - tanks[1] = new FluidTank(FluidType.CRYOGEL, 8000, 1); - tanks[2] = new FluidTank(FluidType.DEUTERIUM, 8000, 2); - tanks[3] = new FluidTank(FluidType.TRITIUM, 8000, 3); + tanks[0] = new FluidTank(FluidTypeTheOldOne.COOLANT, 8000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 8000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 8000, 2); + tanks[3] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 8000, 3); } @Override @@ -390,29 +392,18 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF } private int getCoolingStrength(FluidType type) { - switch(type) { - case WATER: - return 5; - case OIL: - return 15; - case COOLANT: - return this.heat / 250; - case CRYOGEL: - return this.heat > heat/2 ? 25 : 5; - default: - return 0; - } + + 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(FluidType type) { - switch(type) { - case DEUTERIUM: - return 50; - case TRITIUM: - return 75; - default: - return 0; - } + 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) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index ec1a916cf..18d2bf7a6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -5,10 +5,11 @@ import java.util.List; import java.util.Random; import com.hbm.explosion.ExplosionLarge; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -51,7 +52,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, public TileEntityAMSEmitter() { slots = new ItemStack[4]; - tank = new FluidTank(FluidType.COOLANT, 16000, 0); + tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 16000, 0); } @Override @@ -229,7 +230,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, warning = 1; } - if(tank.getTankType().name().equals(FluidType.CRYOGEL.name())) { + if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) { if(tank.getFill() >= 15) { if(heat > 0) @@ -249,7 +250,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } else { heat += efficiency; } - } else if(tank.getTankType().name().equals(FluidType.COOLANT.name())) { + } else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) { if(tank.getFill() >= 15) { if(heat > 0) @@ -269,7 +270,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } else { heat += efficiency; } - } else if(tank.getTankType().name().equals(FluidType.WATER.name())) { + } else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) { if(tank.getFill() >= 45) { if(heat > 0) @@ -330,7 +331,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, warning = 3; } - tank.setTankType(FluidType.CRYOGEL); + tank.setTankType(FluidTypeTheOldOne.CRYOGEL); tank.setFill(tank.getMaxFill()); PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index ead2cae87..ccb2500fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -6,10 +6,11 @@ import java.util.Random; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionLarge; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -53,7 +54,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, public TileEntityAMSLimiter() { slots = new ItemStack[4]; - tank = new FluidTank(FluidType.COOLANT, 8000, 0); + tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 8000, 0); } @Override @@ -231,7 +232,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, warning = 1; } - if(tank.getTankType().name().equals(FluidType.CRYOGEL.name())) { + if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) { if(tank.getFill() >= 5) { if(heat > 0) @@ -251,7 +252,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } else { heat += efficiency; } - } else if(tank.getTankType().name().equals(FluidType.COOLANT.name())) { + } else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) { if(tank.getFill() >= 5) { if(heat > 0) @@ -271,7 +272,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } else { heat += efficiency; } - } else if(tank.getTankType().name().equals(FluidType.WATER.name())) { + } else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) { if(tank.getFill() >= 15) { if(heat > 0) @@ -344,7 +345,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, warning = 3; } - tank.setTankType(FluidType.CRYOGEL); + tank.setTankType(FluidTypeTheOldOne.CRYOGEL); tank.setFill(tank.getMaxFill()); PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java index a3934438d..fedd3debb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -4,11 +4,13 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidTrait; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -28,12 +30,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc public TileEntityBarrel() { super(6); - tank = new FluidTank(FluidType.NONE, 0, 0); + tank = new FluidTank(FluidTypeTheOldOne.NONE, 0, 0); } public TileEntityBarrel(int capacity) { super(6); - tank = new FluidTank(FluidType.NONE, capacity, 0); + tank = new FluidTank(FluidTypeTheOldOne.NONE, capacity, 0); } @Override @@ -73,7 +75,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc Block b = this.getBlockType(); //for when you fill antimatter into a matter tank - if(b != ModBlocks.barrel_antimatter && tank.getTankType().traits.contains(FluidTrait.AMAT)) { + if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true); } @@ -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() == FluidType.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) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index 0508049b3..fa5dd0725 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -5,10 +5,11 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -39,8 +40,8 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl public TileEntityChungus() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.STEAM, 1000000000, 0); - tanks[1] = new FluidTank(FluidType.SPENTSTEAM, 1000000000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.STEAM, 1000000000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 1000000000, 1); } @Override @@ -50,7 +51,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType()); - tanks[1].setTankType((FluidType) outs[0]); + tanks[1].setTankType((FluidTypeTheOldOne) outs[0]); int processMax = (int) Math.ceil(tanks[0].getFill() / (Integer)outs[2]); //the maximum amount of cycles total int processSteam = tanks[0].getFill() / (Integer)outs[2]; //the maximum amount of cycles depending on steam @@ -118,7 +119,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl public void networkUnpack(NBTTagCompound data) { this.power = data.getLong("power"); this.turnTimer = data.getInteger("operational"); - this.tanks[0].setTankType(FluidType.values()[data.getInteger("type")]); + this.tanks[0].setTankType(FluidTypeTheOldOne.values()[data.getInteger("type")]); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java index 6e6f9fa64..e976a1319 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java @@ -4,10 +4,11 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -27,8 +28,8 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I public TileEntityCondenser() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.SPENTSTEAM, 100, 0); - tanks[1] = new FluidTank(FluidType.WATER, 100, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 100, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.WATER, 100, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java index 9f4c0a3ea..57d94f4f5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java @@ -4,8 +4,10 @@ import java.util.List; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.handler.FluidTypeHandler.FluidType; +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.items.ModItems; import com.hbm.items.machine.ItemCatalyst; import com.hbm.lib.Library; @@ -30,8 +32,8 @@ public class TileEntityCore extends TileEntityMachineBase { public TileEntityCore() { super(3); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.DEUTERIUM, 128000, 0); - tanks[1] = new FluidTank(FluidType.TRITIUM, 128000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1); } @Override @@ -97,8 +99,8 @@ public class TileEntityCore extends TileEntityMachineBase { public void networkUnpack(NBTTagCompound data) { - tanks[0].setTankType(FluidType.getEnum(data.getInteger("tank0"))); - tanks[1].setTankType(FluidType.getEnum(data.getInteger("tank1"))); + tanks[0].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank0"))); + tanks[1].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank1"))); tanks[0].setFill(data.getInteger("fill0")); tanks[1].setFill(data.getInteger("fill1")); field = data.getInteger("field"); @@ -172,32 +174,27 @@ public class TileEntityCore extends TileEntityMachineBase { } public float getFuelEfficiency(FluidType type) { - - switch(type) { - - case HYDROGEN: + if(type == Fluids.HYDROGEN) return 1.0F; - case DEUTERIUM: + if(type == Fluids.DEUTERIUM) return 1.5F; - case TRITIUM: + if(type == Fluids.TRITIUM) return 1.7F; - case OXYGEN: + if(type == Fluids.OXYGEN) return 1.2F; - case ACID: + if(type == Fluids.ACID) return 1.4F; - case XENON: + if(type == Fluids.XENON) return 1.5F; - case SAS3: + if(type == Fluids.SAS3) return 2.0F; - case BALEFIRE: + if(type == Fluids.BALEFIRE) return 2.5F; - case AMAT: + if(type == Fluids.AMAT) return 2.2F; - case ASCHRAB: + if(type == Fluids.ASCHRAB) return 2.7F; - default: - return 0; - } + return 0; } //TODO: move stats to the AMSCORE class diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 5faa8d633..edac4345b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -38,7 +39,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne public TileEntityCoreEmitter() { super(0); - tank = new FluidTank(FluidType.CRYOGEL, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java index dc256cb9a..0f4c48940 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -25,8 +26,8 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl public TileEntityCoreInjector() { super(4); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.DEUTERIUM, 128000, 0); - tanks[1] = new FluidTank(FluidType.TRITIUM, 128000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index 46c70e0d0..6ba038f2d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -28,7 +29,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn public TileEntityCoreReceiver() { super(0); - tank = new FluidTank(FluidType.CRYOGEL, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java index c09ed20aa..65f5098e4 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java @@ -3,10 +3,11 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -28,8 +29,8 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen public TileEntityDeuteriumExtractor() { super(0); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 1000, 0); - tanks[1] = new FluidTank(FluidType.HEAVYWATER, 100, 0); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 1000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 100, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java index a47dc32e4..1a82ecbe3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java @@ -1,7 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.inventory.FluidTank; import cpw.mods.fml.relauncher.Side; @@ -15,11 +15,11 @@ public class TileEntityDeuteriumTower extends TileEntityDeuteriumExtractor { public TileEntityDeuteriumTower() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 50000, 0); - tanks[1] = new FluidTank(FluidType.HEAVYWATER, 5000, 0); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 50000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 5000, 0); } - public void fillFluidInit(FluidType type) { + public void fillFluidInit(FluidTypeTheOldOne type) { int offsetX = 0; int offsetZ = 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 00ebc0fab..7df6da5da 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -43,9 +44,9 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, public TileEntityFWatzCore() { slots = new ItemStack[7]; tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.COOLANT, 128000, 0); - tanks[1] = new FluidTank(FluidType.AMAT, 64000, 1); - tanks[2] = new FluidTank(FluidType.ASCHRAB, 64000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.COOLANT, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.AMAT, 64000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.ASCHRAB, 64000, 2); } @Override public int getSizeInventory() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index 88cdca1a3..ec9eabdfe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -37,9 +38,9 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve public TileEntityFusionMultiblock() { slots = new ItemStack[12]; tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.WATER, 128000, 0); - tanks[1] = new FluidTank(FluidType.DEUTERIUM, 64000, 1); - tanks[2] = new FluidTank(FluidType.TRITIUM, 64000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 64000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 64000, 2); } @Override public int getSizeInventory() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 84e0f2316..07a48b9db 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -5,10 +5,11 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineITER; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -51,9 +52,9 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser public TileEntityITER() { super(5); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 1280000, 0); - tanks[1] = new FluidTank(FluidType.ULTRAHOTSTEAM, 128000, 1); - plasma = new FluidTank(FluidType.PLASMA_DT, 16000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 1280000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.ULTRAHOTSTEAM, 128000, 1); + plasma = new FluidTank(FluidTypeTheOldOne.PLASMA_DT, 16000, 2); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java index 2d8a9d254..3aa65b08d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java @@ -1,7 +1,6 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidTrait; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.fluid.FluidType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -21,7 +20,7 @@ public class TileEntityMachineBAT9000 extends TileEntityBarrel { @Override public void checkFluidInteraction() { - if(tank.getTankType().traits.contains(FluidTrait.AMAT)) { + if(tank.getTankType().isAntimatter()) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 10, true, true); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index 2507c2852..4844691fb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -5,11 +5,12 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineBoiler; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -47,8 +48,8 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento public TileEntityMachineBoiler() { slots = new ItemStack[7]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 8000, 0); - tanks[1] = new FluidTank(FluidType.STEAM, 8000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 8000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 8000, 1); } @Override @@ -235,9 +236,9 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType()); if(outs == null) { - tanks[1].setTankType(FluidType.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); } else { - tanks[1].setTankType((FluidType) outs[0]); + tanks[1].setTankType((FluidTypeTheOldOne) outs[0]); } tanks[1].unloadTank(5, 6, slots); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 5698c3623..b2159af26 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -5,11 +5,12 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineBoiler; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -49,8 +50,8 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide public TileEntityMachineBoilerElectric() { slots = new ItemStack[7]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 16000, 0); - tanks[1] = new FluidTank(FluidType.STEAM, 16000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 16000, 1); } @Override @@ -245,9 +246,9 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType()); if(outs == null) { - tanks[1].setTankType(FluidType.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); } else { - tanks[1].setTankType((FluidType) outs[0]); + tanks[1].setTankType((FluidTypeTheOldOne) outs[0]); } tanks[1].unloadTank(5, 6, slots); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index 8fcea6b85..ce596a277 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -3,10 +3,11 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -43,7 +44,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public TileEntityMachineCMBFactory() { slots = new ItemStack[6]; - tank = new FluidTank(FluidType.WATZ, 8000, 0); + tank = new FluidTank(FluidTypeTheOldOne.WATZ, 8000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index d9ad78194..64b82d077 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; 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; @@ -62,10 +63,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve public TileEntityMachineChemplant() { slots = new ItemStack[21]; tanks = new FluidTank[4]; - tanks[0] = new FluidTank(FluidType.NONE, 24000, 0); - tanks[1] = new FluidTank(FluidType.NONE, 24000, 1); - tanks[2] = new FluidTank(FluidType.NONE, 24000, 2); - tanks[3] = new FluidTank(FluidType.NONE, 24000, 3); + tanks[0] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 2); + tanks[3] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 3); } @Override @@ -540,10 +541,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve FluidStack[] inputs = MachineRecipes.getFluidInputFromTempate(slots[4]); FluidStack[] outputs = MachineRecipes.getFluidOutputFromTempate(slots[4]); - tanks[0].setTankType(inputs[0] == null ? FluidType.NONE : inputs[0].type); - tanks[1].setTankType(inputs[1] == null ? FluidType.NONE : inputs[1].type); - tanks[2].setTankType(outputs[0] == null ? FluidType.NONE : outputs[0].type); - tanks[3].setTankType(outputs[1] == null ? FluidType.NONE : outputs[1].type); + tanks[0].setTankType(inputs[0] == null ? FluidTypeTheOldOne.NONE : inputs[0].type); + tanks[1].setTankType(inputs[1] == null ? FluidTypeTheOldOne.NONE : inputs[1].type); + tanks[2].setTankType(outputs[0] == null ? FluidTypeTheOldOne.NONE : outputs[0].type); + tanks[3].setTankType(outputs[1] == null ? FluidTypeTheOldOne.NONE : outputs[1].type); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java index 8b47e8d4d..1af2db7bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -14,11 +14,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.machine.MachineCoal; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -46,7 +47,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory public TileEntityMachineCoal() { slots = new ItemStack[4]; - tank = new FluidTank(FluidType.WATER, 5000, 0); + tank = new FluidTank(FluidTypeTheOldOne.WATER, 5000, 0); } @Override @@ -118,7 +119,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory @Override public boolean isItemValidForSlot(int i, ItemStack stack) { if(i == 0) - if(FluidContainerRegistry.getFluidContent(stack, FluidType.WATER) > 0) + if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0) return true; if(i == 2) if(stack.getItem() instanceof IBatteryItem) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index 3248d4d92..1c64db698 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -4,9 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -39,7 +40,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme public TileEntityMachineCrystallizer() { super(7); - tank = new FluidTank(FluidType.ACID, 8000, 0); + tank = new FluidTank(FluidTypeTheOldOne.ACID, 8000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index b37300e57..62be4306b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -10,10 +10,11 @@ import com.hbm.entity.logic.EntityBalefire; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionThermo; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -55,8 +56,8 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements public TileEntityMachineCyclotron() { super(16); - coolant = new FluidTank(FluidType.COOLANT, 32000, 0); - amat = new FluidTank(FluidType.AMAT, 8000, 1); + coolant = new FluidTank(FluidTypeTheOldOne.COOLANT, 32000, 0); + amat = new FluidTank(FluidTypeTheOldOne.AMAT, 8000, 1); } @Override @@ -360,9 +361,9 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements @Override public void setFluidFill(int fill, FluidType type) { - if(type == FluidType.COOLANT) + if(type == FluidTypeTheOldOne.COOLANT) coolant.setFill(fill); - else if(type == FluidType.AMAT) + else if(type == FluidTypeTheOldOne.AMAT) amat.setFill(fill); } @@ -381,9 +382,9 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements @Override public int getFluidFill(FluidType type) { - if(type == FluidType.COOLANT) + if(type == FluidTypeTheOldOne.COOLANT) return coolant.getFill(); - else if(type == FluidType.AMAT) + else if(type == FluidTypeTheOldOne.AMAT) return amat.getFill(); return 0; @@ -426,7 +427,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements @Override public int getMaxFluidFill(FluidType type) { - if(type == FluidType.COOLANT) + if(type == FluidTypeTheOldOne.COOLANT) return coolant.getMaxFill(); return 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 2bd766a27..381dbb94c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -33,7 +34,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE public TileEntityMachineDiesel() { super(5); - tank = new FluidTank(FluidType.DIESEL, 16000, 0); + tank = new FluidTank(FluidTypeTheOldOne.DIESEL, 16000, 0); } @Override @@ -106,7 +107,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); - if(type.name().equals(FluidType.NITAN.name())) + if(type.name().equals(FluidTypeTheOldOne.NITAN.name())) powerCap = maxPower * 10; else powerCap = maxPower; @@ -136,14 +137,14 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE public static final HashMap fuels = new HashMap(); static { - fuels.put(FluidType.HYDROGEN, 10); - fuels.put(FluidType.DIESEL, 500); - fuels.put(FluidType.PETROIL, 300); - fuels.put(FluidType.BIOFUEL, 400); - fuels.put(FluidType.GASOLINE, 1500); - fuels.put(FluidType.NITAN, 5000); - fuels.put(FluidType.LPG, 450); - fuels.put(FluidType.ETHANOL, 200); + fuels.put(FluidTypeTheOldOne.HYDROGEN, 10); + fuels.put(FluidTypeTheOldOne.DIESEL, 500); + fuels.put(FluidTypeTheOldOne.PETROIL, 300); + fuels.put(FluidTypeTheOldOne.BIOFUEL, 400); + fuels.put(FluidTypeTheOldOne.GASOLINE, 1500); + fuels.put(FluidTypeTheOldOne.NITAN, 5000); + fuels.put(FluidTypeTheOldOne.LPG, 450); + fuels.put(FluidTypeTheOldOne.ETHANOL, 200); } public int getHEFromFuel() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index c80b5aa83..3318ecfcf 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -4,12 +4,13 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidTrait; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -30,7 +31,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements public TileEntityMachineFluidTank() { super(6); - tank = new FluidTank(FluidType.NONE, 256000, 0); + tank = new FluidTank(FluidTypeTheOldOne.NONE, 256000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 68b46de63..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.FluidType; 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(FluidType.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)); } } @@ -331,17 +331,13 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I 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; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index 0039c5c6a..e6d9f682d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -6,10 +6,11 @@ import java.util.Random; import com.hbm.blocks.machine.MachineGenerator; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -47,8 +48,8 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve public TileEntityMachineGenerator() { slots = new ItemStack[14]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WATER, 32000, 0); - tanks[1] = new FluidTank(FluidType.COOLANT, 16000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 32000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.COOLANT, 16000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 03905f44d..4bac885db 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -5,9 +5,10 @@ import java.util.HashMap; import java.util.List; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -46,9 +47,9 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement public TileEntityMachineIGenerator() { super(21); tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.WATER, 16000, 0); - tanks[1] = new FluidTank(FluidType.HEATINGOIL, 16000, 1); - tanks[2] = new FluidTank(FluidType.LUBRICANT, 4000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.HEATINGOIL, 16000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.LUBRICANT, 4000, 2); } @Override @@ -185,18 +186,18 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement public static final HashMap fuels = new HashMap(); static { - fuels.put(FluidType.SMEAR, 50); - fuels.put(FluidType.HEATINGOIL, 75); - fuels.put(FluidType.HYDROGEN, 5); - fuels.put(FluidType.DIESEL, 225); - fuels.put(FluidType.KEROSENE, 300); - fuels.put(FluidType.RECLAIMED, 100); - fuels.put(FluidType.PETROIL, 125); - fuels.put(FluidType.BIOFUEL, 200); - fuels.put(FluidType.GASOLINE, 700); - fuels.put(FluidType.NITAN, 2500); - fuels.put(FluidType.LPG, 200); - fuels.put(FluidType.ETHANOL, 75); + fuels.put(FluidTypeTheOldOne.SMEAR, 50); + fuels.put(FluidTypeTheOldOne.HEATINGOIL, 75); + fuels.put(FluidTypeTheOldOne.HYDROGEN, 5); + fuels.put(FluidTypeTheOldOne.DIESEL, 225); + fuels.put(FluidTypeTheOldOne.KEROSENE, 300); + fuels.put(FluidTypeTheOldOne.RECLAIMED, 100); + fuels.put(FluidTypeTheOldOne.PETROIL, 125); + fuels.put(FluidTypeTheOldOne.BIOFUEL, 200); + fuels.put(FluidTypeTheOldOne.GASOLINE, 700); + fuels.put(FluidTypeTheOldOne.NITAN, 2500); + fuels.put(FluidTypeTheOldOne.LPG, 200); + fuels.put(FluidTypeTheOldOne.ETHANOL, 75); } public int getPowerFromFuel() { @@ -213,9 +214,9 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement @Override public void setFluidFill(int fill, FluidType type) { - if(type == FluidType.WATER) + if(type == FluidTypeTheOldOne.WATER) tanks[0].setFill(fill); - else if(type == FluidType.LUBRICANT) + else if(type == FluidTypeTheOldOne.LUBRICANT) tanks[2].setFill(fill); else if(tanks[1].getTankType() == type) tanks[1].setFill(fill); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java index 30e968532..f51d66855 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineInserter.java @@ -3,11 +3,12 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -41,9 +42,9 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven public TileEntityMachineInserter() { slots = new ItemStack[9]; tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.NONE, 32000, 0); - tanks[1] = new FluidTank(FluidType.NONE, 32000, 0); - tanks[2] = new FluidTank(FluidType.NONE, 32000, 0); + tanks[0] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0); + tanks[2] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index 1f8d6f71f..6bbe7b20c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -37,8 +38,8 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme super(7); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.STEAM, 512000, 0); - tanks[1] = new FluidTank(FluidType.SPENTSTEAM, 10240000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.STEAM, 512000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 10240000, 1); } @Override @@ -71,9 +72,9 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType()); if(outs == null) { - tanks[1].setTankType(FluidType.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); } else { - tanks[1].setTankType((FluidType) outs[0]); + tanks[1].setTankType((FluidTypeTheOldOne) outs[0]); int processMax = (int) Math.ceil(Math.ceil(tanks[0].getFill() / 10F) / (Integer)outs[2]); //the maximum amount of cycles based on the 10% cap int processSteam = tanks[0].getFill() / (Integer)outs[2]; //the maximum amount of cycles depending on steam diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index b9f5ee135..ac56d6409 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -6,11 +6,12 @@ import java.util.Set; import com.google.common.collect.Sets; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +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.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; @@ -66,7 +67,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen //slots 1 - 8: upgrades //slots 9 - 29: output super(30); - tank = new FluidTank(FluidType.OIL, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.OIL, 64000, 0); } @Override @@ -347,7 +348,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen if(item.getEntityItem().getItem() == Item.getItemFromBlock(ModBlocks.ore_oil)) { - tank.setTankType(FluidType.OIL); //just to be sure + tank.setTankType(FluidTypeTheOldOne.OIL); //just to be sure tank.setFill(tank.getFill() + 500); if(tank.getFill() > tank.getMaxFill()) @@ -605,7 +606,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen @Override public void setFluidFill(int fill, FluidType type) { - if(type == FluidType.OIL) + if(type == FluidTypeTheOldOne.OIL) tank.setFill(fill); } @@ -621,7 +622,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen @Override public int getFluidFill(FluidType type) { - if(type == FluidType.OIL) + if(type == FluidTypeTheOldOne.OIL) return tank.getFill(); return 0; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java index 483e145d1..561c2b10e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java @@ -1,7 +1,8 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java index 2b5b86c02..c6d4a027e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java @@ -6,9 +6,10 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineITER; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -31,9 +32,9 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme public TileEntityMachinePlasmaHeater() { super(5); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.DEUTERIUM, 16000, 0); - tanks[1] = new FluidTank(FluidType.TRITIUM, 16000, 1); - plasma = new FluidTank(FluidType.PLASMA_DT, 64000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 16000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 16000, 1); + plasma = new FluidTank(FluidTypeTheOldOne.PLASMA_DT, 64000, 2); } @Override @@ -64,7 +65,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme convert = (int) Math.min(convert, power / powerReq); convert = Math.max(0, convert); - if(convert > 0 && plasma.getTankType() != FluidType.NONE) { + if(convert > 0 && plasma.getTankType() != FluidTypeTheOldOne.NONE) { tanks[0].setFill(tanks[0].getFill() - convert); tanks[1].setFill(tanks[1].getFill() - convert); @@ -90,7 +91,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme if(te instanceof TileEntityITER) { TileEntityITER iter = (TileEntityITER)te; - if(iter.plasma.getFill() == 0 && this.plasma.getTankType() != FluidType.NONE) { + if(iter.plasma.getFill() == 0 && this.plasma.getTankType() != FluidTypeTheOldOne.NONE) { iter.plasma.setTankType(this.plasma.getTankType()); } @@ -149,32 +150,32 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme List types = new ArrayList() {{ add(tanks[0].getTankType()); add(tanks[1].getTankType()); }}; - if(types.contains(FluidType.DEUTERIUM) && types.contains(FluidType.TRITIUM)) { - plasma.setTankType(FluidType.PLASMA_DT); + if(types.contains(FluidTypeTheOldOne.DEUTERIUM) && types.contains(FluidTypeTheOldOne.TRITIUM)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_DT); return; } - if(types.contains(FluidType.DEUTERIUM) && types.contains(FluidType.HELIUM3)) { - plasma.setTankType(FluidType.PLASMA_DH3); + if(types.contains(FluidTypeTheOldOne.DEUTERIUM) && types.contains(FluidTypeTheOldOne.HELIUM3)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_DH3); return; } - if(types.contains(FluidType.DEUTERIUM) && types.contains(FluidType.HYDROGEN)) { - plasma.setTankType(FluidType.PLASMA_HD); + if(types.contains(FluidTypeTheOldOne.DEUTERIUM) && types.contains(FluidTypeTheOldOne.HYDROGEN)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_HD); return; } - if(types.contains(FluidType.HYDROGEN) && types.contains(FluidType.TRITIUM)) { - plasma.setTankType(FluidType.PLASMA_HT); + if(types.contains(FluidTypeTheOldOne.HYDROGEN) && types.contains(FluidTypeTheOldOne.TRITIUM)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_HT); return; } - if(types.contains(FluidType.XENON) && types.contains(FluidType.MERCURY)) { - plasma.setTankType(FluidType.PLASMA_XM); + if(types.contains(FluidTypeTheOldOne.XENON) && types.contains(FluidTypeTheOldOne.MERCURY)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_XM); return; } - if(types.contains(FluidType.BALEFIRE) && types.contains(FluidType.AMAT)) { - plasma.setTankType(FluidType.PLASMA_BF); + if(types.contains(FluidTypeTheOldOne.BALEFIRE) && types.contains(FluidTypeTheOldOne.AMAT)) { + plasma.setTankType(FluidTypeTheOldOne.PLASMA_BF); return; } - plasma.setTankType(FluidType.NONE); + plasma.setTankType(FluidTypeTheOldOne.NONE); } public long getPowerScaled(int i) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 4338ad233..f5077e96f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -32,7 +33,7 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven public TileEntityMachinePuF6Tank() { slots = new ItemStack[4]; - tank = new FluidTank(FluidType.PUF6, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.PUF6, 64000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 5dac387fd..8223f2101 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -7,12 +7,14 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.config.MobConfig; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.handler.radiation.ChunkRadiationManager; 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; @@ -68,9 +70,9 @@ public class TileEntityMachineReactorLarge extends TileEntity public TileEntityMachineReactorLarge() { slots = new ItemStack[8]; tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.WATER, 128000, 0); - tanks[1] = new FluidTank(FluidType.COOLANT, 64000, 1); - tanks[2] = new FluidTank(FluidType.STEAM, 32000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.COOLANT, 64000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.STEAM, 32000, 2); type = ReactorFuelType.URANIUM; } @@ -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)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index f4b3cbf0e..bb4ba65e0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -4,11 +4,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -45,7 +46,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide public TileEntityMachineSeleniumEngine() { slots = new ItemStack[14]; - tank = new FluidTank(FluidType.DIESEL, 16000, 0); + tank = new FluidTank(FluidTypeTheOldOne.DIESEL, 16000, 0); } @Override @@ -224,7 +225,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); - if(type.name().equals(FluidType.NITAN.name())) + if(type.name().equals(FluidTypeTheOldOne.NITAN.name())) powerCap = maxPower * 10; else powerCap = maxPower; @@ -259,18 +260,18 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide public static final HashMap fuels = new HashMap(); static { - fuels.put(FluidType.SMEAR, 50); - fuels.put(FluidType.HEATINGOIL, 75); - fuels.put(FluidType.HYDROGEN, 5); - fuels.put(FluidType.DIESEL, 225); - fuels.put(FluidType.KEROSENE, 300); - fuels.put(FluidType.RECLAIMED, 100); - fuels.put(FluidType.PETROIL, 125); - fuels.put(FluidType.BIOFUEL, 200); - fuels.put(FluidType.GASOLINE, 700); - fuels.put(FluidType.NITAN, 2500); - fuels.put(FluidType.LPG, 200); - fuels.put(FluidType.ETHANOL, 75); + fuels.put(FluidTypeTheOldOne.SMEAR, 50); + fuels.put(FluidTypeTheOldOne.HEATINGOIL, 75); + fuels.put(FluidTypeTheOldOne.HYDROGEN, 5); + fuels.put(FluidTypeTheOldOne.DIESEL, 225); + fuels.put(FluidTypeTheOldOne.KEROSENE, 300); + fuels.put(FluidTypeTheOldOne.RECLAIMED, 100); + fuels.put(FluidTypeTheOldOne.PETROIL, 125); + fuels.put(FluidTypeTheOldOne.BIOFUEL, 200); + fuels.put(FluidTypeTheOldOne.GASOLINE, 700); + fuels.put(FluidTypeTheOldOne.NITAN, 2500); + fuels.put(FluidTypeTheOldOne.LPG, 200); + fuels.put(FluidTypeTheOldOne.ETHANOL, 75); } public int getHEFromFuel() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index cf7298ad2..f9ef4f6c9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -3,11 +3,12 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; 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; @@ -43,8 +44,8 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent public TileEntityMachineTurbine() { slots = new ItemStack[7]; tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.STEAM, 64000, 0); - tanks[1] = new FluidTank(FluidType.SPENTSTEAM, 128000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.STEAM, 64000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 128000, 1); } @Override @@ -232,9 +233,9 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType()); if(outs == null) { - tanks[1].setTankType(FluidType.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); } else { - tanks[1].setTankType((FluidType) outs[0]); + tanks[1].setTankType((FluidTypeTheOldOne) outs[0]); int processMax = 1200; //the maximum amount of cycles based on the 1.2k cycle cap (subject to change) int processSteam = tanks[0].getFill() / (Integer)outs[2]; //the maximum amount of cycles depending on steam diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index d536f29b8..6910172d6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -6,10 +6,11 @@ import java.util.Random; import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -52,7 +53,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven public TileEntityMachineTurbofan() { slots = new ItemStack[3]; - tank = new FluidTank(FluidType.KEROSENE, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.KEROSENE, 64000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index a9a1fd157..51a87709a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -33,7 +34,7 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent public TileEntityMachineUF6Tank() { slots = new ItemStack[4]; - tank = new FluidTank(FluidType.UF6, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.UF6, 64000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 493b4c0d8..3a76bf278 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -10,7 +10,7 @@ import com.hbm.config.MobConfig; import com.hbm.entity.projectile.EntityZirnoxDebris; import com.hbm.entity.projectile.EntityZirnoxDebris.DebrisType; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.interfaces.IControlReceiver; @@ -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; @@ -66,9 +68,9 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF public TileEntityReactorZirnox() { super(28); - steam = new FluidTank(FluidType.SUPERHOTSTEAM, 8000, 0); - carbonDioxide = new FluidTank(FluidType.CARBONDIOXIDE, 16000, 1); - water = new FluidTank(FluidType.WATER, 32000, 2); + steam = new FluidTank(FluidTypeTheOldOne.SUPERHOTSTEAM, 8000, 0); + carbonDioxide = new FluidTank(FluidTypeTheOldOne.CARBONDIOXIDE, 16000, 1); + water = new FluidTank(FluidTypeTheOldOne.WATER, 32000, 2); } @Override @@ -404,33 +406,23 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF } public int getMaxFluidFill(FluidType type) { - switch (type) { - case SUPERHOTSTEAM: return steam.getMaxFill(); - case CARBONDIOXIDE: return carbonDioxide.getMaxFill(); - case WATER: return water.getMaxFill(); - default: return 0; - } + 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, FluidType type) { - switch (type) { - case SUPERHOTSTEAM: steam.setFill(i); - break; - case CARBONDIOXIDE: carbonDioxide.setFill(i); - break; - case WATER: water.setFill(i); - break; - default: break; - } + if(type == Fluids.SUPERHOTSTEAM) steam.setFill(i); + if(type == Fluids.CARBONDIOXIDE) carbonDioxide.setFill(i); + if(type == Fluids.WATER) water.setFill(i); } public int getFluidFill(FluidType type) { - switch (type) { - case SUPERHOTSTEAM: return steam.getFill(); - case CARBONDIOXIDE: return carbonDioxide.getFill(); - case WATER: return water.getFill(); - default: return 0; - } + 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) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java index 03c2d51cb..6aafa0e15 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java @@ -4,10 +4,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -41,7 +42,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce public TileEntitySILEX() { super(11); - tank = new FluidTank(FluidType.ACID, 16000, 0); + tank = new FluidTank(FluidTypeTheOldOne.ACID, 16000, 0); } @Override @@ -117,9 +118,9 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce public static final HashMap fluidConversion = new HashMap(); static { - fluidConversion.put(FluidType.UF6, new ComparableStack(ModItems.fluid_icon, 1, FluidType.UF6.ordinal())); - fluidConversion.put(FluidType.PUF6, new ComparableStack(ModItems.fluid_icon, 1, FluidType.PUF6.ordinal())); - fluidConversion.put(FluidType.DEATH, new ComparableStack(ModItems.fluid_icon, 1, FluidType.DEATH.ordinal())); + fluidConversion.put(FluidTypeTheOldOne.UF6, new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.UF6.ordinal())); + fluidConversion.put(FluidTypeTheOldOne.PUF6, new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PUF6.ordinal())); + fluidConversion.put(FluidTypeTheOldOne.DEATH, new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.DEATH.ordinal())); } int loadDelay; @@ -147,7 +148,7 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce if(loadDelay > 20) loadDelay = 0; - if(loadDelay == 0 && slots[0] != null && tank.getTankType() == FluidType.ACID && (this.current == null || this.current.equals(new ComparableStack(slots[0]).makeSingular()))) { + if(loadDelay == 0 && slots[0] != null && tank.getTankType() == FluidTypeTheOldOne.ACID && (this.current == null || this.current.equals(new ComparableStack(slots[0]).makeSingular()))) { SILEXRecipe recipe = SILEXRecipes.getOutput(slots[0]); if(recipe == null) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java index a9180a31c..2fc26b6d7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java @@ -5,10 +5,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -28,8 +29,8 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, public HashSet secondary = new HashSet(); public TileEntitySolarBoiler() { - water = new FluidTank(FluidType.WATER, 16000, 0); - steam = new FluidTank(FluidType.STEAM, 1600000, 1); + water = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0); + steam = new FluidTank(FluidTypeTheOldOne.STEAM, 1600000, 1); } @Override @@ -38,7 +39,7 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, if(!worldObj.isRemote) { //if(worldObj.getTotalWorldTime() % 5 == 0) { - fillFluidInit(FluidType.STEAM); + fillFluidInit(FluidTypeTheOldOne.STEAM); //} int process = heat / 10; @@ -74,9 +75,9 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, @Override public void setFluidFill(int fill, FluidType type) { - if(type == FluidType.WATER) + if(type == FluidTypeTheOldOne.WATER) water.setFill(fill); - if(type == FluidType.STEAM) + if(type == FluidTypeTheOldOne.STEAM) steam.setFill(fill); } @@ -95,9 +96,9 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, @Override public int getFluidFill(FluidType type) { - if(type == FluidType.WATER) + if(type == FluidTypeTheOldOne.WATER) return water.getFill(); - if(type == FluidType.STEAM) + if(type == FluidTypeTheOldOne.STEAM) return steam.getFill(); return 0; @@ -121,9 +122,9 @@ public class TileEntitySolarBoiler extends TileEntity implements IFluidAcceptor, @Override public int getMaxFluidFill(FluidType type) { - if(type == FluidType.WATER) + if(type == FluidTypeTheOldOne.WATER) return water.getMaxFill(); - if(type == FluidType.STEAM) + if(type == FluidTypeTheOldOne.STEAM) return steam.getMaxFill(); return 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index 8ade8f3e8..aa74c0ada 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -5,10 +5,11 @@ import java.util.List; import com.hbm.handler.MissileStruct; import com.hbm.entity.missile.EntitySoyuz; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -47,8 +48,8 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS public TileEntitySoyuzLauncher() { super(27); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.KEROSENE, 128000, 0); - tanks[1] = new FluidTank(FluidType.OXYGEN, 128000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.KEROSENE, 128000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.OXYGEN, 128000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index e26bdd442..4407131ae 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.List; import com.hbm.config.VersatileConfig; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.hazard.HazardRegistry; 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; @@ -39,8 +40,8 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu public TileEntityStorageDrum() { super(24); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.WASTEFLUID, 16000, 0); - tanks[1] = new FluidTank(FluidType.WASTEGAS, 16000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.WASTEFLUID, 16000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.WASTEGAS, 16000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java index 07cda9edb..7af05fefb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java @@ -1,7 +1,8 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -14,8 +15,8 @@ public class TileEntityTowerLarge extends TileEntityCondenser { public TileEntityTowerLarge() { tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.SPENTSTEAM, 10000, 0); - tanks[1] = new FluidTank(FluidType.WATER, 10000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 10000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.WATER, 10000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerSmall.java index 3d43891c3..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.FluidType; 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(FluidType.SPENTSTEAM, 1000, 0); - tanks[1] = new FluidTank(FluidType.WATER, 1000, 1); + tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 1000, 0); + tanks[1] = new FluidTank(Fluids.WATER, 1000, 1); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java index dd4489c66..de1ae98fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -7,12 +7,13 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.BombConfig; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; 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; @@ -59,7 +60,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I public TileEntityWatzCore() { slots = new ItemStack[40]; - tank = new FluidTank(FluidType.WATZ, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.WATZ, 64000, 0); } @Override public int getSizeInventory() { 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 ba22972fd..9e69fcb01 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java @@ -5,10 +5,11 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -30,10 +31,10 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl public TileEntityMachineCatalyticCracker() { tanks = new FluidTank[4]; - tanks[0] = new FluidTank(FluidType.BITUMEN, 4000, 0); - tanks[1] = new FluidTank(FluidType.STEAM, 8000, 1); - tanks[2] = new FluidTank(FluidType.OIL, 4000, 2); - tanks[3] = new FluidTank(FluidType.PETROLEUM, 4000, 3); + tanks[0] = new FluidTank(FluidTypeTheOldOne.BITUMEN, 4000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 8000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.OIL, 4000, 2); + tanks[3] = new FluidTank(FluidTypeTheOldOne.PETROLEUM, 4000, 3); } @Override @@ -80,14 +81,14 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); if(quart != null) { - tanks[1].setTankType(FluidType.STEAM); + tanks[1].setTankType(FluidTypeTheOldOne.STEAM); tanks[2].setTankType(quart.getW()); tanks[3].setTankType(quart.getX()); } else { - tanks[0].setTankType(FluidType.NONE); - tanks[1].setTankType(FluidType.NONE); - tanks[2].setTankType(FluidType.NONE); - tanks[3].setTankType(FluidType.NONE); + tanks[0].setTankType(FluidTypeTheOldOne.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); + tanks[2].setTankType(FluidTypeTheOldOne.NONE); + tanks[3].setTankType(FluidTypeTheOldOne.NONE); } } 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 f651ab120..c05b2babe 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java @@ -1,9 +1,10 @@ package com.hbm.tileentity.machine.oil; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -15,9 +16,9 @@ public class TileEntityMachineFrackingTower extends TileEntityOilDrillBase imple public TileEntityMachineFrackingTower() { super(); tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.OIL, 64_000, 0); - tanks[1] = new FluidTank(FluidType.GAS, 64_000, 1); - tanks[2] = new FluidTank(FluidType.FRACKSOL, 64_000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.OIL, 64_000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.GAS, 64_000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.FRACKSOL, 64_000, 2); } @Override 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 52d81eee9..e04f41a0b 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFractionTower.java @@ -3,10 +3,11 @@ package com.hbm.tileentity.machine.oil; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -27,9 +28,9 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid public TileEntityMachineFractionTower() { tanks = new FluidTank[3]; - tanks[0] = new FluidTank(FluidType.HEAVYOIL, 4000, 0); - tanks[1] = new FluidTank(FluidType.BITUMEN, 4000, 1); - tanks[2] = new FluidTank(FluidType.SMEAR, 4000, 2); + tanks[0] = new FluidTank(FluidTypeTheOldOne.HEAVYOIL, 4000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.BITUMEN, 4000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.SMEAR, 4000, 2); } @Override @@ -82,9 +83,9 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid tanks[1].setTankType(quart.getW()); tanks[2].setTankType(quart.getX()); } else { - tanks[0].setTankType(FluidType.NONE); - tanks[1].setTankType(FluidType.NONE); - tanks[2].setTankType(FluidType.NONE); + tanks[0].setTankType(FluidTypeTheOldOne.NONE); + tanks[1].setTankType(FluidTypeTheOldOne.NONE); + tanks[2].setTankType(FluidTypeTheOldOne.NONE); } } 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 8b8462f08..4369bed53 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java @@ -6,10 +6,11 @@ import java.util.Random; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionThermo; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -44,7 +45,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven public TileEntityMachineGasFlare() { slots = new ItemStack[3]; - tank = new FluidTank(FluidType.GAS, 64000, 0); + tank = new FluidTank(FluidTypeTheOldOne.GAS, 64000, 0); } @Override 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 c04df0634..875ed8cb2 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java @@ -2,7 +2,8 @@ package com.hbm.tileentity.machine.oil; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionLarge; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; +import com.hbm.inventory.fluid.FluidType; import com.hbm.lib.Library; import net.minecraft.block.Block; 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 19bf58b03..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.FluidType; +import com.hbm.inventory.fluid.FluidType; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; 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 ae9243461..cd1193e7b 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java @@ -3,12 +3,13 @@ package com.hbm.tileentity.machine.oil; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IFluidAcceptor; 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; @@ -52,11 +53,11 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven public TileEntityMachineRefinery() { slots = new ItemStack[12]; tanks = new FluidTank[5]; - tanks[0] = new FluidTank(FluidType.HOTOIL, 64000, 0); - tanks[1] = new FluidTank(FluidType.HEAVYOIL, 16000, 1); - tanks[2] = new FluidTank(FluidType.NAPHTHA, 16000, 2); - tanks[3] = new FluidTank(FluidType.LIGHTOIL, 16000, 3); - tanks[4] = new FluidTank(FluidType.PETROLEUM, 16000, 4); + tanks[0] = new FluidTank(FluidTypeTheOldOne.HOTOIL, 64000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYOIL, 16000, 1); + tanks[2] = new FluidTank(FluidTypeTheOldOne.NAPHTHA, 16000, 2); + tanks[3] = new FluidTank(FluidTypeTheOldOne.LIGHTOIL, 16000, 3); + tanks[4] = new FluidTank(FluidTypeTheOldOne.PETROLEUM, 16000, 4); } @Override @@ -129,7 +130,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven if(i == 0 && stack.getItem() instanceof IBatteryItem) return true; - if(i == 1 && FluidContainerRegistry.getFluidContent(stack, FluidType.HOTOIL) > 0) + if(i == 1 && FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.HOTOIL) > 0) return true; if(stack.getItem() == ModItems.canister_empty) { if(i == 3) 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 e9b13c247..c506b4076 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java @@ -5,11 +5,12 @@ import java.util.HashSet; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; +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.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; @@ -41,8 +42,8 @@ public abstract class TileEntityOilDrillBase extends TileEntityMachineBase imple public TileEntityOilDrillBase() { super(8); tanks = new FluidTank[2]; - tanks[0] = new FluidTank(FluidType.OIL, 64_000, 0); - tanks[1] = new FluidTank(FluidType.GAS, 64_000, 1); + tanks[0] = new FluidTank(FluidTypeTheOldOne.OIL, 64_000, 0); + tanks[1] = new FluidTank(FluidTypeTheOldOne.GAS, 64_000, 1); } @Override 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 20c1f1719..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.FluidType; 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(FluidType.WATER, 10000, 0); - steam = new FluidTank(FluidType.STEAM, 1000000, 1); + feed = new FluidTank(Fluids.WATER, 10000, 0); + steam = new FluidTank(Fluids.STEAM, 1000000, 1); } @Override @@ -66,25 +67,19 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I } public double getHeatFromSteam(FluidType type) { - - switch(type) { - case STEAM: return 100D; - case HOTSTEAM: return 300D; - case SUPERHOTSTEAM: return 450D; - case ULTRAHOTSTEAM: return 600D; - default: return 0D; - } + 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(FluidType type) { - - switch(type) { - case STEAM: return 1D; - case HOTSTEAM: return 10D; - case SUPERHOTSTEAM: return 100D; - case ULTRAHOTSTEAM: return 1000D; - default: return 0D; - } + 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 @@ -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(FluidType.HOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case HOTSTEAM: steam.setTankType(FluidType.SUPERHOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case SUPERHOTSTEAM: steam.setTankType(FluidType.ULTRAHOTSTEAM); steam.setFill(steam.getFill() / 10); break; - case ULTRAHOTSTEAM: steam.setTankType(FluidType.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/TileEntityRBMKConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java index 27e253eda..9e19910e1 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne; import com.hbm.interfaces.IControlReceiver; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual.RBMKColor; @@ -240,7 +240,7 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase implements ICon case BOILER: stats.add(EnumChatFormatting.BLUE + I18nUtil.resolveKey("rbmk.boiler.water", this.data.getInteger("water"), this.data.getInteger("maxWater"))); stats.add(EnumChatFormatting.WHITE + I18nUtil.resolveKey("rbmk.boiler.steam", this.data.getInteger("steam"), this.data.getInteger("maxSteam"))); - stats.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("rbmk.boiler.type", I18nUtil.resolveKey(FluidType.values()[this.data.getShort("type")].getUnlocalizedName()))); + stats.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("rbmk.boiler.type", I18nUtil.resolveKey(FluidTypeTheOldOne.values()[this.data.getShort("type")].getUnlocalizedName()))); break; case CONTROL: 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 8ff7533ca..2fe88d234 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine.rbmk; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -22,7 +23,7 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidAc public TileEntityRBMKCooler() { super(); - this.tank = new FluidTank(FluidType.CRYOGEL, 8000, 0); + this.tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 8000, 0); } @Override 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 87335077b..a4f08bccb 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java @@ -3,9 +3,10 @@ package com.hbm.tileentity.machine.rbmk; import java.util.List; import com.hbm.blocks.machine.rbmk.RBMKBase; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -18,7 +19,7 @@ public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { public FluidTank water; public TileEntityRBMKInlet() { - water = new FluidTank(FluidType.WATER, 32000, 0); + water = new FluidTank(FluidTypeTheOldOne.WATER, 32000, 0); } @Override @@ -68,7 +69,7 @@ public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { @Override public void setFluidFill(int fill, FluidType type) { - if(type == FluidType.WATER) water.setFill(fill); + if(type == FluidTypeTheOldOne.WATER) water.setFill(fill); } @Override @@ -83,13 +84,13 @@ public class TileEntityRBMKInlet extends TileEntity implements IFluidAcceptor { @Override public int getFluidFill(FluidType type) { - if(type == FluidType.WATER) return water.getFill(); + if(type == FluidTypeTheOldOne.WATER) return water.getFill(); return 0; } @Override public int getMaxFluidFill(FluidType type) { - if(type == FluidType.WATER) return water.getMaxFill(); + 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 73172ace7..8f7994e32 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java @@ -6,11 +6,12 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; -import com.hbm.handler.FluidTypeHandler.FluidType; +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.RecipesCommon.ComparableStack; +import com.hbm.inventory.fluid.FluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.lib.Library; @@ -30,7 +31,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement public TileEntityRBMKOutgasser() { super(2); - gas = new FluidTank(FluidType.TRITIUM, 64000, 0); + gas = new FluidTank(FluidTypeTheOldOne.TRITIUM, 64000, 0); } @Override @@ -75,10 +76,10 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement private static HashMap recipes = new HashMap(); static { - recipes.put("blockLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 10000)); - recipes.put("ingotLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 1000)); - recipes.put("dustLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 1000)); - recipes.put(new ComparableStack(ModItems.powder_lithium_tiny), ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 100)); + recipes.put("blockLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.TRITIUM.ordinal()), 10000)); + recipes.put("ingotLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.TRITIUM.ordinal()), 1000)); + recipes.put("dustLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.TRITIUM.ordinal()), 1000)); + recipes.put(new ComparableStack(ModItems.powder_lithium_tiny), ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.TRITIUM.ordinal()), 100)); recipes.put("ingotGold", new ItemStack(ModItems.ingot_au198)); recipes.put("nuggetGold", new ItemStack(ModItems.nugget_au198)); recipes.put("dustGold", new ItemStack(ModItems.powder_au198)); 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 ad244672e..919dd788f 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java @@ -4,10 +4,11 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.machine.rbmk.RBMKBase; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -22,7 +23,7 @@ public class TileEntityRBMKOutlet extends TileEntity implements IFluidSource { public FluidTank steam; public TileEntityRBMKOutlet() { - steam = new FluidTank(FluidType.SUPERHOTSTEAM, 32000, 0); + steam = new FluidTank(FluidTypeTheOldOne.SUPERHOTSTEAM, 32000, 0); } @Override diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java index 756a13f0a..b0098f5b7 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java @@ -5,9 +5,10 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; -import com.hbm.handler.FluidTypeHandler.FluidType; +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; @@ -22,7 +23,7 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl public TileEntityTurretFritz() { super(); - this.tank = new FluidTank(FluidType.DIESEL, 16000, 0); + this.tank = new FluidTank(FluidTypeTheOldOne.DIESEL, 16000, 0); } @Override @@ -68,7 +69,7 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl @Override public void updateFiringTick() { - if(this.tank.getTankType() == FluidType.DIESEL && this.tank.getFill() >= 10) { + if(this.tank.getTankType() == FluidTypeTheOldOne.DIESEL && this.tank.getFill() >= 10) { BulletConfiguration conf = BulletConfigSyncingUtil.pullConfig(BulletConfigSyncingUtil.FLA_NORMAL); this.spawnBullet(conf); @@ -106,7 +107,7 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl for(int i = 1; i < 10; i++) { if(slots[i] != null && slots[i].getItem() == ModItems.ammo_fuel) { - if(this.tank.getTankType() == FluidType.DIESEL && this.tank.getFill() + 1000 <= this.tank.getMaxFill()) { + if(this.tank.getTankType() == FluidTypeTheOldOne.DIESEL && this.tank.getFill() + 1000 <= this.tank.getMaxFill()) { this.tank.setFill(this.tank.getFill() + 1000); this.decrStackSize(i, 1); } diff --git a/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj b/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj index 944c6e71e..ba7e3ec2d 100644 --- a/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj +++ b/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj @@ -1,41 +1,20 @@ -# Blender v2.76 (sub 0) OBJ File: '' +# Blender v2.79 (sub 0) OBJ File: '' # www.blender.org o cube -v 0.500000 0.062531 0.187500 -v 0.500000 0.062531 -0.187500 v -0.500000 0.062531 -0.187500 v -0.500000 0.062531 0.187500 -v 0.437500 0.937531 0.187500 -v 0.437500 0.937531 -0.187500 +v 0.500000 0.062531 -0.187500 +v 0.500000 0.062531 0.187500 v -0.437500 0.937531 -0.187500 v -0.437500 0.937531 0.187500 -v 0.500000 0.687500 -0.437469 -v 0.500000 0.312500 -0.437469 -v -0.500000 0.687500 -0.437469 -v -0.500000 0.312500 -0.437469 -v 0.500000 0.687500 0.437562 -v 0.500000 0.312500 0.437531 -v 0.500000 0.687500 0.437500 -v -0.500000 0.687500 0.437531 -v -0.500000 0.312500 0.437531 -v 0.500000 0.323245 -0.441920 -v 0.500000 0.058080 -0.176755 -v -0.500000 0.323245 -0.441920 -v -0.500000 0.058080 -0.176755 -v 0.500000 0.941964 0.176799 -v 0.500000 0.676821 0.441986 -v 0.500000 0.676777 0.441942 -v -0.500000 0.941964 0.176799 -v -0.500000 0.676777 0.441942 +v 0.437500 0.937531 -0.187500 +v 0.437500 0.937531 0.187500 v -0.500000 0.676821 0.441986 -v 0.500000 0.941920 -0.176755 -v 0.500000 0.676755 -0.441920 -v -0.500000 0.941920 -0.176755 -v -0.500000 0.676755 -0.441920 -v 0.500000 0.323201 0.441964 -v 0.500000 0.058036 0.176799 -v -0.500000 0.323201 0.441964 -v -0.500000 0.058036 0.176799 +v 0.500000 0.676821 0.441986 +v 0.500000 0.941964 0.176799 +v 0.500000 0.676777 0.441942 +v -0.500000 0.676777 0.441942 +v -0.500000 0.941964 0.176799 v -0.437500 0.968458 0.510064 v -0.437500 -0.003814 -0.462208 v -0.437500 1.012652 0.465869 @@ -80,115 +59,136 @@ v -0.124969 0.687500 -0.375000 v -0.124937 0.312500 -0.375000 v -0.124969 0.687500 -0.500000 v -0.124969 0.312500 -0.500000 -v -0.125000 0.312500 -0.375000 v 0.375031 0.687500 -0.375000 v 0.375031 0.312500 -0.375000 v 0.375031 0.687500 -0.500000 v 0.375031 0.312500 -0.500000 v -0.374969 0.125000 0.187500 -v -0.374969 0.000000 0.187500 +v -0.374969 -0.000000 0.187500 v -0.374969 0.125000 -0.187500 v -0.374969 0.000000 -0.187500 v -0.124969 0.125000 0.187500 -v -0.124969 0.000000 0.187500 +v -0.124969 -0.000000 0.187500 v -0.124969 0.125000 -0.187500 v -0.124969 0.000000 -0.187500 +v 0.125031 0.720971 -0.486136 +v 0.125031 0.632583 -0.397748 +v 0.125031 0.897748 -0.132583 +v 0.125031 0.986136 -0.220971 v 0.375031 0.125000 0.187500 -v 0.375031 0.000000 0.187500 +v 0.375031 -0.000000 0.187500 v 0.375031 0.125000 -0.187500 v 0.375031 0.000000 -0.187500 +v 0.125031 0.279029 -0.486136 +v 0.125031 0.013864 -0.220971 +v 0.125031 0.102252 -0.132583 +v 0.125031 0.367418 -0.397748 +v 0.125031 0.102252 0.132583 +v 0.125031 0.013864 0.220971 +v 0.125031 0.279029 0.486136 +v 0.125031 0.367417 0.397748 v 0.125031 0.125000 0.187500 -v 0.125031 0.000000 0.187500 +v 0.125031 -0.000000 0.187500 v 0.125031 0.125000 -0.187500 v 0.125031 0.000000 -0.187500 +v -0.124969 0.279029 -0.486136 +v -0.124969 0.013864 -0.220971 +v -0.124969 0.102252 -0.132583 +v -0.124969 0.367418 -0.397748 +v -0.124969 0.102252 0.132583 +v -0.124969 0.013864 0.220971 +v -0.124969 0.279029 0.486136 +v -0.124969 0.367417 0.397748 v 0.125031 1.000000 0.187500 v 0.125031 0.875000 0.187500 v 0.125031 1.000000 -0.187500 v 0.125031 0.875000 -0.187500 +v -0.124969 0.720971 -0.486136 +v -0.124969 0.632583 -0.397748 +v -0.124969 0.897748 -0.132583 +v -0.124969 0.986136 -0.220971 +v 0.375031 0.897748 0.132583 +v 0.375031 0.632582 0.397748 +v 0.375031 0.720971 0.486136 +v 0.375031 0.986136 0.220971 v -0.374969 1.000000 0.187500 v -0.374969 0.875000 0.187500 v -0.374969 1.000000 -0.187500 v -0.374969 0.875000 -0.187500 +v 0.375031 0.102252 0.132583 +v 0.375031 0.013864 0.220971 +v 0.375031 0.279029 0.486136 +v 0.375031 0.367417 0.397748 +v 0.375031 0.279029 -0.486136 +v 0.375031 0.013864 -0.220971 +v 0.375031 0.102252 -0.132583 +v 0.375031 0.367418 -0.397748 v -0.124969 1.000000 0.187500 v -0.124969 0.875000 0.187500 v -0.124969 1.000000 -0.187500 v -0.124969 0.875000 -0.187500 +v 0.375031 0.720971 -0.486136 +v 0.375031 0.632583 -0.397748 +v 0.375031 0.897748 -0.132583 +v 0.375031 0.986136 -0.220971 +v 0.125031 0.897748 0.132583 +v 0.125031 0.632582 0.397748 +v 0.125031 0.720971 0.486136 +v 0.125031 0.986136 0.220971 v 0.375031 1.000000 0.187500 v 0.375031 0.875000 0.187500 v 0.375031 1.000000 -0.187500 v 0.375031 0.875000 -0.187500 +v -0.124969 0.897748 0.132583 +v -0.124969 0.632582 0.397748 +v -0.124969 0.720971 0.486136 +v -0.124969 0.986136 0.220971 +v -0.374969 0.720971 -0.486136 +v -0.374969 0.632583 -0.397748 +v -0.374969 0.897748 -0.132583 +v -0.374969 0.986136 -0.220971 v -0.374969 0.279029 0.486136 v -0.374969 0.013864 0.220971 v -0.374969 0.367417 0.397748 v -0.374969 0.102252 0.132583 -v -0.374969 0.720971 0.486136 -v -0.374969 0.632582 0.397748 -v -0.374969 0.986136 0.220971 -v -0.374969 0.897748 0.132583 -v -0.374969 0.102252 -0.132583 -v -0.374969 0.013864 -0.220971 -v -0.374969 0.367418 -0.397748 v -0.374969 0.279029 -0.486136 -v -0.374969 0.897748 -0.132583 -v -0.374969 0.632583 -0.397748 -v -0.374969 0.986136 -0.220971 -v -0.374969 0.720971 -0.486136 -v -0.124969 0.720971 0.486136 -v -0.124969 0.632582 0.397748 -v -0.124969 0.986136 0.220971 -v -0.124969 0.897748 0.132583 -v 0.125031 0.720971 0.486136 -v 0.125031 0.632582 0.397748 -v 0.125031 0.986136 0.220971 -v 0.125031 0.897748 0.132583 -v 0.375031 0.897748 -0.132583 -v 0.375031 0.632583 -0.397748 -v 0.375031 0.986136 -0.220971 -v 0.375031 0.720971 -0.486136 -v 0.375031 0.102252 -0.132583 -v 0.375031 0.013864 -0.220971 -v 0.375031 0.367418 -0.397748 -v 0.375031 0.279029 -0.486136 -v 0.375031 0.279029 0.486136 -v 0.375031 0.013864 0.220971 -v 0.375031 0.367417 0.397748 -v 0.375031 0.102252 0.132583 -v 0.375031 0.720971 0.486136 -v 0.375031 0.632582 0.397748 -v 0.375031 0.986136 0.220971 -v 0.375031 0.897748 0.132583 -v -0.124969 0.897748 -0.132583 -v -0.124969 0.632583 -0.397748 -v -0.124969 0.986136 -0.220971 -v -0.124969 0.720971 -0.486136 -v -0.124969 0.279029 0.486136 -v -0.124969 0.013864 0.220971 -v -0.124969 0.367417 0.397748 -v -0.124969 0.102252 0.132583 -v -0.124969 0.102252 -0.132583 -v -0.124969 0.013864 -0.220971 -v -0.124969 0.367418 -0.397748 -v -0.124969 0.279029 -0.486136 -v 0.125031 0.279029 0.486136 -v 0.125031 0.013864 0.220971 -v 0.125031 0.367417 0.397748 -v 0.125031 0.102252 0.132583 -v 0.125031 0.102252 -0.132583 -v 0.125031 0.013864 -0.220971 -v 0.125031 0.367418 -0.397748 -v 0.125031 0.279029 -0.486136 -v 0.125031 0.897748 -0.132583 -v 0.125031 0.632583 -0.397748 -v 0.125031 0.986136 -0.220971 -v 0.125031 0.720971 -0.486136 +v -0.374969 0.013864 -0.220971 +v -0.374969 0.102252 -0.132583 +v -0.374969 0.367418 -0.397748 +v -0.374969 0.897748 0.132583 +v -0.374969 0.632582 0.397748 +v -0.374969 0.720971 0.486136 +v -0.374969 0.986136 0.220971 +v -0.125000 0.312500 -0.375000 +v 0.500000 0.058036 0.176799 +v -0.500000 0.058036 0.176799 +v -0.500000 0.323201 0.441964 +v 0.500000 0.323201 0.441964 +v 0.500000 0.676755 -0.441920 +v -0.500000 0.676755 -0.441920 +v -0.500000 0.941920 -0.176755 +v 0.500000 0.941920 -0.176755 +v 0.500000 0.058080 -0.176755 +v -0.500000 0.058080 -0.176755 +v -0.500000 0.323245 -0.441920 +v 0.500000 0.323245 -0.441920 +v 0.500000 0.312500 0.437531 +v -0.500000 0.312500 0.437531 +v -0.500000 0.687500 0.437531 +v 0.500000 0.687500 0.437500 +v 0.500000 0.687500 0.437562 +v 0.500000 0.312500 -0.437469 +v -0.500000 0.312500 -0.437469 +v -0.500000 0.687500 -0.437469 +v 0.500000 0.687500 -0.437469 vt 0.687012 0.187500 vt 0.687012 0.374512 vt 0.187988 0.187500 vt 0.187988 0.374512 -vt 0.624512 0.375000 -vt 0.624512 0.562012 -vt 0.187988 0.375000 -vt 0.187988 0.562012 +vt 0.562500 0.562500 +vt 0.562500 0.375000 +vt 1.000000 0.562500 +vt 1.000000 0.375000 vt 0.500488 0.812988 vt 0.999512 0.812988 vt 0.999512 0.999512 @@ -218,7 +218,58 @@ vt 0.031738 0.687012 vt 0.031738 0.000488 vt 0.062012 0.687012 vt 0.062012 0.000488 +vt 0.000488 0.687012 +vt 0.000488 0.000488 +vt 0.030762 0.687012 +vt 0.030762 0.000488 +vt 0.062988 0.687012 +vt 0.062988 0.000488 +vt 0.093262 0.687012 +vt 0.093262 0.000488 +vt 0.062012 0.687988 +vt 0.062012 0.718262 +vt 0.031738 0.687988 +vt 0.031738 0.718262 vt 0.093262 0.718262 +vt 0.093262 0.687988 +vt 0.062988 0.718262 +vt 0.062988 0.687988 +vt 0.094238 0.687012 +vt 0.094238 0.000488 +vt 0.124512 0.687012 +vt 0.124512 0.000488 +vt 0.031738 0.687012 +vt 0.031738 0.000488 +vt 0.062012 0.687012 +vt 0.062012 0.000488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 vt 0.125488 0.812012 vt 0.125488 0.625488 vt 0.187500 0.812500 @@ -227,219 +278,422 @@ vt 0.125488 0.624512 vt 0.125488 0.562988 vt 0.312500 0.624512 vt 0.312500 0.562988 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 vt 0.187988 0.625488 vt 0.249512 0.625488 vt 0.249512 0.812012 vt 0.500000 0.562988 vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 vt 0.000488 1.000000 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.000488 1.000000 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 vt 0.000488 0.999512 -vt 1.062012 0.375488 -vt 0.625488 0.375488 -vt 0.625488 0.562012 -vt 1.062012 0.562012 -vt 1.187012 0.187988 -vt 0.687988 0.187988 -vt 0.687988 0.374512 -vt 1.187012 0.374512 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.707200 0.707000 -vn 0.000000 -0.707000 -0.707200 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 0.707100 0.707100 -vn 0.000000 -0.707100 -0.707100 -vn 0.000000 -0.707100 0.707100 -vn 0.000000 0.707100 -0.707100 -vn 1.000000 0.000100 0.000000 -vn 1.000000 0.000000 -0.000300 -vn -1.000000 0.000100 -0.000200 -vn 0.000000 0.000000 -1.000000 -vn -0.000000 -0.000100 -1.000000 -vn 0.000000 -0.000100 1.000000 -vn -0.000000 0.000000 1.000000 -vn 0.000000 -1.000000 0.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.125000 0.562500 +vt 0.562500 0.562500 +vt 0.562500 0.375000 +vt 0.125000 0.375000 +vt 0.687500 0.187500 +vt 0.187500 0.187500 +vt 0.187500 0.375000 +vt 0.687500 0.375000 +vt 0.093750 0.718750 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.7072 0.7070 +vn 0.0000 -0.7070 -0.7072 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.7071 0.7071 +vn 0.0000 -0.7071 -0.7071 +vn 0.0000 -0.7071 0.7071 +vn 0.0000 0.7071 -0.7071 +vn 1.0000 0.0001 0.0000 +vn 1.0000 -0.0000 -0.0003 +vn -1.0000 0.0001 -0.0002 +vn 0.0000 0.0000 -1.0000 +vn -0.0000 -0.0001 -1.0000 +vn 0.0000 -0.0001 1.0000 +vn -0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 s off -f 3/1/1 4/2/1 2/3/1 -f 4/2/1 1/4/1 2/3/1 -f 7/5/1 8/6/1 6/7/1 -f 8/6/1 5/8/1 6/7/1 -f 27/9/2 23/10/2 22/11/2 -f 24/12/3 26/13/3 25/14/3 -f 36/15/4 37/16/4 38/17/4 -f 37/16/4 39/18/4 38/17/4 -f 40/19/5 41/20/5 42/21/5 -f 41/20/5 43/22/5 42/21/5 -f 40/23/6 42/24/6 38/25/6 -f 42/24/6 36/26/6 38/25/6 -f 41/27/7 39/28/7 37/29/7 -f 42/30/8 43/31/8 36/32/8 -f 43/31/8 37/33/8 36/32/8 -f 38/34/9 39/35/9 40/36/9 -f 39/35/9 41/37/9 40/36/9 -f 44/15/4 45/16/4 46/17/4 -f 45/16/4 47/18/4 46/17/4 -f 48/19/5 49/20/5 50/21/5 -f 49/20/5 51/22/5 50/21/5 -f 48/23/9 50/24/9 46/25/9 -f 50/24/9 44/26/9 46/25/9 -f 51/38/8 49/27/8 45/29/8 -f 49/27/8 47/28/8 45/29/8 -f 50/30/6 51/31/6 44/32/6 -f 51/31/6 45/33/6 44/32/6 -f 46/34/7 47/35/7 48/36/7 -f 47/35/7 49/37/7 48/36/7 -f 52/39/4 53/40/4 54/41/4 -f 53/40/4 55/42/4 54/41/4 -f 56/39/4 57/40/4 58/41/4 -f 57/40/4 59/42/4 58/41/4 -f 60/39/4 61/40/4 62/41/4 -f 61/40/4 63/42/4 62/41/4 -f 64/39/4 65/40/4 66/41/4 -f 65/40/4 67/42/4 66/41/4 -f 68/39/4 69/40/4 70/41/4 -f 69/40/4 71/42/4 70/41/4 -f 72/39/4 73/40/4 74/41/4 -f 73/40/4 75/42/4 74/41/4 -f 76/39/10 77/40/10 78/41/10 -f 77/40/11 79/42/11 78/41/11 -f 81/39/4 82/40/4 83/41/4 -f 82/40/4 84/42/4 83/41/4 -f 85/43/4 86/44/4 87/45/4 -f 86/44/4 88/46/4 87/45/4 -f 89/43/4 90/44/4 91/45/4 -f 90/44/4 92/46/4 91/45/4 -f 180/47/5 178/48/5 177/49/5 -f 179/41/5 180/47/5 177/49/5 -f 93/43/4 94/44/4 95/45/4 -f 94/44/4 96/46/4 95/45/4 -f 176/46/5 174/50/5 173/51/5 -f 175/45/5 176/46/5 173/51/5 -f 172/47/5 170/48/5 169/49/5 -f 171/41/5 172/47/5 169/49/5 -f 97/43/4 98/44/4 99/45/4 -f 98/44/4 100/46/4 99/45/4 -f 168/46/5 166/50/5 165/51/5 -f 167/45/5 168/46/5 165/51/5 -f 164/47/5 162/48/5 161/49/5 -f 163/41/5 164/47/5 161/49/5 -f 101/43/4 102/44/4 103/45/4 -f 102/44/4 104/46/4 103/45/4 -f 160/47/5 158/48/5 157/49/5 -f 159/41/5 160/47/5 157/49/5 -f 156/46/5 154/50/5 153/51/5 -f 155/45/5 156/46/5 153/51/5 -f 105/43/4 106/44/4 107/45/4 -f 106/44/4 108/46/4 107/45/4 -f 152/47/5 150/48/5 149/49/5 -f 151/41/5 152/47/5 149/49/5 -f 148/46/5 146/50/5 145/51/5 -f 147/45/5 148/46/5 145/51/5 -f 109/43/4 110/44/4 111/45/4 -f 110/44/4 112/46/4 111/45/4 -f 144/47/5 142/48/5 141/49/5 -f 143/41/5 144/47/5 141/49/5 -f 140/46/5 138/50/5 137/51/5 -f 139/45/5 140/46/5 137/51/5 -f 113/43/4 114/44/4 115/45/4 -f 114/44/4 116/46/4 115/45/4 -f 136/46/5 134/50/5 133/51/5 -f 135/45/5 136/46/5 133/51/5 -f 132/47/5 130/48/5 129/49/5 -f 131/41/5 132/47/5 129/49/5 -f 117/39/4 118/40/4 119/41/4 -f 118/40/4 120/42/4 119/41/4 -f 128/46/5 126/50/5 125/51/5 -f 127/45/5 128/46/5 125/51/5 -f 124/46/5 122/50/5 121/51/5 -f 123/45/5 124/46/5 121/51/5 -f 121/43/4 122/44/4 123/45/4 -f 122/44/4 124/46/4 123/45/4 -f 120/47/5 118/48/5 117/49/5 -f 119/41/5 120/47/5 117/49/5 -f 116/46/5 114/50/5 113/51/5 -f 115/45/5 116/46/5 113/51/5 -f 125/43/4 126/44/4 127/45/4 -f 126/44/4 128/46/4 127/45/4 -f 112/46/5 110/50/5 109/51/5 -f 111/45/5 112/46/5 109/51/5 -f 108/46/5 106/50/5 105/51/5 -f 107/45/5 108/46/5 105/51/5 -f 129/39/4 130/40/4 131/41/4 -f 130/40/4 132/42/4 131/41/4 -f 104/46/5 102/50/5 101/51/5 -f 103/45/5 104/46/5 101/51/5 -f 100/46/5 98/50/5 97/51/5 -f 99/45/5 100/46/5 97/51/5 -f 133/43/4 134/44/4 135/45/4 -f 134/44/4 136/46/4 135/45/4 -f 96/46/5 94/50/5 93/51/5 -f 95/45/5 96/46/5 93/51/5 -f 92/46/5 90/50/5 89/51/5 -f 91/45/5 92/46/5 89/51/5 -f 137/43/4 138/44/4 139/45/4 -f 138/44/4 140/46/4 139/45/4 -f 88/46/5 86/50/5 85/51/5 -f 87/45/5 88/46/5 85/51/5 -f 84/47/5 82/48/5 81/49/5 -f 83/41/5 84/47/5 81/49/5 -f 141/39/4 142/40/4 143/41/4 -f 142/40/4 144/42/4 143/41/4 -f 79/47/12 80/48/12 76/49/12 -f 78/41/5 79/47/5 76/49/5 -f 75/47/5 73/48/5 72/49/5 -f 74/41/5 75/47/5 72/49/5 -f 145/43/4 146/44/4 147/45/4 -f 146/44/4 148/46/4 147/45/4 -f 71/47/5 69/48/5 68/49/5 -f 70/41/5 71/47/5 68/49/5 -f 67/47/5 65/48/5 64/49/5 -f 66/41/5 67/47/5 64/49/5 -f 149/39/4 150/40/4 151/41/4 -f 150/40/4 152/42/4 151/41/4 -f 63/47/5 61/48/5 60/49/5 -f 62/41/5 63/47/5 60/49/5 -f 59/47/5 57/48/5 56/49/5 -f 58/41/5 59/47/5 56/49/5 -f 153/43/4 154/44/4 155/45/4 -f 154/44/4 156/46/4 155/45/4 -f 55/47/5 53/48/5 52/49/5 -f 54/41/5 55/47/5 52/49/5 -f 33/12/9 35/13/9 34/14/9 -f 32/52/9 33/12/9 34/14/9 -f 157/39/4 158/40/4 159/41/4 -f 158/40/4 160/42/4 159/41/4 -f 35/9/8 33/10/8 32/11/8 -f 34/14/8 35/9/8 32/11/8 -f 29/12/9 31/13/9 30/14/9 -f 28/52/9 29/12/9 30/14/9 -f 161/39/4 162/40/4 163/41/4 -f 162/40/4 164/42/4 163/41/4 -f 31/9/8 29/10/8 28/11/8 -f 30/14/8 31/9/8 28/11/8 -f 22/52/3 24/12/3 25/14/3 -f 25/14/2 27/9/2 22/11/2 -f 165/43/4 166/44/4 167/45/4 -f 166/44/4 168/46/4 167/45/4 -f 19/12/7 21/13/7 20/14/7 -f 18/52/7 19/12/7 20/14/7 -f 21/9/6 19/10/6 18/11/6 -f 20/14/6 21/9/6 18/11/6 -f 169/39/4 170/40/4 171/41/4 -f 170/40/4 172/42/4 171/41/4 -f 14/12/13 17/13/13 16/14/13 -f 15/53/14 14/12/14 16/14/14 -f 17/9/15 14/10/15 13/11/15 -f 16/14/16 17/9/16 13/11/16 -f 173/43/4 174/44/4 175/45/4 -f 174/44/4 176/46/4 175/45/4 -f 10/12/13 12/13/13 11/14/13 -f 9/52/13 10/12/13 11/14/13 -f 12/9/16 10/10/16 9/11/16 -f 11/14/16 12/9/16 9/11/16 -f 177/39/4 178/40/4 179/41/4 -f 178/40/4 180/42/4 179/41/4 -f 7/54/17 6/55/17 5/56/17 -f 8/57/17 7/54/17 5/56/17 -f 3/58/17 2/59/17 1/60/17 -f 4/61/17 3/58/17 1/60/17 +f 1/1/1 2/2/1 3/3/1 +f 2/2/1 4/4/1 3/3/1 +f 5/5/1 6/6/1 7/7/1 +f 6/6/1 8/8/1 7/7/1 +f 9/9/2 10/10/2 11/11/2 +f 12/12/3 13/13/3 14/14/3 +f 15/15/4 16/16/4 17/17/4 +f 16/16/4 18/18/4 17/17/4 +f 19/19/5 20/20/5 21/21/5 +f 20/20/5 22/22/5 21/21/5 +f 19/23/6 21/24/6 17/25/6 +f 21/24/6 15/26/6 17/25/6 +f 20/27/7 18/28/7 16/29/7 +f 21/30/8 22/31/8 15/32/8 +f 22/31/8 16/33/8 15/32/8 +f 17/34/9 18/35/9 19/36/9 +f 18/35/9 20/37/9 19/36/9 +f 23/38/4 24/39/4 25/40/4 +f 24/39/4 26/41/4 25/40/4 +f 27/42/5 28/43/5 29/44/5 +f 28/43/5 30/45/5 29/44/5 +f 27/46/9 29/47/9 25/48/9 +f 29/47/9 23/49/9 25/48/9 +f 30/50/8 28/51/8 24/52/8 +f 28/51/8 26/53/8 24/52/8 +f 29/54/6 30/55/6 23/56/6 +f 30/55/6 24/57/6 23/56/6 +f 25/58/7 26/59/7 27/60/7 +f 26/59/7 28/61/7 27/60/7 +f 31/62/4 32/63/4 33/64/4 +f 32/63/4 34/65/4 33/64/4 +f 35/66/4 36/67/4 37/68/4 +f 36/67/4 38/69/4 37/68/4 +f 39/70/4 40/71/4 41/72/4 +f 40/71/4 42/73/4 41/72/4 +f 43/74/4 44/75/4 45/76/4 +f 44/75/4 46/77/4 45/76/4 +f 47/78/4 48/79/4 49/80/4 +f 48/79/4 50/81/4 49/80/4 +f 51/82/4 52/83/4 53/84/4 +f 52/83/4 54/85/4 53/84/4 +f 55/86/10 56/87/10 57/88/10 +f 56/87/11 58/89/11 57/88/11 +f 59/90/4 60/91/4 61/92/4 +f 60/91/4 62/93/4 61/92/4 +f 63/94/4 64/95/4 65/96/4 +f 64/95/4 66/97/4 65/96/4 +f 67/98/4 68/99/4 69/100/4 +f 68/99/4 70/101/4 69/100/4 +f 71/102/5 72/103/5 73/104/5 +f 74/105/5 71/102/5 73/104/5 +f 75/106/4 76/107/4 77/108/4 +f 76/107/4 78/109/4 77/108/4 +f 79/110/5 80/111/5 81/112/5 +f 82/113/5 79/110/5 81/112/5 +f 83/114/5 84/115/5 85/116/5 +f 86/117/5 83/114/5 85/116/5 +f 87/118/4 88/119/4 89/120/4 +f 88/119/4 90/121/4 89/120/4 +f 91/122/5 92/123/5 93/124/5 +f 94/125/5 91/122/5 93/124/5 +f 95/126/5 96/127/5 97/128/5 +f 98/129/5 95/126/5 97/128/5 +f 99/130/4 100/131/4 101/132/4 +f 100/131/4 102/133/4 101/132/4 +f 103/134/5 104/135/5 105/136/5 +f 106/137/5 103/134/5 105/136/5 +f 107/138/5 108/139/5 109/140/5 +f 110/141/5 107/138/5 109/140/5 +f 111/142/4 112/143/4 113/144/4 +f 112/143/4 114/145/4 113/144/4 +f 115/146/5 116/147/5 117/148/5 +f 118/149/5 115/146/5 117/148/5 +f 119/150/5 120/151/5 121/152/5 +f 122/153/5 119/150/5 121/152/5 +f 123/154/4 124/155/4 125/156/4 +f 124/155/4 126/157/4 125/156/4 +f 127/158/5 128/159/5 129/160/5 +f 130/161/5 127/158/5 129/160/5 +f 131/162/5 132/163/5 133/164/5 +f 134/165/5 131/162/5 133/164/5 +f 135/166/4 136/167/4 137/168/4 +f 136/167/4 138/169/4 137/168/4 +f 139/170/5 140/171/5 141/172/5 +f 142/173/5 139/170/5 141/172/5 +f 143/174/5 144/175/5 145/176/5 +f 146/177/5 143/174/5 145/176/5 +f 147/178/4 148/179/4 149/180/4 +f 148/179/4 150/181/4 149/180/4 +f 151/182/5 152/183/5 153/184/5 +f 154/185/5 151/182/5 153/184/5 +f 155/186/5 156/187/5 157/188/5 +f 158/189/5 155/186/5 157/188/5 +f 157/190/4 156/191/4 158/189/4 +f 156/191/4 155/186/4 158/189/4 +f 150/192/5 148/193/5 147/194/5 +f 149/180/5 150/192/5 147/194/5 +f 138/169/5 136/195/5 135/196/5 +f 137/168/5 138/169/5 135/196/5 +f 153/197/4 152/198/4 154/185/4 +f 152/198/4 151/182/4 154/185/4 +f 126/157/5 124/199/5 123/200/5 +f 125/156/5 126/157/5 123/200/5 +f 114/145/5 112/201/5 111/202/5 +f 113/144/5 114/145/5 111/202/5 +f 145/203/4 144/204/4 146/177/4 +f 144/204/4 143/205/4 146/177/4 +f 102/133/5 100/206/5 99/207/5 +f 101/132/5 102/133/5 99/207/5 +f 90/121/5 88/208/5 87/209/5 +f 89/120/5 90/121/5 87/209/5 +f 141/210/4 140/211/4 142/173/4 +f 140/211/4 139/170/4 142/173/4 +f 78/109/5 76/212/5 75/213/5 +f 77/108/5 78/109/5 75/213/5 +f 70/101/5 68/214/5 67/215/5 +f 69/100/5 70/101/5 67/215/5 +f 133/216/4 132/217/4 134/165/4 +f 132/217/4 131/162/4 134/165/4 +f 66/97/5 64/218/5 63/219/5 +f 65/96/5 66/97/5 63/219/5 +f 62/220/5 60/221/5 59/222/5 +f 61/92/5 62/220/5 59/222/5 +f 129/223/4 128/224/4 130/161/4 +f 128/224/4 127/225/4 130/161/4 +f 58/226/12 159/227/12 55/228/12 +f 57/88/5 58/226/5 55/228/5 +f 54/229/5 52/230/5 51/231/5 +f 53/84/5 54/229/5 51/231/5 +f 121/232/4 120/233/4 122/153/4 +f 120/233/4 119/150/4 122/153/4 +f 50/234/5 48/235/5 47/236/5 +f 49/80/5 50/234/5 47/236/5 +f 46/237/5 44/238/5 43/239/5 +f 45/76/5 46/237/5 43/239/5 +f 117/240/4 116/241/4 118/149/4 +f 116/241/4 115/242/4 118/149/4 +f 42/243/5 40/244/5 39/245/5 +f 41/72/5 42/243/5 39/245/5 +f 38/246/5 36/247/5 35/248/5 +f 37/68/5 38/246/5 35/248/5 +f 109/249/4 108/250/4 110/141/4 +f 108/250/4 107/138/4 110/141/4 +f 34/251/5 32/252/5 31/253/5 +f 33/64/5 34/251/5 31/253/5 +f 160/254/9 161/255/9 162/256/9 +f 163/257/9 160/254/9 162/256/9 +f 105/258/4 104/259/4 106/137/4 +f 104/259/4 103/260/4 106/137/4 +f 161/261/8 160/262/8 163/263/8 +f 162/256/8 161/261/8 163/263/8 +f 164/264/9 165/265/9 166/266/9 +f 167/267/9 164/264/9 166/266/9 +f 97/268/4 96/269/4 98/129/4 +f 96/269/4 95/270/4 98/129/4 +f 165/271/8 164/272/8 167/273/8 +f 166/266/8 165/271/8 167/273/8 +f 11/274/3 12/12/3 14/14/3 +f 14/14/2 9/9/2 11/11/2 +f 93/275/4 92/276/4 94/125/4 +f 92/276/4 91/122/4 94/125/4 +f 168/277/7 169/278/7 170/279/7 +f 171/280/7 168/277/7 170/279/7 +f 169/281/6 168/282/6 171/283/6 +f 170/279/6 169/281/6 171/283/6 +f 85/284/4 84/285/4 86/117/4 +f 84/285/4 83/286/4 86/117/4 +f 172/287/13 173/288/13 174/289/13 +f 175/290/14 172/287/14 174/289/14 +f 173/291/15 172/292/15 176/293/15 +f 174/289/16 173/291/16 176/293/16 +f 81/294/4 80/295/4 82/113/4 +f 80/295/4 79/110/4 82/113/4 +f 177/296/13 178/297/13 179/298/13 +f 180/299/13 177/296/13 179/298/13 +f 178/300/16 177/301/16 180/302/16 +f 179/298/16 178/300/16 180/302/16 +f 73/303/4 72/304/4 74/105/4 +f 72/304/4 71/305/4 74/105/4 +f 5/306/17 7/307/17 8/308/17 +f 6/309/17 5/306/17 8/308/17 +f 1/310/17 3/311/17 4/312/17 +f 2/313/17 1/310/17 4/312/17 +f 20/27/7 16/29/7 22/314/7