xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-03-13 21:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

just like 800 errors left

Browse Source 
i will build a time machine, go back to the year 2017 and shoot my former self in the head
This commit is contained in:
Bob 2022-01-11 23:40:34 +01:00
parent ab1c6b2d81
commit 4a395504cd
137 changed files with 1335 additions and 1273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java
View File

@ -2,7 +2,7 @@ package com.hbm.blocks.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.MultiblockHandlerXR;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.items.ModItems;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticCracker;
@ -69,7 +69,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()];
FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[player.getHeldItem().getItemDamage()];
cracker.tanks[0].setTankType(type);
cracker.markDirty();
player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));

18
src/main/java/com/hbm/blocks/machine/MachineChungus.java
View File

@ -1,7 +1,7 @@
package com.hbm.blocks.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.handler.MultiblockHandlerXR;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.TileEntityChungus;
@ -57,30 +57,30 @@ public class MachineChungus extends BlockDummyable {
if(!world.isRemote) {
switch(entity.tanks[0].getTankType()) {
case STEAM:
entity.tanks[0].setTankType(FluidType.HOTSTEAM);
entity.tanks[1].setTankType(FluidType.STEAM);
entity.tanks[0].setTankType(FluidTypeTheOldOne.HOTSTEAM);
entity.tanks[1].setTankType(FluidTypeTheOldOne.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);
entity.tanks[0].setTankType(FluidTypeTheOldOne.SUPERHOTSTEAM);
entity.tanks[1].setTankType(FluidTypeTheOldOne.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);
entity.tanks[0].setTankType(FluidTypeTheOldOne.ULTRAHOTSTEAM);
entity.tanks[1].setTankType(FluidTypeTheOldOne.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);
entity.tanks[0].setTankType(FluidTypeTheOldOne.STEAM);
entity.tanks[1].setTankType(FluidTypeTheOldOne.SPENTSTEAM);
entity.tanks[0].setFill(Math.min(entity.tanks[0].getFill() * 1000, entity.tanks[0].getMaxFill()));
entity.tanks[1].setFill(0);
break;

4
src/main/java/com/hbm/blocks/machine/MachineFractionTower.java
View File

@ -1,7 +1,7 @@
package com.hbm.blocks.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.items.ModItems;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower;
@ -71,7 +71,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()];
FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[player.getHeldItem().getItemDamage()];
frac.tanks[0].setTankType(type);
frac.markDirty();
player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));

4
src/main/java/com/hbm/crafting/ArmorRecipes.java
View File

@ -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 });

10
src/main/java/com/hbm/crafting/WeaponRecipes.java
View File

@ -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 });

52
src/main/java/com/hbm/handler/FluidTypeHandler.java
View File

@ -5,6 +5,7 @@ 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;
@ -16,10 +17,9 @@ public class FluidTypeHandler {
//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 FluidType extends com.hbm.inventory.fluid.FluidType {
public static FluidType NONE = new FluidType (0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"),
public static class FluidTypeTheOldOne extends com.hbm.inventory.fluid.FluidType {
WATER = new FluidType (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"),
/*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),
@ -97,9 +97,21 @@ public class FluidTypeHandler {
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");
CARBONDIOXIDE = new FluidType (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide");*/
//Approximate HEX Color of the fluid, used for pipe rendering
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
private int color;
//X position of the fluid on the sheet, the "row"
private int textureX;
@ -121,46 +133,30 @@ public class FluidTypeHandler {
public int reactivity;
public EnumSymbol symbol;
public int temperature;
public List<FluidTrait> traits = new ArrayList();
public List<FluidTrait> 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) {
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 com.hbm.inventory.fluid.FluidType[] values() {
/*public static com.hbm.inventory.fluid.FluidType[] values() {
return Fluids.metaOrder.toArray(new com.hbm.inventory.fluid.FluidType[0]);
}
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 boolean needsLeadContainer() {
return this.traits.contains(FluidTrait.LEAD_CONTAINER);
}
}*/
};
}

6
src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java
View File

@ -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<Object, Object> 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()));

2
src/main/java/com/hbm/interfaces/IFluidAcceptor.java
View File

@ -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 {

2
src/main/java/com/hbm/interfaces/IFluidContainer.java
View File

@ -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 {

2
src/main/java/com/hbm/interfaces/IFluidDuct.java
View File

@ -1,6 +1,6 @@
package com.hbm.interfaces;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.inventory.fluid.FluidType;
public interface IFluidDuct {

10
src/main/java/com/hbm/interfaces/IFluidSource.java
View File

@ -2,16 +2,16 @@ package com.hbm.interfaces;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
public interface IFluidSource extends IFluidContainer {
void fillFluidInit(FluidType type);
void fillFluidInit(FluidTypeTheOldOne type);
void fillFluid(int x, int y, int z, boolean newTact, FluidType type);
void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type);
boolean getTact();
List<IFluidAcceptor> getFluidList(FluidType type);
void clearFluidList(FluidType type);
List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type);
void clearFluidList(FluidTypeTheOldOne type);
}

2
src/main/java/com/hbm/interfaces/IPartiallyFillable.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/FluidContainer.java
View File

@ -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;

115
src/main/java/com/hbm/inventory/FluidContainerRegistry.java
View File

@ -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<FluidContainer> allContainers = new ArrayList<FluidContainer>();
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) {

6
src/main/java/com/hbm/inventory/FluidStack.java
View File

@ -1,13 +1,13 @@
package com.hbm.inventory;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
public class FluidStack {
public int fill;
public FluidType type;
public FluidTypeTheOldOne type;
public FluidStack(int fill, FluidType type) {
public FluidStack(int fill, FluidTypeTheOldOne type) {
this.fill = fill;
this.type = type;
}

23
src/main/java/com/hbm/inventory/FluidTank.java
View File

@ -4,9 +4,10 @@ import java.util.ArrayList;
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.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"));
}

6
src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java
View File

@ -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;

6
src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java
View File

@ -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;

30
src/main/java/com/hbm/inventory/fluid/FluidType.java
View File

@ -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;
@ -83,6 +82,10 @@ public class FluidType {
return this.name;
}
public String name() {
return getName();
}
public String getName() {
return this.toString();
}
@ -107,6 +110,31 @@ public class FluidType {
return this.traits.contains(FluidTrait.NO_ID);
}
public boolean needsLeadContainer() {
return this.traits.contains(FluidTrait.LEAD_CONTAINER);
}
//shitty wrapper delegates, go!
@Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here
public static FluidType[] values() {
return Fluids.metaOrder.toArray(new FluidType[0]);
}
@Deprecated //reason: not an enum, asshole, use the registry
public static FluidType getEnum(int i) {
return Fluids.fromID(i);
}
@Deprecated //reason: the more time you waste reading this the less time is there for you to use that fucking registry already
public static com.hbm.inventory.fluid.FluidType getEnumFromName(String s) {
for(int i = 0; i < FluidType.values().length; i++)
if(FluidType.values()[i].getName().equals(s))
return FluidType.values()[i];
return Fluids.NONE;
}
@Deprecated //reason: not an enum, again, fuck you
public int ordinal() {
return this.getID();
}
public void onTankBroken(TileEntity te, FluidTank tank) { }
public void onTankUpdate(TileEntity te, FluidTank tank) { }

36
src/main/java/com/hbm/inventory/fluid/Fluids.java
View File

@ -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,11 +61,17 @@ 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 FluidType HELIUM3;
public static FluidType DEATH;
public static FluidType ETHANOL;
public static FluidType HEAVYWATER;
public static final HashMap<Integer, FluidType> idMapping = new HashMap();
public static final HashMap<String, FluidType> nameMapping = new HashMap();
public static final List<FluidType> 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,6 +223,7 @@ 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);
}
@ -216,6 +231,25 @@ public class Fluids {
public 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;
}
}

6
src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java
View File

@ -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);
}

