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

the lorax, i mean borax

Browse Source
This commit is contained in:
Bob 2022-01-16 21:21:51 +01:00
parent c9e683bb32
commit 39d57c61a0
138 changed files with 3820 additions and 1130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/hbm/blocks/ModBlocks.java
View File

@ -1011,6 +1011,7 @@ public class ModBlocks {
public static Block anvil_bismuth;
public static Block anvil_schrabidate;
public static Block anvil_dnt;
public static Block anvil_osmiridium;
public static Block anvil_murky;
public static final int guiID_anvil = 121;
@ -2067,6 +2068,7 @@ public class ModBlocks {
anvil_bismuth = new NTMAnvil(Material.iron, 5).setBlockName("anvil_bismuth").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_bismuth");
anvil_schrabidate = new NTMAnvil(Material.iron, 6).setBlockName("anvil_schrabidate").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_schrabidate");
anvil_dnt = new NTMAnvil(Material.iron, 7).setBlockName("anvil_dnt").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_dnt");
anvil_osmiridium = new NTMAnvil(Material.iron, 8).setBlockName("anvil_osmiridium").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_osmiridium");
anvil_murky = new NTMAnvil(Material.iron, 1916169).setBlockName("anvil_murky").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel");
machine_deaerator = new MachineDeaerator(Material.iron).setBlockName("machine_deaerator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_deaerator");
@ -2773,6 +2775,7 @@ public class ModBlocks {
GameRegistry.registerBlock(anvil_bismuth, ItemBlockBase.class, anvil_bismuth.getUnlocalizedName());
GameRegistry.registerBlock(anvil_schrabidate, ItemBlockBase.class, anvil_schrabidate.getUnlocalizedName());
GameRegistry.registerBlock(anvil_dnt, ItemBlockBase.class, anvil_dnt.getUnlocalizedName());
GameRegistry.registerBlock(anvil_osmiridium, ItemBlockBase.class, anvil_osmiridium.getUnlocalizedName());
GameRegistry.registerBlock(anvil_murky, ItemBlockBase.class, anvil_murky.getUnlocalizedName());
GameRegistry.registerBlock(machine_press, machine_press.getUnlocalizedName());

9
src/main/java/com/hbm/config/MachineConfig.java
View File

@ -4,8 +4,8 @@ import net.minecraftforge.common.config.Configuration;
public class MachineConfig {
public static boolean scaleRTGPower = false;
public static boolean doRTGsDecay = true;
protected static boolean scaleRTGPower = false;
protected static boolean doRTGsDecay = true;
public static void loadFromConfig(Configuration config) {
@ -13,11 +13,6 @@ public class MachineConfig {
scaleRTGPower = CommonConfig.createConfigBool(config, CATEGORY_MACHINE, "9.00_scaleRTGPower", "Should RTG/Betavoltaic fuel power scale down as it decays?", false);
doRTGsDecay = CommonConfig.createConfigBool(config, CATEGORY_MACHINE, "9.01_doRTGsDecay", "Should RTG/Betavoltaic fuel decay at all?", true);
if(VersatileConfig.rtgDecay()) {
scaleRTGPower = true;
doRTGsDecay = true;
}
}
}

6
src/main/java/com/hbm/config/VersatileConfig.java
View File

@ -41,7 +41,11 @@ public class VersatileConfig {
}
public static boolean rtgDecay() {
return GeneralConfig.enable528;
return GeneralConfig.enable528 || MachineConfig.doRTGsDecay;
}
public static boolean scaleRTGPower() {
return GeneralConfig.enable528 || MachineConfig.scaleRTGPower;
}
static int minute = 60 * 20;

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

@ -2,20 +2,18 @@ package com.hbm.crafting;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.OreDictManager;
import com.hbm.inventory.fluid.Fluids;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.items.ModItems;
import com.hbm.main.CraftingManager;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
/**
* For player armor
@ -79,7 +77,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, FluidTypeTheOldOne.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, Fluids.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 });

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

@ -1,20 +1,18 @@
package com.hbm.crafting;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.OreDictManager;
import com.hbm.inventory.fluid.Fluids;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.items.ModItems;
import com.hbm.items.weapon.GunB92Cell;
import com.hbm.main.CraftingManager;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
/**
* For guns, ammo and the like
@ -136,7 +134,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, FluidTypeTheOldOne.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, Fluids.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 +214,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, FluidTypeTheOldOne.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, Fluids.WATZ.ordinal()) });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart_nerf, 16), new Object[] { "I", "I", 'I', ModItems.plate_polymer });
//Folly shells
@ -307,7 +305,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, FluidTypeTheOldOne.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, Fluids.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 +337,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, FluidTypeTheOldOne.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, Fluids.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 });

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

@ -1,162 +0,0 @@
package com.hbm.handler;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.FluidType.FluidTrait;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.render.util.EnumSymbol;
public class FluidTypeHandler {
@Deprecated //you might spot this deprecated annotation and thing "oh goodie, that's something for me to remove and replace!"
//no.
//if you tough any of this i promise you will regret being born
//deprecated means "avoid using in the future" not "fuck with this with your heart's content"
//hands off. if you can read this, close this class now.
public static class FluidTypeTheOldOne extends com.hbm.inventory.fluid.FluidType {
/*WATER = new FluidType (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"),
STEAM = new FluidType (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100),
HOTSTEAM = new FluidType (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300),
SUPERHOTSTEAM = new FluidType (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450),
ULTRAHOTSTEAM = new FluidType (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600),
COOLANT = new FluidType (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"),
LAVA = new FluidType (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200),
DEUTERIUM = new FluidType (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"),
TRITIUM = new FluidType (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"),
OIL = new FluidType (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"),
HOTOIL = new FluidType (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350),
HEAVYOIL = new FluidType (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"),
BITUMEN = new FluidType (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"),
SMEAR = new FluidType (0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"),
HEATINGOIL = new FluidType (0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"),
RECLAIMED = new FluidType (0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"),
PETROIL = new FluidType (0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"),
LUBRICANT = new FluidType (0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"),
NAPHTHA = new FluidType (0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"),
DIESEL = new FluidType (0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"),
LIGHTOIL = new FluidType (0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"),
KEROSENE = new FluidType (0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"),
GAS = new FluidType (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"),
PETROLEUM = new FluidType (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"),
LPG = new FluidType (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"),
BIOGAS = new FluidType (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"),
BIOFUEL = new FluidType (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"),
NITAN = new FluidType (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"),
UF6 = new FluidType (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE),
PUF6 = new FluidType (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
SAS3 = new FluidType (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
SCHRABIDIC = new FluidType (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
AMAT = new FluidType (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT),
ASCHRAB = new FluidType (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT),
ACID = new FluidType (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE),
WATZ = new FluidType (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
CRYOGEL = new FluidType (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170),
HYDROGEN = new FluidType (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"),
OXYGEN = new FluidType (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"),
XENON = new FluidType (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"),
BALEFIRE = new FluidType (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
MERCURY = new FluidType (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"),
PAIN = new FluidType (0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE),
WASTEFLUID = new FluidType (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER),
WASTEGAS = new FluidType (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER),
GASOLINE = new FluidType (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"),
SPENTSTEAM = new FluidType (0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam"),
FRACKSOL = new FluidType (0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE),
PLASMA_DT = new FluidType (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
PLASMA_HD = new FluidType (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
PLASMA_HT = new FluidType (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
PLASMA_XM = new FluidType (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
PLASMA_BF = new FluidType (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
PLASMA_DH3 = new FluidType (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
HELIUM3 = new FluidType (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"),
DEATH = new FluidType (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
ETHANOL = new FluidType (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"),
HEAVYWATER = new FluidType (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"),
CARBONDIOXIDE = new FluidType (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide");*/
public static FluidType NONE = Fluids.NONE, WATER = Fluids.WATER, STEAM = Fluids.STEAM, HOTSTEAM = Fluids.HOTSTEAM,
SUPERHOTSTEAM = Fluids.SUPERHOTSTEAM, ULTRAHOTSTEAM = Fluids.ULTRAHOTSTEAM, COOLANT = Fluids.COOLANT, LAVA = Fluids.LAVA, DEUTERIUM = Fluids.DEUTERIUM,
TRITIUM = Fluids.TRITIUM, OIL = Fluids.OIL, HOTOIL = Fluids.HOTOIL, HEAVYOIL = Fluids.HEAVYOIL, BITUMEN = Fluids.BITUMEN, SMEAR = Fluids.SMEAR,
HEATINGOIL = Fluids.HEATINGOIL, RECLAIMED = Fluids.RECLAIMED, PETROIL = Fluids.PETROIL, LUBRICANT = Fluids.LUBRICANT, NAPHTHA = Fluids.NAPHTHA,
DIESEL = Fluids.DIESEL, LIGHTOIL = Fluids.LIGHTOIL, KEROSENE = Fluids.KEROSENE, GAS = Fluids.GAS, PETROLEUM = Fluids.PETROLEUM, LPG = Fluids.LPG,
BIOGAS = Fluids.BIOGAS, BIOFUEL = Fluids.BIOFUEL, NITAN = Fluids.NITAN, UF6 = Fluids.UF6, PUF6 = Fluids.PUF6, SAS3 = Fluids.SAS3, SCHRABIDIC = Fluids.SCHRABIDIC,
AMAT = Fluids.AMAT, ASCHRAB = Fluids.ASCHRAB, ACID = Fluids.ACID, WATZ = Fluids.WATZ, CRYOGEL = Fluids.CRYOGEL, HYDROGEN = Fluids.HYDROGEN, OXYGEN = Fluids.OXYGEN,
XENON = Fluids.XENON, BALEFIRE = Fluids.BALEFIRE, MERCURY = Fluids.MERCURY, PAIN = Fluids.PAIN, WASTEFLUID = Fluids.WASTEFLUID, WASTEGAS = Fluids.WASTEGAS,
GASOLINE = Fluids.GASOLINE, SPENTSTEAM = Fluids.SPENTSTEAM, FRACKSOL = Fluids.FRACKSOL, PLASMA_DT = Fluids.PLASMA_DT, PLASMA_HD = Fluids.PLASMA_HD,
PLASMA_HT = Fluids.PLASMA_HT, PLASMA_XM = Fluids.PLASMA_XM, PLASMA_BF = Fluids.PLASMA_BF, PLASMA_DH3 = Fluids.PLASMA_DH3, HELIUM3 = Fluids.HELIUM3,
DEATH = Fluids.DEATH, ETHANOL = Fluids.ETHANOL, HEAVYWATER = Fluids.HEAVYWATER, CARBONDIOXIDE = Fluids.CARBONDIOXIDE;
/*//Approximate HEX Color of the fluid, used for pipe rendering
private int color;
//X position of the fluid on the sheet, the "row"
private int textureX;
//Y position of the fluid on the sheet, the "column"
private int textureY;
//ID of the texture sheet the fluid is on
private int sheetID;
//Unlocalized string ID of the fluid
private String name;
//Whether the fluid counts is too hot for certain tanks
//private boolean hot;
//Whether the fluid counts as corrosive and requires a steel tank
//private boolean corrosive;
//Whether the fluid is antimatter and requires magnetic storage
//private boolean antimatter;
public int poison;
public int flammability;
public int reactivity;
public EnumSymbol symbol;
public int temperature;
public List<FluidTrait> traits = new ArrayList();*/
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 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 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 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() {
return Fluids.metaOrder.toArray(new com.hbm.inventory.fluid.FluidType[0]);
}
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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired), 39, 24);
this.acid = new PositionedStack(ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Fluids.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, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) {
new ItemStack(ModItems.fluid_icon, 1, Fluids.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) {
if(recipe.getKey() instanceof ItemStack) {
this.arecipes.add(new RecipeSet(recipe.getKey(), (ItemStack)recipe.getValue()));

165
src/main/java/com/hbm/handler/nei/NEIUniversalHandler.java Normal file
View File

@ -0,0 +1,165 @@
package com.hbm.handler.nei;
import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import com.hbm.lib.RefStrings;
import com.hbm.util.InventoryUtil;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public abstract class NEIUniversalHandler extends TemplateRecipeHandler {
/// SETUP ///
public final String display;
public final String key;
public final ItemStack[] machine;
public final HashMap<Object, Object> recipes;
/// SETUP ///
public NEIUniversalHandler(String key, String display, ItemStack machine[], HashMap recipes) {
this.key = key;
this.display = display;
this.machine = machine;
this.recipes = recipes;
}
public NEIUniversalHandler(String key, String display, ItemStack machine, HashMap recipes) { this(key, display, new ItemStack[]{machine}, recipes); }
public NEIUniversalHandler(String key, String display, Item machine, HashMap recipes) { this(key, display, new ItemStack(machine), recipes); }
public NEIUniversalHandler(String key, String display, Block machine, HashMap recipes) { this(key, display, new ItemStack(machine), recipes); }
public class RecipeSet extends TemplateRecipeHandler.CachedRecipe {
PositionedStack[] input;
PositionedStack[] output;
PositionedStack machinePositioned;
public RecipeSet(ItemStack[][] in, ItemStack[][] out) {
input = new PositionedStack[in.length];
for(int i = 0; i < in.length; i++) {
ItemStack[] sub = in[i];
this.input[i] = new PositionedStack(sub, 48 + i * 18, 24);
}
output = new PositionedStack[out.length];
for(int i = 0; i < out.length; i++) {
ItemStack[] sub = out[i];
this.output[i] = new PositionedStack(sub, 102 + i * 18, 24);
}
this.machinePositioned = new PositionedStack(machine, 75, 31);
}
@Override
public List<PositionedStack> getIngredients() {
return getCycledIngredients(cycleticks / 20, Arrays.asList(input));
}
@Override
public PositionedStack getResult() {
return output[0];
}
@Override
public List<PositionedStack> getOtherStacks() {
List<PositionedStack> other = new ArrayList();
for(PositionedStack pos : output) {
other.add(pos);
}
other.add(machinePositioned);
return getCycledIngredients(cycleticks / 20, other);
}
}
@Override
public String getRecipeName() {
return this.display;
}
@Override
public String getGuiTexture() {
return RefStrings.MODID + ":textures/gui/nei/gui_nei.png";
}
@Override
public void drawBackground(int recipe) {
super.drawBackground(recipe);
drawTexturedModalRect(47, 23, 5, 87, 18, 18);
drawTexturedModalRect(101, 23, 5, 87, 18, 18);
drawTexturedModalRect(74, 14, 59, 87, 18, 38);
}
@Override
public void loadCraftingRecipes(String outputId, Object... results) {
if(outputId.equals(key)) {
for(Entry<Object, Object> recipe : recipes.entrySet()) {
ItemStack[][] ins = InventoryUtil.extractObject(recipe.getKey());
ItemStack[][] outs = InventoryUtil.extractObject(recipe.getValue());
this.arecipes.add(new RecipeSet(ins, outs));
}
} else {
super.loadCraftingRecipes(outputId, results);
}
}
@Override
public void loadCraftingRecipes(ItemStack result) {
for(Entry<Object, Object> recipe : recipes.entrySet()) {
ItemStack[][] ins = InventoryUtil.extractObject(recipe.getKey());
ItemStack[][] outs = InventoryUtil.extractObject(recipe.getValue());
match:
for(ItemStack[] array : outs) {
for(ItemStack stack : array) {
if(NEIServerUtils.areStacksSameTypeCrafting(stack, result)) {
this.arecipes.add(new RecipeSet(ins, outs));
break match;
}
}
}
}
}
@Override
public void loadUsageRecipes(String inputId, Object... ingredients) {
if(inputId.equals(key)) {
loadCraftingRecipes(key, new Object[0]);
} else {
super.loadUsageRecipes(inputId, ingredients);
}
}
@Override
public void loadUsageRecipes(ItemStack ingredient) {
for(Entry<Object, Object> recipe : recipes.entrySet()) {
ItemStack[][] ins = InventoryUtil.extractObject(recipe.getKey());
ItemStack[][] outs = InventoryUtil.extractObject(recipe.getValue());
match:
for(ItemStack[] array : ins) {
for(ItemStack stack : array) {
if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) {
this.arecipes.add(new RecipeSet(ins, outs));
break match;
}
}
}
}
}
}

18
src/main/java/com/hbm/handler/nei/RTGRecipeHandler.java Normal file
View File

@ -0,0 +1,18 @@
package com.hbm.handler.nei;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.machine.ItemRTGPellet;
import net.minecraft.item.ItemStack;
public class RTGRecipeHandler extends NEIUniversalHandler {
public RTGRecipeHandler() {
super("ntmRTG", "RTG", new ItemStack[] {
new ItemStack(ModBlocks.machine_rtg_grey),
new ItemStack(ModBlocks.machine_difurnace_rtg_off),
new ItemStack(ModBlocks.machine_industrial_generator),
new ItemStack(ModBlocks.machine_rtg_furnace_off)
}, ItemRTGPellet.getRecipeMap());
}
}

11
src/main/java/com/hbm/handler/nei/ZirnoxRecipeHandler.java Normal file
View File

@ -0,0 +1,11 @@
package com.hbm.handler.nei;
import com.hbm.blocks.ModBlocks;
import com.hbm.tileentity.machine.TileEntityReactorZirnox;
public class ZirnoxRecipeHandler extends NEIUniversalHandler {
public ZirnoxRecipeHandler() {
super("ntmZirnox", "ZIRNOX", ModBlocks.reactor_zirnox, TileEntityReactorZirnox.fuelMap);
}
}

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

@ -60,6 +60,8 @@ public class FluidContainerRegistry {
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.rod_zirnox_tritium), new ItemStack(ModItems.rod_zirnox_empty), Fluids.TRITIUM, 2000));
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));
@ -73,9 +75,10 @@ public class FluidContainerRegistry {
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++) {
FluidType[] fluids = Fluids.getAll();
for(int i = 1; i < fluids.length; i++) {
FluidType type = FluidType.values()[i];
FluidType type = fluids[i];
if(type.hasNoContainer())
continue;
@ -94,7 +97,7 @@ public class FluidContainerRegistry {
allContainers.add(con);
}
public static int getFluidContent(ItemStack stack, com.hbm.inventory.fluid.FluidType type) {
public static int getFluidContent(ItemStack stack, FluidType type) {
if(stack == null)
return 0;

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

@ -79,7 +79,6 @@ public class FluidTank {
//Called on TE update
public void updateTank(int x, int y, int z, int dim) {
PacketDispatcher.wrapper.sendToAllAround(new TEFluidPacket(x, y, z, fluid, index, type), new TargetPoint(dim, x, y, z, 100));
}
@ -294,7 +293,7 @@ public class FluidTank {
public void writeToNBT(NBTTagCompound nbt, String s) {
nbt.setInteger(s, fluid);
nbt.setInteger(s + "_max", maxFluid);
nbt.setString(s + "_type", type.getName());
nbt.setInteger(s + "_type", type.getID());
}
//Called by TE to load fillstate
@ -303,9 +302,10 @@ public class FluidTank {
int max = nbt.getInteger(s + "_max");
if(max > 0)
maxFluid = nbt.getInteger(s + "_max");
type = FluidType.getEnum(nbt.getInteger(s + "_type"));
type = FluidType.getEnumFromName(nbt.getString(s + "_type")); //compat
if(type.getName().equals(Fluids.NONE.name()))
type = FluidType.getEnumFromName(nbt.getString(s + "_type"));
type = Fluids.fromID(nbt.getInteger(s + "_type"));
}
}

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

@ -157,6 +157,7 @@ public class OreDictManager {
public static final DictFrame F = new DictFrame("Fluorite");
public static final DictFrame LIGNITE = new DictFrame("Lignite");
public static final DictFrame CINNABAR = new DictFrame("Cinnabar");
public static final DictFrame BORAX = new DictFrame("Borax");
public static final DictFrame VOLCANIC = new DictFrame("Volcanic");
/*
* HAZARDS, MISC
@ -294,6 +295,7 @@ public class OreDictManager {
F .dust(fluorite) .block(block_fluorite) .ore(ore_fluorite, basalt_fluorite);
LIGNITE .gem(lignite) .dust(powder_lignite) .ore(ore_lignite);
CINNABAR .crystal(cinnebar) .gem(cinnebar) .ore(ore_cinnebar, ore_depth_cinnebar);
BORAX .dust(powder_borax) .ore(ore_depth_borax);
VOLCANIC .gem(gem_volcanic) .ore(basalt_gem);
/*

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

@ -1,9 +1,9 @@
package com.hbm.inventory.container;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidContainerRegistry;
import com.hbm.inventory.SlotMachineOutput;
import com.hbm.inventory.SlotUpgrade;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineCyclotron;
@ -84,11 +84,11 @@ public class ContainerMachineCyclotron extends Container {
if(!this.mergeItemStack(stack, 13, 14, true))
return null;
} else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.COOLANT) > 0) {
} else if(FluidContainerRegistry.getFluidContent(stack, Fluids.COOLANT) > 0) {
if(!this.mergeItemStack(stack, 11, 12, true))
return null;
} else if(FluidContainerRegistry.getFullContainer(stack, FluidTypeTheOldOne.AMAT) != null) {
} else if(FluidContainerRegistry.getFullContainer(stack, Fluids.AMAT) != null) {
if(!this.mergeItemStack(stack, 9, 10, true))
return null;

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

@ -1,8 +1,8 @@
package com.hbm.inventory.container;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidContainerRegistry;
import com.hbm.inventory.SlotMachineOutput;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.machine.ItemZirnoxRod;
import com.hbm.tileentity.machine.TileEntityReactorZirnox;
@ -78,11 +78,11 @@ public class ContainerReactorZirnox extends Container {
}
} else {
if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.CARBONDIOXIDE) > 0) {
if(FluidContainerRegistry.getFluidContent(stack, Fluids.CARBONDIOXIDE) > 0) {
if(!this.mergeItemStack(stack, 24, 25, true))
return null;
} else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0) {
} else if(FluidContainerRegistry.getFluidContent(stack, Fluids.WATER) > 0) {
if(!this.mergeItemStack(stack, 25, 26, true))
return null;

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

@ -148,20 +148,17 @@ public class FluidType {
//shitty wrapper delegates, go!
//only used for compatibility purposes, these will be removed soon
//don't use these, dumbfuck
@Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here
/*@Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here
public static FluidType[] values() {
return Fluids.metaOrder.toArray(new FluidType[0]);
}
}*/
@Deprecated //reason: not an enum, asshole, use the registry
public static FluidType getEnum(int i) {
return Fluids.fromID(i);
}
@Deprecated //reason: the more time you waste reading this the less time is there for you to use that fucking registry already
public static FluidType getEnumFromName(String s) {
for(int i = 0; i < FluidType.values().length; i++)
if(FluidType.values()[i].getName().equals(s))
return FluidType.values()[i];
return Fluids.NONE;
return Fluids.fromName(s);
}
@Deprecated //reason: not an enum, again, fuck you
public int ordinal() {

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

@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineBoiler;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.machine.TileEntityMachineBoiler;
@ -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(FluidTypeTheOldOne.NONE.name())) {
if(dud.tanks[1].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.NONE.name())) {
if(dud.tanks[1].getTankType().name().equals(Fluids.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,9 +2,9 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineBoilerElectric;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.machine.TileEntityMachineBoilerElectric;
@ -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(FluidTypeTheOldOne.NONE.name())) {
if(diFurnace.tanks[1].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.NONE.name())) {
if(dud.tanks[1].getTankType().name().equals(Fluids.NONE.name())) {
this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
}

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

@ -7,7 +7,6 @@ import java.util.Map.Entry;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineDiesel;
import com.hbm.inventory.fluid.FluidType;

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

@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineLargeTurbine;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.machine.TileEntityMachineLargeTurbine;
@ -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(FluidTypeTheOldOne.NONE.name())) {
if(turbine.tanks[1].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.STEAM.name())) {
if(turbine.tanks[0].getTankType().name().equals(Fluids.STEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14);
}
if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) {
if(turbine.tanks[0].getTankType().name().equals(Fluids.HOTSTEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14);
}
if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) {
if(turbine.tanks[0].getTankType().name().equals(Fluids.SUPERHOTSTEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14);
}
if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) {
if(turbine.tanks[0].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.NONE.name())) {
if(turbine.tanks[1].getTankType().name().equals(Fluids.NONE.name())) {
this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
}

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

@ -6,7 +6,6 @@ import java.util.Map.Entry;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineSelenium;
import com.hbm.inventory.fluid.FluidType;

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

@ -2,9 +2,9 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.container.ContainerMachineTurbine;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.RefStrings;
import com.hbm.tileentity.machine.TileEntityMachineTurbine;
@ -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(FluidTypeTheOldOne.NONE.name())) {
if(diFurnace.tanks[1].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.STEAM.name())) {
if(diFurnace.tanks[0].getTankType().name().equals(Fluids.STEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14);
}
if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) {
if(diFurnace.tanks[0].getTankType().name().equals(Fluids.HOTSTEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14);
}
if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) {
if(diFurnace.tanks[0].getTankType().name().equals(Fluids.SUPERHOTSTEAM.name())) {
drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14);
}
if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) {
if(diFurnace.tanks[0].getTankType().name().equals(Fluids.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(FluidTypeTheOldOne.NONE.name())) {
if(diFurnace.tanks[1].getTankType().name().equals(Fluids.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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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") == FluidTypeTheOldOne.STEAM.ordinal())
if(col.data.getShort("type") == Fluids.STEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 1, 44, 183, 2, 2);
if(col.data.getShort("type") == FluidTypeTheOldOne.HOTSTEAM.ordinal())
if(col.data.getShort("type") == Fluids.HOTSTEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 3, 44, 185, 2, 2);
if(col.data.getShort("type") == FluidTypeTheOldOne.SUPERHOTSTEAM.ordinal())
if(col.data.getShort("type") == Fluids.SUPERHOTSTEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 5, 44, 187, 2, 2);
if(col.data.getShort("type") == FluidTypeTheOldOne.ULTRAHOTSTEAM.ordinal())
if(col.data.getShort("type") == Fluids.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,8 +2,8 @@ package com.hbm.inventory.gui;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.container.ContainerSILEX;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.RefStrings;
import com.hbm.packet.AuxButtonPacket;
import com.hbm.packet.PacketDispatcher;
@ -67,7 +67,7 @@ public class GUISILEX extends GuiInfoContainer {
if(silex.tank.getFill() > 0) {
if(silex.tank.getTankType() == FluidTypeTheOldOne.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType())) {
if(silex.tank.getTankType() == Fluids.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() == FluidTypeTheOldOne.ACID ? 43 : 50, i, 7);
drawTexturedModalRect(guiLeft + 44, guiTop + 54, 176, silex.tank.getTankType() == Fluids.ACID ? 43 : 50, i, 7);
}
}

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

@ -7,9 +7,9 @@ import java.util.List;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.AssemblerRecipes;
import com.hbm.inventory.recipes.MachineRecipes;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemCassette;
import com.hbm.items.machine.ItemChemistryTemplate;
@ -27,7 +27,6 @@ import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
@ -66,9 +65,10 @@ public class GUIScreenTemplateFolder extends GuiScreen {
allStacks.add(new ItemStack(ModItems.siren_track, 1, i));
}
// Fluid IDs
for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) {
if(!FluidTypeTheOldOne.values()[i].hasNoID()) {
allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i));
FluidType[] fluids = Fluids.getInNiceOrder();
for(int i = 1; i < fluids.length; i++) {
if(!fluids[i].hasNoID()) {
allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, fluids[i].getID()));
}
}
// Assembly Templates

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

@ -20,13 +20,13 @@ 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.FluidTypeTheOldOne;
import com.hbm.inventory.OreDictManager;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.inventory.RecipesCommon;
import com.hbm.inventory.RecipesCommon.AStack;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.inventory.RecipesCommon.OreDictStack;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemAssemblyTemplate;
import com.hbm.main.MainRegistry;
@ -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, 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.missile_carrier, 1), new AStack[] {new ComparableStack(ModItems.fluid_barrel_full, 16, Fluids.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, 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_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, Fluids.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, 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, 4), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor_desh, 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.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, Fluids.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, Fluids.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, 4), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor_desh, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, Fluids.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);

1
src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java
View File

@ -61,6 +61,7 @@ public class CrystallizerRecipes {
recipes.put("sand", new ItemStack(ModItems.ingot_fiberglass));
recipes.put(REDSTONE.block(), new ItemStack(ModItems.nugget_mercury));
recipes.put(CINNABAR.crystal(), new ItemStack(ModItems.nugget_mercury, 3));
recipes.put(BORAX.dust(), new ItemStack(ModItems.powder_boron_tiny, 3));
recipes.put(COAL.block(), new ItemStack(ModBlocks.block_graphite));
recipes.put(new ComparableStack(Blocks.cobblestone), new ItemStack(ModBlocks.reinforced_stone));

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

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
@ -92,7 +91,7 @@ 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++) {
for(int i = 0; i < Fluids.getAll().length; i++) {
if(getGasCentOutputs(Fluids.fromID(i)) != null) {
List<ItemStack> out = getGasCentOutputs(Fluids.fromID(i));
ItemStack[] outputs = new ItemStack[4];

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

@ -1,14 +1,12 @@
package com.hbm.inventory.recipes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.Spaghetti;
import com.hbm.inventory.FluidContainer;
import com.hbm.inventory.FluidContainerRegistry;
@ -1133,7 +1131,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(FluidTypeTheOldOne.values()).indexOf(fluidIn[j].type)), fluidIn[j].fill);
inputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, fluidIn[j].type.getID()), fluidIn[j].fill);
ItemStack[] listOut = MachineRecipes.getChemOutputFromTempate(inputs[6]);
for(int j = 0; j < listOut.length; j++)
@ -1143,7 +1141,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(FluidTypeTheOldOne.values()).indexOf(fluidOut[j].type)), fluidOut[j].fill);
outputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, fluidOut[j].type.getID()), fluidOut[j].fill);
for(int j = 0; j < inputs.length; j++)
if(inputs[j] == null)
@ -1163,7 +1161,7 @@ public class MachineRecipes {
Map<Object, Object> recipes = new HashMap<Object, Object>();
for(int i = 0; i < FluidType.values().length; i++) {
for(int i = 0; i < Fluids.getAll().length; i++) {
Object[] outs = getBoilerOutput(FluidType.getEnum(i));
if(outs != null) {
@ -1382,248 +1380,248 @@ public class MachineRecipes {
switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) {
case FP_HEAVYOIL:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.HEAVYOIL);
input[0] = new FluidStack(1000, Fluids.HEAVYOIL);
break;
case FP_SMEAR:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR);
input[0] = new FluidStack(1000, Fluids.SMEAR);
break;
case FP_NAPHTHA:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.NAPHTHA);
input[0] = new FluidStack(1000, Fluids.NAPHTHA);
break;
case FP_LIGHTOIL:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.LIGHTOIL);
input[0] = new FluidStack(1000, Fluids.LIGHTOIL);
break;
case FR_REOIL:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR);
input[0] = new FluidStack(1000, Fluids.SMEAR);
break;
case FR_PETROIL:
input[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED);
input[1] = new FluidStack(200, FluidTypeTheOldOne.LUBRICANT);
input[0] = new FluidStack(800, Fluids.RECLAIMED);
input[1] = new FluidStack(200, Fluids.LUBRICANT);
break;
case FC_BITUMEN:
input[0] = new FluidStack(1200, FluidTypeTheOldOne.BITUMEN);
input[1] = new FluidStack(2400, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(1200, Fluids.BITUMEN);
input[1] = new FluidStack(2400, Fluids.STEAM);
break;
case FC_I_NAPHTHA:
input[0] = new FluidStack(1400, FluidTypeTheOldOne.SMEAR);
input[1] = new FluidStack(800, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1400, Fluids.SMEAR);
input[1] = new FluidStack(800, Fluids.WATER);
break;
case FC_GAS_PETROLEUM:
input[0] = new FluidStack(1800, FluidTypeTheOldOne.GAS);
input[1] = new FluidStack(1200, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1800, Fluids.GAS);
input[1] = new FluidStack(1200, Fluids.WATER);
break;
case FC_DIESEL_KEROSENE:
input[0] = new FluidStack(1200, FluidTypeTheOldOne.DIESEL);
input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(1200, Fluids.DIESEL);
input[1] = new FluidStack(2000, Fluids.STEAM);
break;
case FC_KEROSENE_PETROLEUM:
input[0] = new FluidStack(1400, FluidTypeTheOldOne.KEROSENE);
input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(1400, Fluids.KEROSENE);
input[1] = new FluidStack(2000, Fluids.STEAM);
break;
case CC_I:
input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1800, Fluids.WATER);
break;
case CC_OIL:
input[0] = new FluidStack(1400, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(1400, Fluids.STEAM);
break;
case CC_HEATING:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(2000, Fluids.STEAM);
break;
case CC_HEAVY:
input[0] = new FluidStack(1400, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1400, Fluids.WATER);
break;
case CC_NAPHTHA:
input[0] = new FluidStack(2400, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(2400, Fluids.STEAM);
break;
case ASPHALT:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN);
input[0] = new FluidStack(1000, Fluids.BITUMEN);
break;
case CONCRETE:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(2000, Fluids.WATER);
break;
case CONCRETE_ASBESTOS:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(2000, Fluids.WATER);
break;
case COOLANT:
input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1800, Fluids.WATER);
break;
case CRYOGEL:
input[0] = new FluidStack(1800, FluidTypeTheOldOne.COOLANT);
input[0] = new FluidStack(1800, Fluids.COOLANT);
break;
case DESH:
if(GeneralConfig.enableBabyMode) {
input[0] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL);
input[0] = new FluidStack(200, Fluids.LIGHTOIL);
} else {
input[0] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
input[1] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL);
input[0] = new FluidStack(200, Fluids.MERCURY);
input[1] = new FluidStack(200, Fluids.LIGHTOIL);
}
break;
case PEROXIDE:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1000, Fluids.WATER);
break;
case CIRCUIT_4:
input[0] = new FluidStack(400, FluidTypeTheOldOne.ACID);
input[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(400, Fluids.ACID);
input[1] = new FluidStack(200, Fluids.PETROLEUM);
break;
case CIRCUIT_5:
input[0] = new FluidStack(800, FluidTypeTheOldOne.ACID);
input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
input[0] = new FluidStack(800, Fluids.ACID);
input[1] = new FluidStack(200, Fluids.MERCURY);
break;
case SF_OIL:
input[0] = new FluidStack(350, FluidTypeTheOldOne.OIL);
input[0] = new FluidStack(350, Fluids.OIL);
break;
case SF_HEAVYOIL:
input[0] = new FluidStack(250, FluidTypeTheOldOne.HEAVYOIL);
input[0] = new FluidStack(250, Fluids.HEAVYOIL);
break;
case SF_SMEAR:
input[0] = new FluidStack(200, FluidTypeTheOldOne.SMEAR);
input[0] = new FluidStack(200, Fluids.SMEAR);
break;
case SF_HEATINGOIL:
input[0] = new FluidStack(100, FluidTypeTheOldOne.HEATINGOIL);
input[0] = new FluidStack(100, Fluids.HEATINGOIL);
break;
case SF_RECLAIMED:
input[0] = new FluidStack(200, FluidTypeTheOldOne.RECLAIMED);
input[0] = new FluidStack(200, Fluids.RECLAIMED);
break;
case SF_PETROIL:
input[0] = new FluidStack(250, FluidTypeTheOldOne.PETROIL);
input[0] = new FluidStack(250, Fluids.PETROIL);
break;
case SF_LUBRICANT:
input[0] = new FluidStack(250, FluidTypeTheOldOne.LUBRICANT);
input[0] = new FluidStack(250, Fluids.LUBRICANT);
break;
case SF_NAPHTHA:
input[0] = new FluidStack(300, FluidTypeTheOldOne.NAPHTHA);
input[0] = new FluidStack(300, Fluids.NAPHTHA);
break;
case SF_DIESEL:
input[0] = new FluidStack(400, FluidTypeTheOldOne.DIESEL);
input[0] = new FluidStack(400, Fluids.DIESEL);
break;
case SF_LIGHTOIL:
input[0] = new FluidStack(450, FluidTypeTheOldOne.LIGHTOIL);
input[0] = new FluidStack(450, Fluids.LIGHTOIL);
break;
case SF_KEROSENE:
input[0] = new FluidStack(550, FluidTypeTheOldOne.KEROSENE);
input[0] = new FluidStack(550, Fluids.KEROSENE);
break;
case SF_GAS:
input[0] = new FluidStack(750, FluidTypeTheOldOne.GAS);
input[0] = new FluidStack(750, Fluids.GAS);
break;
case SF_PETROLEUM:
input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(600, Fluids.PETROLEUM);
break;
case SF_BIOGAS:
input[0] = new FluidStack(3500, FluidTypeTheOldOne.BIOGAS);
input[0] = new FluidStack(3500, Fluids.BIOGAS);
break;
case SF_BIOFUEL:
input[0] = new FluidStack(1500, FluidTypeTheOldOne.BIOFUEL);
input[0] = new FluidStack(1500, Fluids.BIOFUEL);
break;
case POLYMER:
input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(600, Fluids.PETROLEUM);
break;
case DEUTERIUM:
input[0] = new FluidStack(4000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(4000, Fluids.WATER);
break;
case STEAM:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1000, Fluids.WATER);
break;
case LPG:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(2000, Fluids.PETROLEUM);
break;
case BP_BIOFUEL:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.BIOGAS);
input[0] = new FluidStack(2000, Fluids.BIOGAS);
break;
case YELLOWCAKE:
input[0] = new FluidStack(500, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(500, Fluids.ACID);
break;
case UF6:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1000, Fluids.WATER);
break;
case PUF6:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(1000, Fluids.WATER);
break;
case SAS3:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(2000, Fluids.ACID);
break;
case NITAN:
input[0] = new FluidStack(600, FluidTypeTheOldOne.KEROSENE);
input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
input[0] = new FluidStack(600, Fluids.KEROSENE);
input[1] = new FluidStack(200, Fluids.MERCURY);
break;
case OIL_SAND:
input[0] = new FluidStack(400, FluidTypeTheOldOne.BITUMEN);
input[0] = new FluidStack(400, Fluids.BITUMEN);
break;
case CORDITE:
input[0] = new FluidStack(200, FluidTypeTheOldOne.HEATINGOIL);
input[0] = new FluidStack(200, Fluids.HEATINGOIL);
break;
case KEVLAR:
input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(100, Fluids.PETROLEUM);
break;
case SOLID_FUEL:
input[0] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
input[0] = new FluidStack(200, Fluids.PETROLEUM);
break;
case ELECTROLYSIS:
input[0] = new FluidStack(8000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(8000, Fluids.WATER);
break;
case XENON:
input[0] = new FluidStack(0, FluidTypeTheOldOne.NONE);
input[0] = new FluidStack(0, Fluids.NONE);
break;
case XENON_OXY:
input[0] = new FluidStack(250, FluidTypeTheOldOne.OXYGEN);
input[0] = new FluidStack(250, Fluids.OXYGEN);
break;
case SATURN:
input[0] = new FluidStack(100, FluidTypeTheOldOne.ACID);
input[1] = new FluidStack(50, FluidTypeTheOldOne.MERCURY);
input[0] = new FluidStack(100, Fluids.ACID);
input[1] = new FluidStack(50, Fluids.MERCURY);
break;
case BALEFIRE:
input[0] = new FluidStack(6000, FluidTypeTheOldOne.KEROSENE);
input[0] = new FluidStack(6000, Fluids.KEROSENE);
break;
case SCHRABIDIC:
input[0] = new FluidStack(8000, FluidTypeTheOldOne.SAS3);
input[1] = new FluidStack(6000, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(8000, Fluids.SAS3);
input[1] = new FluidStack(6000, Fluids.ACID);
break;
case SCHRABIDATE:
input[0] = new FluidStack(250, FluidTypeTheOldOne.SCHRABIDIC);
input[0] = new FluidStack(250, Fluids.SCHRABIDIC);
break;
case COLTAN_CLEANING:
input[0] = new FluidStack(250, FluidTypeTheOldOne.ACID);
input[1] = new FluidStack(500, FluidTypeTheOldOne.HYDROGEN);
input[0] = new FluidStack(250, Fluids.ACID);
input[1] = new FluidStack(500, Fluids.HYDROGEN);
break;
case COLTAN_PAIN:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS);
input[1] = new FluidStack(500, FluidTypeTheOldOne.OXYGEN);
input[0] = new FluidStack(1000, Fluids.GAS);
input[1] = new FluidStack(500, Fluids.OXYGEN);
break;
case COLTAN_CRYSTAL:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN);
input[1] = new FluidStack(500, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(1000, Fluids.PAIN);
input[1] = new FluidStack(500, Fluids.ACID);
break;
case VIT_LIQUID:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEFLUID);
input[0] = new FluidStack(1000, Fluids.WASTEFLUID);
break;
case VIT_GAS:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEGAS);
input[0] = new FluidStack(1000, Fluids.WASTEGAS);
break;
case TEL:
input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
input[1] = new FluidStack(1000, FluidTypeTheOldOne.STEAM);
input[0] = new FluidStack(100, Fluids.PETROLEUM);
input[1] = new FluidStack(1000, Fluids.STEAM);
break;
case GASOLINE:
input[0] = new FluidStack(10000, FluidTypeTheOldOne.PETROIL);
input[0] = new FluidStack(10000, Fluids.PETROIL);
break;
case FRACKSOL:
input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
input[1] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(100, Fluids.PETROLEUM);
input[1] = new FluidStack(1000, Fluids.WATER);
break;
case OSMIRIDIUM_DEATH:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(1000, Fluids.ACID);
break;
case METH:
input[0] = new FluidStack(400, FluidTypeTheOldOne.LUBRICANT);
input[1] = new FluidStack(400, FluidTypeTheOldOne.ACID);
input[0] = new FluidStack(400, Fluids.LUBRICANT);
input[1] = new FluidStack(400, Fluids.ACID);
break;
case CO2:
input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS);
input[0] = new FluidStack(1000, Fluids.GAS);
break;
case HEAVY_ELECTROLYSIS:
input[0] = new FluidStack(8000, FluidTypeTheOldOne.HEAVYWATER);
input[0] = new FluidStack(8000, Fluids.HEAVYWATER);
break;
case DUCRETE:
input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
input[0] = new FluidStack(2000, Fluids.WATER);
default:
break;
}
@ -1809,152 +1807,152 @@ public class MachineRecipes {
switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) {
case FP_HEAVYOIL:
output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidTypeTheOldOne.BITUMEN);
output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidTypeTheOldOne.SMEAR);
output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, Fluids.BITUMEN);
output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, Fluids.SMEAR);
break;
case FP_SMEAR:
output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL);
output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidTypeTheOldOne.LUBRICANT);
output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, Fluids.HEATINGOIL);
output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, Fluids.LUBRICANT);
break;
case FP_NAPHTHA:
output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL);
output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidTypeTheOldOne.DIESEL);
output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, Fluids.HEATINGOIL);
output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, Fluids.DIESEL);
break;
case FP_LIGHTOIL:
output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidTypeTheOldOne.DIESEL);
output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidTypeTheOldOne.KEROSENE);
output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, Fluids.DIESEL);
output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, Fluids.KEROSENE);
break;
case FR_REOIL:
output[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED);
output[0] = new FluidStack(800, Fluids.RECLAIMED);
break;
case FR_PETROIL:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.PETROIL);
output[0] = new FluidStack(1000, Fluids.PETROIL);
break;
case FC_BITUMEN:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.OIL);
output[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
output[0] = new FluidStack(1000, Fluids.OIL);
output[1] = new FluidStack(200, Fluids.PETROLEUM);
break;
case FC_I_NAPHTHA:
output[0] = new FluidStack(800, FluidTypeTheOldOne.NAPHTHA);
output[0] = new FluidStack(800, Fluids.NAPHTHA);
break;
case FC_GAS_PETROLEUM:
output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM);
output[0] = new FluidStack(800, Fluids.PETROLEUM);
break;
case FC_DIESEL_KEROSENE:
output[0] = new FluidStack(400, FluidTypeTheOldOne.KEROSENE);
output[0] = new FluidStack(400, Fluids.KEROSENE);
break;
case FC_KEROSENE_PETROLEUM:
output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM);
output[0] = new FluidStack(800, Fluids.PETROLEUM);
break;
case CC_OIL:
output[0] = new FluidStack(2000, FluidTypeTheOldOne.OIL);
output[0] = new FluidStack(2000, Fluids.OIL);
break;
case CC_I:
output[0] = new FluidStack(1600, FluidTypeTheOldOne.SMEAR);
output[0] = new FluidStack(1600, Fluids.SMEAR);
break;
case CC_HEATING:
output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEATINGOIL);
output[0] = new FluidStack(1800, Fluids.HEATINGOIL);
break;
case CC_HEAVY:
output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEAVYOIL);
output[0] = new FluidStack(1800, Fluids.HEAVYOIL);
break;
case CC_NAPHTHA:
output[0] = new FluidStack(2000, FluidTypeTheOldOne.NAPHTHA);
output[0] = new FluidStack(2000, Fluids.NAPHTHA);
break;
case COOLANT:
output[0] = new FluidStack(2000, FluidTypeTheOldOne.COOLANT);
output[0] = new FluidStack(2000, Fluids.COOLANT);
break;
case CRYOGEL:
output[0] = new FluidStack(2000, FluidTypeTheOldOne.CRYOGEL);
output[0] = new FluidStack(2000, Fluids.CRYOGEL);
break;
case PEROXIDE:
output[0] = new FluidStack(800, FluidTypeTheOldOne.ACID);
output[0] = new FluidStack(800, Fluids.ACID);
break;
case DEUTERIUM:
output[0] = new FluidStack(500, FluidTypeTheOldOne.DEUTERIUM);
output[0] = new FluidStack(500, Fluids.DEUTERIUM);
break;
case STEAM:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.STEAM);
output[0] = new FluidStack(1000, Fluids.STEAM);
break;
case BP_BIOGAS:
output[0] = new FluidStack(4000, FluidTypeTheOldOne.BIOGAS);
output[0] = new FluidStack(4000, Fluids.BIOGAS);
break;
case BP_BIOFUEL:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.BIOFUEL);
output[0] = new FluidStack(1000, Fluids.BIOFUEL);
break;
case LPG:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.LPG);
output[0] = new FluidStack(1000, Fluids.LPG);
break;
case UF6:
output[0] = new FluidStack(1200, FluidTypeTheOldOne.UF6);
output[0] = new FluidStack(1200, Fluids.UF6);
break;
case PUF6:
output[0] = new FluidStack(900, FluidTypeTheOldOne.PUF6);
output[0] = new FluidStack(900, Fluids.PUF6);
break;
case SAS3:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.SAS3);
output[0] = new FluidStack(1000, Fluids.SAS3);
break;
case NITAN:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.NITAN);
output[0] = new FluidStack(1000, Fluids.NITAN);
break;
case OIL_SAND:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN);
output[0] = new FluidStack(1000, Fluids.BITUMEN);
break;
case DYN_SCHRAB:
output[0] = new FluidStack(50, FluidTypeTheOldOne.WATZ);
output[0] = new FluidStack(50, Fluids.WATZ);
break;
case DYN_EUPH:
output[0] = new FluidStack(100, FluidTypeTheOldOne.WATZ);
output[0] = new FluidStack(100, Fluids.WATZ);
break;
case DYN_DNT:
output[0] = new FluidStack(150, FluidTypeTheOldOne.WATZ);
output[0] = new FluidStack(150, Fluids.WATZ);
break;
case ELECTROLYSIS:
output[0] = new FluidStack(400, FluidTypeTheOldOne.HYDROGEN);
output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN);
output[0] = new FluidStack(400, Fluids.HYDROGEN);
output[1] = new FluidStack(400, Fluids.OXYGEN);
break;
case XENON:
output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON);
output[0] = new FluidStack(50, Fluids.XENON);
break;
case XENON_OXY:
output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON);
output[0] = new FluidStack(50, Fluids.XENON);
break;
case BALEFIRE:
output[0] = new FluidStack(8000, FluidTypeTheOldOne.BALEFIRE);
output[0] = new FluidStack(8000, Fluids.BALEFIRE);
break;
case SCHRABIDIC:
output[0] = new FluidStack(16000, FluidTypeTheOldOne.SCHRABIDIC);
output[0] = new FluidStack(16000, Fluids.SCHRABIDIC);
break;
case COLTAN_CLEANING:
output[0] = new FluidStack(500, FluidTypeTheOldOne.WATER);
output[0] = new FluidStack(500, Fluids.WATER);
break;
case COLTAN_PAIN:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN);
output[0] = new FluidStack(1000, Fluids.PAIN);
break;
case COLTAN_CRYSTAL:
output[0] = new FluidStack(250, FluidTypeTheOldOne.WATER);
output[0] = new FluidStack(250, Fluids.WATER);
break;
case GASOLINE:
output[0] = new FluidStack(12000, FluidTypeTheOldOne.GASOLINE);
output[0] = new FluidStack(12000, Fluids.GASOLINE);
break;
case FRACKSOL:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.FRACKSOL);
output[0] = new FluidStack(1000, Fluids.FRACKSOL);
break;
case HELIUM3:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.HELIUM3);
output[0] = new FluidStack(1000, Fluids.HELIUM3);
break;
case OSMIRIDIUM_DEATH:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.DEATH);
output[0] = new FluidStack(1000, Fluids.DEATH);
break;
case ETHANOL:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.ETHANOL);
output[0] = new FluidStack(1000, Fluids.ETHANOL);
break;
case CO2:
output[0] = new FluidStack(1000, FluidTypeTheOldOne.CARBONDIOXIDE);
output[0] = new FluidStack(1000, Fluids.CARBONDIOXIDE);
break;
case HEAVY_ELECTROLYSIS:
output[0] = new FluidStack(400, FluidTypeTheOldOne.DEUTERIUM);
output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN);
output[0] = new FluidStack(400, Fluids.DEUTERIUM);
output[1] = new FluidStack(400, Fluids.OXYGEN);
break;
default:
break;
@ -1968,7 +1966,7 @@ public class MachineRecipes {
for(FluidContainer con : FluidContainerRegistry.allContainers) {
if(con != null) {
ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(con.type));
ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, con.type.getID());
fluid.stackTagCompound = new NBTTagCompound();
fluid.stackTagCompound.setInteger("fill", con.content);
map.put(fluid, con.fullContainer);

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

@ -3,7 +3,6 @@ package com.hbm.inventory.recipes;
import java.util.HashMap;
import java.util.Map;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
@ -59,18 +58,18 @@ public class RefineryRecipes {
}
public static void registerFractions() {
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));
fractions.put(Fluids.HEAVYOIL, new Quartet(Fluids.BITUMEN, Fluids.SMEAR, heavy_frac_bitu, heavy_frac_smear));
fractions.put(Fluids.SMEAR, new Quartet(Fluids.HEATINGOIL, Fluids.LUBRICANT, smear_frac_heat, smear_frac_lube));
fractions.put(Fluids.NAPHTHA, new Quartet(Fluids.HEATINGOIL, Fluids.DIESEL, napht_frac_heat, napht_frac_diesel));
fractions.put(Fluids.LIGHTOIL, new Quartet(Fluids.DIESEL, Fluids.KEROSENE, light_frac_diesel, light_frac_kero));
}
public static void registerCracking() {
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));
cracking.put(Fluids.BITUMEN, new Quartet(Fluids.OIL, Fluids.PETROLEUM, bitumen_crack_oil, bitumen_crack_petro));
cracking.put(Fluids.SMEAR, new Quartet(Fluids.NAPHTHA, Fluids.PETROLEUM, smear_crack_napht, smear_crack_petro));
cracking.put(Fluids.GAS, new Quartet(Fluids.PETROLEUM, Fluids.NONE, gas_crack_petro, 0));
cracking.put(Fluids.DIESEL, new Quartet(Fluids.KEROSENE, Fluids.PETROLEUM, diesel_crack_kero, diesel_crack_petro));
cracking.put(Fluids.KEROSENE, new Quartet(Fluids.PETROLEUM, Fluids.NONE, kero_crack_petro, 0));
}
public static Quartet<FluidType, FluidType, Integer, Integer> getFractions(FluidType oil) {

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

@ -6,8 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.special.ItemWasteLong;
import com.hbm.items.special.ItemWasteShort;
@ -26,7 +26,7 @@ public class SILEXRecipes {
public static void register() {
itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.UF6.ordinal()), new ComparableStack(ModItems.ingot_uranium));
itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.UF6.getID()), 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, FluidTypeTheOldOne.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium));
itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.PUF6.getID()), 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, FluidTypeTheOldOne.DEATH.ordinal()), new SILEXRecipe(1000, 1000)
recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.DEATH.getID()), new SILEXRecipe(1000, 1000)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_impure_osmiridium), 1))
);

