From b762d23a2af504831e8d6db9f7c988ffee0ccd06 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 17 Mar 2023 15:18:29 +0100 Subject: [PATCH] dynamic gas tanks, removed some old assets, recipes --- .../com/hbm/handler/BobmazonOfferFactory.java | 2 +- .../java/com/hbm/hazard/HazardRegistry.java | 4 +- .../hbm/inventory/FluidContainerRegistry.java | 17 +- .../com/hbm/inventory/OreDictManager.java | 45 +++-- .../com/hbm/inventory/fluid/FluidType.java | 27 +-- .../java/com/hbm/inventory/fluid/Fluids.java | 113 ++++++------ .../hbm/inventory/material/NTMMaterial.java | 11 ++ .../inventory/recipes/AssemblerRecipes.java | 18 +- .../inventory/recipes/ChemplantRecipes.java | 15 +- .../hbm/inventory/recipes/MixerRecipes.java | 1 - src/main/java/com/hbm/items/ModItems.java | 171 +----------------- .../com/hbm/items/machine/ItemCanister.java | 12 +- .../com/hbm/items/machine/ItemGasTank.java | 93 ++++++++++ .../com/hbm/items/special/ItemAutogen.java | 1 - src/main/java/com/hbm/main/MainRegistry.java | 15 ++ .../tileentity/RenderCombustionEngine.java | 6 +- src/main/resources/assets/hbm/lang/de_DE.lang | 5 +- src/main/resources/assets/hbm/lang/en_US.lang | 3 +- .../textures/items/assembly_template_0.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_1.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_2.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_3.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_4.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_5.png | Bin 102 -> 0 bytes .../textures/items/assembly_template_6.png | Bin 104 -> 0 bytes .../hbm/textures/items/battery_advanced.png | Bin 277 -> 0 bytes .../textures/items/battery_advanced_alt.png | Bin 282 -> 0 bytes .../hbm/textures/items/battery_creative.png | Bin 285 -> 0 bytes .../textures/items/battery_creative_alt.png | Bin 284 -> 0 bytes .../hbm/textures/items/battery_generic.png | Bin 281 -> 0 bytes .../textures/items/battery_generic_alt.png | Bin 286 -> 0 bytes .../textures/items/battery_schrabidium.png | Bin 252 -> 0 bytes .../items/battery_schrabidium_alt.png | Bin 307 -> 0 bytes .../items/battery_schrabidium_old.png | Bin 304 -> 0 bytes .../hbm/textures/items/blades_aluminium.png | Bin 289 -> 0 bytes .../textures/items/blades_combine_steel.png | Bin 304 -> 0 bytes .../assets/hbm/textures/items/blades_gold.png | Bin 294 -> 0 bytes .../assets/hbm/textures/items/blades_iron.png | Bin 292 -> 0 bytes .../hbm/textures/items/blades_schrabidium.png | Bin 298 -> 0 bytes .../hbm/textures/items/chem_icon_PC.png | Bin 0 -> 287 bytes .../hbm/textures/items/chem_icon_PVC.png | Bin 0 -> 263 bytes .../assets/hbm/textures/items/gas_biogas.png | Bin 265 -> 0 bytes .../assets/hbm/textures/items/gas_bottle.png | Bin 0 -> 201 bytes .../assets/hbm/textures/items/gas_full.png | Bin 261 -> 0 bytes .../assets/hbm/textures/items/gas_label.png | Bin 0 -> 118 bytes .../assets/hbm/textures/items/gas_lpg.png | Bin 425 -> 0 bytes .../hbm/textures/items/gas_petroleum.png | Bin 271 -> 0 bytes .../assets/hbm/textures/items/gas_xenon.png | Bin 274 -> 0 bytes .../hbm/textures/items/gun_b92_ammo.png | Bin 166 -> 0 bytes .../hbm/textures/items/gun_jack_ammo_alt.png | Bin 310 -> 0 bytes .../textures/items/gun_revolver_ammo_alt.png | Bin 273 -> 0 bytes .../items/gun_revolver_cursed_ammo_alt.png | Bin 238 -> 0 bytes .../items/gun_revolver_gold_ammo_alt.png | Bin 243 -> 0 bytes .../items/gun_revolver_iron_ammo_alt.png | Bin 241 -> 0 bytes .../items/gun_revolver_lead_ammo_alt.png | Bin 283 -> 0 bytes .../gun_revolver_nightmare2_ammo_alt.png | Bin 247 -> 0 bytes .../items/gun_revolver_nightmare_ammo_alt.png | Bin 201 -> 0 bytes .../gun_revolver_schrabidium_ammo_alt.png | Bin 248 -> 0 bytes .../assets/hbm/textures/items/ingot_pc.png | Bin 0 -> 255 bytes 59 files changed, 279 insertions(+), 280 deletions(-) create mode 100644 src/main/java/com/hbm/items/machine/ItemGasTank.java delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_0.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_1.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_5.png delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_creative.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_creative_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_generic.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_generic_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_old.png delete mode 100644 src/main/resources/assets/hbm/textures/items/blades_aluminium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/blades_combine_steel.png delete mode 100644 src/main/resources/assets/hbm/textures/items/blades_gold.png delete mode 100644 src/main/resources/assets/hbm/textures/items/blades_iron.png delete mode 100644 src/main/resources/assets/hbm/textures/items/blades_schrabidium.png create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_PC.png create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gas_biogas.png create mode 100644 src/main/resources/assets/hbm/textures/items/gas_bottle.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gas_full.png create mode 100644 src/main/resources/assets/hbm/textures/items/gas_label.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gas_lpg.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gas_petroleum.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gas_xenon.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_b92_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_jack_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium_ammo_alt.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_pc.png diff --git a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java index d561434c7..80f7ca4a2 100644 --- a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java +++ b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java @@ -60,7 +60,7 @@ public class BobmazonOfferFactory { materials.add(new Offer(new ItemStack(ModItems.canister_full, 1, Fluids.GASOLINE.getID()), Requirement.OIL, 20 * inflation)); materials.add(new Offer(new ItemStack(ModItems.canister_full, 1, Fluids.KEROSENE.getID()), Requirement.OIL, 20 * inflation)); materials.add(new Offer(new ItemStack(ModItems.canister_full, 1, Fluids.NITAN.getID()), Requirement.OIL, 100 * inflation)); - materials.add(new Offer(new ItemStack(ModItems.gas_petroleum), Requirement.OIL, 8 * inflation)); + materials.add(new Offer(new ItemStack(ModItems.gas_full, 1, Fluids.PETROLEUM.getID()), Requirement.OIL, 8 * inflation)); materials.add(new Offer(new ItemStack(ModItems.motor), Requirement.ASSEMBLY, 12 * inflation)); materials.add(new Offer(new ItemStack(ModItems.rtg_unit), Requirement.NUCLEAR, 25 * inflation)); materials.add(new Offer(new ItemStack(ModItems.circuit_aluminium), Requirement.ASSEMBLY, 4 * inflation)); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 533c063a3..7f686ff4c 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -126,8 +126,8 @@ public class HazardRegistry { public static final float nugget = 0.1F; public static final float ingot = 1.0F; public static final float gem = 1.0F; - public static final float plate = 1.0F; - public static final float plateCast = 3.0F; + public static final float plate = ingot; + public static final float plateCast = plate * 3; public static final float powder_mult = 3.0F; public static final float powder = ingot * powder_mult; public static final float powder_tiny = nugget * powder_mult; diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index e97d74c01..df4bf1079 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -6,7 +6,8 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.FluidType.ExtContainer; +import com.hbm.inventory.fluid.Fluids.CD_Canister; +import com.hbm.inventory.fluid.Fluids.CD_Gastank; import com.hbm.items.ModItems; import com.hbm.util.Compat; @@ -26,10 +27,6 @@ public class FluidContainerRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), Fluids.SCHRABIDIC, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_sulfuric_acid), new ItemStack(Items.bucket), Fluids.SULFURIC_ACID, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), Fluids.GAS, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), Fluids.PETROLEUM, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), Fluids.LPG, 1000)); - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), Fluids.BIOGAS, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), Fluids.DIESEL, 10000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), Fluids.KEROSENE, 10000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), Fluids.OXYGEN, 10000)); @@ -73,16 +70,14 @@ public class FluidContainerRegistry { FluidType type = fluids[i]; - if(type.containers.contains(ExtContainer.CANISTER)) - FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_full, 1, i), new ItemStack(ModItems.canister_empty), Fluids.fromID(i), 1000)); + if(type.getContainer(CD_Canister.class) != null) FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_full, 1, i), new ItemStack(ModItems.canister_empty), Fluids.fromID(i), 1000)); + if(type.getContainer(CD_Gastank.class) != null) FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full, 1, i), new ItemStack(ModItems.gas_empty), Fluids.fromID(i), 1000)); - if(type.hasNoContainer()) - continue; + if(type.hasNoContainer()) continue; FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, i), new ItemStack(ModItems.fluid_tank_lead_empty), Fluids.fromID(i), 1000)); - if(type.needsLeadContainer()) - continue; + if(type.needsLeadContainer()) continue; FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), Fluids.fromID(i), 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), Fluids.fromID(i), 16000)); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 5b791e8e6..f5a75b68c 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -174,6 +174,7 @@ public class OreDictManager { public static final DictFrame POLYMER = new DictFrame("Polymer"); public static final DictFrame BAKELITE = new DictFrame("Bakelite"); public static final DictFrame PET = new DictFrame("PET"); + public static final DictFrame PC = new DictFrame("Polycarbonate"); public static final DictFrame PVC = new DictFrame("PVC"); public static final DictFrame RUBBER = new DictFrame("Rubber"); public static final DictFrame MAGTUNG = new DictFrame("MagnetizedTungsten"); @@ -266,7 +267,7 @@ public class OreDictManager { /** Any post oil polymer like teflon ("polymer") or bakelite */ public static final DictGroup ANY_PLASTIC = new DictGroup("AnyPlastic", POLYMER, BAKELITE); //using the Any prefix means that it's just the secondary prefix, and that shape prefixes are applicable /** Any post vacuum polymer like PET or PVC */ - public static final DictGroup ANY_HARDPLASTIC = new DictGroup("AnyHardPlastic", PET, PVC); + public static final DictGroup ANY_HARDPLASTIC = new DictGroup("AnyHardPlastic", PC, PVC); /** Any "powder" propellant like gunpowder, ballistite and cordite */ public static final DictFrame ANY_GUNPOWDER = new DictFrame("AnyPropellant"); /** Any smokeless powder like ballistite and cordite */ @@ -319,7 +320,7 @@ public class OreDictManager { CO60 .rad(HazardRegistry.co60) .hot(1) .nugget(nugget_co60) .billet(billet_co60) .ingot(ingot_co60) .dust(powder_co60); AU198 .rad(HazardRegistry.au198) .hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198); PB209 .rad(HazardRegistry.pb209) .blinding(50F) .hot(7) .nugget(nugget_pb209) .billet(billet_pb209) .ingot(ingot_pb209); - SA326 .rad(HazardRegistry.sa326) .blinding(50F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium) .plate(plate_schrabidium) .block(block_schrabidium) .ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium) .oreNether(ore_nether_schrabidium); + SA326 .rad(HazardRegistry.sa326) .blinding(50F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium).plate(plate_schrabidium).plateCast(Mats.MAT_SCHRABIDIUM.make(plate_cast)).block(block_schrabidium).ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium) .oreNether(ore_nether_schrabidium); SA327 .rad(HazardRegistry.sa327) .blinding(50F) .nugget(nugget_solinium) .billet(billet_solinium) .ingot(ingot_solinium) .block(block_solinium); SBD .rad(HazardRegistry.sb) .blinding(50F) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate); SRN .rad(HazardRegistry.sr) .blinding(50F) .ingot(ingot_schraranium) .block(block_schraranium); @@ -351,7 +352,8 @@ public class OreDictManager { POLYMER .ingot(ingot_polymer) .dust(powder_polymer) .block(block_polymer); BAKELITE .ingot(ingot_bakelite) .dust(powder_bakelite) .block(block_bakelite); RUBBER .ingot(ingot_rubber) .block(block_rubber); - PET .ingot(ingot_pet); + //PET .ingot(ingot_pet); + PC .ingot(ingot_pc); PVC .ingot(ingot_pvc); MAGTUNG .ingot(ingot_magnetized_tungsten) .dust(powder_magnetized_tungsten) .block(block_magnetized_tungsten); CMB .ingot(ingot_combine_steel) .dust(powder_combine_steel) .plate(plate_combine_steel) .block(block_combine_steel); @@ -442,15 +444,24 @@ public class OreDictManager { ANY_COKE .gem(fromAll(coke, EnumCokeType.class)).block(fromAll(block_coke, EnumCokeType.class)); ANY_BISMOID .ingot(ingot_bismuth, ingot_arsenic).nugget(nugget_bismuth, nugget_arsenic).block(block_bismuth); + /* + * TAR + */ OreDictionary.registerOre(KEY_OIL_TAR, fromOne(oil_tar, EnumTarType.CRUDE)); OreDictionary.registerOre(KEY_CRACK_TAR, fromOne(oil_tar, EnumTarType.CRACK)); OreDictionary.registerOre(KEY_COAL_TAR, fromOne(oil_tar, EnumTarType.COAL)); OreDictionary.registerOre(KEY_WOOD_TAR, fromOne(oil_tar, EnumTarType.WOOD)); + /* + * TANKS + */ OreDictionary.registerOre(KEY_UNIVERSAL_TANK, new ItemStack(fluid_tank_full, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(KEY_HAZARD_TANK, new ItemStack(fluid_tank_lead_full, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(KEY_UNIVERSAL_BARREL, new ItemStack(fluid_barrel_full, 1, OreDictionary.WILDCARD_VALUE)); + /* + * TOOLS + */ OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, new ItemStack(screwdriver, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(KEY_TOOL_SCREWDRIVER, new ItemStack(screwdriver_desh, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(KEY_TOOL_HANDDRILL, new ItemStack(hand_drill, 1, OreDictionary.WILDCARD_VALUE)); @@ -458,6 +469,9 @@ public class OreDictManager { OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, new ItemStack(chemistry_set, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(KEY_TOOL_CHEMISTRYSET, new ItemStack(chemistry_set_boron, 1, OreDictionary.WILDCARD_VALUE)); + /* + * CIRCUITS + */ OreDictionary.registerOre(KEY_CIRCUIT_BISMUTH, circuit_bismuth); OreDictionary.registerOre(KEY_CIRCUIT_BISMUTH, circuit_arsenic); @@ -752,20 +766,23 @@ public class OreDictManager { return this; } + public static void registerHazards(List hazards, float hazMult, String dictKey) { + + if(!hazards.isEmpty() && hazMult > 0F) { + HazardData data = new HazardData().setMutex(0b1); + + for(HazardEntry hazard : hazards) { + data.addEntry(hazard.clone(hazMult)); + } + + HazardSystem.register(dictKey, data); + } + } + public void registerStack(String tag, ItemStack stack) { for(String mat : mats) { - OreDictionary.registerOre(tag + mat, stack); - - if(!hazards.isEmpty() && hazMult > 0F) { - HazardData data = new HazardData().setMutex(0b1); - - for(HazardEntry hazard : hazards) { - data.addEntry(hazard.clone(this.hazMult)); - } - - HazardSystem.register(tag + mat, data); - } + registerHazards(hazards, hazMult, tag + mat); } /* diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index eaf634c27..cc52b005d 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -1,16 +1,12 @@ package com.hbm.inventory.fluid; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map.Entry; import org.lwjgl.input.Keyboard; -import java.util.Set; - import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.*; import com.hbm.inventory.fluid.trait.FluidTraitSimple.*; @@ -32,8 +28,6 @@ public class FluidType { private String stringId; //Approximate HEX Color of the fluid, used for pipe rendering private int color; - //The color for containers, not the liquid itself. Used for canisters. - private int containerColor = 0xffffff; //Unlocalized string ID of the fluid private String unlocalized; @@ -52,7 +46,7 @@ public class FluidType { /** How much "stuff" there is in one mB. 1mB of water turns into 100mB of steam, therefore steam has a compression of 0.01. Compression is only used for translating fluids into other fluids, heat calculations should ignore this. */ public double compression = DEFAULT_COMPRESSION; - public Set containers = new HashSet(); + public HashMap containers = new HashMap(); private HashMap, FluidTrait> traits = new HashMap(); //public List enumTraits = new ArrayList(); @@ -89,16 +83,14 @@ public class FluidType { return this; } - public FluidType addContainers(int color, ExtContainer... containers) { - this.containerColor = color; - Collections.addAll(this.containers, containers); + public FluidType addContainers(Object... containers) { + for(Object container : containers) this.containers.put(container.getClass(), container); return this; } - /*public FluidType addTraits(EnumFluidTrait... traits) { - Collections.addAll(this.enumTraits, traits); - return this; - }*/ + public T getContainer(Class container) { + return (T) this.containers.get(container); + } public FluidType addTraits(FluidTrait... traits) { for(FluidTrait trait : traits) this.traits.put(trait.getClass(), trait); @@ -125,9 +117,6 @@ public class FluidType { return this.color; } - public int getContainerColor() { - return this.containerColor; - } public ResourceLocation getTexture() { return this.texture; } @@ -210,10 +199,6 @@ public class FluidType { } } - public static enum ExtContainer { - CANISTER - } - //shitty wrapper delegates, go! //only used for compatibility purposes, these will be removed soon //don't use these, dumbfuck diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 9a10f940d..d2f66bc09 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.hbm.inventory.fluid.FluidType.ExtContainer; import com.hbm.inventory.fluid.trait.*; import com.hbm.inventory.fluid.trait.FluidTraitSimple.*; import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade; @@ -157,25 +156,25 @@ public class Fluids { LAVA = new FluidType("LAVA", 0xFF3300, 4, 0, 0, EnumSymbol.NOWATER).setTemp(1200).addTraits(LIQUID); DEUTERIUM = new FluidType("DEUTERIUM", 0x0000FF, 3, 4, 0, EnumSymbol.NONE).addTraits(new FT_Flammable(5_000), new FT_Combustible(FuelGrade.HIGH, 10_000), GASEOUS); TRITIUM = new FluidType("TRITIUM", 0x000099, 3, 4, 0, EnumSymbol.RADIATION).addTraits(new FT_Flammable(5_000), new FT_Combustible(FuelGrade.HIGH, 10_000), GASEOUS, new FT_VentRadiation(0.001F)); - OIL = new FluidType("OIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(0x424242, ExtContainer.CANISTER).addTraits(new FT_Flammable(10_000), LIQUID); + OIL = new FluidType("OIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x424242)).addTraits(new FT_Flammable(10_000), LIQUID); HOTOIL = new FluidType("HOTOIL", 0x300900, 2, 3, 0, EnumSymbol.NONE).setTemp(350).addTraits(new FT_Flammable(10_000), LIQUID); - HEAVYOIL = new FluidType("HEAVYOIL", 0x141312, 2, 1, 0, EnumSymbol.NONE).addContainers(0x513F39, ExtContainer.CANISTER).addTraits(new FT_Flammable(50_000), new FT_Combustible(FuelGrade.LOW, 25_000), LIQUID); - BITUMEN = new FluidType("BITUMEN", 0x1f2426, 2, 0, 0, EnumSymbol.NONE).addContainers(0x5A5877, ExtContainer.CANISTER).addTraits(LIQUID); - SMEAR = new FluidType("SMEAR", 0x190f01, 2, 1, 0, EnumSymbol.NONE).addContainers(0x624F3B, ExtContainer.CANISTER).addTraits(new FT_Flammable(50_000), LIQUID); - HEATINGOIL = new FluidType("HEATINGOIL", 0x211806, 2, 2, 0, EnumSymbol.NONE).addContainers(0x694235, ExtContainer.CANISTER).addTraits(new FT_Flammable(150_000), new FT_Combustible(FuelGrade.LOW, 100_000), LIQUID); - RECLAIMED = new FluidType("RECLAIMED", 0x332b22, 2, 2, 0, EnumSymbol.NONE).addContainers(0xF65723, ExtContainer.CANISTER).addTraits(new FT_Flammable(100_000), new FT_Combustible(FuelGrade.LOW, 200_000), LIQUID); - PETROIL = new FluidType("PETROIL", 0x44413d, 1, 3, 0, EnumSymbol.NONE).addContainers(0x2369F6, ExtContainer.CANISTER).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 300_000), LIQUID); - LUBRICANT = new FluidType("LUBRICANT", 0x606060, 2, 1, 0, EnumSymbol.NONE).addContainers(0xF1CC05, ExtContainer.CANISTER).addTraits(LIQUID); - NAPHTHA = new FluidType("NAPHTHA", 0x595744, 2, 1, 0, EnumSymbol.NONE).addContainers(0x5F6D44, ExtContainer.CANISTER).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 200_000), LIQUID); - DIESEL = new FluidType("DIESEL", 0xf2eed5, 1, 2, 0, EnumSymbol.NONE).addContainers(0xFF2C2C, ExtContainer.CANISTER).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.HIGH, 500_000), LIQUID); - LIGHTOIL = new FluidType("LIGHTOIL", 0x8c7451, 1, 2, 0, EnumSymbol.NONE).addContainers(0xB46B52, ExtContainer.CANISTER).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.MEDIUM, 500_000), LIQUID); - KEROSENE = new FluidType("KEROSENE", 0xffa5d2, 1, 2, 0, EnumSymbol.NONE).addContainers(0xFF377D, ExtContainer.CANISTER).addTraits(new FT_Flammable(300_000), new FT_Combustible(FuelGrade.AERO, 1_250_000), LIQUID); - GAS = new FluidType("GAS", 0xfffeed, 1, 4, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(10_000), GASEOUS); - PETROLEUM = new FluidType("PETROLEUM", 0x7cb7c9, 1, 4, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(25_000), GASEOUS); + HEAVYOIL = new FluidType("HEAVYOIL", 0x141312, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x513F39)).addTraits(new FT_Flammable(50_000), new FT_Combustible(FuelGrade.LOW, 25_000), LIQUID); + BITUMEN = new FluidType("BITUMEN", 0x1f2426, 2, 0, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x5A5877)).addTraits(LIQUID); + SMEAR = new FluidType("SMEAR", 0x190f01, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x624F3B)).addTraits(new FT_Flammable(50_000), LIQUID); + HEATINGOIL = new FluidType("HEATINGOIL", 0x211806, 2, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x694235)).addTraits(new FT_Flammable(150_000), new FT_Combustible(FuelGrade.LOW, 100_000), LIQUID); + RECLAIMED = new FluidType("RECLAIMED", 0x332b22, 2, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xF65723)).addTraits(new FT_Flammable(100_000), new FT_Combustible(FuelGrade.LOW, 200_000), LIQUID); + PETROIL = new FluidType("PETROIL", 0x44413d, 1, 3, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x2369F6)).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 300_000), LIQUID); + LUBRICANT = new FluidType("LUBRICANT", 0x606060, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xF1CC05)).addTraits(LIQUID); + NAPHTHA = new FluidType("NAPHTHA", 0x595744, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x5F6D44)).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 200_000), LIQUID); + DIESEL = new FluidType("DIESEL", 0xf2eed5, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xFF2C2C)).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.HIGH, 500_000), LIQUID); + LIGHTOIL = new FluidType("LIGHTOIL", 0x8c7451, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.MEDIUM, 500_000), LIQUID); + KEROSENE = new FluidType("KEROSENE", 0xffa5d2, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xFF377D)).addTraits(new FT_Flammable(300_000), new FT_Combustible(FuelGrade.AERO, 1_250_000), LIQUID); + GAS = new FluidType("GAS", 0xfffeed, 1, 4, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0xFF4545, 0xFFE97F)).addTraits(new FT_Flammable(10_000), GASEOUS); + PETROLEUM = new FluidType("PETROLEUM", 0x7cb7c9, 1, 4, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0x5E7CFF, 0xFFE97F)).addTraits(new FT_Flammable(25_000), GASEOUS); LPG = new FluidType("LPG", 0x4747EA, 1, 3, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.HIGH, 400_000), LIQUID); - BIOGAS = new FluidType("BIOGAS", 0xbfd37c, 1, 4, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(25_000), GASEOUS); - BIOFUEL = new FluidType("BIOFUEL", 0xeef274, 1, 2, 0, EnumSymbol.NONE).addContainers(0x9EB623, ExtContainer.CANISTER).addTraits(new FT_Flammable(150_000), new FT_Combustible(FuelGrade.HIGH, 400_000), LIQUID); - NITAN = new FluidType("NITAN", 0x8018ad, 2, 4, 1, EnumSymbol.NONE).addContainers(0x6B238C, ExtContainer.CANISTER).addTraits(new FT_Flammable(2_000_000), new FT_Combustible(FuelGrade.HIGH, 5_000_000), LIQUID); + BIOGAS = new FluidType("BIOGAS", 0xbfd37c, 1, 4, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0xC8FF1F, 0x303030)).addTraits(new FT_Flammable(25_000), GASEOUS); + BIOFUEL = new FluidType("BIOFUEL", 0xeef274, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x9EB623)).addTraits(new FT_Flammable(150_000), new FT_Combustible(FuelGrade.HIGH, 400_000), LIQUID); + NITAN = new FluidType("NITAN", 0x8018ad, 2, 4, 1, EnumSymbol.NONE).addContainers(new CD_Canister(0x6B238C)).addTraits(new FT_Flammable(2_000_000), new FT_Combustible(FuelGrade.HIGH, 5_000_000), LIQUID); UF6 = new FluidType("UF6", 0xD1CEBE, 4, 0, 2, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(0.2F), new FT_Corrosive(15), GASEOUS); PUF6 = new FluidType("PUF6", 0x4C4C4C, 4, 0, 4, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(0.1F), new FT_Corrosive(15), GASEOUS); SAS3 = new FluidType("SAS3", 0x4ffffc, 5, 0, 4, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(1F), new FT_Corrosive(30), LIQUID); @@ -185,18 +184,18 @@ public class Fluids { ACID = new FluidType("ACID", 0xfff7aa, 3, 0, 3, EnumSymbol.OXIDIZER).addTraits(new FT_Corrosive(40), LIQUID); WATZ = new FluidType("WATZ", 0x86653E, 4, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(60), new FT_VentRadiation(0.1F), LIQUID); CRYOGEL = new FluidType("CRYOGEL", 0x32ffff, 2, 0, 0, EnumSymbol.CROYGENIC).setTemp(-170).addTraits(LIQUID); - HYDROGEN = new FluidType("HYDROGEN", 0x4286f4, 3, 4, 0, EnumSymbol.CROYGENIC).setTemp(-260).addTraits(new FT_Flammable(5_000), new FT_Combustible(FuelGrade.HIGH, 10_000), LIQUID, EVAP); - OXYGEN = new FluidType("OXYGEN", 0x98bdf9, 3, 0, 0, EnumSymbol.CROYGENIC).setTemp(-100).addTraits(LIQUID, EVAP); - XENON = new FluidType("XENON", 0xba45e8, 0, 0, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS); + HYDROGEN = new FluidType("HYDROGEN", 0x4286f4, 3, 4, 0, EnumSymbol.CROYGENIC).setTemp(-260).addContainers(new CD_Gastank(0x4286f4, 0xffffff)).addTraits(new FT_Flammable(5_000), new FT_Combustible(FuelGrade.HIGH, 10_000), LIQUID, EVAP); + OXYGEN = new FluidType("OXYGEN", 0x98bdf9, 3, 0, 0, EnumSymbol.CROYGENIC).setTemp(-100).addContainers(new CD_Gastank(0x98bdf9, 0xffffff)).addTraits(LIQUID, EVAP); + XENON = new FluidType("XENON", 0xba45e8, 0, 0, 0, EnumSymbol.ASPHYXIANT).addContainers(new CD_Gastank(0x8C21FF, 0x303030)).addTraits(GASEOUS); BALEFIRE = new FluidType("BALEFIRE", 0x28e02e, 4, 4, 3, EnumSymbol.RADIATION).setTemp(1500).addTraits(new FT_Corrosive(50), new FT_Flammable(1_000_000), new FT_Combustible(FuelGrade.HIGH, 2_500_000), LIQUID); MERCURY = new FluidType("MERCURY", 0x808080, 2, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, new FT_Poison(false, 2)); PAIN = new FluidType("PAIN", 0x938541, 2, 0, 1, EnumSymbol.ACID).setTemp(300).addTraits(new FT_Corrosive(30), new FT_Poison(true, 2), LIQUID); WASTEFLUID = new FluidType("WASTEFLUID", 0x544400, 2, 0, 1, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(0.5F), NOCON, LIQUID); WASTEGAS = new FluidType("WASTEGAS", 0xB8B8B8, 2, 0, 1, EnumSymbol.RADIATION).addTraits(new FT_VentRadiation(0.5F), NOCON, GASEOUS); - GASOLINE = new FluidType("GASOLINE", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(0x2F7747, ExtContainer.CANISTER).addTraits(new FT_Flammable(400_000), new FT_Combustible(FuelGrade.HIGH, 1_000_000), LIQUID); - COALGAS = new FluidType("COALGAS", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(0x2E155F, ExtContainer.CANISTER).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.MEDIUM, 150_000), LIQUID); + GASOLINE = new FluidType("GASOLINE", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x2F7747)).addTraits(new FT_Flammable(400_000), new FT_Combustible(FuelGrade.HIGH, 1_000_000), LIQUID); + COALGAS = new FluidType("COALGAS", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x2E155F)).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.MEDIUM, 150_000), LIQUID); SPENTSTEAM = new FluidType("SPENTSTEAM", 0x445772, 2, 0, 0, EnumSymbol.NONE).setCompression(1D).addTraits(NOCON, GASEOUS); - FRACKSOL = new FluidType("FRACKSOL", 0x798A6B, 1, 3, 3, EnumSymbol.ACID).addContainers(0x4F887F, ExtContainer.CANISTER).addTraits(new FT_Corrosive(15), new FT_Poison(false, 0), LIQUID); + FRACKSOL = new FluidType("FRACKSOL", 0x798A6B, 1, 3, 3, EnumSymbol.ACID).addContainers(new CD_Canister(0x4F887F)).addTraits(new FT_Corrosive(15), new FT_Poison(false, 0), LIQUID); PLASMA_DT = new FluidType("PLASMA_DT", 0xF7AFDE, 0, 4, 0, EnumSymbol.RADIATION).setTemp(3250).addTraits(NOCON, NOID, PLASMA); PLASMA_HD = new FluidType("PLASMA_HD", 0xF0ADF4, 0, 4, 0, EnumSymbol.RADIATION).setTemp(2500).addTraits(NOCON, NOID, PLASMA); PLASMA_HT = new FluidType("PLASMA_HT", 0xD1ABF2, 0, 4, 0, EnumSymbol.RADIATION).setTemp(3000).addTraits(NOCON, NOID, PLASMA); @@ -206,50 +205,50 @@ public class Fluids { PLASMA_DH3 = new FluidType("PLASMA_DH3", 0xFF83AA, 0, 4, 0, EnumSymbol.RADIATION).setTemp(3480).addTraits(NOCON, NOID, PLASMA); HELIUM3 = new FluidType("HELIUM3", 0xFCF0C4, 3, 4, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS); DEATH = new FluidType("DEATH", 0x717A88, 2, 0, 1, EnumSymbol.ACID).setTemp(300).addTraits(new FT_Corrosive(80), new FT_Poison(true, 4), LEADCON, LIQUID); - ETHANOL = new FluidType("ETHANOL", 0xe0ffff, 2, 3, 0, EnumSymbol.NONE).addContainers(0xEAFFF3, ExtContainer.CANISTER).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.HIGH, 200_000), LIQUID); + ETHANOL = new FluidType("ETHANOL", 0xe0ffff, 2, 3, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xEAFFF3)).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.HIGH, 200_000), LIQUID); HEAVYWATER = new FluidType("HEAVYWATER", 0x00a0b0, 1, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); - CRACKOIL = new FluidType("CRACKOIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(0x424242, ExtContainer.CANISTER).addTraits(new FT_Flammable(10_000), LIQUID); - COALOIL = new FluidType("COALOIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(0x424242, ExtContainer.CANISTER).addTraits(new FT_Flammable(10_000), LIQUID); - HOTCRACKOIL = new FluidType("HOTCRACKOIL", 0x300900, 2, 3, 0, EnumSymbol.NONE).setTemp(350).addContainers(0x424242, ExtContainer.CANISTER).addTraits(new FT_Flammable(10_000), LIQUID); - NAPHTHA_CRACK = new FluidType("NAPHTHA_CRACK", 0x595744, 2, 1, 0, EnumSymbol.NONE).addContainers(0x5F6D44, ExtContainer.CANISTER).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 200_000), LIQUID); - LIGHTOIL_CRACK = new FluidType("LIGHTOIL_CRACK", 0x8c7451, 1, 2, 0, EnumSymbol.NONE).addContainers(0xB46B52, ExtContainer.CANISTER).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.MEDIUM, 500_000), LIQUID); - DIESEL_CRACK = new FluidType("DIESEL_CRACK", 0xf2eed5, 1, 2, 0, EnumSymbol.NONE).addContainers(0xFF2C2C, ExtContainer.CANISTER).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.HIGH, 450_000), LIQUID); + CRACKOIL = new FluidType("CRACKOIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x424242)).addTraits(new FT_Flammable(10_000), LIQUID); + COALOIL = new FluidType("COALOIL", 0x020202, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x424242)).addTraits(new FT_Flammable(10_000), LIQUID); + HOTCRACKOIL = new FluidType("HOTCRACKOIL", 0x300900, 2, 3, 0, EnumSymbol.NONE).setTemp(350).addContainers(new CD_Canister(0x424242)).addTraits(new FT_Flammable(10_000), LIQUID); + NAPHTHA_CRACK = new FluidType("NAPHTHA_CRACK", 0x595744, 2, 1, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x5F6D44)).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 200_000), LIQUID); + LIGHTOIL_CRACK = new FluidType("LIGHTOIL_CRACK", 0x8c7451, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.MEDIUM, 500_000), LIQUID); + DIESEL_CRACK = new FluidType("DIESEL_CRACK", 0xf2eed5, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xFF2C2C)).addTraits(new FT_Flammable(200_000), new FT_Combustible(FuelGrade.HIGH, 450_000), LIQUID); AROMATICS = new FluidType("AROMATICS", 0x68A09A, 1, 4, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(25_000), LIQUID); UNSATURATEDS = new FluidType("UNSATURATEDS", 0x628FAE, 1, 4, 1, EnumSymbol.NONE).addTraits(new FT_Flammable(1_000_000), GASEOUS); //acetylene burns as hot as satan's asshole SALIENT = new FluidType("SALIENT", 0x457F2D, 0, 0, 0, EnumSymbol.NONE).addTraits(DELICIOUS, LIQUID); XPJUICE = new FluidType("XPJUICE", 0xBBFF09, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); ENDERJUICE = new FluidType("ENDERJUICE", 0x127766, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); - PETROIL_LEADED = new FluidType("PETROIL_LEADED", 0x44413d, 1, 3, 0, EnumSymbol.NONE).addContainers(0x2331F6, ExtContainer.CANISTER).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 450_000), LIQUID); - GASOLINE_LEADED = new FluidType("GASOLINE_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(0x2F775A, ExtContainer.CANISTER).addTraits(new FT_Flammable(400_000), new FT_Combustible(FuelGrade.HIGH, 1_500_000), LIQUID); - COALGAS_LEADED = new FluidType("COALGAS_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(0x1E155F, ExtContainer.CANISTER).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.MEDIUM, 250_000), LIQUID); + PETROIL_LEADED = new FluidType("PETROIL_LEADED", 0x44413d, 1, 3, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x2331F6)).addTraits(new FT_Flammable(125_000), new FT_Combustible(FuelGrade.MEDIUM, 450_000), LIQUID); + GASOLINE_LEADED = new FluidType("GASOLINE_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x2F775A)).addTraits(new FT_Flammable(400_000), new FT_Combustible(FuelGrade.HIGH, 1_500_000), LIQUID); + COALGAS_LEADED = new FluidType("COALGAS_LEADED", 0x445772, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x1E155F)).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.MEDIUM, 250_000), LIQUID); SULFURIC_ACID = new FluidType("SULFURIC_ACID", 0xB0AA64, 3, 0, 2, EnumSymbol.ACID).addTraits(new FT_Corrosive(50), LIQUID); COOLANT_HOT = new FluidType("COOLANT_HOT", 0x99525E, 1, 0, 0, EnumSymbol.NONE).setTemp(600).addTraits(LIQUID); MUG = new FluidType("MUG", 0x4B2D28, 0, 0, 0, EnumSymbol.NONE).addTraits(DELICIOUS, LIQUID); MUG_HOT = new FluidType("MUG_HOT", 0x6B2A20, 0, 0, 0, EnumSymbol.NONE).setTemp(500).addTraits(DELICIOUS, LIQUID); - WOODOIL = new FluidType("WOODOIL", 0x847D54, 2, 2, 0, EnumSymbol.NONE).addContainers(0xBF7E4F, ExtContainer.CANISTER).addTraits(LIQUID); - COALCREOSOTE = new FluidType("COALCREOSOTE", 0x51694F, 3, 2, 0, EnumSymbol.NONE).addContainers(0x285A3F, ExtContainer.CANISTER).addTraits(LIQUID); - SEEDSLURRY = new FluidType("SEEDSLURRY", 0x7CC35E, 0, 0, 0, EnumSymbol.NONE).addContainers(0x7CC35E, ExtContainer.CANISTER).addTraits(LIQUID); + WOODOIL = new FluidType("WOODOIL", 0x847D54, 2, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xBF7E4F)).addTraits(LIQUID); + COALCREOSOTE = new FluidType("COALCREOSOTE", 0x51694F, 3, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x285A3F)).addTraits(LIQUID); + SEEDSLURRY = new FluidType("SEEDSLURRY", 0x7CC35E, 0, 0, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0x7CC35E)).addTraits(LIQUID); NITRIC_ACID = new FluidType("NITRIC_ACID", 0xBB7A1E, 3, 0, 2, EnumSymbol.OXIDIZER).addTraits(LIQUID, new FT_Corrosive(60)); - SOLVENT = new FluidType("SOLVENT", 0xE4E3EF, 2, 3, 0, EnumSymbol.NONE).addContainers(0xE4E3EF, ExtContainer.CANISTER).addTraits(LIQUID, new FT_Corrosive(30)); + SOLVENT = new FluidType("SOLVENT", 0xE4E3EF, 2, 3, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xE4E3EF)).addTraits(LIQUID, new FT_Corrosive(30)); BLOOD = new FluidType("BLOOD", 0xB22424, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); BLOOD_HOT = new FluidType("BLOOD_HOT", 0xF22419, 3, 0, 0, EnumSymbol.NONE).addTraits(LIQUID).setTemp(666); //it's funny because it's the satan number - SYNGAS = new FluidType("SYNGAS", 0x131313, 1, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS); + SYNGAS = new FluidType("SYNGAS", 0x131313, 1, 4, 2, EnumSymbol.NONE).addContainers(new CD_Gastank(0xFFFFFF, 0x131313)).addTraits(GASEOUS); OXYHYDROGEN = new FluidType("OXYHYDROGEN", 0x483FC1, 0, 4, 2, EnumSymbol.NONE).addTraits(GASEOUS); RADIOSOLVENT = new FluidType("RADIOSOLVENT", 0xA4D7DD, 3, 3, 0, EnumSymbol.NONE).addTraits(LIQUID, LEADCON, new FT_Corrosive(50), new FT_VentRadiation(0.01F)); - CHLORINE = new FluidType("CHLORINE", 0xBAB572, 3, 0, 0, EnumSymbol.OXIDIZER).addTraits(GASEOUS, new FT_Corrosive(25), new FT_Poison(true, 1)); - HEAVYOIL_VACUUM = new FluidType("HEAVYOIL_VACUUM", 0x131214, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0x513F39, ExtContainer.CANISTER); - REFORMATE = new FluidType("REFORMATE", 0x835472, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xD180D6, ExtContainer.CANISTER); - LIGHTOIL_VACUUM = new FluidType("LIGHTOIL_VACUUM", 0x8C8851, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xB46B52, ExtContainer.CANISTER); - SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addTraits(GASEOUS, new FT_Corrosive(10), new FT_Poison(false, 1)); - XYLENE = new FluidType("XYLENE", 0x5C4E76, 2, 3, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xA380D6, ExtContainer.CANISTER); - HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211D06, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0x694235, ExtContainer.CANISTER); - DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xCDC3C6, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFFC500, ExtContainer.CANISTER); - DIESEL_CRACK_REFORM = new FluidType("DIESEL_CRACK_REFORM",0xCDC3CC, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFFC500, ExtContainer.CANISTER); - KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFF377D, ExtContainer.CANISTER); - REFORMGAS = new FluidType("REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); + CHLORINE = new FluidType("CHLORINE", 0xBAB572, 3, 0, 0, EnumSymbol.OXIDIZER).addContainers(new CD_Gastank(0xBAB572, 0x887B34)).addTraits(GASEOUS, new FT_Corrosive(25), new FT_Poison(true, 1)); + HEAVYOIL_VACUUM = new FluidType("HEAVYOIL_VACUUM", 0x131214, 2, 1, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0x513F39)); + REFORMATE = new FluidType("REFORMATE", 0x835472, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xD180D6)); + LIGHTOIL_VACUUM = new FluidType("LIGHTOIL_VACUUM", 0x8C8851, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xB46B52)); + SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addContainers(new CD_Gastank(0xC9BE0D, 0x303030)).addTraits(GASEOUS, new FT_Corrosive(10), new FT_Poison(false, 1)); + XYLENE = new FluidType("XYLENE", 0x5C4E76, 2, 3, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xA380D6)); + HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211D06, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0x694235)); + DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xCDC3C6, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xFFC500)); + DIESEL_CRACK_REFORM = new FluidType("DIESEL_CRACK_REFORM",0xCDC3CC, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xFFC500)); + KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(new CD_Canister(0xFF377D)); + REFORMGAS = new FluidType("REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0x9392FF, 0xFFB992)).addTraits(GASEOUS); COLLOID = new FluidType("COLLOID", 0x787878, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); - PHOSGENE = new FluidType("PHOSGENE", 0xCFC4A4, 4, 0, 1, EnumSymbol.NONE).addTraits(GASEOUS); - MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xBAB572, 4, 1, 1, EnumSymbol.NONE).addTraits(GASEOUS); + PHOSGENE = new FluidType("PHOSGENE", 0xCFC4A4, 4, 0, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0xCFC4A4, 0x361414)).addTraits(GASEOUS); + MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xBAB572, 4, 1, 1, EnumSymbol.NONE).addContainers(new CD_Gastank(0xBAB572, 0x361414)).addTraits(GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -567,4 +566,14 @@ public class Fluids { return all; } + + public static class CD_Canister { + public int color; + public CD_Canister(int color) { this.color = color; } + } + + public static class CD_Gastank { + public int bottleColor, labelColor; + public CD_Gastank(int color1, int color2) { this.bottleColor = color1; this.labelColor = color2; } + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/material/NTMMaterial.java b/src/main/java/com/hbm/inventory/material/NTMMaterial.java index 354052e5b..35940e7b2 100644 --- a/src/main/java/com/hbm/inventory/material/NTMMaterial.java +++ b/src/main/java/com/hbm/inventory/material/NTMMaterial.java @@ -5,6 +5,9 @@ import java.util.Set; import com.hbm.inventory.OreDictManager.DictFrame; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + /** * Encapsulates most materials that are currently listed as DictFrames, even vanilla ones. * @author hbm @@ -75,6 +78,14 @@ public class NTMMaterial { return this; } + public ItemStack make(Item item, int amount) { + return new ItemStack(item, amount, this.id); + } + + public ItemStack make(Item item) { + return make(item, 1); + } + public static enum SmeltingBehavior { NOT_SMELTABLE, //anything that can't be smelted or otherwise doesn't belong in a smelter, like diamond. may also include things that are smeltable but turn into a different type VAPORIZES, //can't be smelted because the material would skadoodle diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 086d40f87..90ef04f95 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -956,7 +956,16 @@ public class AssemblerRecipes { new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(CU.plate(), 12) }, 150); - + + makeRecipe(new ComparableStack(ModBlocks.machine_vacuum_distill, 1), new AStack[] { + new OreDictStack(STEEL.plateCast(), 16), + new OreDictStack(CU.plate528(), 16), + new OreDictStack(TCALLOY.ingot(), 4), + new ComparableStack(ModItems.sphere_steel, 1), + new ComparableStack(ModItems.pipes_steel, 1), + new ComparableStack(ModItems.motor_desh, 3), + new ComparableStack(ModItems.circuit_gold, 1) + }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_catalytic_reformer, 1), new AStack[] { new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(CU.plate528(), 8), @@ -966,7 +975,7 @@ public class AssemblerRecipes { new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit_red_copper, 3) - }, 150); + }, 200); makeRecipe(new ComparableStack(ModBlocks.block_cap_nuka, 1), new AStack[] { new ComparableStack(ModItems.cap_nuka, 128) }, 10); makeRecipe(new ComparableStack(ModBlocks.block_cap_quantum, 1), new AStack[] { new ComparableStack(ModItems.cap_quantum, 128) }, 10); @@ -978,7 +987,6 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.block_cap_star, 1), new AStack[] { new ComparableStack(ModItems.cap_star, 128) }, 10); if(!GeneralConfig.enable528) { - makeRecipe(new ComparableStack(ModBlocks.machine_hephaestus, 1), new AStack[] { new ComparableStack(ModItems.pipes_steel, 1), new OreDictStack(STEEL.ingot(), 24), new OreDictStack(CU.plate(), 24), new OreDictStack(NB.ingot(), 4), new OreDictStack(RUBBER.ingot(), 12), new ComparableStack(ModBlocks.glass_quartz, 16) }, 150); makeRecipe(new ComparableStack(ModBlocks.reactor_element, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(OreDictManager.getReflector(), 4), new OreDictStack(PB.plate(), 2), new OreDictStack(ZR.ingot(), 2), },150); makeRecipe(new ComparableStack(ModBlocks.reactor_control, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(PB.ingot(), 6), new ComparableStack(ModItems.bolt_tungsten, 6), new ComparableStack(ModItems.motor, 1), },100); @@ -999,6 +1007,8 @@ public class AssemblerRecipes { addTantalium(new ComparableStack(ModBlocks.machine_silex, 1), 15); addTantalium(new ComparableStack(ModBlocks.machine_radar, 1), 20); addTantalium(new ComparableStack(ModBlocks.machine_mining_laser, 1), 30); + addTantalium(new ComparableStack(ModBlocks.machine_vacuum_distill, 1), 50); + addTantalium(new ComparableStack(ModBlocks.machine_catalytic_reformer, 1), 50); addTantalium(new ComparableStack(ModBlocks.turret_chekhov, 1), 3); addTantalium(new ComparableStack(ModBlocks.turret_friendly, 1), 3); @@ -1145,7 +1155,7 @@ public class AssemblerRecipes { new ComparableStack(ModItems.motor_desh, 16), new ComparableStack(ModItems.bolt_dura_steel, 12), new OreDictStack(KEY_YELLOW, 4) - }, 5000); + }, 1200); if(Loader.isModLoaded("Mekanism")) { diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 018a06ff6..9a1b21989 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -108,12 +108,23 @@ public class ChemplantRecipes extends SerializableRecipe { .inputItems(new OreDictStack(S.dust())) .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500)) .outputItems(new ItemStack(ModItems.ingot_rubber))); - recipes.add(new ChemRecipe(94, "PET", 100) + /*recipes.add(new ChemRecipe(94, "PET", 100) .inputItems(new OreDictStack(AL.dust())) .inputFluids( new FluidStack(Fluids.XYLENE, 500), new FluidStack(Fluids.OXYGEN, 100)) - .outputItems(new ItemStack(ModItems.ingot_pet))); + .outputItems(new ItemStack(ModItems.ingot_pet)));*/ + recipes.add(new ChemRecipe(94, "PC", 100) + .inputFluids( + new FluidStack(Fluids.XYLENE, 500), + new FluidStack(Fluids.PHOSGENE, 500)) + .outputItems(new ItemStack(ModItems.ingot_pc))); + recipes.add(new ChemRecipe(96, "PVC", 100) + .inputItems(new OreDictStack(CA.dust())) //placeholder! + .inputFluids( + new FluidStack(Fluids.UNSATURATEDS, 250), + new FluidStack(Fluids.CHLORINE, 250)) + .outputItems(new ItemStack(ModItems.ingot_pvc))); recipes.add(new ChemRecipe(89, "DYNAMITE", 50) .inputItems( new ComparableStack(Items.sugar), diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index 8844cd417..cce2fcf99 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -12,7 +12,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; import com.hbm.inventory.FluidStack; -import com.hbm.inventory.OreDictManager; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index c4264edcd..9ac065476 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -347,6 +347,7 @@ public class ModItems { public static Item ingot_bakelite; public static Item ingot_rubber; public static Item ingot_pet; + public static Item ingot_pc; public static Item ingot_pvc; public static Item ingot_fiberglass; @@ -907,9 +908,6 @@ public class ModItems { public static Item gas_empty; public static Item gas_full; - public static Item gas_petroleum; - public static Item gas_biogas; - public static Item gas_lpg; public static Item fluid_tank_full; public static Item fluid_tank_empty; @@ -1044,18 +1042,7 @@ public class ModItems { public static Item rod_quad; public static Item rod_zirnox_empty; - //public static Item rod_zirnox_natural_uranium_fuel; - //public static Item rod_zirnox_uranium_fuel; - //public static Item rod_zirnox_th232; - //public static Item rod_zirnox_thorium_fuel; - //public static Item rod_zirnox_mox_fuel; - //public static Item rod_zirnox_plutonium_fuel; - //public static Item rod_zirnox_u233_fuel; - //public static Item rod_zirnox_u235_fuel; - //public static Item rod_zirnox_les_fuel; - //public static Item rod_zirnox_lithium; public static Item rod_zirnox_tritium; - //public static Item rod_zirnox_zfb_mox; public static ItemEnumMulti rod_zirnox; public static Item rod_zirnox_natural_uranium_fuel_depleted; @@ -2808,7 +2795,8 @@ public class ModItems { ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polymer"); ingot_bakelite = new ItemCustomLore().setUnlocalizedName("ingot_bakelite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bakelite"); ingot_rubber = new ItemCustomLore().setUnlocalizedName("ingot_rubber").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_rubber"); - ingot_pet = new ItemCustomLore().setUnlocalizedName("ingot_pet").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pet"); + //ingot_pet = new ItemCustomLore().setUnlocalizedName("ingot_pet").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pet"); + ingot_pc = new ItemCustomLore().setUnlocalizedName("ingot_pc").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pc"); ingot_pvc = new ItemCustomLore().setUnlocalizedName("ingot_pvc").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pvc"); ingot_desh = new ItemCustomLore().setUnlocalizedName("ingot_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_desh"); nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_desh"); @@ -3426,10 +3414,7 @@ public class ModItems { canister_full = new ItemCanister().setUnlocalizedName("canister_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_empty"); canister_napalm = new ItemCustomLore().setUnlocalizedName("canister_napalm").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_napalm"); gas_empty = new Item().setUnlocalizedName("gas_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":gas_empty"); - gas_full = new Item().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_full"); - gas_petroleum = new Item().setUnlocalizedName("gas_petroleum").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_petroleum"); - gas_biogas = new Item().setUnlocalizedName("gas_biogas").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_biogas"); - gas_lpg = new Item().setUnlocalizedName("gas_lpg").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_lpg"); + gas_full = new ItemGasTank().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_empty"); tank_waste = new ItemTankWaste().setUnlocalizedName("tank_waste").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab); @@ -5735,7 +5720,8 @@ public class ModItems { GameRegistry.registerItem(ingot_polymer, ingot_polymer.getUnlocalizedName()); GameRegistry.registerItem(ingot_bakelite, ingot_bakelite.getUnlocalizedName()); GameRegistry.registerItem(ingot_rubber, ingot_rubber.getUnlocalizedName()); - GameRegistry.registerItem(ingot_pet, ingot_pet.getUnlocalizedName()); + //GameRegistry.registerItem(ingot_pet, ingot_pet.getUnlocalizedName()); + GameRegistry.registerItem(ingot_pc, ingot_pc.getUnlocalizedName()); GameRegistry.registerItem(ingot_pvc, ingot_pvc.getUnlocalizedName()); GameRegistry.registerItem(ingot_schraranium, ingot_schraranium.getUnlocalizedName()); GameRegistry.registerItem(ingot_schrabidium, ingot_schrabidium.getUnlocalizedName()); @@ -6473,9 +6459,6 @@ public class ModItems { //Gas Tanks GameRegistry.registerItem(gas_empty, gas_empty.getUnlocalizedName()); GameRegistry.registerItem(gas_full, gas_full.getUnlocalizedName()); - GameRegistry.registerItem(gas_petroleum, gas_petroleum.getUnlocalizedName()); - GameRegistry.registerItem(gas_biogas, gas_biogas.getUnlocalizedName()); - GameRegistry.registerItem(gas_lpg, gas_lpg.getUnlocalizedName()); //Universal Tank GameRegistry.registerItem(fluid_tank_empty, fluid_tank_empty.getUnlocalizedName()); @@ -8248,143 +8231,6 @@ public class ModItems { GameRegistry.registerItem(mysteryshovel, mysteryshovel.getUnlocalizedName()); GameRegistry.registerItem(memory, memory.getUnlocalizedName()); - addRemap("ammo_nuke_tots", 5594, ammo_nuke, AmmoFatman.TOTS); - addRemap("ammo_12gauge_incendiary", 5455, ammo_12gauge, Ammo12Gauge.INCENDIARY); - addRemap("ammo_12gauge_shrapnel", 5456, ammo_12gauge, Ammo12Gauge.SHRAPNEL); - addRemap("ammo_stinger_rocket_bones", 5572, ammo_stinger_rocket, AmmoStinger.BONES); - addRemap("ammo_556_flechette_phosphorus", 5515, ammo_556, Ammo556mm.FLECHETTE_PHOSPHORUS); - addRemap("ammo_50ae_chlorophyte", 5527, ammo_50ae, Ammo50AE.CHLOROPHYTE); - addRemap("gun_revolver_nightmare2_ammo", 5440, ammo_357, Ammo357Magnum.NIGHTMARE2); - addRemap("gun_revolver_iron_ammo", 5432, ammo_357, Ammo357Magnum.IRON); - addRemap("ammo_50bmg_star", 5534, ammo_50bmg, Ammo50BMG.STAR); - addRemap("ammo_556_star", 5509, ammo_556, Ammo556mm.STAR); - addRemap("ammo_556_flechette", 5513, ammo_556, Ammo556mm.FLECHETTE); - addRemap("ammo_12gauge_du", 5457, ammo_12gauge, Ammo12Gauge.DU); - addRemap("ammo_shell_apfsds_t", 5586, ammo_shell, Ammo240Shell.APFSDS_T); - addRemap("ammo_4gauge_void", 5481, ammo_4gauge, Ammo4Gauge.VOID); - addRemap("ammo_shell_apfsds_du", 5587, ammo_shell, Ammo240Shell.APFSDS_DU); - addRemap("ammo_fireext_foam", 5549, ammo_fireext, AmmoFireExt.FOAM); - addRemap("ammo_556_flechette_chlorophyte", 5517, ammo_556, Ammo556mm.FLECHETTE_CHLOROPHYTE); - addRemap("ammo_fuel_vaporizer", 5546, ammo_fuel, AmmoFlamethrower.VAPORIZER); - addRemap("ammo_4gauge_titan", 5482, ammo_4gauge, Ammo4Gauge.QUACK); - addRemap("ammo_556_phosphorus", 5506, ammo_556, Ammo556mm.PHOSPHORUS); - addRemap("ammo_4gauge_flechette_phosphorus", 5473, ammo_4gauge, Ammo4Gauge.FLECHETTE_PHOSPHORUS); - addRemap("ammo_shell_w9", 5588, ammo_shell, Ammo240Shell.W9); - addRemap("gun_revolver_gold_ammo", 5434, ammo_357, Ammo357Magnum.GOLD); - addRemap("ammo_556_flechette_du", 5516, ammo_556, Ammo556mm.FLECHETTE_DU); - addRemap("ammo_20gauge_incendiary", 5463, ammo_20gauge, Ammo20Gauge.INCENDIARY); - addRemap("ammo_shell_explosive", 5585, ammo_shell, Ammo240Shell.EXPLOSIVE); - addRemap("ammo_20gauge_explosive", 5465, ammo_20gauge, Ammo20Gauge.EXPLOSIVE); - addRemap("ammo_556_k", 5519, ammo_556, Ammo556mm.K); - addRemap("ammo_44_phosphorus", 5487, ammo_44, Ammo44Magnum.PHOSPHORUS); - addRemap("gun_revolver_cursed_ammo", 5437, ammo_357, Ammo357Magnum.STEEL); - addRemap("ammo_556_flechette_incendiary", 5514, ammo_556, Ammo556mm.FLECHETTE_INCENDIARY); - addRemap("ammo_75bolt_he", 5542, ammo_75bolt, Ammo75Bolt.HE); - addRemap("ammo_20gauge_flechette", 5462, ammo_20gauge, Ammo20Gauge.FLECHETTE); - addRemap("ammo_rocket_shrapnel", 5559, ammo_rocket, AmmoRocket.SHRAPNEL); - addRemap("ammo_556_chlorophyte", 5510, ammo_556, Ammo556mm.CHLOROPHYTE); - addRemap("ammo_12gauge_marauder", 5459, ammo_12gauge, Ammo12Gauge.MARAUDER); - addRemap("ammo_50bmg_chlorophyte", 5535, ammo_50bmg, Ammo50BMG.CHLOROPHYTE); - addRemap("ammo_rocket_emp", 5560, ammo_rocket, AmmoRocket.EMP); - addRemap("ammo_4gauge_vampire", 5480, ammo_4gauge, Ammo4Gauge.VAMPIRE); - addRemap("ammo_5mm_du", 5496, ammo_5mm, Ammo5mm.DU); - addRemap("ammo_9mm_rocket", 5503, ammo_9mm, Ammo9mm.ROCKET); - addRemap("gun_revolver_ammo", 5433, ammo_357, Ammo357Magnum.LEAD); - addRemap("ammo_grenade_sleek", 5580, ammo_grenade, AmmoGrenade.SLEEK); - addRemap("ammo_4gauge_slug", 5471, ammo_4gauge, Ammo4Gauge.SLUG); - addRemap("ammo_4gauge_kampf", 5477, ammo_4gauge, Ammo4Gauge.KAMPF); - addRemap("ammo_20gauge_shrapnel", 5464, ammo_20gauge, Ammo20Gauge.SHRAPNEL); - addRemap("ammo_5mm_explosive", 5495, ammo_5mm, Ammo5mm.EXPLOSIVE); - addRemap("gun_revolver_nightmare_ammo", 5438, ammo_357, Ammo357Magnum.NIGHTMARE1); - addRemap("ammo_stinger_rocket_he", 5569, ammo_stinger_rocket, AmmoStinger.HE); - addRemap("ammo_20gauge_caustic", 5466, ammo_20gauge, Ammo20Gauge.CAUSTIC); - addRemap("ammo_4gauge_semtex", 5475, ammo_4gauge, Ammo4Gauge.MINING); - addRemap("ammo_grenade_kampf", 5583, ammo_grenade, AmmoGrenade.KAMPF); - addRemap("ammo_556_flechette_sleek", 5518, ammo_556, Ammo556mm.FLECHETTE_SLEEK); - addRemap("ammo_mirv_special", 5602, ammo_nuke, AmmoFatman.MIRV_SPECIAL); - addRemap("ammo_50bmg_flechette", 5536, ammo_50bmg, Ammo50BMG.FLECHETTE); - addRemap("ammo_556_sleek", 5511, ammo_556, Ammo556mm.SLEEK); - addRemap("ammo_9mm_chlorophyte", 5502, ammo_9mm, Ammo9mm.CHLOROPHYTE); - addRemap("ammo_nuke_barrel", 5597, ammo_nuke, AmmoFatman.BARREL); - addRemap("ammo_nuke_low", 5592, ammo_nuke, AmmoFatman.LOW); - addRemap("ammo_fireext_sand", 5550, ammo_fireext, AmmoFireExt.SAND); - addRemap("ammo_44_silver", 5492, ammo_44, Ammo44Magnum.SILVER); - addRemap("ammo_grenade_concussion", 5578, ammo_grenade, AmmoGrenade.CONCUSSION); - addRemap("ammo_20gauge_shock", 5467, ammo_20gauge, Ammo20Gauge.SHOCK); - addRemap("ammo_4gauge_flechette", 5472, ammo_4gauge, Ammo4Gauge.FLECHETTE); - addRemap("ammo_rocket_toxic", 5562, ammo_rocket, AmmoRocket.CHLORINE); - addRemap("ammo_50bmg_explosive", 5531, ammo_50bmg, Ammo50BMG.EXPLOSIVE); - addRemap("ammo_grenade_finned", 5579, ammo_grenade, AmmoGrenade.FINNED); - addRemap("ammo_dart_nuclear", 5553, ammo_dart, AmmoDart.NUCLEAR); - addRemap("ammo_grenade_phosphorus", 5576, ammo_grenade, AmmoGrenade.PHOSPHORUS); - addRemap("ammo_5mm_star", 5497, ammo_5mm, Ammo5mm.STAR); - addRemap("ammo_4gauge_sleek", 5483, ammo_4gauge, Ammo4Gauge.SLEEK); - addRemap("ammo_mirv_high", 5600, ammo_nuke, AmmoFatman.MIRV_HIGH); - addRemap("ammo_5mm_chlorophyte", 5498, ammo_5mm, Ammo5mm.CHLOROPHYTE); - addRemap("ammo_50bmg_flechette_po", 5538, ammo_50bmg, Ammo50BMG.FLECHETTE_PO); - addRemap("ammo_50ae_star", 5526, ammo_50ae, Ammo50AE.STAR); - addRemap("ammo_50bmg_flechette_am", 5537, ammo_50bmg, Ammo50BMG.FLECHETTE_AM); - addRemap("ammo_9mm_ap", 5500, ammo_9mm, Ammo9mm.AP); - addRemap("ammo_mirv", 5598, ammo_nuke, AmmoFatman.MIRV); - addRemap("ammo_4gauge_claw", 5479, ammo_4gauge, Ammo4Gauge.CLAW); - addRemap("ammo_rocket_glare", 5561, ammo_rocket, AmmoRocket.GLARE); - addRemap("ammo_stinger_rocket_incendiary", 5570, ammo_stinger_rocket, AmmoStinger.INCENDIARY); - addRemap("ammo_rocket_incendiary", 5557, ammo_rocket, AmmoRocket.INCENDIARY); - addRemap("ammo_50ae_ap", 5524, ammo_50ae, Ammo50AE.AP); - addRemap("ammo_mirv_safe", 5601, ammo_nuke, AmmoFatman.MIRV_SAFE); - addRemap("ammo_4gauge_canister", 5478, ammo_4gauge, Ammo4Gauge.CANISTER); - addRemap("ammo_50ae_du", 5525, ammo_50ae, Ammo50AE.DU); - addRemap("ammo_44_ap", 5485, ammo_44, Ammo44Magnum.AP); - addRemap("ammo_44_bj", 5491, ammo_44, Ammo44Magnum.BJ); - addRemap("ammo_rocket_sleek", 5564, ammo_rocket, AmmoRocket.SLEEK); - addRemap("ammo_nuke_high", 5593, ammo_nuke, AmmoFatman.HIGH); - addRemap("ammo_grenade_incendiary", 5575, ammo_grenade, AmmoGrenade.INCENDIARY); - addRemap("ammo_44_du", 5486, ammo_44, Ammo44Magnum.DU); - addRemap("ammo_50bmg_ap", 5532, ammo_50bmg, Ammo50BMG.AP); - addRemap("ammo_50bmg_du", 5533, ammo_50bmg, Ammo50BMG.DU); - addRemap("ammo_9mm_du", 5501, ammo_9mm, Ammo9mm.DU); - addRemap("ammo_20gauge_slug", 5461, ammo_20gauge, Ammo20Gauge.SLUG); - addRemap("ammo_grenade_tracer", 5582, ammo_grenade, AmmoGrenade.TRACER); - addRemap("ammo_fuel_phosphorus", 5545, ammo_fuel, AmmoFlamethrower.PHOSPHORUS); - addRemap("ammo_44_pip", 5490, ammo_44, Ammo44Magnum.PIP); - addRemap("ammo_grenade_toxic", 5577, ammo_grenade, AmmoGrenade.CHLORINE); - addRemap("ammo_nuke_safe", 5595, ammo_nuke, AmmoFatman.SAFE); - addRemap("gun_mp_ammo", 5505, ammo_556, Ammo556mm.GOLD); - addRemap("gun_revolver_lead_ammo", 5435, ammo_357, Ammo357Magnum.NUCLEAR); - addRemap("ammo_stinger_rocket_nuclear", 5571, ammo_stinger_rocket, AmmoStinger.NUCLEAR); - addRemap("ammo_grenade_nuclear", 5581, ammo_grenade, AmmoGrenade.NUCLEAR); - addRemap("ammo_rocket_digamma", 5567, ammo_rocket, AmmoRocket.DIGAMMA); - addRemap("ammo_rocket_nuclear", 5565, ammo_rocket, AmmoRocket.NUCLEAR); - addRemap("ammo_mirv_low", 5599, ammo_nuke, AmmoFatman.MIRV_LOW); - addRemap("ammo_44_chlorophyte", 5489, ammo_44, Ammo44Magnum.CHLOROPHYTE); - addRemap("ammo_22lr_chlorophyte", 5522, ammo_22lr, Ammo22LR.CHLOROPHYTE); - addRemap("ammo_12gauge_sleek", 5458, ammo_12gauge, Ammo12Gauge.SLEEK); - addRemap("ammo_20gauge_sleek", 5469, ammo_20gauge, Ammo20Gauge.SLEEK); - addRemap("ammo_4gauge_explosive", 5474, ammo_4gauge, Ammo4Gauge.EXPLOSIVE); - addRemap("ammo_50bmg_incendiary", 5529, ammo_50bmg, Ammo50BMG.INCENDIARY); - addRemap("ammo_556_du", 5508, ammo_556, Ammo556mm.DU); - addRemap("ammo_fuel_napalm", 5544, ammo_fuel, AmmoFlamethrower.NAPALM); - addRemap("gun_revolver_schrabidium_ammo", 5436, ammo_357, Ammo357Magnum.SCHRABIDIUM); - addRemap("ammo_556_ap", 5507, ammo_556, Ammo556mm.AP); - addRemap("ammo_20gauge_wither", 5468, ammo_20gauge, Ammo20Gauge.WITHER); - addRemap("ammo_rocket_rpc", 5566, ammo_rocket, AmmoRocket.RPC); - addRemap("ammo_fuel_gas", 5547, ammo_fuel, AmmoFlamethrower.CHLORINE); - addRemap("ammo_22lr_ap", 5521, ammo_22lr, Ammo22LR.AP); - addRemap("ammo_grenade_he", 5574, ammo_grenade, AmmoGrenade.HE); - addRemap("ammo_4gauge_balefire", 5476, ammo_4gauge, Ammo4Gauge.BALEFIRE); - addRemap("ammo_357_desh", 5439, ammo_357, Ammo357Magnum.DESH); - addRemap("ammo_nuke_pumpkin", 5596, ammo_nuke, AmmoFatman.PUMPKIN); - addRemap("ammo_44_star", 5488, ammo_44, Ammo44Magnum.STAR); - addRemap("ammo_50bmg_sleek", 5539, ammo_50bmg, Ammo50BMG.SLEEK); - addRemap("ammo_dart_nerf", 5554, ammo_dart, AmmoDart.NERF); - addRemap("ammo_50bmg_phosphorus", 5530, ammo_50bmg, Ammo50BMG.PHOSPHORUS); - addRemap("ammo_44_rocket", 5493, ammo_44, Ammo44Magnum.ROCKET); - addRemap("ammo_rocket_he", 5556, ammo_rocket, AmmoRocket.HE); - addRemap("ammo_556_tracer", 5512, ammo_556, Ammo556mm.TRACER); - addRemap("ammo_75bolt_incendiary", 5541, ammo_75bolt, Ammo75Bolt.INCENDIARY); - addRemap("ammo_rocket_canister", 5563, ammo_rocket, AmmoRocket.CANISTER); - addRemap("ammo_rocket_phosphorus", 5558, ammo_rocket, AmmoRocket.PHOSPHORUS); - //CONSERVE REMAP addRemap("canned_beef", canned_conserve, EnumFoodType.BEEF); addRemap("canned_tuna", canned_conserve, EnumFoodType.TUNA); @@ -8425,7 +8271,10 @@ public class ModItems { addRemap("rod_zirnox_les_fuel", rod_zirnox, EnumZirnoxType.LES_FUEL); addRemap("rod_zirnox_lithium", rod_zirnox, EnumZirnoxType.LITHIUM); addRemap("rod_zirnox_zfb_mox", rod_zirnox, EnumZirnoxType.ZFB_MOX); - + + addRemap("gas_petroleum", gas_full, Fluids.PETROLEUM.getID()); + addRemap("gas_biogas", gas_full, Fluids.BIOGAS.getID()); + addRemap("gas_lpg", gas_full, Fluids.LPG.getID()); } public static void addRemap(String unloc, int removoingTheseWouldTakeForever, Item item, Enum sub) { diff --git a/src/main/java/com/hbm/items/machine/ItemCanister.java b/src/main/java/com/hbm/items/machine/ItemCanister.java index 6290acb2d..b1393db87 100644 --- a/src/main/java/com/hbm/items/machine/ItemCanister.java +++ b/src/main/java/com/hbm/items/machine/ItemCanister.java @@ -3,7 +3,7 @@ package com.hbm.items.machine; import java.util.List; import com.hbm.inventory.fluid.FluidType; -import com.hbm.inventory.fluid.FluidType.ExtContainer; +import com.hbm.inventory.fluid.Fluids.CD_Canister; import com.hbm.inventory.fluid.Fluids; import cpw.mods.fml.relauncher.Side; @@ -32,7 +32,7 @@ public class ItemCanister extends Item { for(int i = 1; i < order.length; ++i) { FluidType type = order[i]; - if(type.containers.contains(ExtContainer.CANISTER)) { + if(type.getContainer(CD_Canister.class) != null) { list.add(new ItemStack(item, 1, type.getID())); } } @@ -70,11 +70,13 @@ public class ItemCanister extends Item { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { - if(p_82790_2_ == 0) { + public int getColorFromItemStack(ItemStack stack, int pass) { + if(pass == 0) { return 16777215; } else { - int j = Fluids.fromID(stack.getItemDamage()).getContainerColor(); + + CD_Canister canister = Fluids.fromID(stack.getItemDamage()).getContainer(CD_Canister.class); + int j = canister == null ? -1 : canister.color; if(j < 0) { j = 16777215; diff --git a/src/main/java/com/hbm/items/machine/ItemGasTank.java b/src/main/java/com/hbm/items/machine/ItemGasTank.java new file mode 100644 index 000000000..11a20554a --- /dev/null +++ b/src/main/java/com/hbm/items/machine/ItemGasTank.java @@ -0,0 +1,93 @@ +package com.hbm.items.machine; + +import java.util.List; + +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.fluid.Fluids.CD_Gastank; +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; + +public class ItemGasTank extends Item { + + IIcon overlayIcon; + IIcon labelIcon; + + public ItemGasTank() { + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tabs, List list) { + + FluidType[] order = Fluids.getInNiceOrder(); + for(int i = 1; i < order.length; ++i) { + FluidType type = order[i]; + + if(type.getContainer(CD_Gastank.class) != null) { + list.add(new ItemStack(item, 1, type.getID())); + } + } + } + + public String getItemStackDisplayName(ItemStack stack) { + String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); + String s1 = ("" + StatCollector.translateToLocal(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName())).trim(); + + if(s1 != null) { + s = s + " " + s1; + } + + return s; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() { + return true; + } + + @Override + public int getRenderPasses(int meta) { + return 3; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister reg) { + super.registerIcons(reg); + this.overlayIcon = reg.registerIcon(RefStrings.MODID + ":gas_bottle"); + this.labelIcon = reg.registerIcon(RefStrings.MODID + ":gas_label"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int damage, int pass) { + return pass == 2 ? this.labelIcon : pass == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(damage, pass); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass) { + if(pass == 0) { + return 16777215; + } else { + + CD_Gastank tank = Fluids.fromID(stack.getItemDamage()).getContainer(CD_Gastank.class); + + if(tank == null) return 0xffffff; + + return pass == 1 ? tank.bottleColor : tank.labelColor; + } + } +} diff --git a/src/main/java/com/hbm/items/special/ItemAutogen.java b/src/main/java/com/hbm/items/special/ItemAutogen.java index 54d66d08d..2b01c38a1 100644 --- a/src/main/java/com/hbm/items/special/ItemAutogen.java +++ b/src/main/java/com/hbm/items/special/ItemAutogen.java @@ -7,7 +7,6 @@ import java.util.Map.Entry; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.NTMMaterial; -import com.hbm.inventory.material.NTMMaterial.SmeltingBehavior; import com.hbm.lib.RefStrings; import com.hbm.render.icon.RGBMutatorInterpolatedComponentRemap; import com.hbm.render.icon.TextureAtlasSpriteMutatable; diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 3fb2c196c..d88605e43 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1033,6 +1033,15 @@ public class MainRegistry { ignoreMappings.add("hbm:item.canister_lightoil"); ignoreMappings.add("hbm:item.canister_biofuel"); ignoreMappings.add("hbm:item.canister_ethanol"); + ignoreMappings.add("hbm:item.gun_revolver_nightmare2_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_iron_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_gold_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_cursed_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_nightmare_ammo"); + ignoreMappings.add("hbm:item.gun_mp_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_lead_ammo"); + ignoreMappings.add("hbm:item.gun_revolver_schrabidium_ammo"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); @@ -1040,6 +1049,12 @@ public class MainRegistry { remapItems.put("hbm:item.briquette_lignite", ModItems.briquette); for(MissingMapping mapping : event.get()) { + + // ignore all ammo prefixes because those are from the time we threw out all the ammo items + if(mapping.name.startsWith("hbm:item.ammo_")) { + mapping.ignore(); + continue; + } if(ignoreMappings.contains(mapping.name)) { mapping.ignore(); diff --git a/src/main/java/com/hbm/render/tileentity/RenderCombustionEngine.java b/src/main/java/com/hbm/render/tileentity/RenderCombustionEngine.java index 53197c65f..2290beb64 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderCombustionEngine.java +++ b/src/main/java/com/hbm/render/tileentity/RenderCombustionEngine.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.fluid.Fluids.CD_Canister; import com.hbm.main.ResourceManager; import com.hbm.render.item.ItemRenderBase; import com.hbm.tileentity.machine.TileEntityMachineCombustionEngine; @@ -36,9 +37,10 @@ public class RenderCombustionEngine extends TileEntitySpecialRenderer implements ResourceManager.combustion_engine.renderPart("Engine"); TileEntityMachineCombustionEngine engine = (TileEntityMachineCombustionEngine) tile; + CD_Canister canister = engine.tank.getTankType().getContainer(CD_Canister.class); - int color = engine.tank.getTankType().getContainerColor(); - if(color != 0xffffff) { + if(canister != null) { + int color = canister.color; float r = ((color & 0xff0000) >> 16) / 256F; float g = ((color & 0x00ff00) >> 8) / 256F; float b = ((color & 0x0000ff) >> 0) / 256F; diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index beb93e933..911aff76c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -1725,7 +1725,7 @@ item.gadget_kit.name=The Gadget Kit item.gadget_wireing.name=Kabelrolle item.gas_biogas.name=Biogastank item.gas_empty.name=Leerer Gastank -item.gas_full.name=Gastank +item.gas_full.name=Gastank: item.gas_lpg.name=LPG-Tank item.gas_mask.name=Gasmaske item.gas_mask_filter.name=Gasmaskenfilter @@ -1971,7 +1971,7 @@ item.ingot_arsenic.name=Arsenbarren item.ingot_asbestos.name=Asbestplatte item.ingot_au198.name=Gold-198-Barren item.ingot_australium.name=Australiumbarren -item.ingot_bakelite.name=Bakelitbarren +item.ingot_bakelite.name=Bakelittafel item.ingot_beryllium.name=Berylliumbarren item.ingot_bismuth.name=Bismutbarren item.ingot_boron.name=Borbarren @@ -2007,6 +2007,7 @@ item.ingot_neptunium_fuel.name=Neptuniumkernbrennstoffbarren item.ingot_niobium.name=Niobbarren item.ingot_osmiridium.name=Osmiridiumbarren item.ingot_pb209.name=Blei-209-Barren +item.ingot_pc.name=Hartplastiktafel item.ingot_pet.name=Aluminiumverstärkte PET-Tafel item.ingot_phosphorus.name=Weiße Phosphortafel item.ingot_plutonium.name=Plutoniumbarren diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 3da4ce06f..6aac09461 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2349,7 +2349,7 @@ item.gadget_kit.name=The Gadget Kit item.gadget_wireing.name=Wiring item.gas_biogas.name=Biogas Tank item.gas_empty.name=Empty Gas Tank -item.gas_full.name=Gas Tank +item.gas_full.name=Gas Tank: item.gas_lpg.name=LPG Tank item.gas_mask.name=Gas Mask item.gas_mask_filter.name=Gas Mask Filter @@ -2646,6 +2646,7 @@ item.ingot_neptunium_fuel.name=Neptunium Fuel Ingot item.ingot_niobium.name=Niobium Ingot item.ingot_osmiridium.name=Osmiridium Ingot item.ingot_pb209.name=Lead-209 Ingot +item.ingot_pc.name=Hard Plastic Bar item.ingot_pet.name=Aluminium-Metallized PET Bar item.ingot_phosphorus.name=Bar of White Phosphorus item.ingot_plutonium.name=Plutonium Ingot diff --git a/src/main/resources/assets/hbm/textures/items/assembly_template_0.png b/src/main/resources/assets/hbm/textures/items/assembly_template_0.png deleted file mode 100644 index 0b1735f84319b9703cdd3c009d268f21f8aac36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfbP0l+XkKE>Re0 diff --git a/src/main/resources/assets/hbm/textures/items/assembly_template_2.png b/src/main/resources/assets/hbm/textures/items/assembly_template_2.png deleted file mode 100644 index 2524f739211e7edc8cc25da1ff377798977262d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfmdKI;Vst07JVP8UO$Q diff --git a/src/main/resources/assets/hbm/textures/items/assembly_template_3.png b/src/main/resources/assets/hbm/textures/items/assembly_template_3.png deleted file mode 100644 index e0304f824b481493066e37e6d8ecd7d0f7233b3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfP^tyXmY11eDbFMT5GQ06E5Mp4sc!5LsUN6sopi%};S3j3^P6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1WKS2z z5DWjk6AyAW81T3nH#_fWnK#!#<`Cze9TSBs3bx*e&-F}h5jl96`Saxe0;*~MS|qO} zv^~h^RIQqCa5&;d_&v8rJ9o~zuhOqD^`OW#X1{kgCy6j0m^kIcrf3E3ojXeG9QETY zg-V6k_mBntD*#V}ZiO-z}2A60H~~omtTA T<;%VS=sX5bS3j3^P6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t13{Mxw z5DWjk6Ap4V81T5xJ=iV%LSR?Z_Pz%vIrr>n*lf|ru3p5V_)T2Nu=j#eMa6|bPwWpi zb=W1gS!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1Y)==* z5DWjk6E|`mcHnVc?<;QOV8&U|AR>3*=~A90r##lhq;jlR{mjE#BBagm&Nd#5orbpiEev)oCZ@=d%htmdUC--dsXzV^IiJ@=Jk!iD8 zw=KAHJ$QD)4xX#GHJPpJ<9QAU%AcQpauky)78&qol`;+09TG?x&QzG diff --git a/src/main/resources/assets/hbm/textures/items/battery_creative_alt.png b/src/main/resources/assets/hbm/textures/items/battery_creative_alt.png deleted file mode 100644 index 4572200894a0685211329e4a8e64a17718882df3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1EKe85 z5DWjk6E<=-IPkcxzv8#%sBg@XDDQ)(SnnKST(_x+L%m@B32`Mu@rQf|A2t3wS%1h< z=~s*7vV^t;YrH4DuuX2$_;L1fO^C_cqhJ53aWd&O*PUG%yQzAcNm!$9Ntq amNPYfS#H9e@_h%;l?0#LT=By}Z;C1rt33 zJ+nVO$@hV3x;$MRLoEFFPQ1w3V8FvVcaiaz{n9If%eu~8YE@EqN$RD^W)uefN?Gda?KPzO_MKmhJTOL|$l94Xm V`rRhSQUmBJ22WQ%mvv4FO#ruXVvhg- diff --git a/src/main/resources/assets/hbm/textures/items/battery_generic_alt.png b/src/main/resources/assets/hbm/textures/items/battery_generic_alt.png deleted file mode 100644 index 6b5fff415930c7e8942f4dd1e1844014b4f3c215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3`aNA7LoEFFPPoW<*no%CxK;ckoA2^3+u1(|#U0>Y8RO_UF?0jxm&XcK zmv%Ss3s$;Fyc1}f5G2%nUpvv`VeP(@9>u-i-+$LXDUu->l^vA5_nAkLbc3??#;2)` zx*C?xO&v8;e_5v{Jb$0hTyW&^PotaD4jgX&=YL?Mem=L-G!_BRMMgf2P6r=-_mWtr be4O2vbP0l+XkKrO{`( diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium.png deleted file mode 100644 index f51c4ef7bbeb845ab6d9557289b20371f2ac5ca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfs?EKZSC z`LrNOw7|T`nE#l-J*CXhSL-ww3MTi*_vg+(^5ue@V>iPY!&#MS?Dr3dT)4XDRe;1o zms^MHPAPKu7WZt`Es34>{vWH8#jcDA^-bcwL8cbm9ewpc=QDV^`njxgN@xNAl_g{P diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_alt.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium_alt.png deleted file mode 100644 index 40182fe36aa1aa578b40158fe3426c13a6ae9251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3mUy~2hFJLTowS>mSy8}cyPEl<3ny9oVyAl-R598L>|hPwIPd1~j7C?c z$f6G_5@q*1*%z&{7i=?bQJk0>=wDkW(5?});X?b1=X%@TdEQFUpIjsCd)@cKWD#j@ zgD0x{Y;-=fPA-)dR&hCdJ(BI^$%#e#ZU}HmTu-fiTz`gx=T1{&QQhC*3EGUOFEcT} wKQKdZLhvJ&z?mio8C7dq-In_tDv+6~ue*Pry=`@YCD6SLp00i_>zopr08g`Q!T0#LT=By}Z;C1rt33 zJ+nVO$@hV37J9lkhFJLTov@L&!GMQF*DXoVOG+(4xk{?)mWYpo^FcGU_eX*h+`L*` z3SIC0n=G32%zs8AZyJZ0{jFUmdQRLkcAjFG^>^{j@@Jo8C$UDcZPD?$tkPtD@-5?& zlBqotBlN@+!~#FDACJ;lkjP=!A-;eoW!jrlbz(nMYvytF*-e=k$~kXBu|3y@Ia9M) t)l``{bvpyuA{TV1JhTiyvq5GV_m=$!+4l$h!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(L7HV z#}EturG1T@EQTB`>%W#vkh<*g@B4`pTK7H|9Gb9V_p7bn>s+Htp3S+x{C($-5~r)j zBm%?ZvOV88pZm{eth(8QS%l}{hHG3kj7yHRCtO&dzS*NQztmaQBevy%gxvOv;T85Q zbF^NG{pzan6uP(~JY;j0fc*20B;jN4cBP2S;JklIpy=YPubXz}g|3%%csyMqX0p`O hb1|9S|2MDaU$={SqW=q@NT5p@JYD@<);T3K0RZZ-ZF~R# diff --git a/src/main/resources/assets/hbm/textures/items/blades_combine_steel.png b/src/main/resources/assets/hbm/textures/items/blades_combine_steel.png deleted file mode 100644 index f6e964f423a2748ad3a717aea9851d0ea2cbdbc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(OORz z#}Etur2)5j4;yf#wB}u4HHuzx?%Llu40bhc*H;DE`?XawboLtlYf_O+JOBIQtYpzc zFXr4_{Ns)Eb=P<2Kg&93ycXq)7d38Bk#i3e-5JASZVJhNf{ wjXT?ysnsWO-9OW<&d!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(PB>* z#}Etur4#S+HW+ZU$R1iMb5hc(lU!QPI4LE4B%asxEIW z%2q3%->Ps;Q8~{%FY6$W&Vokgj2UmGV;!7?+F$J4D%s+)eO03D3prt)i&<*-zF%ii zd$3X=pYf+vR?`XTk6k%wvJne-CjPUNlHb?pwE1zgWs9Z6RL-*%MaCD_zL?5m3g}!0Pgg&ebxsLQ0PdA(k^lez diff --git a/src/main/resources/assets/hbm/textures/items/blades_iron.png b/src/main/resources/assets/hbm/textures/items/blades_iron.png deleted file mode 100644 index 4b159379d78c9adc5883aee9ccb64e07230e0937..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(Lzrb z#}EturF|E9j~H+`?+!6L(KA!`_LFn!wkZO(p|6eyGu>!=J?C@RwwGrt_xsxme|*{U zs@HJQ`d!~9-EjVLzxw}yCHrT)ayhJ#Ivl0_fpr2G|G@VurfAy z?(|FXK}g_sgYT>vlR6ytE}HeS`-g>4;VSmB>#BGoechI`&*!{m4w|>|V)B~4$3Vw2c)I$ztaD0e0synkas2=Q diff --git a/src/main/resources/assets/hbm/textures/items/blades_schrabidium.png b/src/main/resources/assets/hbm/textures/items/blades_schrabidium.png deleted file mode 100644 index 59753bef8355a14ef359d818c1672423c1201c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(Q;20 z#}EturGB@0j~H;A_A&Q2f6+5nSA5M3sVCNt8v2-yPJl;dD#fS=HIjj~O?mp%ouAyNzkzj??>YXfzCb54c)I$ztaD0e0swjuYlQ#+ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PC.png new file mode 100644 index 0000000000000000000000000000000000000000..23d18b26051e8e3b5651133aeab173a1b9bc002e GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfv&j1rL*tCBw2nja9FjvodDr zZK;|5=HK?&_QC=syXEGFyw-ZPd&~F9%qw2cI$3h@wlY&x@#^>q3qI7$k#)Fi;&|EI zE?}Z*_m54;egN{an^LB{Ts5w+e5d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png new file mode 100644 index 0000000000000000000000000000000000000000..3d0fbdd1cdd00830fbe6861527c8da3af3cc6691 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfATq>-D(>1X&v%Tlo2gPcRGpc8{5%$8h}Pra literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/gas_biogas.png b/src/main/resources/assets/hbm/textures/items/gas_biogas.png deleted file mode 100644 index e715954a6bcc13d070525312ad796582dd5b05b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfKaSXBO zO-@*#y2AU@&-m$2KFiOS604c?s78jTEB?Mgj(6#g^9K$bcwqXQLD^Gp#hv3H>~qYR zy85}Sb4q9e02l;EasU7T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/gas_full.png b/src/main/resources/assets/hbm/textures/items/gas_full.png deleted file mode 100644 index 740f6ea87bf8c0fd0fbb134e99f6f6999c659473..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf@8>`V&&zFhvi$wMiMc-&3J+djV34~iE4gdMD;=Ol N22WQ%mvv4FO#lFNC4v9| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/gas_lpg.png b/src/main/resources/assets/hbm/textures/items/gas_lpg.png deleted file mode 100644 index b579ba33ad0ef195875f48449090060b47461b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmV;a0apHrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0X|7YK~y+TwUWz9 z12Gha|AZOZQbj2YwYn6o=tc#fp&|ALHaY zFy)KNLKlCX28F$LDpE-(JMdx`DT~0LNJ)k!Mzf6;LWb=cR{Q z73jY9p>;s5VWXq40mz2xXeRrd-7Y1%6OB+AMhUeq55Ca_bAOk!}EqB--DB+y3; Mp00i_>zopr0IG0up8x;= diff --git a/src/main/resources/assets/hbm/textures/items/gas_xenon.png b/src/main/resources/assets/hbm/textures/items/gas_xenon.png deleted file mode 100644 index 8987c5b3a46ef75d5194648a1502da9f3c6b38e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU#$+x`v@CO1dH*Q$F}%rAu5v?_GO9} zC_9}b!u>xhA$?bATlHKC>zbhxyad=$bv-$gezGqH_6C~ZQ9c6I+_aNJral5^H Vy_m_l5}>CTJYD@<);T3K0RYh|Y2E+; diff --git a/src/main/resources/assets/hbm/textures/items/gun_b92_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_b92_ammo.png deleted file mode 100644 index f0412460c8d0ee101c7c9038acb56c702f6f7534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vffdv>Utn^XC<{^_Y$p7;0mChaJG&UE--bN7Z-sY<6S z7qjsgF&8Xj4i5hRp9cui&*vp30Kt#%@Adt*S}-mQv9MrZ5Z)!b^fk{eKcGbnp00i_ I>zopr0H1g|0RR91 diff --git a/src/main/resources/assets/hbm/textures/items/gun_jack_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_jack_ammo_alt.png deleted file mode 100644 index 58f0210debe078293c4e6eb1aa12e24367bb1f57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf>Cp#tYUiqN&lBTFEOvyM|MqGOW}8&y0|aZXBgHzZ@H+jeo7htx9%A;l6ae=I2hNh zUMk_Rx~+8TM}zh{zV+{0`d<}w?foNnDsA^_9_!t+8~+~7<8f==Q>A^Nu5kKRhGnPy zO4uKibR>4UGQYQ-oPRy%X-Pt@kFiDmK}&I$mPHyrsxG^gzPJ5v7;0KL|J=?UdfB-? zA)%9#3VTx{r5FSiPaCl%7?@tex$?E4oKWjn^(m;pV`;OXk;vd$@? F2>@%kdL94( diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo_alt.png deleted file mode 100644 index 37d74f02cebbc3cd1da2a9937014f2d696e4327d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3nmk<`LoEE4_8jDGP~dU(l{nDCDAR2G@r?w}gAkqvay$=AuKHhE!f2vt zyXSQN{pgMpM+#E*+~?S`JH>*jW9gl#`%e^1DLNPaRQnPy!+D*iDSovKLZ=Vx{A&Ak z|6K+P1w+;(n=gzWI{xe`%N#g%+c9)Lec9k5dSJ7q!J@y+cNa8IV|TqU*V(V`$X1|h O7(8A5T-G@yGywo3o?rw3 diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo_alt.png deleted file mode 100644 index 318a70da4da0dc457d984869fe32401995c0b3ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhj;D)b zh=u>&o{O9Z6nI$Y9(vC+`Q{xp<7IY=0$Dmo9Js@uyo?RLD)cbp4FCShp7)LxOdU#_ zesmpKJo&gpcW{dIHH&m%M&swq6MXjZRd_Kfonlv*StI*l3e(>2H4KwZUS~Z2zp>-H e^#)$cEw=xkwq%!7us;FX%i!ti=d#Wzp$P!{uu;7L diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo_alt.png deleted file mode 100644 index 0f28b6663b6c83306729b21075cdf86358207ac6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhp{I*u zh=u>so<`0F10I&m&3ac`S<(w!Uux;!kKoA_m?hFT>G^*a2QKqBbCx&s>^#bQ(mLn8 z|D(1to|xXCGP&S#t`4q}6&@}QB|c3}{ZkfPYiLlO_vbK^w^xDu?OhFv?fAHLyqTt5 hX6oPQzAS!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhzNd?0 zh=u>so{O9giX5)dt9YfBS;{QBdF$BmUUd(z1#Hh3cRx2t(|g!=NTT`R-t0Sqe;!q? z@379Qd|&%w@8j&evkU?Pf@`)uV)Rg2&O9rqp##QBI48;PAY>_fp@qppkKN{-bwZoO a9lI2blcq1@Ol*KwGkCiCxvX!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$ie`Aa zIEGmGFYVvR%VfyoYAnwj5a>`YD=W$?D|&jv0pG&2XC0*{x2I@!%{{cN!s_SA|Hs2! zp6JJ{yb{IgcK@;0i{{tqagV&-U%jd7)}VJkUY+sTO;I-nMunQ{d9!EzZxdV~F5oBn zVw0FbJNJ&J4_^y2wJI4Cbu03Jzqd|e>0v$dkV&B?hR;`3Utx~chiQjdj)+%jhBhZZup00i_>zopr0DD7WcmMzZ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png deleted file mode 100644 index 11909366bcf5e95c5e7ce80e181abc76e1666118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfK91P!m^8D#M zvk%#_TX^$N9-Feqe^YqOp4gMV#>daaGGyEiZ0TUgKk5BvZP#QL29AYy_Jt_CT*1hY zB-2@FXW_faops3D}j&fTALq`Uj!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhnWu|m zh=u>soT4_Oh$_BpT6 zo#EpY{vX{x7EkP#)^d$|eoa<&fzplR9qbA#_sDEm!W8}fBZJD+>CDqY8lt+{6>L9c oJ#f`fIR3NYa1FbiGtV;a$J6d)OU_*VALs%GPgg&ebxsLQ0Li9Q-2eap diff --git a/src/main/resources/assets/hbm/textures/items/ingot_pc.png b/src/main/resources/assets/hbm/textures/items/ingot_pc.png new file mode 100644 index 0000000000000000000000000000000000000000..75b9bfe9a1e48272266aa1d1181968e6989aaa9d GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfPCk$DRX1)&J_ILX9>FE=ISmBzr zM4j?gfi;cJU5Y+4Zb?co9bPT*vGrs#JO6{6HEa)zpWNA5Twu6|Ey0*&+0F$yY6nHS yn69nQ`Cb3+$ff_nyDoK}Q;y(Oj5fAoU|6}TblMZ?C_kVN7(8A5T-G@yGywqWs9co* literal 0 HcmV?d00001