6
src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java
View File

@ -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);
}

4
src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java
View File

@ -7,7 +7,7 @@ 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.lib.RefStrings;
@ -43,7 +43,7 @@ public class GUIMachineDiesel extends GuiInfoContainer {
List<String> text = new ArrayList();
text.add(EnumChatFormatting.YELLOW + "Accepted Fuels:");
for(Entry<FluidType, Integer> entry : TileEntityMachineDiesel.fuels.entrySet()) {
for(Entry<FluidTypeTheOldOne, Integer> entry : TileEntityMachineDiesel.fuels.entrySet()) {
text.add(" " + I18nUtil.resolveKey(entry.getKey().getUnlocalizedName()) + " (" + entry.getValue() + " HE/t)");
}
this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text.toArray(new String[0]));

14
src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java
View File

@ -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);
}

4
src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java
View File

@ -6,7 +6,7 @@ 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.lib.RefStrings;
@ -43,7 +43,7 @@ public class GUIMachineSelenium extends GuiInfoContainer {
List<String> text = new ArrayList();
text.add(EnumChatFormatting.YELLOW + "Accepted Fuels:");
for(Entry<FluidType, Integer> entry : TileEntityMachineDiesel.fuels.entrySet()) {
for(Entry<FluidTypeTheOldOne, Integer> entry : TileEntityMachineDiesel.fuels.entrySet()) {
text.add(" " + I18nUtil.resolveKey(entry.getKey().getUnlocalizedName()) + " (" + entry.getValue() + " HE/t)");
}

14
src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java
View File

@ -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);
}

10
src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java
View File

@ -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;

6
src/main/java/com/hbm/inventory/gui/GUISILEX.java
View File

@ -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);
}
}

6
src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java
View File

@ -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));
}
}

12
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -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);

132
src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java
View File