2
src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java
View File

@ -7,7 +7,6 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.inventory.OreDictManager;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.inventory.RecipesCommon;
import com.hbm.inventory.RecipesCommon.AStack;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.inventory.RecipesCommon.OreDictStack;
@ -50,6 +49,7 @@ public class AnvilRecipes {
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_schrabidate, 1), new ComparableStack(anvil), new OreDictStack(SBD.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_starmetal, 1), new ComparableStack(anvil), new OreDictStack(STAR.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_steel, 1), new ComparableStack(anvil), new OreDictStack(STEEL.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_osmiridium, 1), new ComparableStack(anvil), new OreDictStack(OSMIRIDIUM.ingot(), 10)));
}
for(int i = 0; i < 9; i++)

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

@ -3,7 +3,8 @@ package com.hbm.items.machine;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.tileentity.conductor.TileEntityFluidDuct;
import cpw.mods.fml.relauncher.Side;
@ -19,144 +20,116 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class ItemFluidDuct extends Item {
IIcon overlayIcon;
public ItemFluidDuct()
{
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
public ItemFluidDuct() {
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
@Override
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list)
{
for (int i = 1; i < FluidTypeTheOldOne.values().length; ++i)
{
list.add(new ItemStack(item, 1, i));
}
}
public void getSubItems(Item item, CreativeTabs tabs, List list) {
FluidType[] order = Fluids.getInNiceOrder();
for(int i = 1; i < order.length; ++i) {
if(!order[i].hasNoID()) {
list.add(new ItemStack(item, 1, order[i].getID()));
}
}
}
/*public void onCreated(ItemStack stack, World world, EntityPlayer player) {
if(stack != null)
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_identifier, 1, stack.getItemDamage()));
}*/
public String getItemStackDisplayName(ItemStack stack) {
String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
String s1 = ("" + StatCollector.translateToLocal(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName())).trim();
public String getItemStackDisplayName(ItemStack stack)
{
String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
if(s1 != null) {
s = s + " " + s1;
}
if (s1 != null)
{
s = s + " " + s1;
}
return s;
}
return s;
}
@Override
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses()
{
return true;
}
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister p_94581_1_)
{
super.registerIcons(p_94581_1_);
this.overlayIcon = p_94581_1_.registerIcon("hbm:duct_overlay");
}
@Override
public void registerIcons(IIconRegister p_94581_1_) {
super.registerIcons(p_94581_1_);
this.overlayIcon = p_94581_1_.registerIcon("hbm:duct_overlay");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_)
{
return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_);
}
public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) {
return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_);
}
@Override
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int p_82790_2_)
{
if (p_82790_2_ == 0)
{
return 16777215;
}
else
{
int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
public int getColorFromItemStack(ItemStack stack, int p_82790_2_) {
if(p_82790_2_ == 0) {
return 16777215;
} else {
int j = Fluids.fromID(stack.getItemDamage()).getColor();
if (j < 0)
{
j = 16777215;
}
if(j < 0) {
j = 16777215;
}
return j;
}
}
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2)
{
if (world.getBlock(x, y, z) != Blocks.snow_layer)
{
if (i == 0)
{
--y;
}
return j;
}
}
if (i == 1)
{
++y;
}
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) {
if(world.getBlock(x, y, z) != Blocks.snow_layer) {
if(i == 0) {
--y;
}
if (i == 2)
{
--z;
}
if(i == 1) {
++y;
}
if (i == 3)
{
++z;
}
if(i == 2) {
--z;
}
if (i == 4)
{
--x;
}
if(i == 3) {
++z;
}
if (i == 5)
{
++x;
}
if(i == 4) {
--x;
}
if (!world.isAirBlock(x, y, z))
{
return false;
}
}
if(i == 5) {
++x;
}
if (!player.canPlayerEdit(x, y, z, i, stack))
{
return false;
}
else
{
--stack.stackSize;
world.setBlock(x, y, z, ModBlocks.fluid_duct);
if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) {
((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);
if(!world.isAirBlock(x, y, z)) {
return false;
}
}
return true;
}
}
if(!player.canPlayerEdit(x, y, z, i, stack)) {
return false;
} else {
--stack.stackSize;
world.setBlock(x, y, z, ModBlocks.fluid_duct);
if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) {
((TileEntityFluidDuct) world.getTileEntity(x, y, z)).type = Fluids.fromID(stack.getItemDamage());
}
world.playSoundEffect(x, y, z, "hbm:block.pipePlaced", 1.0F, 0.65F + world.rand.nextFloat() * 0.2F);
return true;
}
}
}

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