@ -4,7 +4,7 @@ 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.inventory.FluidStack;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.inventory.RecipesCommon.AStack;
@ -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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.BITUMEN),
new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidTypeTheOldOne.SMEAR)
));
recipes.add(new ChemRecipe("FP_SMEAR", 50)
.inputFluids(new FluidStack(1000, FluidType.SMEAR))
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.HEATINGOIL),
new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidTypeTheOldOne.LUBRICANT)
));
recipes.add(new ChemRecipe("FP_NAPHTHA", 50)
.inputFluids(new FluidStack(1000, FluidType.NAPHTHA))
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.HEATINGOIL),
new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidTypeTheOldOne.DIESEL)
));
recipes.add(new ChemRecipe("FP_LIGHTOIL", 50)
.inputFluids(new FluidStack(1000, FluidType.LIGHTOIL))
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.DIESEL),
new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidTypeTheOldOne.KEROSENE)
));
recipes.add(new ChemRecipe("FR_REOIL", 30)
.inputFluids(new FluidStack(1000, FluidType.SMEAR))
.outputFluids(new FluidStack(800, FluidType.RECLAIMED)));
.inputFluids(new FluidStack(1000, FluidTypeTheOldOne.SMEAR))
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.RECLAIMED),
new FluidStack(200, FluidTypeTheOldOne.LUBRICANT))
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.BITUMEN),
new FluidStack(2400, FluidTypeTheOldOne.STEAM))
.outputFluids(
new FluidStack(1000, FluidType.OIL),
new FluidStack(200, FluidType.PETROLEUM)));
new FluidStack(1000, FluidTypeTheOldOne.OIL),
new FluidStack(200, FluidTypeTheOldOne.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, FluidTypeTheOldOne.SMEAR),
new FluidStack(800, FluidTypeTheOldOne.WATER))
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.GAS),
new FluidStack(1200, FluidTypeTheOldOne.WATER))
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.DIESEL),
new FluidStack(2000, FluidTypeTheOldOne.STEAM))
.outputFluids(new FluidStack(400, FluidTypeTheOldOne.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, FluidTypeTheOldOne.KEROSENE),
new FluidStack(2000, FluidTypeTheOldOne.STEAM))
.outputFluids(new FluidStack(800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.STEAM))
.outputFluids(new FluidStack(2000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.WATER))
.outputFluids(new FluidStack(1600, FluidTypeTheOldOne.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, FluidTypeTheOldOne.STEAM))
.outputFluids(new FluidStack(1800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.WATER))
.outputFluids(new FluidStack(1800, FluidTypeTheOldOne.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, FluidTypeTheOldOne.STEAM))
.outputFluids(new FluidStack(2000, FluidTypeTheOldOne.NAPHTHA)));
}
public static void registerSolidFuel() {
recipes.add(new ChemRecipe("SF_OIL", 20)
.inputFluids(new FluidStack(350, FluidType.OIL))
.inputFluids(new FluidStack(350, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.BIOGAS)));
recipes.add(new ChemRecipe("BP_BIOFUEL", 100)
.inputFluids(new FluidStack(2000, FluidType.BIOGAS))
.outputFluids(new FluidStack(1000, FluidType.BIOFUEL)));
.inputFluids(new FluidStack(2000, FluidTypeTheOldOne.BIOGAS))
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.BIOFUEL)));
recipes.add(new ChemRecipe("LPG", 100)
.inputFluids(new FluidStack(2000, FluidType.PETROLEUM))
.outputFluids(new FluidStack(1000, FluidType.LPG)));
.inputFluids(new FluidStack(2000, FluidTypeTheOldOne.PETROLEUM))
.outputFluids(new FluidStack(1000, FluidTypeTheOldOne.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, FluidTypeTheOldOne.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, FluidTypeTheOldOne.BITUMEN))
.outputItems(new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4)));
}

22
src/main/java/com/hbm/inventory/recipes/FusionRecipes.java
View File

@ -2,14 +2,14 @@ package com.hbm.inventory.recipes;
import java.util.HashMap;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.items.ModItems;
import net.minecraft.item.ItemStack;
public class FusionRecipes {
public static int getByproductChance(FluidType plasma) {
public static int getByproductChance(FluidTypeTheOldOne plasma) {
switch(plasma) {
case PLASMA_DT: return 1200;
@ -22,7 +22,7 @@ public class FusionRecipes {
}
}
public static int getBreedingLevel(FluidType plasma) {
public static int getBreedingLevel(FluidTypeTheOldOne plasma) {
switch(plasma) {
case PLASMA_DT: return 1;
@ -35,7 +35,7 @@ public class FusionRecipes {
}
}
public static ItemStack getByproduct(FluidType plasma) {
public static ItemStack getByproduct(FluidTypeTheOldOne plasma) {
switch(plasma) {
case PLASMA_DT: return new ItemStack(ModItems.pellet_charged);
@ -48,7 +48,7 @@ public class FusionRecipes {
}
}
public static int getSteamProduction(FluidType plasma) {
public static int getSteamProduction(FluidTypeTheOldOne plasma) {
switch(plasma) {
case PLASMA_DT: return 30;
@ -65,12 +65,12 @@ public class FusionRecipes {
HashMap<ItemStack, ItemStack> 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));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_DT.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_DT));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_DH3.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_DH3));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_HD.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_HD));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_HT.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_HT));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_XM.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_XM));
map.put(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PLASMA_BF.ordinal()), getByproduct(FluidTypeTheOldOne.PLASMA_BF));
return map;
}

14
src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java
View File

@ -5,7 +5,7 @@ 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.items.ModItems;
import com.hbm.items.machine.ItemFluidIcon;
@ -66,7 +66,7 @@ public class GasCentrifugeRecipes {
};
//Recipes for NEI
public static List<ItemStack> getGasCentOutputs(FluidType fluid) {
public static List<ItemStack> getGasCentOutputs(FluidTypeTheOldOne fluid) {
List<ItemStack> outputs = new ArrayList(4);
switch(fluid) {
@ -85,7 +85,7 @@ public class GasCentrifugeRecipes {
}
}
public static int getQuantityRequired(FluidType fluid) {
public static int getQuantityRequired(FluidTypeTheOldOne fluid) {
switch(fluid) {
case UF6:
return 1200;
@ -99,9 +99,9 @@ public class GasCentrifugeRecipes {
public static Map<Object, Object[]> getGasCentrifugeRecipes() {
Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
for(int i = 0; i < FluidType.values().length; i++) {
if(getGasCentOutputs(FluidType.getEnum(i)) != null) {
List<ItemStack> out = getGasCentOutputs(FluidType.getEnum(i));
for(int i = 0; i < FluidTypeTheOldOne.values().length; i++) {
if(getGasCentOutputs(FluidTypeTheOldOne.getEnum(i)) != null) {
List<ItemStack> out = getGasCentOutputs(FluidTypeTheOldOne.getEnum(i));
ItemStack[] outputs = new ItemStack[4];
for(int j = 0; j < out.size(); j++) {
@ -112,7 +112,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(FluidTypeTheOldOne.getEnum(i)));
recipes.put(input, outputs);
}

328
src/main/java/com/hbm/inventory/recipes/MachineRecipes.java
View File

@ -8,7 +8,7 @@ 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;
@ -155,13 +155,13 @@ public class MachineRecipes {
//return: FluidType, amount produced, amount required, heat required (°C * 100)
@SuppressWarnings("incomplete-switch")
public static Object[] getBoilerOutput(FluidType type) {
public static Object[] getBoilerOutput(FluidTypeTheOldOne 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 };
case WATER: return new Object[] { FluidTypeTheOldOne.STEAM, 500, 5, 10000 };
case STEAM: return new Object[] { FluidTypeTheOldOne.HOTSTEAM, 5, 50, 30000 };
case HOTSTEAM: return new Object[] { FluidTypeTheOldOne.SUPERHOTSTEAM, 5, 50, 45000 };
case OIL: return new Object[] { FluidTypeTheOldOne.HOTOIL, 5, 5, 35000 };
}
return null;
@ -169,13 +169,13 @@ public class MachineRecipes {
//return: FluidType, amount produced, amount required, HE produced
@SuppressWarnings("incomplete-switch")
public static Object[] getTurbineOutput(FluidType type) {
public static Object[] getTurbineOutput(FluidTypeTheOldOne 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 };
case STEAM: return new Object[] { FluidTypeTheOldOne.SPENTSTEAM, 5, 500, 50 };
case HOTSTEAM: return new Object[] { FluidTypeTheOldOne.STEAM, 50, 5, 100 };
case SUPERHOTSTEAM: return new Object[] { FluidTypeTheOldOne.HOTSTEAM, 50, 5, 150 };
case ULTRAHOTSTEAM: return new Object[] { FluidTypeTheOldOne.SUPERHOTSTEAM, 50, 5, 250 };
}
return null;
@ -1137,7 +1137,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 +1147,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 +1167,8 @@ public class MachineRecipes {
Map<Object, Object> recipes = new HashMap<Object, Object>();
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 +1176,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 +1386,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 +1813,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 +1972,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);

38
src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java
View File

@ -3,7 +3,7 @@ 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.items.ModItems;
import com.hbm.items.machine.ItemFluidIcon;
import com.hbm.util.Tuple.Quartet;
@ -38,44 +38,44 @@ public class RefineryRecipes {
public static final int kero_crack_petro = 60;
//why didn't i use fluid stacks here? was there a reason?
private static Map<FluidType, Quartet<FluidType, FluidType, Integer, Integer>> fractions = new HashMap();
private static Map<FluidType, Quartet<FluidType, FluidType, Integer, Integer>> cracking = new HashMap();
private static Map<FluidTypeTheOldOne, Quartet<FluidTypeTheOldOne, FluidTypeTheOldOne, Integer, Integer>> fractions = new HashMap();
private static Map<FluidTypeTheOldOne, Quartet<FluidTypeTheOldOne, FluidTypeTheOldOne, Integer, Integer>> cracking = new HashMap();
public static Map<Object, Object[]> getRefineryRecipe() {
Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
recipes.put(ItemFluidIcon.make(FluidType.HOTOIL, 1000),
recipes.put(ItemFluidIcon.make(FluidTypeTheOldOne.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(FluidTypeTheOldOne.HEAVYOIL, oil_frac_heavy * 10),
ItemFluidIcon.make(FluidTypeTheOldOne.NAPHTHA, oil_frac_naph * 10),
ItemFluidIcon.make(FluidTypeTheOldOne.LIGHTOIL, oil_frac_light * 10),
ItemFluidIcon.make(FluidTypeTheOldOne.PETROLEUM, oil_frac_petro * 10),
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<FluidType, FluidType, Integer, Integer> getFractions(FluidType oil) {
public static Quartet<FluidTypeTheOldOne, FluidTypeTheOldOne, Integer, Integer> getFractions(FluidTypeTheOldOne oil) {
return fractions.get(oil);
}
public static Quartet<FluidType, FluidType, Integer, Integer> getCracking(FluidType oil) {
public static Quartet<FluidTypeTheOldOne, FluidTypeTheOldOne, Integer, Integer> getCracking(FluidTypeTheOldOne oil) {
return cracking.get(oil);
}
}

8
src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java
View File

@ -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))
);

10
src/main/java/com/hbm/items/ModItems.java
View File

@ -5,7 +5,7 @@ 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.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.handler.guncfg.*;
import com.hbm.items.armor.*;
import com.hbm.items.bomb.*;
@ -5212,10 +5212,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(FluidTypeTheOldOne.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
jetpack_break = new JetpackBreak(FluidTypeTheOldOne.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
jetpack_fly = new JetpackRegular(FluidTypeTheOldOne.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
jetpack_vector = new JetpackVectorized(FluidTypeTheOldOne.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");

8
src/main/java/com/hbm/items/armor/JetpackBase.java
View File

@ -3,7 +3,7 @@ package com.hbm.items.armor;
import java.util.List;
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.render.model.ModelJetPack;
import com.hbm.util.ArmorUtil;
@ -27,10 +27,10 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
public abstract class JetpackBase extends ItemArmorMod implements IPartiallyFillable {
private ModelJetPack model;
public FluidType fuel;
public FluidTypeTheOldOne fuel;
public int maxFuel;
public JetpackBase(FluidType fuel, int maxFuel) {
public JetpackBase(FluidTypeTheOldOne fuel, int maxFuel) {
super(ArmorModHandler.plate_only, false, true, false, false);
this.fuel = fuel;
this.maxFuel = maxFuel;
@ -139,7 +139,7 @@ public abstract class JetpackBase extends ItemArmorMod implements IPartiallyFill
}
@Override
public FluidType getType(ItemStack stack) {
public FluidTypeTheOldOne getType(ItemStack stack) {
return fuel;
}

4
src/main/java/com/hbm/items/armor/JetpackBooster.java
View File

@ -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.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
@ -19,7 +19,7 @@ import net.minecraft.world.World;
public class JetpackBooster extends JetpackBase {
public JetpackBooster(FluidType fuel, int maxFuel) {
public JetpackBooster(FluidTypeTheOldOne fuel, int maxFuel) {
super(fuel, maxFuel);
}

4
src/main/java/com/hbm/items/armor/JetpackBreak.java
View File

@ -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.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
@ -20,7 +20,7 @@ public class JetpackBreak extends JetpackBase {
public static int maxFuel = 1200;
public JetpackBreak(FluidType fuel, int maxFuel) {
public JetpackBreak(FluidTypeTheOldOne fuel, int maxFuel) {
super(fuel, maxFuel);
}

4
src/main/java/com/hbm/items/armor/JetpackRegular.java
View File

@ -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.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class JetpackRegular extends JetpackBase {
public JetpackRegular(FluidType fuel, int maxFuel) {
public JetpackRegular(FluidTypeTheOldOne fuel, int maxFuel) {
super(fuel, maxFuel);
}

4
src/main/java/com/hbm/items/armor/JetpackVectorized.java
View File

@ -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.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
@ -19,7 +19,7 @@ import net.minecraft.world.World;
public class JetpackVectorized extends JetpackBase {
public JetpackVectorized(FluidType fuel, int maxFuel) {
public JetpackVectorized(FluidTypeTheOldOne fuel, int maxFuel) {
super(fuel, maxFuel);
}

10
src/main/java/com/hbm/items/machine/ItemFluidDuct.java
View File

@ -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);

10
src/main/java/com/hbm/items/machine/ItemFluidIcon.java
View File

@ -1,7 +1,7 @@
package com.hbm.items.machine;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.items.ModItems;
import cpw.mods.fml.relauncher.Side;
@ -28,7 +28,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));
}
@ -52,7 +52,7 @@ public class ItemFluidIcon extends Item {
return stack;
}
public static ItemStack make(FluidType fluid, int i) {
public static ItemStack make(FluidTypeTheOldOne fluid, int i) {
return addQuantity(new ItemStack(ModItems.fluid_icon, 1, fluid.ordinal()), i);
}
@ -66,7 +66,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 +100,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;

24
src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java
View File

@ -4,7 +4,7 @@ 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.items.ModItems;
import com.hbm.tileentity.conductor.TileEntityFluidDuct;
@ -55,8 +55,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,18 +71,18 @@ public class ItemFluidIdentifier extends Item {
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("info.templatefolder", I18nUtil.resolveKey(ModItems.template_folder.getUnlocalizedName() + ".name")));
list.add("");
list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".info"));
list.add(" " + I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName()));
list.add(" " + I18n.format(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName()));
list.add("");
list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage0"));
list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage1"));
list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage2"));
}
public static FluidType getType(ItemStack stack) {
public static FluidTypeTheOldOne getType(ItemStack stack) {
if(stack != null && stack.getItem() instanceof ItemFluidIdentifier)
return FluidType.getEnum(stack.getItemDamage());
return FluidTypeTheOldOne.getEnum(stack.getItemDamage());
else
return FluidType.NONE;
return FluidTypeTheOldOne.NONE;
}
@Override
@ -91,7 +91,7 @@ public class ItemFluidIdentifier extends Item {
if(te instanceof TileEntityFluidDuct) {
if(!world.isRemote) {
TileEntityFluidDuct duct = (TileEntityFluidDuct) te;
FluidType type = FluidType.getEnum(stack.getItemDamage());
FluidTypeTheOldOne type = FluidTypeTheOldOne.getEnum(stack.getItemDamage());
if (player.isSneaking()) markDuctsRecursively(world, x, y, z, type);
else duct.type = type;
}
@ -101,15 +101,15 @@ public class ItemFluidIdentifier extends Item {
return false;
}
private void markDuctsRecursively(World world, int x, int y, int z, FluidType type) {
private void markDuctsRecursively(World world, int x, int y, int z, FluidTypeTheOldOne type) {
markDuctsRecursively(world, x, y, z, type, 64);
}
private void markDuctsRecursively(World world, int x, int y, int z, FluidType type, int maxRecursion) {
private void markDuctsRecursively(World world, int x, int y, int z, FluidTypeTheOldOne type, int maxRecursion) {
TileEntity start = world.getTileEntity(x, y, z);
if (!(start instanceof TileEntityFluidDuct)) return;
TileEntityFluidDuct startDuct = (TileEntityFluidDuct) start;
FluidType oldType = startDuct.type;
FluidTypeTheOldOne oldType = startDuct.type;
if (oldType == type) return; // prevent infinite loops
startDuct.type = type;
@ -158,7 +158,7 @@ public class ItemFluidIdentifier 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;

10
src/main/java/com/hbm/items/machine/ItemFluidTank.java
View File

@ -1,7 +1,7 @@
package com.hbm.items.machine;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.items.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -25,9 +25,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];
FluidTypeTheOldOne type = FluidTypeTheOldOne.values()[i];
if(type.hasNoContainer())
continue;
@ -45,7 +45,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 +85,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;

8
src/main/java/com/hbm/items/special/ItemStarterKit.java
View File

@ -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));

4
src/main/java/com/hbm/items/special/ItemSyringe.java
View File

@ -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));

5
src/main/java/com/hbm/lib/Library.java
View File

@ -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;
@ -382,7 +383,7 @@ public class Library {
*/
}
public static void transmitFluid(int x, int y, int z, boolean newTact, IFluidSource that, World worldObj, FluidType type) {
public static void transmitFluid(int x, int y, int z, boolean newTact, IFluidSource that, World worldObj, FluidTypeTheOldOne type) {
Block block = worldObj.getBlock(x, y, z);
TileEntity tileentity = worldObj.getTileEntity(x, y, z);

14
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -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 });
@ -570,7 +570,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 });
@ -639,7 +639,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) });
@ -731,7 +731,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});

4
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -62,7 +62,7 @@ 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;
@ -784,7 +784,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();

10
src/main/java/com/hbm/packet/AuxButtonPacket.java
View File

@ -2,7 +2,7 @@ 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.items.weapon.ItemMissile.PartSize;
import com.hbm.tileentity.TileEntityMachineBase;
import com.hbm.tileentity.TileEntityTickingBase;
@ -104,13 +104,13 @@ public class AuxButtonPacket implements IMessage {
reactor.rods = m.value;
if(m.id == 1) {
FluidType type = FluidType.STEAM;
FluidTypeTheOldOne 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())

8
src/main/java/com/hbm/packet/TEFluidPacket.java
View File

@ -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)
{

2
src/main/java/com/hbm/packet/TEFluidPipePacket.java
View File

@ -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;

5
src/main/java/com/hbm/render/tileentity/RenderBAT9000.java
View File

@ -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();

10
src/main/java/com/hbm/render/tileentity/RenderChemplant.java
View File

@ -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)

5
src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
View File

@ -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();

2
src/main/java/com/hbm/render/tileentity/RenderTurretBase.java
View File

@ -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;

5
src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java
View File

@ -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");

2
src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java
View File

@ -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;

4
src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java
View File

@ -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");

4
src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java
View File

@ -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");

2
src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java
View File

@ -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;

21
src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java
View File

@ -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;
}

21
src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java
View File

@ -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;
}

5
src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java
View File

@ -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<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
public TileEntityFluidDuct() {

60
src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java
View File

@ -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;
@ -17,59 +18,60 @@ 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<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
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[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 - 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, 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 + 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, 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 - 1, yCoord, zCoord, type))
connections[5] = ForgeDirection.WEST;
else
connections[5] = null;
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
type = FluidType.GAS;
type = Fluids.GAS;
}
@Override
public void writeToNBT(NBTTagCompound nbt)
{
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
}
@Override
@SideOnly(Side.CLIENT)
public double getMaxRenderDistanceSquared()
{
public double getMaxRenderDistanceSquared() {
return 65536.0D;
}

6
src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java
View File

@ -4,17 +4,17 @@ 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 net.minecraft.tileentity.TileEntity;
public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct {
public FluidType type = FluidType.GAS;
public FluidTypeTheOldOne type = FluidTypeTheOldOne.GAS;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
@Override
public FluidType getType() {
public FluidTypeTheOldOne getType() {
return type;
}

8
src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java
View File

@ -4,7 +4,7 @@ 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.lib.Library;
@ -17,7 +17,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 FluidTypeTheOldOne type = FluidTypeTheOldOne.OIL;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
public TileEntityOilDuct() {
@ -57,7 +57,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbt);
type = FluidType.OIL;
type = FluidTypeTheOldOne.OIL;
}
@Override
@ -74,7 +74,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
}
@Override
public FluidType getType() {
public FluidTypeTheOldOne getType() {
return type;
}
}

6
src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java
View File

@ -4,18 +4,18 @@ 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 net.minecraft.tileentity.TileEntity;
public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct {
public FluidType type = FluidType.OIL;
public FluidTypeTheOldOne type = FluidTypeTheOldOne.OIL;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
@Override
public FluidType getType() {
public FluidTypeTheOldOne getType() {
return type;
}

34
src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java
View File

@ -4,7 +4,7 @@ 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;
@ -60,10 +60,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
@ -389,22 +389,20 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
}
}
private int getCoolingStrength(FluidType type) {
switch(type) {
case WATER:
private int getCoolingStrength(FluidTypeTheOldOne type) {
if(type == FluidTypeTheOldOne.WATER)
return 5;
case OIL:
if(type == FluidTypeTheOldOne.OIL)
return 15;
case COOLANT:
if(type == FluidTypeTheOldOne.COOLANT)
return this.heat / 250;
case CRYOGEL:
if(type == FluidTypeTheOldOne.CRYOGEL)
return this.heat > heat/2 ? 25 : 5;
default:
return 0;
}
}
private int getFuelPower(FluidType type) {
private int getFuelPower(FluidTypeTheOldOne type) {
switch(type) {
case DEUTERIUM:
return 50;
@ -479,7 +477,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -493,7 +491,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -505,7 +503,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -525,7 +523,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 4 && tanks[index] != null)
tanks[index].setTankType(type);
}

20
src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java
View File

@ -5,7 +5,7 @@ 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;
@ -51,7 +51,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 +229,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 +249,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 +269,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 +330,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));
@ -364,13 +364,13 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getFill();
else
@ -378,7 +378,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getMaxFill();
else
@ -391,7 +391,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}

20
src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java
View File

@ -6,7 +6,7 @@ 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;
@ -53,7 +53,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 +231,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 +251,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 +271,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 +344,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));
@ -378,13 +378,13 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getFill();
else
@ -392,7 +392,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getMaxFill();
else
@ -405,7 +405,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}

24
src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java
View File

@ -4,7 +4,7 @@ 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.IFluidSource;
import com.hbm.inventory.FluidTank;
@ -28,12 +28,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
@ -106,7 +106,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() == FluidTypeTheOldOne.WATER && ModEventHandler.fire > 0) {
int light = this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, this.xCoord, this.yCoord, this.zCoord);
if(light > 7) {
@ -126,12 +126,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(mode == 2 || mode == 3)
return 0;
@ -140,7 +140,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type);
fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type);
@ -150,7 +150,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -164,24 +164,24 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return this.list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
this.list.clear();
}

26
src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
View File

@ -5,7 +5,7 @@ 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;
@ -39,8 +39,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 +50,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 +118,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
@ -138,7 +138,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset);
dir = dir.getRotation(ForgeDirection.UP);
@ -148,7 +148,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -158,7 +158,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -166,7 +166,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -176,7 +176,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
@ -190,7 +190,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}
@ -205,12 +205,12 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list2;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list2.clear();
}

22
src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
View File

@ -4,7 +4,7 @@ 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;
@ -27,8 +27,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
@ -81,14 +81,14 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
fillFluid(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, getTact(), type);
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -103,7 +103,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -111,7 +111,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -121,7 +121,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
@ -135,7 +135,7 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}
@ -150,12 +150,12 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}
}

37
src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
View File

@ -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,33 +174,28 @@ 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;
}
}
//TODO: move stats to the AMSCORE class
public int getCore() {

12
src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java
View File

@ -3,7 +3,7 @@ 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.lib.ModDamageSource;
@ -38,7 +38,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
@ -186,13 +186,13 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getFill();
else
@ -200,7 +200,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getMaxFill();
else
@ -213,7 +213,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}