@ -1,8 +1,8 @@
package com.hbm.items.machine;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import cpw.mods.fml.relauncher.Side;
@ -16,68 +16,63 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
public class ItemFluidIcon extends Item {
IIcon overlayIcon;
public ItemFluidIcon()
{
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
public ItemFluidIcon() {
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list)
{
for (int i = 0; i < FluidTypeTheOldOne.values().length; ++i)
{
list.add(new ItemStack(item, 1, i));
}
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool)
{
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
FluidType[] order = Fluids.getInNiceOrder();
for(int i = 1; i < order.length; ++i) {
list.add(new ItemStack(item, 1, order[i].getID()));
}
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
if(stack.hasTagCompound())
if(stack.getTagCompound().getInteger("fill") > 0)
list.add(stack.getTagCompound().getInteger("fill") + "mB");
}
public static ItemStack addQuantity(ItemStack stack, int i) {
if(!stack.hasTagCompound())
stack.stackTagCompound = new NBTTagCompound();
stack.getTagCompound().setInteger("fill", i);
return stack;
}
public static ItemStack make(FluidType fluid, int i) {
return addQuantity(new ItemStack(ModItems.fluid_icon, 1, fluid.ordinal()), i);
}
public static int getQuantity(ItemStack stack) {
if(!stack.hasTagCompound())
return 0;
return stack.getTagCompound().getInteger("fill");
}
public String getItemStackDisplayName(ItemStack stack)
{
String s = (I18n.format(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
public String getItemStackDisplayName(ItemStack stack) {
String s = (I18n.format(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName())).trim();
if (s != null)
{
return s;
}
if(s != null) {
return s;
}
return "Unknown";
}
return "Unknown";
}
/*
/*
* @Override
*
* @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() {
@ -101,9 +96,9 @@ public class ItemFluidIcon extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int p_82790_2_) {
int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
int j = Fluids.fromID(stack.getItemDamage()).getColor();
if (j < 0) {
if(j < 0) {
j = 16777215;
}

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

@ -4,7 +4,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidDuct;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
@ -35,12 +34,6 @@ public class ItemFluidIdentifier extends Item {
this.setMaxDamage(0);
}
/*
* @Override public String getUnlocalizedName(ItemStack stack) { int i =
* stack.getItemDamage(); return super.getUnlocalizedName() + "." +
* FluidType.getEnum(i).getName(); }
*/
public ItemStack getContainerItem(ItemStack stack) {
return stack.copy();
}
@ -56,10 +49,10 @@ public class ItemFluidIdentifier extends Item {
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for(int i = 0; i < FluidTypeTheOldOne.values().length; ++i) {
if(!FluidTypeTheOldOne.values()[i].hasNoID()) {
list.add(new ItemStack(item, 1, i));
FluidType[] order = Fluids.getInNiceOrder();
for(int i = 1; i < order.length; ++i) {
if(!order[i].hasNoID()) {
list.add(new ItemStack(item, 1, order[i].getID()));
}
}
}

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

@ -1,8 +1,8 @@
package com.hbm.items.machine;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -26,27 +26,29 @@ public class ItemFluidTank extends Item {
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) {
FluidType type = FluidTypeTheOldOne.values()[i];
FluidType[] order = Fluids.getInNiceOrder();
for(int i = 1; i < order.length; ++i) {
FluidType type = order[i];
if(type.hasNoContainer())
continue;
int id = type.getID();
if(type.needsLeadContainer()) {
if(this == ModItems.fluid_tank_lead_full) {
list.add(new ItemStack(item, 1, i));
list.add(new ItemStack(item, 1, id));
}
} else {
list.add(new ItemStack(item, 1, i));
list.add(new ItemStack(item, 1, id));
}
}
}
public String getItemStackDisplayName(ItemStack stack) {
String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
String s1 = ("" + StatCollector.translateToLocal(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName())).trim();
if(s1 != null) {
s = s + " " + s1;
@ -86,7 +88,7 @@ public class ItemFluidTank extends Item {
if(p_82790_2_ == 0) {
return 16777215;
} else {
int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
int j = Fluids.fromID(stack.getItemDamage()).getColor();
if(j < 0) {
j = 16777215;

22
src/main/java/com/hbm/items/machine/ItemRTGPellet.java
View File

@ -1,16 +1,14 @@
package com.hbm.items.machine;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableSet;
import com.hbm.config.MachineConfig;
import com.hbm.config.VersatileConfig;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemRTGPelletDepleted.DepletedRTGMaterial;
import com.hbm.tileentity.IRadioisotopeFuel;
import com.hbm.util.BobMathUtil;
import com.hbm.util.I18nUtil;
@ -82,7 +80,7 @@ public class ItemRTGPellet extends Item {
}
public static ItemStack handleDecay(ItemStack stack, ItemRTGPellet instance) {
if (instance.getDoesDecay() && MachineConfig.doRTGsDecay) {
if (instance.getDoesDecay() && VersatileConfig.rtgDecay()) {
if (instance.getLifespan(stack) <= 0)
return instance.getDecayItem();
else
@ -152,7 +150,7 @@ public class ItemRTGPellet extends Item {
super.addInformation(stack, player, list, bool);
list.add(I18nUtil.resolveKey(this.getUnlocalizedName().concat(".desc")));
final ItemRTGPellet instance = (ItemRTGPellet) stack.getItem();
list.add(I18nUtil.resolveKey("desc.item.rtgHeat", instance.getDoesDecay() && MachineConfig.scaleRTGPower ? getScaledPower(instance, stack) : instance.getHeat()));
list.add(I18nUtil.resolveKey("desc.item.rtgHeat", instance.getDoesDecay() && VersatileConfig.scaleRTGPower() ? getScaledPower(instance, stack) : instance.getHeat()));
if (instance.getDoesDecay()) {
list.add(I18nUtil.resolveKey("desc.item.rtgDecay", I18nUtil.resolveKey(instance.getDecayItem().getUnlocalizedName() + ".name"), instance.getDecayItem().stackSize));
list.add(BobMathUtil.toPercentage(instance.getLifespan(stack), instance.getMaxLifespan()));
@ -170,4 +168,16 @@ public class ItemRTGPellet extends Item {
public String getData() {
return String.format("%s (%s HE/t) %s", I18nUtil.resolveKey(getUnlocalizedName().concat(".name")), getHeat(), (getDoesDecay() ? " (decays)" : ""));
}
public static HashMap<ItemStack, ItemStack> getRecipeMap() {
HashMap<ItemStack, ItemStack> map = new HashMap<ItemStack, ItemStack>();
for(ItemRTGPellet pellet : pelletList) {
if(pellet.decayItem != null) {
map.put(new ItemStack(pellet), pellet.decayItem.copy());
}
}
return map;
}
}

75
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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemBattery;
import com.hbm.items.machine.ItemBreedingRod.BreedingRodType;
@ -24,41 +24,40 @@ import net.minecraft.world.World;
public class ItemStarterKit extends Item {
public ItemStarterKit()
{
this.maxStackSize = 1;
}
private void giveHaz(World world, EntityPlayer p, int tier) {
for(int i = 0; i < 4; i++) {
if(p.inventory.armorInventory[i] != null && !world.isRemote) {
world.spawnEntityInWorld(new EntityItem(world, p.posX, p.posY + p.eyeHeight, p.posZ, p.inventory.armorInventory[i]));
}
}
public ItemStarterKit() {
this.maxStackSize = 1;
}
switch(tier) {
case 0:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots);
break;
case 1:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_red);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_red);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_red);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_red);
break;
case 2:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_grey);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_grey);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_grey);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_grey);
break;
}
}
private void giveHaz(World world, EntityPlayer p, int tier) {
for(int i = 0; i < 4; i++) {
if(p.inventory.armorInventory[i] != null && !world.isRemote) {
world.spawnEntityInWorld(new EntityItem(world, p.posX, p.posY + p.eyeHeight, p.posZ, p.inventory.armorInventory[i]));
}
}
switch(tier) {
case 0:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots);
break;
case 1:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_red);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_red);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_red);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_red);
break;
case 2:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_grey);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_grey);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_grey);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_grey);
break;
}
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
@ -200,7 +199,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, FluidTypeTheOldOne.COOLANT.getID()));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, Fluids.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 +248,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, FluidTypeTheOldOne.WATER.getID()));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidTypeTheOldOne.COOLANT.getID()));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 16, Fluids.WATER.getID()));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, Fluids.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));

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