14
src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java
View File

@ -3,7 +3,7 @@ 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.tileentity.TileEntityMachineBase;
@ -25,8 +25,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
@ -102,7 +102,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
else if (type.name().equals(tanks[1].getTankType().name()))
@ -112,7 +112,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if (type.name().equals(tanks[1].getTankType().name()))
@ -120,7 +120,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if (type.name().equals(tanks[1].getTankType().name()))
@ -136,7 +136,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if (index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}

12
src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java
View File

@ -3,7 +3,7 @@ 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.lib.Library;
@ -28,7 +28,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
@ -91,13 +91,13 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getFill();
else
@ -105,7 +105,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
return tank.getMaxFill();
else
@ -118,7 +118,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}

22
src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java
View File

@ -3,7 +3,7 @@ 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;
@ -28,8 +28,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
@ -111,14 +111,14 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
fillFluid(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, getTact(), type);
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -133,7 +133,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -141,7 +141,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -151,7 +151,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
@ -165,7 +165,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}
@ -180,12 +180,12 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}

8
src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java
View File

@ -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;

16
src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java
View File

@ -4,7 +4,7 @@ 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;
@ -43,9 +43,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() {
@ -391,13 +391,13 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 3 && tanks[index] != null)
tanks[index].setTankType(type);
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[1].getTankType().name()))
tanks[1].setFill(i);
else if(type.name().equals(tanks[2].getTankType().name()))
@ -405,7 +405,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[1].getTankType().name()))
return tanks[1].getFill();
else if(type.name().equals(tanks[2].getTankType().name()))
@ -415,7 +415,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[1].getTankType().name()))
return tanks[1].getMaxFill();
else if(type.name().equals(tanks[2].getTankType().name()))