@ -4,11 +4,10 @@ import java.util.List;
import java.util.Random;
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.FluidTypeTheOldOne;
import com.hbm.interfaces.IPartiallyFillable;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.weapon.ItemGunBase;
import com.hbm.lib.ModDamageSource;
@ -285,7 +284,7 @@ public class ItemSyringe extends Item {
IPartiallyFillable fillable = (IPartiallyFillable) jetpack.getItem();
if(fillable.getType(jetpack) != FluidTypeTheOldOne.KEROSENE)
if(fillable.getType(jetpack) != Fluids.KEROSENE)
return stack;
int fill = Math.min(fillable.getFill(jetpack) + 1000, fillable.getMaxFill(jetpack));

9
src/main/java/com/hbm/items/tool/ItemWandD.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library;
import com.hbm.tileentity.conductor.TileEntityFluidDuct;
import api.hbm.energy.IEnergyConductor;
import net.minecraft.block.Block;
@ -41,9 +42,15 @@ public class ItemWandD extends Item {
}
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof IEnergyConductor) {
/*if(te instanceof IEnergyConductor) {
IEnergyConductor con = (IEnergyConductor) te;
player.addChatComponentMessage(new ChatComponentText("" + con.getPowerNet()));
}*/
if(te instanceof TileEntityFluidDuct) {
player.addChatComponentMessage(new ChatComponentText("" + ((TileEntityFluidDuct)te).type.getUnlocalizedName()));
player.addChatComponentMessage(new ChatComponentText("" + ((TileEntityFluidDuct)te).type.getID()));
}
//CellularDungeonFactory.meteor.generate(world, x, y, z, world.rand);

2
src/main/java/com/hbm/items/weapon/ItemCrucible.java
View File

@ -93,7 +93,7 @@ public class ItemCrucible extends ItemSwordAbility implements IEquipReceiver {
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, victim.posX, victim.posY + victim.height * 0.5, victim.posZ), new TargetPoint(victim.dimension, victim.posX, victim.posY + victim.height * 0.5, victim.posZ, 50));
}
if(attacker instanceof EntityPlayer && ((EntityPlayer)attacker).getDisplayName().equals("Tankish"))
if(attacker instanceof EntityPlayer && (((EntityPlayer)attacker).getDisplayName().equals("Tankish") || ((EntityPlayer)attacker).getDisplayName().equals("Tankish020")))
return true;
return super.hitEntity(stack, victim, attacker);