16
src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java
View File

@ -4,7 +4,7 @@ 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;
@ -37,9 +37,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() {
@ -1202,13 +1202,13 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 3 && tanks[index] != null)
tanks[index].setTankType(type);
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -1218,7 +1218,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -1230,7 +1230,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
else if(type.name().equals(tanks[1].getTankType().name()))

24
src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
View File

@ -5,7 +5,7 @@ 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;
@ -51,9 +51,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
@ -316,7 +316,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if (type.name().equals(tanks[1].getTankType().name()))
@ -326,7 +326,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if (index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
@ -345,7 +345,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if (type.name().equals(tanks[1].getTankType().name()))
@ -357,13 +357,13 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(xCoord, yCoord - 3, zCoord, getTact(), type);
fillFluid(xCoord, yCoord + 3, zCoord, getTact(), type);
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -377,17 +377,17 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if (type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
else if (type.name().equals(tanks[1].getTankType().name()))

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java
View File

@ -1,6 +1,6 @@
package com.hbm.tileentity.machine;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -27,7 +27,7 @@ public class TileEntityMachineBAT9000 extends TileEntityBarrel {
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord + 3, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord + 3, getTact(), type);
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord - 3, getTact(), type);

26
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java
View File

@ -5,7 +5,7 @@ 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;
@ -47,8 +47,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 +235,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);
@ -326,7 +326,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type);
@ -337,7 +337,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -352,7 +352,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -360,7 +360,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -370,7 +370,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
@ -384,7 +384,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}
@ -399,12 +399,12 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}
}