2
src/main/java/com/hbm/items/weapon/ItemGunShotty.java
View File

@ -16,7 +16,7 @@ public class ItemGunShotty extends ItemGunBase {
protected void updateServer(ItemStack stack, World world, EntityPlayer player, int slot, boolean isCurrentItem) {
super.updateServer(stack, world, player, slot, isCurrentItem);
if((player.getUniqueID().toString().equals(Library.Dr_Nostalgia) || player.getUniqueID().toString().equals(Library.Tankish)) &&
if((player.getUniqueID().toString().equals(Library.Dr_Nostalgia) || player.getDisplayName().equals("Tankish") || player.getDisplayName().equals("Tankish020")) &&
this.getDelay(stack) < this.mainConfig.rateOfFire * 0.9)
this.setDelay(stack, 0);
}

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

@ -10,7 +10,6 @@ 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.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidDuct;
import com.hbm.interfaces.IFluidSource;

2
src/main/java/com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.27 BETA (4109)";
public static final String VERSION = "1.0.27 BETA (4116)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

2
src/main/java/com/hbm/main/ClientProxy.java
View File

@ -346,7 +346,7 @@ public class ClientProxy extends ServerProxy {
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_gold, new ItemRenderWeaponFFColt(ResourceManager.ff_gold, ResourceManager.ff_gold, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_lead, new ItemRenderWeaponFFColt(ResourceManager.ff_lead, ResourceManager.ff_iron, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_schrabidium, new ItemRenderWeaponFFColt(ResourceManager.ff_schrabidium, ResourceManager.ff_schrabidium, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_cursed, new ItemRenderRevolverCursed());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_cursed, new ItemRenderWeaponFFCursed());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare, new ItemRenderWeaponFFNightmare());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare2));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman, new ItemRenderFatMan());

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

@ -7,8 +7,8 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.config.GeneralConfig;
import com.hbm.crafting.*;
import com.hbm.crafting.handlers.*;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.OreDictManager;
import com.hbm.inventory.fluid.Fluids;
import static com.hbm.inventory.OreDictManager.*;
import com.hbm.items.ModItems;
@ -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, FluidTypeTheOldOne.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, Fluids.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 });
@ -455,8 +455,9 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModBlocks.det_miner, 3), new Object[] { "FFF", "ITI", "ITI", 'F', Items.flint, 'I', IRON.plate(), 'T', Blocks.tnt });
addRecipeAuto(new ItemStack(ModBlocks.det_miner, 4), new Object[] { "FFF", "ITI", "ITI", 'F', Items.flint, 'I', IRON.plate(), 'T', ModItems.ball_dynamite });
addRecipeAuto(new ItemStack(ModBlocks.det_miner, 12), new Object[] { "FFF", "ITI", "ITI", 'F', Items.flint, 'I', STEEL.plate(), 'T', ModItems.ingot_semtex });
addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.emp_bomb), 1), new Object[] { "LML", "LCL", "LML", 'L', PB.plate(), 'M', ModItems.magnetron, 'C', ModItems.circuit_gold });
addRecipeAuto(new ItemStack(ModBlocks.emp_bomb, 1), new Object[] { "LML", "LCL", "LML", 'L', PB.plate(), 'M', ModItems.magnetron, 'C', ModItems.circuit_gold });
addShapelessAuto(new ItemStack(ModBlocks.charge_dynamite, 1), new Object[] { ModItems.stick_dynamite, ModItems.stick_dynamite, ModItems.stick_dynamite, ModItems.ducttape });
addRecipeAuto(new ItemStack(ModBlocks.charge_miner, 1), new Object[] { " F ", "FCF", " F ", 'F', Items.flint, 'C', ModBlocks.charge_dynamite });
addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_generic), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', AL.plate(), 'R', REDSTONE.dust() });
addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', CU.plate(), 'S', "sulfur", 'L', PB.dust() });
@ -505,8 +506,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, 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(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, Fluids.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, Fluids.WATER.getID()), 'I', POLYMER.ingot() });
addRecipeAuto(new ItemStack(ModItems.battery_sc_uranium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', U238.billet(), 'P', PB.plate(), 'C', ModItems.thermo_element });
addRecipeAuto(new ItemStack(ModItems.battery_sc_technetium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', TC99.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_uranium });
@ -571,7 +572,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, FluidTypeTheOldOne.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, Fluids.LAVA.getID()), 'S', ModItems.black_hole });
addRecipeAuto(new ItemStack(ModItems.ams_core_thingy), new Object[] { "NSN", "NGN", "G G", 'N', GOLD.nugget(), 'G', GOLD.ingot(), 'S', ModItems.battery_spark_cell_10000 });
addRecipeAuto(new ItemStack(ModItems.photo_panel), new Object[] { " G ", "IPI", " C ", 'G', KEY_ANYPANE, 'I', ModItems.plate_polymer, 'P', NETHERQUARTZ.dust(), 'C', ModItems.circuit_aluminium });
addRecipeAuto(new ItemStack(ModBlocks.machine_satlinker), new Object[] { "PSP", "SCS", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'C', ModItems.sat_chip });
@ -640,8 +641,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 < FluidTypeTheOldOne.values().length; ++i)
{
for(int i = 1; i < Fluids.getAll().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) });
addShapelessAuto(new ItemStack(ModItems.fluid_duct, 8, i), new Object[] { new ItemStack(ModBlocks.fluid_duct, 8), new ItemStack(ModBlocks.fluid_duct, 8),
@ -653,8 +653,8 @@ public class CraftingManager {
addShapelessAuto(new ItemStack(ModItems.fluid_duct, 8, i), new Object[] { new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE),
new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE),
new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_duct, 8, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.fluid_identifier, 1, i) });
}
}
addShapelessAuto(new ItemStack(ModBlocks.fluid_duct, 1), new Object[] { new ItemStack(ModItems.fluid_duct, 1, OreDictionary.WILDCARD_VALUE) });
addShapelessAuto(new ItemStack(ModItems.redstone_depleted, 1), new Object[] { new ItemStack(ModItems.battery_su, 1, OreDictionary.WILDCARD_VALUE) });
@ -732,7 +732,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModItems.upgrade_smelter, 1), new Object[] { "PHP", "CUC", "DTD", 'P', CU.plate(), 'H', Blocks.hopper, 'C', ModItems.coil_tungsten, 'U', ModItems.upgrade_template, 'D', ModItems.coil_copper, 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', TI.plate(), 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', POLYMER.ingot(), 'T', ModBlocks.machine_transformer });
addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, 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_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, Fluids.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});

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

@ -62,7 +62,6 @@ 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.FluidTypeTheOldOne;
import com.hbm.handler.imc.IMCCentrifuge;
import com.hbm.handler.imc.IMCCrystallizer;
import com.hbm.handler.imc.IMCHandler;
@ -786,7 +785,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, FluidTypeTheOldOne.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, Fluids.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();

11
src/main/java/com/hbm/main/ModEventHandler.java
View File

@ -529,16 +529,19 @@ public class ModEventHandler {
return;
if(event.phase == Phase.START && event.side == Side.CLIENT) {
if(BlockAshes.ashes > 256)
BlockAshes.ashes = 256;
if(BlockAshes.ashes > 0)
BlockAshes.ashes -= 2;
if(BlockAshes.ashes > 256) BlockAshes.ashes = 256;
if(BlockAshes.ashes > 0) BlockAshes.ashes -= 2;
if(BlockAshes.ashes < 0) BlockAshes.ashes = 0;
if(mc.theWorld.getTotalWorldTime() % 20 == 0) {
this.lastBrightness = this.currentBrightness;
currentBrightness = mc.theWorld.getLightBrightnessForSkyBlocks(MathHelper.floor_double(mc.thePlayer.posX), MathHelper.floor_double(mc.thePlayer.posY), MathHelper.floor_double(mc.thePlayer.posZ), 0);
}
if(ArmorUtil.isWearingEmptyMask(mc.thePlayer)) {
MainRegistry.proxy.displayTooltip(EnumChatFormatting.RED + "Your mask has no filter!");
}
}
}

9
src/main/java/com/hbm/main/NEIConfig.java
View File

@ -1,6 +1,7 @@
package com.hbm.main;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.VersatileConfig;
import com.hbm.handler.nei.*;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemBattery;
@ -56,6 +57,14 @@ public class NEIConfig implements IConfigureNEI {
API.registerUsageHandler(new AnvilRecipeHandler());
API.registerRecipeHandler(new FuelPoolHandler());
API.registerUsageHandler(new FuelPoolHandler());
//universal boyes
API.registerRecipeHandler(new ZirnoxRecipeHandler());
API.registerUsageHandler(new ZirnoxRecipeHandler());
if(VersatileConfig.rtgDecay()) {
API.registerRecipeHandler(new RTGRecipeHandler());
API.registerUsageHandler(new RTGRecipeHandler());
}
//Some things are even beyond my control...or are they?
API.hideItem(ItemBattery.getEmptyBattery(ModItems.memory));

2
src/main/java/com/hbm/main/ResourceManager.java
View File

@ -602,6 +602,7 @@ public class ResourceManager {
public static final IModelCustom ar15 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/ar15.obj"));
public static final IModelCustom mg42 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/mg42.obj"));
public static final IModelCustom rem700 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/rem700.obj"));
public static final IModelCustom cursed_revolver = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/cursed.obj"));
public static final IModelCustom lance = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lance.obj"));
@ -680,6 +681,7 @@ public class ResourceManager {
public static final ResourceLocation ff_schrabidium = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/schrabidium.png");
public static final ResourceLocation ff_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood.png");
public static final ResourceLocation ff_wood_red = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood_red.png");
public static final ResourceLocation ff_cursed = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/cursed.png");
public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");

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

@ -2,8 +2,8 @@ package com.hbm.packet;
import com.hbm.config.MobConfig;
import com.hbm.entity.mob.EntityDuck;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.weapon.ItemMissile.PartSize;
import com.hbm.tileentity.TileEntityMachineBase;
import com.hbm.tileentity.TileEntityTickingBase;
@ -105,13 +105,13 @@ public class AuxButtonPacket implements IMessage {
reactor.rods = m.value;
if(m.id == 1) {
FluidType type = FluidTypeTheOldOne.STEAM;
FluidType type = Fluids.STEAM;
int fill = reactor.tanks[2].getFill();
switch(m.value) {
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;
case 0: type = Fluids.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
case 1: type = Fluids.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
case 2: type = Fluids.STEAM; fill = (int)Math.floor(fill * 100); break;
}
if(fill > reactor.tanks[2].getMaxFill())

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

@ -1,8 +1,8 @@
package com.hbm.packet;
import java.util.Arrays;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@ -29,7 +29,7 @@ public class TEFluidPacket implements IMessage {
this.z = z;
this.fill = fill;
this.index = index;
this.type = Arrays.asList(FluidType.values()).indexOf(type);
this.type = type.getID();
}
@Override
@ -63,7 +63,7 @@ public class TEFluidPacket implements IMessage {
IFluidContainer gen = (IFluidContainer) te;
gen.setFillstate(m.fill, m.index);
gen.setType(FluidType.getEnum(m.type), m.index);
gen.setType(Fluids.fromID(m.type), m.index);
}
} catch(Exception x) { }
return null;

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

@ -1,6 +1,7 @@
package com.hbm.packet;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.tileentity.conductor.TileEntityFluidDuct;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
@ -35,7 +36,7 @@ public class TEFluidPipePacket implements IMessage {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
type = FluidType.getEnum(buf.readInt());
type = Fluids.fromID(buf.readInt());
}
@Override
@ -43,13 +44,7 @@ public class TEFluidPipePacket implements IMessage {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
for (int i = 0; i < FluidType.values().length; ++i)
{
if(FluidType.values()[i] == type) {
buf.writeInt(i);
break;
}
}
buf.writeInt(type.getID());
}
public static class Handler implements IMessageHandler<TEFluidPipePacket, IMessage> {

91
src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFCursed.java Normal file
View File

@ -0,0 +1,91 @@
package com.hbm.render.item.weapon;
import org.lwjgl.opengl.GL11;
import com.hbm.main.ResourceManager;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
public class ItemRenderWeaponFFCursed implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
case ENTITY:
case INVENTORY:
return true;
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_CULL_FACE);
switch(type) {
case EQUIPPED_FIRST_PERSON:
double s0 = 0.25D;
GL11.glTranslated(0.75, 0.25, 0);
GL11.glScaled(s0, s0, s0);
GL11.glRotated(170, 0, 1, 0);
GL11.glRotated(25, 0, 0, -1);
break;
case EQUIPPED:
double scale = 0.25D;
GL11.glRotated(105, 0, 1, 0);
GL11.glRotated(-10, 1, 0, 0);
GL11.glRotated(10, 0, 0, 1);
GL11.glTranslated(0.2, 0.05, 0.45);
GL11.glScaled(scale, scale, scale);
break;
case ENTITY:
double s1 = 0.125D;
GL11.glScaled(s1, s1, s1);
GL11.glTranslated(1, 0, 0);
break;
case INVENTORY:
GL11.glEnable(GL11.GL_LIGHTING);
double s = 2.75D;
GL11.glTranslated(10, 11.5, 0);
GL11.glRotated(-135, 0, 0, 1);
GL11.glRotated(180, 0, 1, 0);
GL11.glScaled(s, s, -s);
break;
default: break;
}
GL11.glShadeModel(GL11.GL_SMOOTH);
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_cursed);
ResourceManager.cursed_revolver.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glPopMatrix();
}
}

223
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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HmfController;
import com.hbm.tileentity.machine.TileEntityMachineChemplant;
@ -11,160 +11,165 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
public class RenderChemplant extends TileEntitySpecialRenderer {
public RenderChemplant() { }
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
public RenderChemplant() {
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) {
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
switch(tileEntity.getBlockMetadata())
{
switch(tileEntity.getBlockMetadata()) {
case 2:
GL11.glRotatef(180, 0F, 1F, 0F);
GL11.glTranslated(0.5D, 0.0D, -0.5D); break;
GL11.glTranslated(0.5D, 0.0D, -0.5D);
break;
case 4:
GL11.glRotatef(270, 0F, 1F, 0F);
GL11.glTranslated(0.5D, 0.0D, -0.5D); break;
GL11.glTranslated(0.5D, 0.0D, -0.5D);
break;
case 3:
GL11.glRotatef(0, 0F, 1F, 0F);
GL11.glTranslated(0.5D, 0.0D, -0.5D); break;
GL11.glTranslated(0.5D, 0.0D, -0.5D);
break;
case 5:
GL11.glRotatef(90, 0F, 1F, 0F);
GL11.glTranslated(0.5D, 0.0D, -0.5D); break;
GL11.glTranslated(0.5D, 0.0D, -0.5D);
break;
}
bindTexture(ResourceManager.chemplant_body_tex);
ResourceManager.chemplant_body.renderAll();
bindTexture(ResourceManager.chemplant_body_tex);
ResourceManager.chemplant_body.renderAll();
GL11.glPopMatrix();
renderExtras(tileEntity, x, y, z, f);
}
GL11.glPopMatrix();
renderExtras(tileEntity, x, y, z, f);
}
public void renderExtras(TileEntity tileEntity, double x, double y, double z, float f) {
GL11.glPushMatrix();
GL11.glTranslated(x, y, z);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glPushMatrix();
GL11.glTranslated(x, y, z);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
TileEntityMachineChemplant chem = (TileEntityMachineChemplant)tileEntity;
switch(chem.getBlockMetadata())
{
TileEntityMachineChemplant chem = (TileEntityMachineChemplant) tileEntity;
switch(chem.getBlockMetadata()) {
case 2:
GL11.glTranslated(-1, 0, 0);
GL11.glRotatef(180, 0F, 1F, 0F); break;
GL11.glRotatef(180, 0F, 1F, 0F);
break;
case 4:
GL11.glRotatef(270, 0F, 1F, 0F); break;
GL11.glRotatef(270, 0F, 1F, 0F);
break;
case 3:
GL11.glTranslated(0, 0, -1);
GL11.glRotatef(0, 0F, 1F, 0F); break;
GL11.glRotatef(0, 0F, 1F, 0F);
break;
case 5:
GL11.glTranslated(-1, 0, -1);
GL11.glRotatef(90, 0F, 1F, 0F); break;
GL11.glRotatef(90, 0F, 1F, 0F);
break;
}
bindTexture(ResourceManager.chemplant_spinner_tex);
bindTexture(ResourceManager.chemplant_spinner_tex);
int rotation = (int) (System.currentTimeMillis() % (360 * 5)) / 5;
int rotation = (int) (System.currentTimeMillis() % (360 * 5)) / 5;
GL11.glPushMatrix();
GL11.glPushMatrix();
GL11.glTranslated(-0.625, 0, 0.625);
if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing)
if(chem.tanks[0].getTankType() != Fluids.NONE && chem.isProgressing)
GL11.glRotatef(-rotation, 0F, 1F, 0F);
else
GL11.glRotatef(-45, 0F, 1F, 0F);
ResourceManager.chemplant_spinner.renderAll();
GL11.glPopMatrix();
GL11.glPushMatrix();
GL11.glPopMatrix();
GL11.glPushMatrix();
GL11.glTranslated(0.625, 0, 0.625);
if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing)
if(chem.tanks[1].getTankType() != Fluids.NONE && chem.isProgressing)
GL11.glRotatef(rotation, 0F, 1F, 0F);
else
GL11.glRotatef(45, 0F, 1F, 0F);
ResourceManager.chemplant_spinner.renderAll();
GL11.glPopMatrix();
GL11.glPopMatrix();
double push = Math.sin((System.currentTimeMillis() % 2000) / 1000D * Math.PI) * 0.25 - 0.25;
double push = Math.sin((System.currentTimeMillis() % 2000) / 1000D * Math.PI) * 0.25 - 0.25;
bindTexture(ResourceManager.chemplant_piston_tex);
GL11.glPushMatrix();
if(chem.isProgressing)
GL11.glTranslated(0, push, 0);
bindTexture(ResourceManager.chemplant_piston_tex);
GL11.glPushMatrix();
if(chem.isProgressing)
GL11.glTranslated(0, push, 0);
else
GL11.glTranslated(0, -0.25, 0);
ResourceManager.chemplant_piston.renderAll();
GL11.glPopMatrix();
GL11.glTranslated(0, -0.25, 0);
bindTexture(ResourceManager.chemplant_fluid_tex);
int color = 0;
ResourceManager.chemplant_piston.renderAll();
GL11.glPopMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
GL11.glPushMatrix();
if(chem.isProgressing)
HmfController.setMod(50000D, -250D);
else
HmfController.setMod(50000D, -50000D);
color = chem.tanks[0].getTankType().getColor();
GL11.glColor3ub((byte)((color & 0xFF0000) >> 16), (byte)((color & 0x00FF00) >> 8), (byte)((color & 0x0000FF) >> 0));
bindTexture(ResourceManager.chemplant_fluid_tex);
int color = 0;
GL11.glDisable(GL11.GL_LIGHTING);
if(chem.tanks[0].getTankType() != Fluids.NONE) {
GL11.glPushMatrix();
if(chem.isProgressing)
HmfController.setMod(50000D, -250D);
else
HmfController.setMod(50000D, -50000D);
color = chem.tanks[0].getTankType().getColor();
GL11.glColor3ub((byte) ((color & 0xFF0000) >> 16), (byte) ((color & 0x00FF00) >> 8), (byte) ((color & 0x0000FF) >> 0));
GL11.glTranslated(-0.625, 0, 0.625);
int count = chem.tanks[0].getFill() * 16 / 24000;
for(int i = 0; i < count; i++) {
if(i < count - 1)
ResourceManager.chemplant_fluid.renderAll();
else
ResourceManager.chemplant_fluidcap.renderAll();
GL11.glTranslated(0, 0.125, 0);
}
GL11.glPopMatrix();
}
if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
GL11.glPushMatrix();
if(chem.isProgressing)
HmfController.setMod(50000D, 250D);
else
HmfController.setMod(50000D, 50000D);
color = chem.tanks[1].getTankType().getColor();
GL11.glColor3ub((byte)((color & 0xFF0000) >> 16), (byte)((color & 0x00FF00) >> 8), (byte)((color & 0x0000FF) >> 0));
int count = chem.tanks[0].getFill() * 16 / 24000;
for(int i = 0; i < count; i++) {
if(i < count - 1)
ResourceManager.chemplant_fluid.renderAll();
else
ResourceManager.chemplant_fluidcap.renderAll();
GL11.glTranslated(0, 0.125, 0);
}
GL11.glPopMatrix();
}
if(chem.tanks[1].getTankType() != Fluids.NONE) {
GL11.glPushMatrix();
if(chem.isProgressing)
HmfController.setMod(50000D, 250D);
else
HmfController.setMod(50000D, 50000D);
color = chem.tanks[1].getTankType().getColor();
GL11.glColor3ub((byte) ((color & 0xFF0000) >> 16), (byte) ((color & 0x00FF00) >> 8), (byte) ((color & 0x0000FF) >> 0));
GL11.glTranslated(0.625, 0, 0.625);
int count = chem.tanks[1].getFill() * 16 / 24000;
for(int i = 0; i < count; i++) {
if(i < count - 1)
ResourceManager.chemplant_fluid.renderAll();
else
ResourceManager.chemplant_fluidcap.renderAll();
GL11.glTranslated(0, 0.125, 0);
}
GL11.glPopMatrix();
}
GL11.glEnable(GL11.GL_LIGHTING);
HmfController.resetMod();
for(int i = 0; i < count; i++) {
GL11.glPopMatrix();
if(i < count - 1)
ResourceManager.chemplant_fluid.renderAll();
else
ResourceManager.chemplant_fluidcap.renderAll();
GL11.glTranslated(0, 0.125, 0);
}
GL11.glPopMatrix();
}
GL11.glEnable(GL11.GL_LIGHTING);
HmfController.resetMod();
GL11.glPopMatrix();
}
}

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