26
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java
View File

@ -5,7 +5,7 @@ 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;
@ -49,8 +49,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 +245,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);
@ -325,7 +325,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord, getTact(), type);
@ -336,7 +336,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -351,7 +351,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -359,7 +359,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -369,7 +369,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
@ -383,7 +383,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 2 && tanks[index] != null)
tanks[index].setTankType(type);
}
@ -398,12 +398,12 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}

12
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java
View File

@ -3,7 +3,7 @@ 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;
@ -43,7 +43,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
@ -339,22 +339,22 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0;
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}

34
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java
View File

@ -4,7 +4,7 @@ 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;
@ -62,10 +62,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 +540,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);
}
}
@ -907,13 +907,13 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index < 4 && tanks[index] != null)
tanks[index].setTankType(type);
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
tanks[0].setFill(i);
else if(type.name().equals(tanks[1].getTankType().name()))
@ -925,7 +925,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -939,7 +939,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[0].getTankType().name()))
return tanks[0].getMaxFill();
else if(type.name().equals(tanks[1].getTankType().name()))
@ -949,7 +949,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
int meta = worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
if(meta == 5) {
fillFluid(this.xCoord - 2, this.yCoord, this.zCoord, getTact(), type);
@ -981,7 +981,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -995,7 +995,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[2].getTankType().name()))
return list1;
if(type.name().equals(tanks[3].getTankType().name()))
@ -1004,7 +1004,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
if(type.name().equals(tanks[2].getTankType().name()))
list1.clear();
if(type.name().equals(tanks[3].getTankType().name()))

14
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java
View File

@ -14,7 +14,7 @@ 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;
@ -46,7 +46,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 +118,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)
@ -313,18 +313,18 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0;
}
@ -334,7 +334,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}

12
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java
View File

@ -4,7 +4,7 @@ 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.recipes.CrystallizerRecipes;
@ -39,7 +39,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
@ -265,12 +265,12 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
}
@Override
public void setFluidFill(int fill, FluidType type) {
public void setFluidFill(int fill, FluidTypeTheOldOne type) {
tank.setFill(fill);
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}
@ -280,12 +280,12 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return tank.getFill();
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
return tank.getMaxFill();
}

32
src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java
View File

@ -10,7 +10,7 @@ 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;
@ -55,8 +55,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
@ -359,15 +359,15 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
}
@Override
public void setFluidFill(int fill, FluidType type) {
if(type == FluidType.COOLANT)
public void setFluidFill(int fill, FluidTypeTheOldOne type) {
if(type == FluidTypeTheOldOne.COOLANT)
coolant.setFill(fill);
else if(type == FluidType.AMAT)
else if(type == FluidTypeTheOldOne.AMAT)
amat.setFill(fill);
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
if(index == 0)
coolant.setTankType(type);
else if(index == 1)
@ -380,17 +380,17 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
}
@Override
public int getFluidFill(FluidType type) {
if(type == FluidType.COOLANT)
public int getFluidFill(FluidTypeTheOldOne type) {
if(type == FluidTypeTheOldOne.COOLANT)
return coolant.getFill();
else if(type == FluidType.AMAT)
else if(type == FluidTypeTheOldOne.AMAT)
return amat.getFill();
return 0;
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(xCoord + 3, yCoord, zCoord + 1, getTact(), type);
fillFluid(xCoord + 3, yCoord, zCoord - 1, getTact(), type);
@ -404,7 +404,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -414,19 +414,19 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
list.clear();
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(type == FluidType.COOLANT)
if(type == FluidTypeTheOldOne.COOLANT)
return coolant.getMaxFill();
return 0;

36
src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
View File

@ -4,7 +4,7 @@ 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;
@ -33,7 +33,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
@ -105,8 +105,8 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
tank.loadTank(0, 1, slots);
tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
FluidType type = tank.getTankType();
if(type.name().equals(FluidType.NITAN.name()))
FluidTypeTheOldOne type = tank.getTankType();
if(type.name().equals(FluidTypeTheOldOne.NITAN.name()))
powerCap = maxPower * 10;
else
powerCap = maxPower;
@ -133,21 +133,21 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
return getHEFromFuel() > 0;
}
public static final HashMap<FluidType, Integer> fuels = new HashMap();
public static final HashMap<FluidTypeTheOldOne, Integer> 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() {
FluidType type = tank.getTankType();
FluidTypeTheOldOne type = tank.getTankType();
Integer value = fuels.get(type);
return value != null ? value : 0;
}
@ -199,22 +199,22 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0;
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}

20
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java
View File

@ -4,7 +4,7 @@ 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.IFluidSource;
@ -30,7 +30,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
@ -103,12 +103,12 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
}
@Override
public void setType(FluidType type, int index) {
public void setType(FluidTypeTheOldOne type, int index) {
tank.setTankType(type);
}
@Override
public int getMaxFluidFill(FluidType type) {
public int getMaxFluidFill(FluidTypeTheOldOne type) {
if(mode == 2 || mode == 3)
return 0;
@ -117,7 +117,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
}
@Override
public void fillFluidInit(FluidType type) {
public void fillFluidInit(FluidTypeTheOldOne type) {
fillFluid(this.xCoord + 2, this.yCoord, this.zCoord - 1, getTact(), type);
fillFluid(this.xCoord + 2, this.yCoord, this.zCoord + 1, getTact(), type);
fillFluid(this.xCoord - 2, this.yCoord, this.zCoord - 1, getTact(), type);
@ -129,7 +129,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
}
@Override
public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
public void fillFluid(int x, int y, int z, boolean newTact, FluidTypeTheOldOne type) {
Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
}
@ -143,23 +143,23 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
}
@Override
public int getFluidFill(FluidType type) {
public int getFluidFill(FluidTypeTheOldOne type) {
return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
}
@Override
public void setFluidFill(int i, FluidType type) {
public void setFluidFill(int i, FluidTypeTheOldOne type) {
if(type.name().equals(tank.getTankType().name()))
tank.setFill(i);
}
@Override
public List<IFluidAcceptor> getFluidList(FluidType type) {
public List<IFluidAcceptor> getFluidList(FluidTypeTheOldOne type) {
return this.list;
}
@Override
public void clearFluidList(FluidType type) {
public void clearFluidList(FluidTypeTheOldOne type) {
this.list.clear();
}

Some files were not shown because too many files have changed in this diff Show More