@ -2,7 +2,6 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.turret.TileEntityTurretBrandon;

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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.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/RenderTurretFriendly.java
View File

@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.NONE);
this.renderConnectors(turret, true, false, Fluids.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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.NONE);
this.renderConnectors(turret, true, false, Fluids.NONE);
bindTexture(ResourceManager.turret_base_tex);
ResourceManager.turret_chekhov.renderPart("Base");

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

@ -2,7 +2,6 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
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.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.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/RenderTurretMaxwell.java
View File

@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.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/RenderTurretRichard.java
View File

@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.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/RenderTurretTauon.java
View File

@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.fluid.Fluids;
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, FluidTypeTheOldOne.NONE);
this.renderConnectors(turret, true, false, Fluids.NONE);
bindTexture(ResourceManager.turret_base_tex);
ResourceManager.turret_chekhov.renderPart("Base");

3
src/main/java/com/hbm/tileentity/IRTGUser.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import com.google.common.annotations.Beta;
import com.hbm.config.MachineConfig;
import com.hbm.config.VersatileConfig;
import com.hbm.interfaces.Untested;
import net.minecraft.item.Item;
@ -28,7 +29,7 @@ public interface IRTGUser
public static short getPower(IRadioisotopeFuel fuel, ItemStack stack)
{
return MachineConfig.scaleRTGPower ? IRadioisotopeFuel.getScaledPower(fuel, stack) : fuel.getHeat();
return VersatileConfig.scaleRTGPower() ? IRadioisotopeFuel.getScaledPower(fuel, stack) : fuel.getHeat();
}
/**

5
src/main/java/com/hbm/tileentity/IRadioisotopeFuel.java
View File

@ -6,6 +6,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import com.hbm.config.MachineConfig;
import com.hbm.config.VersatileConfig;
import com.hbm.interfaces.ICustomWarhead.SaltedFuel.HalfLifeType;
import com.hbm.lib.Library;
import com.hbm.util.BobMathUtil;
@ -90,7 +91,7 @@ public interface IRadioisotopeFuel
*/
public static ItemStack handleDecay(ItemStack stack, IRadioisotopeFuel instance)
{
if (instance.getDoesDecay() && MachineConfig.doRTGsDecay)
if (instance.getDoesDecay() && VersatileConfig.rtgDecay())
{
if (instance.getLifespan(stack) <= 0)
return instance.getDecayItem();
@ -132,7 +133,7 @@ public interface IRadioisotopeFuel
public static void addTooltip(List<String> tooltip, ItemStack stack, boolean showAdv)
{
final IRadioisotopeFuel instance = (IRadioisotopeFuel) stack.getItem();
tooltip.add(I18nUtil.resolveKey("desc.item.rtgHeat", instance.getDoesDecay() && MachineConfig.scaleRTGPower ? getScaledPower(instance, stack) : instance.getHeat()));
tooltip.add(I18nUtil.resolveKey("desc.item.rtgHeat", instance.getDoesDecay() && VersatileConfig.scaleRTGPower() ? getScaledPower(instance, stack) : instance.getHeat()));
if (instance.getDoesDecay())
{
tooltip.add(I18nUtil.resolveKey("desc.item.rtgDecay", I18nUtil.resolveKey(instance.getDecayItem().getUnlocalizedName() + ".name"), instance.getDecayItem().stackSize));

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

@ -58,19 +58,17 @@ public class TileEntityFluidDuct extends TileEntity implements IFluidDuct {
else connections[5] = null;
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
type = FluidType.getEnum(nbt.getInteger("fluid"));
}
type = Fluids.fromID(nbt.getInteger("fluid"));
}
@Override
public void writeToNBT(NBTTagCompound nbt)
{
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger("fluid", Arrays.asList(FluidType.values()).indexOf(type));
}
nbt.setInteger("fluid", type.getID());
}
@Override
@SideOnly(Side.CLIENT)

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

@ -4,15 +4,15 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidDuct;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import net.minecraft.tileentity.TileEntity;
public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct {
public FluidType type = FluidTypeTheOldOne.GAS;
public FluidType type = Fluids.GAS;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
@Override

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

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidDuct;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.Library;
import cpw.mods.fml.relauncher.Side;
@ -18,7 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
public ForgeDirection[] connections = new ForgeDirection[6];
public FluidType type = FluidTypeTheOldOne.OIL;
public FluidType type = Fluids.OIL;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
public TileEntityOilDuct() {
@ -58,7 +58,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbt);
type = FluidTypeTheOldOne.OIL;
type = Fluids.OIL;
}
@Override

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

@ -4,15 +4,15 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidDuct;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import net.minecraft.tileentity.TileEntity;
public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct {
public FluidType type = FluidTypeTheOldOne.OIL;
public FluidType type = Fluids.OIL;
public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
@Override

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

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
@ -62,10 +61,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
public TileEntityAMSBase() {
slots = new ItemStack[16];
tanks = new FluidTank[4];
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);
tanks[0] = new FluidTank(Fluids.COOLANT, 8000, 0);
tanks[1] = new FluidTank(Fluids.CRYOGEL, 8000, 1);
tanks[2] = new FluidTank(Fluids.DEUTERIUM, 8000, 2);
tanks[3] = new FluidTank(Fluids.TRITIUM, 8000, 3);
}
@Override
@ -393,10 +392,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
private int getCoolingStrength(FluidType type) {
if(type == FluidTypeTheOldOne.WATER) return 5;
if(type == FluidTypeTheOldOne.OIL) return 15;
if(type == FluidTypeTheOldOne.COOLANT) return this.heat / 250;
if(type == FluidTypeTheOldOne.CRYOGEL) return this.heat > heat/2 ? 25 : 5;
if(type == Fluids.WATER) return 5;
if(type == Fluids.OIL) return 15;
if(type == Fluids.COOLANT) return this.heat / 250;
if(type == Fluids.CRYOGEL) return this.heat > heat/2 ? 25 : 5;
return 0;
}

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

@ -5,11 +5,11 @@ import java.util.List;
import java.util.Random;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -52,7 +52,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
public TileEntityAMSEmitter() {
slots = new ItemStack[4];
tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 16000, 0);
tank = new FluidTank(Fluids.COOLANT, 16000, 0);
}
@Override
@ -230,7 +230,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
warning = 1;
}
if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) {
if(tank.getTankType() == Fluids.CRYOGEL) {
if(tank.getFill() >= 15) {
if(heat > 0)
@ -250,7 +250,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
} else {
heat += efficiency;
}
} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) {
} else if(tank.getTankType() == Fluids.COOLANT) {
if(tank.getFill() >= 15) {
if(heat > 0)
@ -270,7 +270,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
} else {
heat += efficiency;
}
} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) {
} else if(tank.getTankType() == Fluids.WATER) {
if(tank.getFill() >= 45) {
if(heat > 0)
@ -331,7 +331,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
warning = 3;
}
tank.setTankType(FluidTypeTheOldOne.CRYOGEL);
tank.setTankType(Fluids.CRYOGEL);
tank.setFill(tank.getMaxFill());
PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50));

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

@ -6,11 +6,11 @@ import java.util.Random;
import com.hbm.entity.particle.EntityGasFlameFX;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -54,7 +54,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
public TileEntityAMSLimiter() {
slots = new ItemStack[4];
tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 8000, 0);
tank = new FluidTank(Fluids.COOLANT, 8000, 0);
}
@Override
@ -232,7 +232,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
warning = 1;
}
if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) {
if(tank.getTankType() == Fluids.CRYOGEL) {
if(tank.getFill() >= 5) {
if(heat > 0)
@ -252,7 +252,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
} else {
heat += efficiency;
}
} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) {
} else if(tank.getTankType() == Fluids.COOLANT) {
if(tank.getFill() >= 5) {
if(heat > 0)
@ -272,7 +272,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
} else {
heat += efficiency;
}
} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) {
} else if(tank.getTankType() == Fluids.WATER) {
if(tank.getFill() >= 15) {
if(heat > 0)
@ -345,7 +345,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
warning = 3;
}
tank.setTankType(FluidTypeTheOldOne.CRYOGEL);
tank.setTankType(Fluids.CRYOGEL);
tank.setFill(tank.getMaxFill());
PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50));

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

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
@ -30,12 +29,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
public TileEntityBarrel() {
super(6);
tank = new FluidTank(FluidTypeTheOldOne.NONE, 0, 0);
tank = new FluidTank(Fluids.NONE, 0, 0);
}
public TileEntityBarrel(int capacity) {
super(6);
tank = new FluidTank(FluidTypeTheOldOne.NONE, capacity, 0);
tank = new FluidTank(Fluids.NONE, capacity, 0);
}
@Override

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

@ -51,6 +51,13 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType());
//some funky crashfixing for unlikely cases
if(outs == null) {
tanks[0].setTankType(Fluids.STEAM);
tanks[1].setTankType(Fluids.SPENTSTEAM);
outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType());
}
tanks[1].setTankType((FluidType) outs[0]);
int processMax = (int) Math.ceil(tanks[0].getFill() / (Integer)outs[2]); //the maximum amount of cycles total

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

@ -3,16 +3,14 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.Library;
import com.hbm.main.ModEventHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.EnumSkyBlock;
@ -28,8 +26,8 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
public TileEntityCondenser() {
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 100, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.WATER, 100, 1);
tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 100, 0);
tanks[1] = new FluidTank(Fluids.WATER, 100, 1);
}
@Override

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

@ -4,7 +4,6 @@ import java.util.List;
import com.hbm.entity.effect.EntityCloudFleijaRainbow;
import com.hbm.entity.logic.EntityNukeExplosionMK3;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
@ -32,8 +31,8 @@ public class TileEntityCore extends TileEntityMachineBase {
public TileEntityCore() {
super(3);
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1);
tanks[0] = new FluidTank(Fluids.DEUTERIUM, 128000, 0);
tanks[1] = new FluidTank(Fluids.TRITIUM, 128000, 1);
}
@Override
@ -99,8 +98,8 @@ public class TileEntityCore extends TileEntityMachineBase {
public void networkUnpack(NBTTagCompound data) {
tanks[0].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank0")));
tanks[1].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank1")));
tanks[0].setTankType(Fluids.fromID(data.getInteger("tank0")));
tanks[1].setTankType(Fluids.fromID(data.getInteger("tank1")));
tanks[0].setFill(data.getInteger("fill0"));
tanks[1].setFill(data.getInteger("fill1"));
field = data.getInteger("field");

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

@ -3,10 +3,10 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.ModDamageSource;
import com.hbm.tileentity.TileEntityMachineBase;
@ -39,7 +39,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
public TileEntityCoreEmitter() {
super(0);
tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0);
tank = new FluidTank(Fluids.CRYOGEL, 64000, 0);
}
@Override

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

@ -3,10 +3,10 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.tileentity.TileEntityMachineBase;
import cpw.mods.fml.relauncher.Side;
@ -26,8 +26,8 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
public TileEntityCoreInjector() {
super(4);
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1);
tanks[0] = new FluidTank(Fluids.DEUTERIUM, 128000, 0);
tanks[1] = new FluidTank(Fluids.TRITIUM, 128000, 1);
}
@Override

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

@ -3,11 +3,10 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.lib.Library;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.tileentity.TileEntityMachineBase;
import api.hbm.block.ILaserable;
@ -29,7 +28,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
public TileEntityCoreReceiver() {
super(0);
tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0);
tank = new FluidTank(Fluids.CRYOGEL, 64000, 0);
}
@Override

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

@ -3,11 +3,11 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
import com.hbm.packet.PacketDispatcher;
@ -29,8 +29,8 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
public TileEntityDeuteriumExtractor() {
super(0);
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 1000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 100, 0);
tanks[0] = new FluidTank(Fluids.WATER, 1000, 0);
tanks[1] = new FluidTank(Fluids.HEAVYWATER, 100, 0);
}
@Override

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

@ -1,8 +1,9 @@
package com.hbm.tileentity.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -15,11 +16,11 @@ public class TileEntityDeuteriumTower extends TileEntityDeuteriumExtractor {
public TileEntityDeuteriumTower() {
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 50000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 5000, 0);
tanks[0] = new FluidTank(Fluids.WATER, 50000, 0);
tanks[1] = new FluidTank(Fluids.HEAVYWATER, 5000, 0);
}
public void fillFluidInit(FluidTypeTheOldOne type) {
public void fillFluidInit(FluidType type) {
int offsetX = 0;
int offsetZ = 0;

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

@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IReactor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -44,9 +44,9 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
public TileEntityFWatzCore() {
slots = new ItemStack[7];
tanks = new FluidTank[3];
tanks[0] = new FluidTank(FluidTypeTheOldOne.COOLANT, 128000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.AMAT, 64000, 1);
tanks[2] = new FluidTank(FluidTypeTheOldOne.ASCHRAB, 64000, 2);
tanks[0] = new FluidTank(Fluids.COOLANT, 128000, 0);
tanks[1] = new FluidTank(Fluids.AMAT, 64000, 1);
tanks[2] = new FluidTank(Fluids.ASCHRAB, 64000, 2);
}
@Override
public int getSizeInventory() {

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

@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IReactor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -38,9 +38,9 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve
public TileEntityFusionMultiblock() {
slots = new ItemStack[12];
tanks = new FluidTank[3];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 128000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 64000, 1);
tanks[2] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 64000, 2);
tanks[0] = new FluidTank(Fluids.WATER, 128000, 0);
tanks[1] = new FluidTank(Fluids.DEUTERIUM, 64000, 1);
tanks[2] = new FluidTank(Fluids.TRITIUM, 64000, 2);
}
@Override
public int getSizeInventory() {

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

@ -5,11 +5,11 @@ import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.MachineITER;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.BreederRecipes;
import com.hbm.inventory.recipes.FusionRecipes;
import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe;
@ -52,9 +52,9 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
public TileEntityITER() {
super(5);
tanks = new FluidTank[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);
tanks[0] = new FluidTank(Fluids.WATER, 1280000, 0);
tanks[1] = new FluidTank(Fluids.ULTRAHOTSTEAM, 128000, 1);
plasma = new FluidTank(Fluids.PLASMA_DT, 16000, 2);
}
@Override

18
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java
View File

@ -1,8 +1,5 @@
package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.machine.MachineBattery;
import com.hbm.lib.Library;
import com.hbm.tileentity.TileEntityMachineBase;
@ -73,9 +70,6 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I
switch(i) {
case 0:
if(stack.getItem() instanceof IBatteryItem)
return true;
break;
case 1:
if(stack.getItem() instanceof IBatteryItem)
return true;
@ -162,15 +156,17 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I
this.maxPower = ((MachineBattery)worldObj.getBlock(xCoord, yCoord, zCoord)).maxPower;
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
power = Library.chargeItemsFromTE(slots, 1, power, maxPower);
long prevPower = this.power;
//////////////////////////////////////////////////////////////////////
this.transmitPower();
//////////////////////////////////////////////////////////////////////
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
power = Library.chargeItemsFromTE(slots, 1, power, maxPower);
NBTTagCompound nbt = new NBTTagCompound();
nbt.setLong("power", power);
nbt.setLong("power", (power + prevPower) / 2);
nbt.setLong("maxPower", maxPower);
nbt.setShort("redLow", redLow);
nbt.setShort("redHigh", redHigh);
@ -218,7 +214,7 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I
IEnergyConductor con = (IEnergyConductor) te;
if(con.getPowerNet() != null) {
if(mode == 1 || mode == 2) {
if(mode == 2 || mode == 3) {
if(con.getPowerNet().isSubscribed(this)) {
con.getPowerNet().unsubscribe(this);
}

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

@ -5,20 +5,18 @@ import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.MachineBoiler;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.MachineRecipes;
import com.hbm.lib.Library;
import com.hbm.packet.AuxGaugePacket;
import com.hbm.packet.PacketDispatcher;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@ -26,7 +24,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.AxisAlignedBB;
public class TileEntityMachineBoiler extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource {
@ -48,8 +45,8 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
public TileEntityMachineBoiler() {
slots = new ItemStack[7];
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 8000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 8000, 1);
tanks[0] = new FluidTank(Fluids.WATER, 8000, 0);
tanks[1] = new FluidTank(Fluids.STEAM, 8000, 1);
}
@Override
@ -236,9 +233,9 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType());
if(outs == null) {
tanks[1].setTankType(FluidTypeTheOldOne.NONE);
tanks[1].setTankType(Fluids.NONE);
} else {
tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
tanks[1].setTankType((FluidType) outs[0]);
}
tanks[1].unloadTank(5, 6, slots);

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

@ -5,12 +5,12 @@ import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.MachineBoiler;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.MachineRecipes;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -50,8 +50,8 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
public TileEntityMachineBoilerElectric() {
slots = new ItemStack[7];
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 16000, 1);
tanks[0] = new FluidTank(Fluids.WATER, 16000, 0);
tanks[1] = new FluidTank(Fluids.STEAM, 16000, 1);
}
@Override
@ -246,9 +246,9 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType());
if(outs == null) {
tanks[1].setTankType(FluidTypeTheOldOne.NONE);
tanks[1].setTankType(Fluids.NONE);
} else {
tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
tanks[1].setTankType((FluidType) outs[0]);
}
tanks[1].unloadTank(5, 6, slots);

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

@ -3,11 +3,11 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -44,7 +44,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
public TileEntityMachineCMBFactory() {
slots = new ItemStack[6];
tank = new FluidTank(FluidTypeTheOldOne.WATZ, 8000, 0);
tank = new FluidTank(Fluids.WATZ, 8000, 0);
}
@Override

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

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
@ -12,6 +11,7 @@ import com.hbm.inventory.FluidStack;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.UpgradeManager;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.MachineRecipes;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemChemistryTemplate;
@ -63,10 +63,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
public TileEntityMachineChemplant() {
slots = new ItemStack[21];
tanks = new FluidTank[4];
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);
tanks[0] = new FluidTank(Fluids.NONE, 24000, 0);
tanks[1] = new FluidTank(Fluids.NONE, 24000, 1);
tanks[2] = new FluidTank(Fluids.NONE, 24000, 2);
tanks[3] = new FluidTank(Fluids.NONE, 24000, 3);
}
@Override
@ -541,10 +541,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
FluidStack[] inputs = MachineRecipes.getFluidInputFromTempate(slots[4]);
FluidStack[] outputs = MachineRecipes.getFluidOutputFromTempate(slots[4]);
tanks[0].setTankType(inputs[0] == null ? 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);
tanks[0].setTankType(inputs[0] == null ? Fluids.NONE : inputs[0].type);
tanks[1].setTankType(inputs[1] == null ? Fluids.NONE : inputs[1].type);
tanks[2].setTankType(outputs[0] == null ? Fluids.NONE : outputs[0].type);
tanks[3].setTankType(outputs[1] == null ? Fluids.NONE : outputs[1].type);
}
}

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

@ -14,12 +14,12 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.machine.MachineCoal;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidContainerRegistry;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket;
@ -47,7 +47,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
public TileEntityMachineCoal() {
slots = new ItemStack[4];
tank = new FluidTank(FluidTypeTheOldOne.WATER, 5000, 0);
tank = new FluidTank(Fluids.WATER, 5000, 0);
}
@Override
@ -119,7 +119,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
@Override
public boolean isItemValidForSlot(int i, ItemStack stack) {
if(i == 0)
if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0)
if(FluidContainerRegistry.getFluidContent(stack, Fluids.WATER) > 0)
return true;
if(i == 2)
if(stack.getItem() instanceof IBatteryItem)

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

@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.CrystallizerRecipes;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
@ -31,7 +31,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
public static final int demand = 1000;
public static final int acidRequired = 500;
public short progress;
public static final short duration = 600;
public short duration = 600;
public float angle;
public float prevAngle;
@ -40,7 +40,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
public TileEntityMachineCrystallizer() {
super(7);
tank = new FluidTank(FluidTypeTheOldOne.ACID, 8000, 0);
tank = new FluidTank(Fluids.ACID, 8000, 0);
}
@Override
@ -82,6 +82,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
NBTTagCompound data = new NBTTagCompound();
data.setShort("progress", progress);
data.setShort("duration", getDuration());
data.setLong("power", power);
this.networkPack(data, 25);
} else {
@ -118,6 +119,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
this.power = data.getLong("power");
this.progress = data.getShort("progress");
this.duration = data.getShort("duration");
}
private void processItem() {
@ -201,7 +203,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
return Math.min(chance, 0.15F);
}
public int getDuration() {
public short getDuration() {
float durationMod = 1;
@ -215,7 +217,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
durationMod -= 0.75F;
}
return (int) (duration * Math.max(durationMod, 0.25F));
return (short) (600 * Math.max(durationMod, 0.25F));
}
public int getPowerRequired() {

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

@ -10,11 +10,11 @@ import com.hbm.entity.logic.EntityBalefire;
import com.hbm.entity.logic.EntityNukeExplosionMK4;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.explosion.ExplosionThermo;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.CyclotronRecipes;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
@ -56,8 +56,8 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
public TileEntityMachineCyclotron() {
super(16);
coolant = new FluidTank(FluidTypeTheOldOne.COOLANT, 32000, 0);
amat = new FluidTank(FluidTypeTheOldOne.AMAT, 8000, 1);
coolant = new FluidTank(Fluids.COOLANT, 32000, 0);
amat = new FluidTank(Fluids.AMAT, 8000, 1);
}
@Override
@ -361,9 +361,9 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
@Override
public void setFluidFill(int fill, FluidType type) {
if(type == FluidTypeTheOldOne.COOLANT)
if(type == Fluids.COOLANT)
coolant.setFill(fill);
else if(type == FluidTypeTheOldOne.AMAT)
else if(type == Fluids.AMAT)
amat.setFill(fill);
}
@ -382,9 +382,9 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
@Override
public int getFluidFill(FluidType type) {
if(type == FluidTypeTheOldOne.COOLANT)
if(type == Fluids.COOLANT)
return coolant.getFill();
else if(type == FluidTypeTheOldOne.AMAT)
else if(type == Fluids.AMAT)
return amat.getFill();
return 0;
@ -427,7 +427,7 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements
@Override
public int getMaxFluidFill(FluidType type) {
if(type == FluidTypeTheOldOne.COOLANT)
if(type == Fluids.COOLANT)
return coolant.getMaxFill();
return 0;

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

@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidContainerRegistry;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.tileentity.TileEntityMachineBase;
@ -34,7 +34,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
public TileEntityMachineDiesel() {
super(5);
tank = new FluidTank(FluidTypeTheOldOne.DIESEL, 16000, 0);
tank = new FluidTank(Fluids.DIESEL, 16000, 0);
}
@Override
@ -107,7 +107,7 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
FluidType type = tank.getTankType();
if(type.name().equals(FluidTypeTheOldOne.NITAN.name()))
if(type == Fluids.NITAN)
powerCap = maxPower * 10;
else
powerCap = maxPower;
@ -137,14 +137,14 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE
public static final HashMap<FluidType, Integer> fuels = new HashMap();
static {
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);
fuels.put(Fluids.HYDROGEN, 10);
fuels.put(Fluids.DIESEL, 500);
fuels.put(Fluids.PETROIL, 300);
fuels.put(Fluids.BIOFUEL, 400);
fuels.put(Fluids.GASOLINE, 1500);
fuels.put(Fluids.NITAN, 5000);
fuels.put(Fluids.LPG, 450);
fuels.put(Fluids.ETHANOL, 200);
}
public int getHEFromFuel() {

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java
View File

@ -79,7 +79,7 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
IEnergyConductor con = (IEnergyConductor) te;
if(con.getPowerNet() != null) {
if(mode == 1 || mode == 2) {
if(mode == 2 || mode == 3) {
if(con.getPowerNet().isSubscribed(this)) {
con.getPowerNet().unsubscribe(this);
}

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

@ -4,13 +4,13 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.FluidType.FluidTrait;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.Library;
import com.hbm.tileentity.TileEntityMachineBase;
@ -31,7 +31,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
public TileEntityMachineFluidTank() {
super(6);
tank = new FluidTank(FluidTypeTheOldOne.NONE, 256000, 0);
tank = new FluidTank(Fluids.NONE, 256000, 0);
}
@Override

6
src/main/java/com/hbm/tileentity/machine/TileEntityMachineGenerator.java
View File

@ -6,11 +6,11 @@ import java.util.Random;
import com.hbm.blocks.machine.MachineGenerator;
import com.hbm.explosion.ExplosionNukeGeneric;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemFuelRod;
import com.hbm.lib.Library;
@ -48,8 +48,8 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve
public TileEntityMachineGenerator() {
slots = new ItemStack[14];
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 32000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.COOLANT, 16000, 1);
tanks[0] = new FluidTank(Fluids.WATER, 32000, 0);
tanks[1] = new FluidTank(Fluids.COOLANT, 16000, 1);
}
@Override

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

@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.List;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemRTGPellet;
import com.hbm.lib.Library;
@ -47,9 +47,9 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
public TileEntityMachineIGenerator() {
super(21);
tanks = new FluidTank[3];
tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.HEATINGOIL, 16000, 1);
tanks[2] = new FluidTank(FluidTypeTheOldOne.LUBRICANT, 4000, 2);
tanks[0] = new FluidTank(Fluids.WATER, 16000, 0);
tanks[1] = new FluidTank(Fluids.HEATINGOIL, 16000, 1);
tanks[2] = new FluidTank(Fluids.LUBRICANT, 4000, 2);
}
@Override
@ -186,18 +186,18 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
public static final HashMap<FluidType, Integer> fuels = new HashMap();
static {
fuels.put(FluidTypeTheOldOne.SMEAR, 50);
fuels.put(FluidTypeTheOldOne.HEATINGOIL, 75);
fuels.put(FluidTypeTheOldOne.HYDROGEN, 5);
fuels.put(FluidTypeTheOldOne.DIESEL, 225);
fuels.put(FluidTypeTheOldOne.KEROSENE, 300);
fuels.put(FluidTypeTheOldOne.RECLAIMED, 100);
fuels.put(FluidTypeTheOldOne.PETROIL, 125);
fuels.put(FluidTypeTheOldOne.BIOFUEL, 200);
fuels.put(FluidTypeTheOldOne.GASOLINE, 700);
fuels.put(FluidTypeTheOldOne.NITAN, 2500);
fuels.put(FluidTypeTheOldOne.LPG, 200);
fuels.put(FluidTypeTheOldOne.ETHANOL, 75);
fuels.put(Fluids.SMEAR, 50);
fuels.put(Fluids.HEATINGOIL, 75);
fuels.put(Fluids.HYDROGEN, 5);
fuels.put(Fluids.DIESEL, 225);
fuels.put(Fluids.KEROSENE, 300);
fuels.put(Fluids.RECLAIMED, 100);
fuels.put(Fluids.PETROIL, 125);
fuels.put(Fluids.BIOFUEL, 200);
fuels.put(Fluids.GASOLINE, 700);
fuels.put(Fluids.NITAN, 2500);
fuels.put(Fluids.LPG, 200);
fuels.put(Fluids.ETHANOL, 75);
}
public int getPowerFromFuel() {
@ -214,9 +214,9 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement
@Override
public void setFluidFill(int fill, FluidType type) {
if(type == FluidTypeTheOldOne.WATER)
if(type == Fluids.WATER)
tanks[0].setFill(fill);
else if(type == FluidTypeTheOldOne.LUBRICANT)
else if(type == Fluids.LUBRICANT)
tanks[2].setFill(fill);
else if(tanks[1].getTankType() == type)
tanks[1].setFill(fill);

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

@ -3,12 +3,12 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
@ -42,9 +42,9 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven
public TileEntityMachineInserter() {
slots = new ItemStack[9];
tanks = new FluidTank[3];
tanks[0] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0);
tanks[2] = new FluidTank(FluidTypeTheOldOne.NONE, 32000, 0);
tanks[0] = new FluidTank(Fluids.NONE, 32000, 0);
tanks[1] = new FluidTank(Fluids.NONE, 32000, 0);
tanks[2] = new FluidTank(Fluids.NONE, 32000, 0);
}
@Override

10
src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java
View File

@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidContainer;
import com.hbm.interfaces.IFluidSource;
import com.hbm.inventory.FluidTank;
import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.MachineRecipes;
import com.hbm.lib.Library;
import com.hbm.tileentity.TileEntityMachineBase;
@ -38,8 +38,8 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme
super(7);
tanks = new FluidTank[2];
tanks[0] = new FluidTank(FluidTypeTheOldOne.STEAM, 512000, 0);
tanks[1] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 10240000, 1);
tanks[0] = new FluidTank(Fluids.STEAM, 512000, 0);
tanks[1] = new FluidTank(Fluids.SPENTSTEAM, 10240000, 1);
}
@Override
@ -72,9 +72,9 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme
Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType());
if(outs == null) {
tanks[1].setTankType(FluidTypeTheOldOne.NONE);
tanks[1].setTankType(Fluids.NONE);
} else {
tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
tanks[1].setTankType((FluidType) outs[0]);
int processMax = (int) Math.ceil(Math.ceil(tanks[0].getFill() / 10F) / (Integer)outs[2]); //the maximum amount of cycles based on the 10% cap
int processSteam = tanks[0].getFill() / (Integer)outs[2]; //the maximum amount of cycles depending on steam

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