From 6e3e702213b7510b4d79f07d31b7498396ccce8b Mon Sep 17 00:00:00 2001 From: 70000hp <105080577+70000hp@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:32:23 -0500 Subject: [PATCH] my bones --- .../com/hbm/crafting/SmeltingRecipes.java | 18 +- .../com/hbm/inventory/OreDictManager.java | 188 +++--- .../java/com/hbm/inventory/fluid/Fluids.java | 16 +- .../inventory/material/MatDistribution.java | 35 +- .../java/com/hbm/inventory/material/Mats.java | 62 +- .../inventory/recipes/CentrifugeRecipes.java | 143 ++-- .../inventory/recipes/ChemplantRecipes.java | 38 +- .../hbm/inventory/recipes/CokerRecipes.java | 24 +- .../inventory/recipes/CombinationRecipes.java | 35 +- .../recipes/CrystallizerRecipes.java | 83 +-- .../recipes/ElectrolyserFluidRecipes.java | 29 +- .../recipes/ElectrolyserMetalRecipes.java | 87 +-- .../inventory/recipes/FractionRecipes.java | 27 +- .../hbm/inventory/recipes/MixerRecipes.java | 71 +- .../recipes/RotaryFurnaceRecipes.java | 56 +- .../hbm/inventory/recipes/SILEXRecipes.java | 202 +++--- .../inventory/recipes/ShredderRecipes.java | 113 ++-- .../recipes/SolidificationRecipes.java | 26 +- src/main/java/com/hbm/items/ItemEnums.java | 4 +- src/main/java/com/hbm/items/ModItems.java | 627 +++++++++--------- .../hbm/items/special/ItemBedrockOreNew.java | 52 +- src/main/resources/assets/hbm/lang/en_US.lang | 11 +- .../hbm/textures/gui/fluids/alumina.png | Bin 0 -> 538 bytes .../textures/gui/fluids/bauxite_solution.png | Bin 0 -> 672 bytes .../assets/hbm/textures/gui/fluids/lye.png | Bin 0 -> 807 bytes .../textures/gui/fluids/sodium_aluminate.png | Bin 0 -> 595 bytes .../hbm/textures/items/chunk_ore.cryolite.png | Bin 0 -> 805 bytes .../hbm/textures/models/tank/tank_LYE.png | Bin 0 -> 1182 bytes 28 files changed, 1006 insertions(+), 941 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/alumina.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/bauxite_solution.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/lye.png create mode 100644 src/main/resources/assets/hbm/textures/gui/fluids/sodium_aluminate.png create mode 100644 src/main/resources/assets/hbm/textures/items/chunk_ore.cryolite.png create mode 100644 src/main/resources/assets/hbm/textures/models/tank/tank_LYE.png diff --git a/src/main/java/com/hbm/crafting/SmeltingRecipes.java b/src/main/java/com/hbm/crafting/SmeltingRecipes.java index 18276a4ee..ef55934b8 100644 --- a/src/main/java/com/hbm/crafting/SmeltingRecipes.java +++ b/src/main/java/com/hbm/crafting/SmeltingRecipes.java @@ -21,11 +21,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class SmeltingRecipes { - + public static void AddSmeltingRec() { GameRegistry.addSmelting(ModItems.glyphid_meat, new ItemStack(ModItems.glyphid_meat_grilled), 1.0F); - + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_thorium), new ItemStack(ModItems.ingot_th232), 3.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_uranium), new ItemStack(ModItems.ingot_uranium), 6.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_uranium_scorched), new ItemStack(ModItems.ingot_uranium), 6.0F); @@ -36,7 +36,7 @@ public class SmeltingRecipes { GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_copper), new ItemStack(ModItems.ingot_copper), 2.5F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_tungsten), new ItemStack(ModItems.ingot_tungsten), 6.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_nether_tungsten), new ItemStack(ModItems.ingot_tungsten), 12.0F); - GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_aluminium), new ItemStack(ModItems.ingot_aluminium), 2.5F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_aluminium), DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.CRYOLITE, 1), 2.5F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_lead), new ItemStack(ModItems.ingot_lead), 3.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_beryllium), new ItemStack(ModItems.ingot_beryllium), 2.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_schrabidium), new ItemStack(ModItems.ingot_schrabidium), 128.0F); @@ -46,7 +46,7 @@ public class SmeltingRecipes { GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.IRON), new ItemStack(Items.iron_ingot, 16), 10.0F); GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.COPPER), new ItemStack(ModItems.ingot_copper, 16), 10.0F); - GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.ALUMINIUM), new ItemStack(ModItems.ingot_aluminium, 16), 10.0F); + GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.ALUMINIUM), DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.CRYOLITE, 16), 10.0F); GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.RAREEARTH), DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE, 16), 10.0F); GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.ore_meteor, EnumMeteorType.COBALT), new ItemStack(ModItems.ingot_cobalt, 4), 10.0F); @@ -119,7 +119,7 @@ public class SmeltingRecipes { GameRegistry.addSmelting(ModItems.rag_piss, new ItemStack(ModItems.rag), 0.1F); GameRegistry.addSmelting(DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.TOBACCO), DictFrame.fromOne(ModItems.plant_item, EnumPlantType.TOBACCO), 0.1F); GameRegistry.addSmelting(ModItems.ball_fireclay, new ItemStack(ModItems.ingot_firebrick), 0.1F); - + //GameRegistry.addSmelting(Items.bone, new ItemStack(Items.slime_ball, 3), 0.0F); //GameRegistry.addSmelting(new ItemStack(Items.dye, 1, 15), new ItemStack(Items.slime_ball, 1), 0.0F); GameRegistry.addSmelting(new ItemStack(Blocks.gravel, 1), new ItemStack(Blocks.cobblestone, 1), 0.0F); @@ -133,7 +133,7 @@ public class SmeltingRecipes { GameRegistry.addSmelting(new ItemStack(ModBlocks.sand_lead), new ItemStack(ModBlocks.glass_lead), 0.25F); GameRegistry.addSmelting(new ItemStack(ModBlocks.ash_digamma), new ItemStack(ModBlocks.glass_ash), 10F); GameRegistry.addSmelting(new ItemStack(ModBlocks.basalt), new ItemStack(ModBlocks.basalt_smooth), 0.1F); - + GameRegistry.addSmelting(ModItems.ingot_schraranium, new ItemStack(ModItems.nugget_schrabidium, 1), 2.0F); GameRegistry.addSmelting(ModItems.lodestone, new ItemStack(ModItems.crystal_iron, 1), 5.0F); @@ -169,14 +169,14 @@ public class SmeltingRecipes { GameRegistry.addSmelting(ModItems.ingot_meteorite_forged, ItemHot.heatUp(new ItemStack(ModItems.ingot_meteorite_forged)), 0.0F); GameRegistry.addSmelting(ModItems.blade_meteorite, ItemHot.heatUp(new ItemStack(ModItems.blade_meteorite)), 0.0F); GameRegistry.addSmelting(ModItems.meteorite_sword, ItemHot.heatUp(new ItemStack(ModItems.meteorite_sword_seared)), 0.0F); - + GameRegistry.addSmelting(new ItemStack(ModItems.scrap_plastic, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.ingot_polymer), 0.1F); - + for(EnumBedrockOre ore : EnumBedrockOre.values()) { int i = ore.ordinal(); GameRegistry.addSmelting(new ItemStack(ModItems.ore_bedrock, 1, i), new ItemStack(Blocks.cobblestone, 16), 0.1F); } - + for(int i = 0; i < 10; i++) GameRegistry.addSmelting(new ItemStack(ModItems.ingot_steel_dusted, 1, i), ItemHot.heatUp(new ItemStack(ModItems.ingot_steel_dusted, 1, i)), 1.0F); } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 3157d450a..7d4a9e0d2 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -48,7 +48,7 @@ import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; //the more i optimize this, the more it starts looking like gregtech @NotableComments public class OreDictManager { - + /** Alternate, additional names for ore dict registration. Used mostly for DictGroups */ private static final HashMap> reRegistration = new HashMap(); @@ -70,7 +70,7 @@ public class OreDictManager { public static final String KEY_SAPLING = "treeSapling"; public static final String KEY_SAND = "sand"; public static final String KEY_COBBLESTONE = "cobblestone"; - + public static final String KEY_BLACK = "dyeBlack"; public static final String KEY_RED = "dyeRed"; public static final String KEY_GREEN = "dyeGreen"; @@ -155,45 +155,45 @@ public class OreDictManager { /* * STABLE */ - /** TITANIUM */ + /** TITANIUM */ public static final DictFrame TI = new DictFrame("Titanium"); - /** COPPER */ + /** COPPER */ public static final DictFrame CU = new DictFrame("Copper"); public static final DictFrame MINGRADE = new DictFrame("Mingrade"); public static final DictFrame ALLOY = new DictFrame("AdvancedAlloy"); - /** TUNGSTEN */ + /** TUNGSTEN */ public static final DictFrame W = new DictFrame("Tungsten"); - /** ALUMINUM */ + /** ALUMINUM */ public static final DictFrame AL = new DictFrame("Aluminum"); public static final DictFrame STEEL = new DictFrame("Steel"); - /** TECHNETIUM STEEL */ + /** TECHNETIUM STEEL */ public static final DictFrame TCALLOY = new DictFrame("TcAlloy"); /** CADMIUM STEEL */ public static final DictFrame CDALLOY = new DictFrame("CdAlloy"); - /** BISMUTH BRONZE */ + /** BISMUTH BRONZE */ public static final DictFrame BBRONZE = new DictFrame("BismuthBronze"); /** ARSENIC BRONZE */ public static final DictFrame ABRONZE = new DictFrame("ArsenicBronze"); /** BISMUTH STRONTIUM CALCIUM COPPER OXIDE */ public static final DictFrame BSCCO = new DictFrame("BSCCO"); - /** LEAD */ + /** LEAD */ public static final DictFrame PB = new DictFrame("Lead"); public static final DictFrame BI = new DictFrame("Bismuth"); public static final DictFrame AS = new DictFrame("Arsenic"); public static final DictFrame CA = new DictFrame("Calcium"); public static final DictFrame CD = new DictFrame("Cadmium"); - /** TANTALUM */ + /** TANTALUM */ public static final DictFrame TA = new DictFrame("Tantalum"); public static final DictFrame COLTAN = new DictFrame("Coltan"); - /** NIOBIUM */ + /** NIOBIUM */ public static final DictFrame NB = new DictFrame("Niobium"); - /** BERYLLIUM */ + /** BERYLLIUM */ public static final DictFrame BE = new DictFrame("Beryllium"); - /** COBALT */ + /** COBALT */ public static final DictFrame CO = new DictFrame("Cobalt"); - /** BORON */ + /** BORON */ public static final DictFrame B = new DictFrame("Boron"); - /** SILICON */ + /** SILICON */ public static final DictFrame SI = new DictFrame("Silicon"); public static final DictFrame GRAPHITE = new DictFrame("Graphite"); public static final DictFrame CARBON = new DictFrame("Carbon"); @@ -221,11 +221,11 @@ public class OreDictManager { /* * DUST AND GEM ORES */ - /** SULFUR */ + /** SULFUR */ public static final DictFrame S = new DictFrame("Sulfur"); - /** SALTPETER/NITER */ + /** SALTPETER/NITER */ public static final DictFrame KNO = new DictFrame("Saltpeter"); - /** FLUORITE */ + /** FLUORITE */ public static final DictFrame F = new DictFrame("Fluorite"); public static final DictFrame LIGNITE = new DictFrame("Lignite"); public static final DictFrame COALCOKE = new DictFrame("CoalCoke"); @@ -241,10 +241,12 @@ public class OreDictManager { public static final DictFrame MALACHITE = new DictFrame("Malachite"); public static final DictFrame LIMESTONE = new DictFrame("Limestone"); public static final DictFrame SLAG = new DictFrame("Slag"); + public static final DictFrame BAUXITE = new DictFrame("Bauxite"); + public static final DictFrame CRYOLITE = new DictFrame("Cryolite"); /* * HAZARDS, MISC */ - /** LITHIUM */ + /** LITHIUM */ public static final DictFrame LI = new DictFrame("Lithium"); /** SODIUM */ public static final DictFrame NA = new DictFrame("Sodium"); @@ -266,28 +268,28 @@ public class OreDictManager { * RARE EARTHS */ public static final DictFrame RAREEARTH = new DictFrame("RareEarth"); - /** LANTHANUM */ + /** LANTHANUM */ public static final DictFrame LA = new DictFrame("Lanthanum"); - /** ZIRCONIUM */ + /** ZIRCONIUM */ public static final DictFrame ZR = new DictFrame("Zirconium"); - /** NEODYMIUM */ + /** NEODYMIUM */ public static final DictFrame ND = new DictFrame("Neodymium"); - /** CERIUM */ + /** CERIUM */ public static final DictFrame CE = new DictFrame("Cerium"); /* * NITAN */ - /** IODINE */ + /** IODINE */ public static final DictFrame I = new DictFrame("Iodine"); - /** ASTATINE */ + /** ASTATINE */ public static final DictFrame AT = new DictFrame("Astatine"); - /** CAESIUM */ + /** CAESIUM */ public static final DictFrame CS = new DictFrame("Caesium"); - /** STRONTIUM */ + /** STRONTIUM */ public static final DictFrame ST = new DictFrame("Strontium"); - /** BROMINE */ + /** BROMINE */ public static final DictFrame BR = new DictFrame("Bromine"); - /** TENNESSINE */ + /** TENNESSINE */ public static final DictFrame TS = new DictFrame("Tennessine") ; /* * FISSION FRAGMENTS @@ -298,12 +300,12 @@ public class OreDictManager { public static final DictFrame XE135 = new DictFrame("Xenon135", "Xe135"); public static final DictFrame CS137 = new DictFrame("Caesium137", "Cs137"); public static final DictFrame AT209 = new DictFrame("Astatine209", "At209"); - + /* * COLLECTIONS */ /** Any form of elastic polymer */ - public static final DictGroup ANY_RUBBER = new DictGroup("AnyRubber", LATEX, RUBBER); + public static final DictGroup ANY_RUBBER = new DictGroup("AnyRubber", LATEX, RUBBER); /** 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 */ @@ -327,7 +329,7 @@ public class OreDictManager { public static final DictFrame ANY_BISMOID = new DictFrame("AnyBismoid"); public static final DictFrame ANY_ASH = new DictFrame("Ash"); - + public static void registerOres() { /* @@ -341,7 +343,7 @@ public class OreDictManager { QUARTZ.dust(powder_quartz); DIAMOND.dust(powder_diamond).ore(gravel_diamond, ore_sellafield_diamond); EMERALD.dust(powder_emerald).ore(ore_sellafield_emerald); - + /* * RADIOACTIVE */ @@ -373,7 +375,7 @@ public class OreDictManager { SRN .rad(HazardRegistry.sr) .blinding(50F) .ingot(ingot_schraranium) .block(block_schraranium); GH336 .rad(HazardRegistry.gh336) .nugget(nugget_gh336) .billet(billet_gh336) .ingot(ingot_gh336); MUD .rad(HazardRegistry.mud) .ingot(ingot_mud); - + /* * STABLE */ @@ -444,8 +446,10 @@ public class OreDictManager { HEMATITE .ore(fromOne(stone_resource, EnumStoneType.HEMATITE)); MALACHITE .ingot(DictFrame.fromOne(chunk_ore, EnumChunkType.MALACHITE)) .ore(fromOne(stone_resource, EnumStoneType.MALACHITE)); LIMESTONE .dust(powder_limestone) .ore(fromOne(stone_resource, EnumStoneType.LIMESTONE)); + BAUXITE .gem(fromOne(stone_resource, EnumStoneType.BAUXITE)); + CRYOLITE .crystal(fromOne(chunk_ore, EnumChunkType.CRYOLITE)); SLAG .block(block_slag); - + /* * HAZARDS, MISC */ @@ -457,7 +461,7 @@ public class OreDictManager { */ P_WHITE .hot(5) .ingot(ingot_phosphorus) .block(block_white_phosphorus); P_RED .dust(powder_fire) .block(block_red_phosphorus); - + /* * RARE METALS */ @@ -476,7 +480,7 @@ public class OreDictManager { ZR .nugget(nugget_zirconium) .ingot(ingot_zirconium) .billet(billet_zirconium) .dust(powder_zirconium) .block(block_zirconium) .ore(ore_depth_zirconium); ND .nugget(fragment_neodymium) .dustSmall(powder_neodymium_tiny) .dust(powder_neodymium) .ore(ore_depth_nether_neodymium) .oreNether(ore_depth_nether_neodymium); CE .nugget(fragment_cerium) .dustSmall(powder_cerium_tiny) .dust(powder_cerium); - + /* * NITAN */ @@ -496,7 +500,7 @@ public class OreDictManager { XE135 .rad(HazardRegistry.xe135) .hot(10F) .dustSmall(powder_xe135_tiny) .dust(powder_xe135); CS137 .rad(HazardRegistry.cs137) .hot(3F) .hydro(3F) .dustSmall(powder_cs137_tiny) .dust(powder_cs137); AT209 .rad(HazardRegistry.at209) .hot(20F) .dust(powder_at209); - + /* * COLLECTIONS */ @@ -566,7 +570,7 @@ public class OreDictManager { if(mat.autogen.contains(MaterialShapes.STOCK)) for(String name : mat.names) OreDictionary.registerOre(MaterialShapes.STOCK.name() + name, new ItemStack(ModItems.part_stock, 1, mat.id)); if(mat.autogen.contains(MaterialShapes.GRIP)) for(String name : mat.names) OreDictionary.registerOre(MaterialShapes.GRIP.name() + name, new ItemStack(ModItems.part_grip, 1, mat.id)); } - + for(EnumBedrockOre ore : EnumBedrockOre.values()) { OreDictionary.registerOre("ore" + ore.oreName, new ItemStack(ModItems.ore_enriched, 1, ore.ordinal())); } @@ -574,17 +578,17 @@ public class OreDictManager { OreDictionary.registerOre("itemRubber", ingot_rubber); OreDictionary.registerOre("coalCoke", fromOne(coke, EnumCokeType.COAL)); - + for(String name : new String[] {"fuelCoke", "coke"}) { OreDictionary.registerOre(name, fromOne(coke, EnumCokeType.COAL)); OreDictionary.registerOre(name, fromOne(coke, EnumCokeType.LIGNITE)); OreDictionary.registerOre(name, fromOne(coke, EnumCokeType.PETROLEUM)); } - + OreDictionary.registerOre("briquetteCoal", fromOne(briquette, EnumBriquetteType.COAL)); OreDictionary.registerOre("briquetteLignite", fromOne(briquette, EnumBriquetteType.LIGNITE)); OreDictionary.registerOre("briquetteWood", fromOne(briquette, EnumBriquetteType.WOOD)); - + OreDictionary.registerOre(getReflector(), neutron_reflector); OreDictionary.registerOre("logWood", pink_log); @@ -595,13 +599,13 @@ public class OreDictManager { OreDictionary.registerOre("slabWoodPink", pink_slab); OreDictionary.registerOre("stairWood", pink_stairs); OreDictionary.registerOre("stairWoodPink", pink_stairs); - + String[] dyes = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" }; for(int i = 0; i < 16; i++) { String dyeName = "dye" + dyes[i]; - + OreDictionary.registerOre(dyeName, new ItemStack(ModItems.chemical_dye, 1, i)); - + OreDictionary.registerOre(dyeName, new ItemStack(ModItems.crayon, 1, i)); } OreDictionary.registerOre("dye", new ItemStack(chemical_dye, 1, OreDictionary.WILDCARD_VALUE)); @@ -651,7 +655,7 @@ public class OreDictManager { OreDictionary.registerOre("container1000lubricant", bdcl); OreDictionary.registerOre("itemSilicon", billet_silicon); - + for(NTMMaterial mat : Mats.orderedList) { if(mat.autogen.contains(MaterialShapes.FRAGMENT)) { String name = mat.names[0]; @@ -663,15 +667,15 @@ public class OreDictManager { else MineralRecipes.add9To1(mat.make(ModItems.bedrock_ore_fragment), new ItemStack(ModItems.nothing)); } } - + MaterialShapes.registerCompatShapes(); compensateMojangSpaghettiBullshit(); } - + public static String getReflector() { return GeneralConfig.enableReflectorCompat ? "plateDenseLead" : "plateTungCar"; //let's just mangle the name into "tungCar" so that it can't conflict with anything ever } - + public static void registerGroups() { ANY_RUBBER.addPrefix(INGOT, true); ANY_PLASTIC.addPrefix(INGOT, true).addPrefix(DUST, true).addPrefix(BLOCK, true).addPrefix(GRIP, true).addPrefix(STOCK, true); @@ -681,24 +685,24 @@ public class OreDictManager { ANY_BISMOIDBRONZE.addPrefix(INGOT, true).addPrefix(CASTPLATE, true).addPrefix(LIGHTBARREL, true).addPrefix(HEAVYBARREL, true).addPrefix(LIGHTRECEIVER, true).addPrefix(HEAVYRECEIVER, true); ANY_TAR.addPrefix(ANY, false); } - + private static boolean recursionBrake = false; - + @SubscribeEvent public void onRegisterOre(OreRegisterEvent event) { if(recursionBrake) return; - + recursionBrake = true; - + HashSet strings = reRegistration.get(event.Name); - + if(strings != null) { for(String name : strings) { OreDictionary.registerOre(name, event.Ore); MainRegistry.logger.info("Re-registration for " + event.Name + " to " + name); } } - + recursionBrake = false; if(event.Name.startsWith("ingot") || event.Name.startsWith("ore") || event.Name.startsWith("plate") || event.Name.startsWith("block")) { @@ -707,7 +711,7 @@ public class OreDictManager { } public static final HashSet arcSmeltable = new HashSet(); - + /** Vanilla item ore dict registration events never actually register in the ODM because vanilla items are registered so early that the ODM event handler doesn't exist yet. */ public static void compensateMojangSpaghettiBullshit() { @@ -730,12 +734,12 @@ public class OreDictManager { arcSmeltable.add(new ComparableStack(Items.brick)); arcSmeltable.add(new ComparableStack(Items.netherbrick)); } - + public static class DictFrame { public String[] mats; float hazMult = 1.0F; List hazards = new ArrayList(); - + public DictFrame(String... mats) { this.mats = mats; } @@ -772,14 +776,14 @@ public class OreDictManager { public String stock() { return STOCK.name() + mats[0]; } public String grip() { return GRIP.name() + mats[0]; } public String[] all(MaterialShapes shape) { return appendToAll(shape.prefixes); } - + /** Returns cast (triple) plates if 528 mode is enabled or normal plates if not */ public String plate528() { return GeneralConfig.enable528 ? plateCast() : plate(); } - + private String[] appendToAll(String... prefix) { - + String[] names = new String[mats.length * prefix.length]; - + for(int i = 0; i < mats.length; i++) { for(int j = 0; j < prefix.length; j++) { names[i * prefix.length + j] = prefix[j] + mats[i]; @@ -793,12 +797,12 @@ public class OreDictManager { public DictFrame blinding(float time) { return this.haz(new HazardEntry(HazardRegistry.BLINDING, time)); } public DictFrame asbestos(float asb) { return this.haz(new HazardEntry(HazardRegistry.ASBESTOS, asb)); } public DictFrame hydro(float h) { return this.haz(new HazardEntry(HazardRegistry.HYDROACTIVE, h)); } - + public DictFrame haz(HazardEntry hazard) { hazards.add(hazard); return this; } - + /** Returns an ItemStack composed of the supplied item with the meta being the enum's ordinal. Purely syntactic candy */ public static ItemStack fromOne(Item item, Enum en) { return new ItemStack(item, 1, en.ordinal()); @@ -816,7 +820,7 @@ public class OreDictManager { public static Object[] fromAll(Item item, Class en) { Enum[] vals = en.getEnumConstants(); Object[] stacks = new Object[vals.length]; - + for(int i = 0; i < vals.length; i++) { stacks[i] = new ItemStack(item, 1, vals[i].ordinal()); } @@ -825,13 +829,13 @@ public class OreDictManager { public static Object[] fromAll(Block block, Class en) { Enum[] vals = en.getEnumConstants(); Object[] stacks = new Object[vals.length]; - + for(int i = 0; i < vals.length; i++) { stacks[i] = new ItemStack(block, 1, vals[i].ordinal()); } return stacks; } - + public DictFrame any(Object... thing) { return makeObject(ANY, thing); } @@ -871,7 +875,7 @@ public class OreDictManager { hazMult = HazardRegistry.billet; return makeObject(BILLET, billet); } - + public DictFrame block(Object... block) { hazMult = HazardRegistry.block; return makeObject(BLOCK, block); @@ -886,17 +890,17 @@ public class OreDictManager { } public DictFrame makeObject(MaterialShapes shape, Object... objects) { - + String tag = shape.name(); for(Object o : objects) { if(o instanceof Item) registerStack(tag, new ItemStack((Item) o)); if(o instanceof Block) registerStack(tag, new ItemStack((Block) o)); if(o instanceof ItemStack) registerStack(tag, (ItemStack) o); } - + return this; } - + public DictFrame makeItem(String tag, Item... items) { for(Item i : items) registerStack(tag, new ItemStack(i)); return this; @@ -909,26 +913,26 @@ public class OreDictManager { for(Block b : blocks) registerStack(tag, new ItemStack(b)); 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); registerHazards(hazards, hazMult, tag + mat); } - + /* * Fix for a small oddity in nuclearcraft: many radioactive elements do not have an ore prefix and the sizes * seem generally inconsistent (TH and U are 20 "tiny"s per ingot while boron is 12), so we assume those to be ingots. @@ -940,12 +944,12 @@ public class OreDictManager { } } } - + public static class DictGroup { - + private String groupName; private HashSet names = new HashSet(); - + public DictGroup(String groupName) { this.groupName = groupName; } @@ -957,7 +961,7 @@ public class OreDictManager { this(groupName); this.addFrames(frames); } - + public DictGroup addNames(String... names) { for(String mat : names) this.names.add(mat); return this; @@ -966,22 +970,22 @@ public class OreDictManager { for(DictFrame frame : frames) this.addNames(frame.mats); return this; } - + /** * Will add a reregistration entry for every mat name of every added DictFrame for the given prefix * @param prefix The prefix of both the input and result of the reregistration * @return */ public DictGroup addPrefix(MaterialShapes shape, boolean inputPrefix) { - + String prefix = shape.name(); String group = prefix + groupName; - + for(String name : names) { String original = (inputPrefix ? prefix : "") + name; addReRegistration(original, group); } - + return this; } /** @@ -991,12 +995,12 @@ public class OreDictManager { * @return */ public DictGroup addFixed(String prefix, String original) { - + String group = prefix + groupName; addReRegistration(original, group); return this; } - + public String any() { return ANY.name() + groupName; } public String nugget() { return NUGGET.name() + groupName; } public String tiny() { return TINY.name() + groupName; } @@ -1023,16 +1027,16 @@ public class OreDictManager { public String stock() { return STOCK.name() + groupName; } public String grip() { return GRIP.name() + groupName; } } - + private static void addReRegistration(String original, String additional) { - + HashSet strings = reRegistration.get(original); - + if(strings == null) strings = new HashSet(); - + strings.add(additional); - + reRegistration.put(original, strings); } } diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 5b3fed36d..d3b8f1f63 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -183,6 +183,10 @@ public class Fluids { public static FluidType STELLAR_FLUX; public static FluidType VITRIOL; public static FluidType SLOP; + public static FluidType LYE; + public static FluidType SODIUM_ALUMINATE; + public static FluidType BAUXITE_SOLUTION; + public static FluidType ALUMINA; /* Lagacy names for compatibility purposes */ @Deprecated public static FluidType ACID; //JAOPCA uses this, apparently @@ -387,10 +391,14 @@ public class Fluids { VITRIOL = new FluidType("VITRIOL", 0x6E5222, 2, 0, 1, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); SLOP = new FluidType("SLOP", 0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); LEAD = new FluidType("LEAD", 0x666672, 4, 0, 0, EnumSymbol.NONE).setTemp(350).addTraits(LIQUID, VISCOUS); - LEAD_HOT = new FluidType("LEAD_HOT", 0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS); + LEAD_HOT = new FluidType("LEAD_HOT", 0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS); PERFLUOROMETHYL = new FluidType("PERFLUOROMETHYL", 0xBDC8DC, 1, 0, 1, EnumSymbol.NONE).setTemp(15).addTraits(LIQUID); PERFLUOROMETHYL_COLD = new FluidType("PERFLUOROMETHYL_COLD",0x99DADE, 1, 0, 1, EnumSymbol.NONE).setTemp(-150).addTraits(LIQUID); - PERFLUOROMETHYL_HOT = new FluidType(146, "PERFLUOROMETHYL_HOT",0xB899DE, 1, 0, 1, EnumSymbol.NONE).setTemp(250).addTraits(LIQUID); + PERFLUOROMETHYL_HOT = new FluidType("PERFLUOROMETHYL_HOT",0xB899DE, 1, 0, 1, EnumSymbol.NONE).setTemp(250).addTraits(LIQUID); + LYE = new FluidType("LYE", 0xFFECCC, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID); + SODIUM_ALUMINATE = new FluidType("SODIUM_ALUMINATE", 0xFFD191, 3, 0, 1, EnumSymbol.ACID).addTraits(new FT_Corrosive(30), LIQUID); + BAUXITE_SOLUTION = new FluidType("BAUXITE_SOLUTION", 0xE2560F, 3, 0, 3, EnumSymbol.ACID).addTraits(new FT_Corrosive(40), LIQUID, VISCOUS); + ALUMINA = new FluidType(150,"ALUMINA", 0xDDFFFF, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE @@ -534,8 +542,12 @@ public class Fluids { metaOrder.add(POTASSIUM_CHLORIDE); metaOrder.add(CALCIUM_CHLORIDE); metaOrder.add(CALCIUM_SOLUTION); + metaOrder.add(SODIUM_ALUMINATE); + metaOrder.add(BAUXITE_SOLUTION); + metaOrder.add(ALUMINA); //solutions and working fluids metaOrder.add(FRACKSOL); + metaOrder.add(LYE); //the fun guys metaOrder.add(PHOSGENE); metaOrder.add(MUSTARDGAS); diff --git a/src/main/java/com/hbm/inventory/material/MatDistribution.java b/src/main/java/com/hbm/inventory/material/MatDistribution.java index 962606582..8dd455284 100644 --- a/src/main/java/com/hbm/inventory/material/MatDistribution.java +++ b/src/main/java/com/hbm/inventory/material/MatDistribution.java @@ -21,6 +21,7 @@ import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; import com.hbm.items.ItemEnums.EnumAshType; import com.hbm.items.ItemEnums.EnumCasingType; @@ -44,7 +45,7 @@ public class MatDistribution extends SerializableRecipe { registerEntry(Blocks.golden_rail, MAT_GOLD, INGOT.q(6, 6), MAT_REDSTONE, DUST.q(1, 6)); registerEntry(Blocks.detector_rail, MAT_IRON, INGOT.q(6, 6), MAT_REDSTONE, DUST.q(1, 6)); registerEntry(Items.minecart, MAT_IRON, INGOT.q(5)); - + //castables registerEntry(ModItems.blade_titanium, MAT_TITANIUM, INGOT.q(2)); registerEntry(ModItems.blade_tungsten, MAT_TUNGSTEN, INGOT.q(2)); @@ -62,15 +63,15 @@ public class MatDistribution extends SerializableRecipe { registerEntry(DictFrame.fromOne(ModItems.casing, EnumCasingType.SMALL_STEEL), MAT_WEAPONSTEEL, PLATE.q(1, 4)); registerEntry(DictFrame.fromOne(ModItems.casing, EnumCasingType.LARGE), MAT_GUNMETAL, PLATE.q(1, 2)); registerEntry(DictFrame.fromOne(ModItems.casing, EnumCasingType.LARGE_STEEL), MAT_WEAPONSTEEL, PLATE.q(1, 2)); - + registerEntry(Items.minecart, MAT_IRON, INGOT.q(5)); + registerEntry(DictFrame.fromOne(ModItems.chunk_ore, ItemEnums.EnumChunkType.CRYOLITE), MAT_ALUMINIUM, INGOT.q(1), MAT_SODIUM, INGOT.q(1)); //actual ores if(!Compat.isModLoaded(Compat.MOD_GT6)) { registerOre(OreDictManager.IRON.ore(), MAT_IRON, INGOT.q(2), MAT_TITANIUM, NUGGET.q(3), MAT_STONE, QUART.q(1)); registerOre(OreDictManager.TI.ore(), MAT_TITANIUM, INGOT.q(2), MAT_IRON, NUGGET.q(3), MAT_STONE, QUART.q(1)); registerOre(OreDictManager.W.ore(), MAT_TUNGSTEN, INGOT.q(2), MAT_STONE, QUART.q(1)); - registerOre(OreDictManager.AL.ore(), MAT_ALUMINIUM, INGOT.q(2), MAT_STONE, QUART.q(1)); } - + registerOre(OreDictManager.COAL.ore(), MAT_CARBON, GEM.q(3), MAT_STONE, QUART.q(1)); registerOre(OreDictManager.GOLD.ore(), MAT_GOLD, INGOT.q(2), MAT_LEAD, NUGGET.q(3), MAT_STONE, QUART.q(1)); registerOre(OreDictManager.U.ore(), MAT_URANIUM, INGOT.q(2), MAT_LEAD, NUGGET.q(3), MAT_STONE, QUART.q(1)); @@ -83,7 +84,7 @@ public class MatDistribution extends SerializableRecipe { registerOre(OreDictManager.HEMATITE.ore(), MAT_HEMATITE, INGOT.q(1)); registerOre(OreDictManager.MALACHITE.ore(), MAT_MALACHITE, INGOT.q(6)); - + registerEntry(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.LIMESTONE), MAT_FLUX, DUST.q(10)); registerEntry(ModItems.powder_flux, MAT_FLUX, DUST.q(1)); registerEntry(new ItemStack(Items.coal, 1, 1), MAT_CARBON, NUGGET.q(3)); @@ -92,7 +93,7 @@ public class MatDistribution extends SerializableRecipe { registerEntry(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.COAL), MAT_CARBON, NUGGET.q(2)); registerEntry(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.MISC), MAT_CARBON, NUGGET.q(1)); } - + public static void registerEntry(Object key, Object... matDef) { ComparableStack comp = null; @@ -100,32 +101,32 @@ public class MatDistribution extends SerializableRecipe { if(key instanceof Block) comp = new ComparableStack((Block) key); if(key instanceof ItemStack) comp = new ComparableStack((ItemStack) key); if(key instanceof ComparableStack) comp = (ComparableStack) key; - + if(comp == null) return; if(matDef.length % 2 == 1) return; - + List stacks = new ArrayList(); - + for(int i = 0; i < matDef.length; i += 2) { stacks.add(new MaterialStack((NTMMaterial) matDef[i], (int) matDef[i + 1])); } - + if(stacks.isEmpty()) return; - + materialEntries.put(comp, stacks); } - + public static void registerOre(String key, Object... matDef) { if(matDef.length % 2 == 1) return; - + List stacks = new ArrayList(); - + for(int i = 0; i < matDef.length; i += 2) { stacks.add(new MaterialStack((NTMMaterial) matDef[i], (int) matDef[i + 1])); } - + if(stacks.isEmpty()) return; - + materialOreEntries.put(key, stacks); } @@ -190,7 +191,7 @@ public class MatDistribution extends SerializableRecipe { Mats.materialEntries.clear(); Mats.materialOreEntries.clear(); } - + @Override public String getComment() { return "Defines a set of items that can be smelted. Smelting generated from the ore dictionary (prefix + material) is auto-generated and cannot be " diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 4eb3cdf92..d723d7101 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -33,19 +33,19 @@ public class Mats { public static HashMap matByName = new HashMap(); public static HashMap> materialEntries = new HashMap(); public static HashMap> materialOreEntries = new HashMap(); - + /* * ItemStacks are saved with their metadata being truncated to a short, so the max meta is 32767 * Format for elements: Atomic number *100, plus the last two digits of the mass number. Mass number is 0 for generic/undefined/mixed materials. * Vanilla numbers are in vanilla space (0-29), basic alloys use alloy space (30-99) */ - + /* Vanilla Space, up to 30 materials, */ public static final int _VS = 0; /* Alloy Space, up to 70 materials. Use >20_000 as an extension.*/ public static final int _AS = 30; public static final int _ES = 20_000; - + //Vanilla and vanilla-like public static final NTMMaterial MAT_WOOD = makeNonSmeltable(_VS + 03, WOOD, 0x896727, 0x281E0B, 0x896727).setAutogen(STOCK, GRIP).n(); public static final NTMMaterial MAT_IVORY = makeNonSmeltable(_VS + 04, BONE, 0xFFFEEE, 0x797870, 0xEDEBCA).setAutogen(GRIP).n(); @@ -67,6 +67,8 @@ public class Mats { public static final NTMMaterial MAT_PIGIRON = makeSmeltable(2603, df("PigIron"), 0xFF8B59).m(); public static final NTMMaterial MAT_METEORICIRON = makeSmeltable(2604, df("MeteoricIron"), 0x715347).m(); public static final NTMMaterial MAT_MALACHITE = makeAdditive( 2901, MALACHITE, 0xA2F0C8, 0x227048, 0x61AF87).m(); + public static final NTMMaterial MAT_BAUXITE = makeNonSmeltable(2902, BAUXITE, 0xF4BA30, 0xAA320A, 0xE2560F).setAutogen(FRAGMENT).n(); + public static final NTMMaterial MAT_CRYOLITE = makeNonSmeltable(2903, CRYOLITE, 0xCBC2A4, 0x8B711F, 0x8B701A).setAutogen(FRAGMENT).n(); //Radioactive public static final NTMMaterial MAT_URANIUM = makeSmeltable(9200, U, 0xC1C7BD, 0x2B3227, 0x9AA196).setAutogen(FRAGMENT, NUGGET, BILLET, DUST, BLOCK).m(); @@ -131,7 +133,7 @@ public class Mats { public static final NTMMaterial MAT_SILICON = makeSmeltable(1400, SI, 0xD1D7DF, 0x1A1A3D, 0x878B9E).setAutogen(FRAGMENT, NUGGET, BILLET).m(); public static final NTMMaterial MAT_ASBESTOS = makeSmeltable(1401, ASBESTOS, 0xD8D9CF, 0x616258, 0xB0B3A8).setAutogen(FRAGMENT, BLOCK).n(); public static final NTMMaterial MAT_OSMIRIDIUM = makeSmeltable(7699, OSMIRIDIUM, 0xDBE3EF, 0x7891BE, 0xACBDD9).setAutogen(NUGGET, CASTPLATE, WELDEDPLATE).m(); - + //Alloys public static final NTMMaterial MAT_STEEL = makeSmeltable(_AS + 0, STEEL, 0xAFAFAF, 0x0F0F0F, 0x4A4A4A).setAutogen(DUSTTINY, BOLT, WIRE, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT, LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, GRIP).m(); public static final NTMMaterial MAT_MINGRADE = makeSmeltable(_AS + 1, MINGRADE, 0xFFBA7D, 0xAF1700, 0xE44C0F).setAutogen(WIRE, DUST, BLOCK).m(); @@ -154,7 +156,7 @@ public class Mats { public static final NTMMaterial MAT_GUNMETAL = makeSmeltable(_AS + 19, GUNMETAL, 0xFFEF3F, 0xAD3600, 0xF9C62C).setAutogen(LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, HEAVYRECEIVER, MECHANISM, STOCK, GRIP).n(); public static final NTMMaterial MAT_WEAPONSTEEL = makeSmeltable(_AS + 20, WEAPONSTEEL, 0xA0A0A0, 0x000000, 0x808080).setAutogen(SHELL, LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, HEAVYRECEIVER, MECHANISM, STOCK, GRIP).n(); public static final NTMMaterial MAT_SATURN = makeSmeltable(_AS + 4, BIGMT, 0x3AC4DA, 0x09282C, 0x30A4B7).setAutogen(PLATE, CASTPLATE, SHELL, BLOCK, LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, HEAVYRECEIVER, MECHANISM, STOCK, GRIP).m(); - + //Extension public static final NTMMaterial MAT_RAREEARTH = makeNonSmeltable(_ES + 00, RAREEARTH, 0xC1BDBD, 0x384646, 0x7B7F7F).setAutogen(FRAGMENT).n(); public static final NTMMaterial MAT_POLYMER = makeNonSmeltable(_ES + 01, POLYMER, 0x363636, 0x040404, 0x272727).setAutogen(STOCK, GRIP).n(); @@ -162,52 +164,52 @@ public class Mats { public static final NTMMaterial MAT_RUBBER = makeNonSmeltable(_ES + 03, RUBBER, 0x817F75, 0x0F0D03, 0x4B4A3F).setAutogen(PIPE, GRIP).n(); public static final NTMMaterial MAT_HARDPLASTIC = makeNonSmeltable(_ES + 04, PC, 0xEDE7C4, 0x908A67, 0xE1DBB8).setAutogen(STOCK, GRIP).n(); public static final NTMMaterial MAT_PVC = makeNonSmeltable(_ES + 05, PVC, 0xFCFCFC, 0x9F9F9F, 0xF0F0F0).setAutogen(STOCK, GRIP).n(); - + public static NTMMaterial makeSmeltable(int id, DictFrame dict, int color) { return makeSmeltable(id, dict, color, color, color); } public static NTMMaterial make(int id, DictFrame dict) { return new NTMMaterial(id, dict); } - + public static NTMMaterial makeSmeltable(int id, DictFrame dict, int solidColorLight, int solidColorDark, int moltenColor) { return new NTMMaterial(id, dict).smeltable(SmeltingBehavior.SMELTABLE).setSolidColor(solidColorLight, solidColorDark).setMoltenColor(moltenColor); } - + public static NTMMaterial makeAdditive(int id, DictFrame dict, int solidColorLight, int solidColorDark, int moltenColor) { return new NTMMaterial(id, dict).smeltable(SmeltingBehavior.ADDITIVE).setSolidColor(solidColorLight, solidColorDark).setMoltenColor(moltenColor); } - + public static NTMMaterial makeNonSmeltable(int id, DictFrame dict, int solidColorLight, int solidColorDark, int moltenColor) { return new NTMMaterial(id, dict).smeltable(SmeltingBehavior.NOT_SMELTABLE).setSolidColor(solidColorLight, solidColorDark).setMoltenColor(moltenColor); } - + public static DictFrame df(String string) { return new DictFrame(string); } - + /** will not respect stacksizes - all stacks will be treated as a singular */ public static List getMaterialsFromItem(ItemStack stack) { List list = new ArrayList(); List names = ItemStackUtil.getOreDictNames(stack); - + if(!names.isEmpty()) { outer: for(String name : names) { - + List oreEntries = materialOreEntries.get(name); - + if(oreEntries != null) { list.addAll(oreEntries); break outer; } - + for(Entry prefixEntry : prefixByName.entrySet()) { String prefix = prefixEntry.getKey(); - + if(name.startsWith(prefix)) { String materialName = name.substring(prefix.length()); NTMMaterial material = matByName.get(materialName); - + if(material != null && (material.smeltsInto.smeltable == SmeltingBehavior.SMELTABLE || material.smeltsInto.smeltable == SmeltingBehavior.ADDITIVE)) { list.add(new MaterialStack(material, prefixEntry.getValue().q(1))); break outer; @@ -216,17 +218,17 @@ public class Mats { } } } - + List entries = materialEntries.get(new ComparableStack(stack).makeSingular()); - + if(entries != null) { entries.forEach(x -> { if(x != null) list.add(x); }); } - + if(stack.getItem() == ModItems.scraps) { list.add(ItemScraps.getMats(stack)); } - + return list; } @@ -236,28 +238,28 @@ public class Mats { baseMats.forEach(x -> smelting.add(new MaterialStack(x.material.smeltsInto, (int) (x.amount * x.material.convOut / x.material.convIn)))); return smelting; } - + public static class MaterialStack { //final fields to prevent accidental changing public final NTMMaterial material; public int amount; - + public MaterialStack(NTMMaterial material, int amount) { this.material = material; this.amount = amount; } - + public MaterialStack copy() { return new MaterialStack(material, amount); } } - + public static String formatAmount(int amount, boolean showInMb) { - + if(showInMb) return (amount * 2) + "mB"; - + String format = ""; - + int blocks = amount / BLOCK.q(1); amount -= BLOCK.q(blocks); int ingots = amount / INGOT.q(1); @@ -265,12 +267,12 @@ public class Mats { int nuggets = amount / NUGGET.q(1); amount -= NUGGET.q(nuggets); int quanta = amount; - + if(blocks > 0) format += (blocks == 1 ? I18nUtil.resolveKey("matshape.block", blocks) : I18nUtil.resolveKey("matshape.blocks", blocks)) + " "; if(ingots > 0) format += (ingots == 1 ? I18nUtil.resolveKey("matshape.ingot", ingots) : I18nUtil.resolveKey("matshape.ingots", ingots)) + " "; if(nuggets > 0) format += (nuggets == 1 ? I18nUtil.resolveKey("matshape.nugget", nuggets) : I18nUtil.resolveKey("matshape.nuggets", nuggets)) + " "; if(quanta > 0) format += (quanta == 1 ? I18nUtil.resolveKey("matshape.quantum", quanta) : I18nUtil.resolveKey("matshape.quanta", quanta)) + " "; - + return format.trim(); } } diff --git a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index cbf275343..641008670 100644 --- a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -22,6 +22,7 @@ import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ItemEnums.EnumAshType; import com.hbm.items.ItemEnums.EnumChunkType; import com.hbm.items.ModItems; @@ -46,21 +47,21 @@ public class CentrifugeRecipes extends SerializableRecipe { @Override public void registerDefaults() { - + boolean lbs = GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleCentrifuge; - + recipes.put(new ComparableStack(ModItems.waste_natural_uranium), new ItemStack[] { new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.nugget_pu239, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); - + recipes.put(new ComparableStack(ModItems.waste_uranium), new ItemStack[] { new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.nugget_plutonium, 1), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); - + recipes.put(new ComparableStack(ModItems.waste_thorium), new ItemStack[] { new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.nugget_th232, 1), @@ -72,73 +73,73 @@ public class CentrifugeRecipes extends SerializableRecipe { new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.nuclear_waste_tiny, 3) }); - + recipes.put(new ComparableStack(ModItems.waste_plutonium), new ItemStack[] { new ItemStack(ModItems.nugget_pu_mix, 1), new ItemStack(ModItems.nugget_pu_mix, 1), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 3) }); - + recipes.put(new ComparableStack(ModItems.waste_u233), new ItemStack[] { new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.nugget_neptunium, 1), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 3) }); - + recipes.put(new ComparableStack(ModItems.waste_u235), new ItemStack[] { new ItemStack(ModItems.nugget_pu238, 1), new ItemStack(ModItems.nugget_neptunium, 1), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 3) }); - + recipes.put(new ComparableStack(ModItems.waste_schrabidium), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 2), new ItemStack(ModItems.nugget_pu239, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); - + recipes.put(new ComparableStack(ModItems.waste_zfb_mox), new ItemStack[] { new ItemStack(ModItems.nugget_zirconium, 3), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nugget_pu_mix, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_mox), new ItemStack[] { new ItemStack(ModItems.powder_sr90_tiny, 1), new ItemStack(ModItems.nugget_pu_mix, 3), new ItemStack(ModItems.powder_cs137_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 4) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_pu238be), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 1), new ItemStack(ModItems.nugget_pu238, 1), new ItemStack(ModItems.powder_coal_tiny, 2), new ItemStack(ModItems.nugget_lead, 2) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_pu239), new ItemStack[] { new ItemStack(ModItems.nugget_pu240, 2), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.powder_cs137_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 5) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_ra226be), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 2), new ItemStack(ModItems.nugget_polonium, 2), new ItemStack(ModItems.powder_coal_tiny, 1), new ItemStack(ModItems.nugget_lead, 1) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_sa326), new ItemStack[] { new ItemStack(ModItems.nugget_solinium, 1), new ItemStack(ModItems.powder_neodymium_tiny, 1), new ItemStack(ModItems.nugget_tantalium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 6) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_u233), new ItemStack[] { new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.powder_i131_tiny, 1), new ItemStack(ModItems.powder_sr90_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 6) }); - + recipes.put(new ComparableStack(ModItems.waste_plate_u235), new ItemStack[] { new ItemStack(ModItems.nugget_neptunium, 1), new ItemStack(ModItems.nugget_pu238, 1), @@ -283,7 +284,7 @@ public class CentrifugeRecipes extends SerializableRecipe { new ItemStack(ModItems.powder_boron_tiny, 2), new ItemStack(ModItems.powder_niobium_tiny, 2), new ItemStack(ModItems.nugget_zirconium, 3) }); - + ArrayList naquadriaNuggets = OreDictionary.getOres("nuggetNaquadria"); if(naquadriaNuggets.size() != 0) { ItemStack nuggetNQR = naquadriaNuggets.get(0); @@ -300,195 +301,195 @@ public class CentrifugeRecipes extends SerializableRecipe { new ItemStack(ModItems.nugget_euphemium, 6), new ItemStack(ModItems.nuclear_waste, 2) }); } - + recipes.put(new OreDictStack(COAL.ore()), new ItemStack[] { new ItemStack(ModItems.powder_coal, 2), new ItemStack(ModItems.powder_coal, 2), new ItemStack(ModItems.powder_coal, 2), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(LIGNITE.ore()), new ItemStack[] { new ItemStack(ModItems.powder_lignite, 2), new ItemStack(ModItems.powder_lignite, 2), new ItemStack(ModItems.powder_lignite, 2), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(IRON.ore()), new ItemStack[] { new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(GOLD.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_gold, 2) : new ItemStack(ModItems.powder_gold, 1), new ItemStack(ModItems.powder_gold, 1), lbs ? new ItemStack(ModItems.nugget_bismuth, 1) : new ItemStack(ModItems.powder_gold, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(DIAMOND.ore()), new ItemStack[] { new ItemStack(ModItems.powder_diamond, 1), new ItemStack(ModItems.powder_diamond, 1), new ItemStack(ModItems.powder_diamond, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(EMERALD.ore()), new ItemStack[] { new ItemStack(ModItems.powder_emerald, 1), new ItemStack(ModItems.powder_emerald, 1), new ItemStack(ModItems.powder_emerald, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(TI.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_titanium, 2) : new ItemStack(ModItems.powder_titanium, 1), lbs ? new ItemStack(ModItems.powder_titanium, 2) : new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(NETHERQUARTZ.ore()), new ItemStack[] { new ItemStack(ModItems.powder_quartz, 1), new ItemStack(ModItems.powder_quartz, 1), new ItemStack(ModItems.powder_lithium_tiny, 1), new ItemStack(Blocks.netherrack, 1) }); - + recipes.put(new OreDictStack(W.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_tungsten, 2) : new ItemStack(ModItems.powder_tungsten, 1), new ItemStack(ModItems.powder_tungsten, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(CU.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_copper, 2) : new ItemStack(ModItems.powder_copper, 1), new ItemStack(ModItems.powder_copper, 1), new ItemStack(ModItems.powder_gold, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(AL.ore()), new ItemStack[] { - new ItemStack(ModItems.powder_aluminium, 1), - new ItemStack(ModItems.powder_aluminium, 1), + new ItemStack(ModItems.chunk_ore, 2, ItemEnums.EnumChunkType.CRYOLITE.ordinal()), + new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(PB.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_lead, 2) : new ItemStack(ModItems.powder_lead, 1), lbs ? new ItemStack(ModItems.nugget_bismuth, 1) : new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.powder_gold, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(SA326.ore()), new ItemStack[] { new ItemStack(ModItems.powder_schrabidium, 1), new ItemStack(ModItems.powder_schrabidium, 1), new ItemStack(ModItems.nugget_solinium, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack("oreRareEarth"), new ItemStack[] { new ItemStack(ModItems.powder_desh_mix, 1), new ItemStack(ModItems.nugget_zirconium, 1), new ItemStack(ModItems.nugget_zirconium, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(PU.ore()), new ItemStack[] { new ItemStack(ModItems.powder_plutonium, 1), new ItemStack(ModItems.powder_plutonium, 1), new ItemStack(ModItems.nugget_polonium, 3), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(U.ore()), new ItemStack[] { lbs ? new ItemStack(ModItems.powder_uranium, 2) : new ItemStack(ModItems.powder_uranium, 1), lbs ? new ItemStack(ModItems.nugget_technetium, 2) : new ItemStack(ModItems.powder_uranium, 1), lbs ? new ItemStack(ModItems.nugget_ra226, 2) : new ItemStack(ModItems.nugget_ra226, 1), new ItemStack(Blocks.gravel, 1) }); - + for(String ore : OreDictManager.TH232.all(MaterialShapes.ORE)) recipes.put(new OreDictStack(ore), new ItemStack[] { new ItemStack(ModItems.powder_thorium, 1), new ItemStack(ModItems.powder_thorium, 1), new ItemStack(ModItems.powder_uranium, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(BE.ore()), new ItemStack[] { new ItemStack(ModItems.powder_beryllium, 1), new ItemStack(ModItems.powder_beryllium, 1), new ItemStack(ModItems.powder_emerald, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(F.ore()), new ItemStack[] { new ItemStack(ModItems.fluorite, 3), new ItemStack(ModItems.fluorite, 3), new ItemStack(ModItems.gem_sodalite, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new OreDictStack(REDSTONE.ore()), new ItemStack[] { new ItemStack(Items.redstone, 3), new ItemStack(Items.redstone, 3), lbs ? new ItemStack(ModItems.ingot_mercury, 3) : new ItemStack(ModItems.ingot_mercury, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new ComparableStack(ModBlocks.ore_tikite), new ItemStack[] { new ItemStack(ModItems.powder_plutonium, 1), new ItemStack(ModItems.powder_cobalt, 2), new ItemStack(ModItems.powder_niobium, 2), new ItemStack(Blocks.end_stone, 1) }); - + recipes.put(new OreDictStack(LAPIS.ore()), new ItemStack[] { new ItemStack(ModItems.powder_lapis, 6), new ItemStack(ModItems.powder_cobalt_tiny, 1), new ItemStack(ModItems.gem_sodalite, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new ComparableStack(ModBlocks.block_euphemium_cluster), new ItemStack[] { new ItemStack(ModItems.nugget_euphemium, 7), new ItemStack(ModItems.powder_schrabidium, 4), new ItemStack(ModItems.ingot_starmetal, 2), new ItemStack(ModItems.nugget_solinium, 2) }); - + recipes.put(new ComparableStack(ModBlocks.ore_nether_fire), new ItemStack[] { new ItemStack(Items.blaze_powder, 2), new ItemStack(ModItems.powder_fire, 2), new ItemStack(ModItems.ingot_phosphorus), new ItemStack(Blocks.netherrack) }); - + recipes.put(new OreDictStack(CO.ore()), new ItemStack[] { new ItemStack(ModItems.powder_cobalt, 2), new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_copper, 1), new ItemStack(Blocks.gravel, 1) }); - + recipes.put(new ComparableStack(ModItems.powder_tektite), new ItemStack[] { new ItemStack(ModItems.powder_meteorite_tiny, 1), new ItemStack(ModItems.powder_paleogenite_tiny, 1), new ItemStack(ModItems.powder_meteorite_tiny, 1), new ItemStack(ModItems.dust, 6) }); - + recipes.put(new ComparableStack(ModBlocks.block_slag), new ItemStack[] { new ItemStack(Blocks.gravel, 1), new ItemStack(ModItems.powder_fire, 1), new ItemStack(ModItems.powder_calcium), new ItemStack(ModItems.dust) }); - + recipes.put(new ComparableStack(ModItems.powder_ash, 1, EnumAshType.COAL.ordinal()), new ItemStack[] { new ItemStack(ModItems.powder_coal_tiny, 2), new ItemStack(ModItems.powder_boron_tiny, 1), new ItemStack(ModItems.dust_tiny, 6)}); - + for(EnumBedrockOre ore : EnumBedrockOre.values()) { int i = ore.ordinal(); - + recipes.put(new ComparableStack(ModItems.ore_bedrock, 1, i), new ItemStack[] { new ItemStack(ModItems.ore_centrifuged, 1, i), new ItemStack(ModItems.ore_centrifuged, 1, i), new ItemStack(ModItems.ore_centrifuged, 1, i), new ItemStack(ModItems.ore_centrifuged, 1, i) }); - + recipes.put(new ComparableStack(ModItems.ore_cleaned, 1, i), new ItemStack[] { new ItemStack(ModItems.ore_separated, 1, i), new ItemStack(ModItems.ore_separated, 1, i), new ItemStack(ModItems.ore_separated, 1, i), new ItemStack(ModItems.ore_separated, 1, i) }); - + recipes.put(new ComparableStack(ModItems.ore_purified, 1, i), new ItemStack[] { new ItemStack(ModItems.ore_enriched, 1, i), new ItemStack(ModItems.ore_enriched, 1, i), new ItemStack(ModItems.ore_enriched, 1, i), new ItemStack(ModItems.ore_enriched, 1, i) }); - + EnumByproduct tier1 = ore.byproducts[0]; ItemStack by1 = tier1 == null ? new ItemStack(ModItems.dust) : DictFrame.fromOne(ModItems.ore_byproduct, tier1, 1); recipes.put(new ComparableStack(ModItems.ore_nitrated, 1, i), new ItemStack[] { @@ -496,7 +497,7 @@ public class CentrifugeRecipes extends SerializableRecipe { new ItemStack(ModItems.ore_nitrocrystalline, 1, i), ItemStackUtil.carefulCopy(by1), ItemStackUtil.carefulCopy(by1) }); - + EnumByproduct tier2 = ore.byproducts[1]; ItemStack by2 = tier2 == null ? new ItemStack(ModItems.dust) : DictFrame.fromOne(ModItems.ore_byproduct, tier2, 1); recipes.put(new ComparableStack(ModItems.ore_deepcleaned, 1, i), new ItemStack[] { @@ -504,7 +505,7 @@ public class CentrifugeRecipes extends SerializableRecipe { new ItemStack(ModItems.ore_enriched, 1, i), ItemStackUtil.carefulCopy(by2), ItemStackUtil.carefulCopy(by2) }); - + EnumByproduct tier3 = ore.byproducts[2]; ItemStack by3 = tier3 == null ? new ItemStack(ModItems.dust) : DictFrame.fromOne(ModItems.ore_byproduct, tier3, 1); recipes.put(new ComparableStack(ModItems.ore_seared, 1, i), new ItemStack[] { @@ -513,7 +514,7 @@ public class CentrifugeRecipes extends SerializableRecipe { ItemStackUtil.carefulCopy(by3), ItemStackUtil.carefulCopy(by3) }); } - + for(BedrockOreType type : BedrockOreType.values()) { recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type)), new ItemStack[] {ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY, type), new ItemStack(Blocks.gravel)}); @@ -536,20 +537,20 @@ public class CentrifugeRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.SOLVENT_WASHED, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.byproductSolvent1, 1), ItemBedrockOreNew.extract(type.byproductSolvent2, 1), ItemBedrockOreNew.extract(type.byproductSolvent3, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)}); recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.RAD_WASHED, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.byproductRad1, 1), ItemBedrockOreNew.extract(type.byproductRad2, 1), ItemBedrockOreNew.extract(type.byproductRad3, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)}); } - + List quartz = OreDictionary.getOres("crystalCertusQuartz"); - + if(quartz != null && !quartz.isEmpty()) { ItemStack qItem = quartz.get(0).copy(); qItem.stackSize = 2; - + recipes.put(new OreDictStack("oreCertusQuartz"), new ItemStack[] { qItem.copy(), qItem.copy(), qItem.copy(), qItem.copy() }); } - + recipes.put(new ComparableStack(Items.blaze_rod), new ItemStack[] {new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.blaze_powder, 1), new ItemStack(ModItems.powder_fire, 1), new ItemStack(ModItems.powder_fire, 1) }); recipes.put(new ComparableStack(ModItems.ingot_schraranium), new ItemStack[] { new ItemStack(ModItems.nugget_schrabidium, 2), new ItemStack(ModItems.nugget_schrabidium, 1), new ItemStack(ModItems.nugget_uranium, 3), new ItemStack(ModItems.nugget_neptunium, 2) }); @@ -568,7 +569,7 @@ public class CentrifugeRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ModItems.crystal_niter), new ItemStack[] { new ItemStack(ModItems.niter, 3), new ItemStack(ModItems.niter, 3), new ItemStack(ModItems.niter, 3), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_copper), new ItemStack[] { new ItemStack(ModItems.powder_copper, 2), new ItemStack(ModItems.powder_copper, 2), new ItemStack(ModItems.sulfur, 1), new ItemStack(ModItems.powder_cobalt_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_tungsten), new ItemStack[] { new ItemStack(ModItems.powder_tungsten, 2), new ItemStack(ModItems.powder_tungsten, 2), new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); - recipes.put(new ComparableStack(ModItems.crystal_aluminium), new ItemStack[] { new ItemStack(ModItems.powder_aluminium, 2), new ItemStack(ModItems.powder_aluminium, 2), new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); + recipes.put(new ComparableStack(ModItems.crystal_aluminium), new ItemStack[] { new ItemStack(ModItems.chunk_ore, 3, ItemEnums.EnumChunkType.CRYOLITE.ordinal()), new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_fluorite), new ItemStack[] { new ItemStack(ModItems.fluorite, 4), new ItemStack(ModItems.fluorite, 4), new ItemStack(ModItems.gem_sodalite, 2), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_beryllium), new ItemStack[] { new ItemStack(ModItems.powder_beryllium, 2), new ItemStack(ModItems.powder_beryllium, 2), new ItemStack(ModItems.powder_quartz, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_lead), new ItemStack[] { new ItemStack(ModItems.powder_lead, 2), new ItemStack(ModItems.powder_lead, 2), new ItemStack(ModItems.powder_gold, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); @@ -581,44 +582,44 @@ public class CentrifugeRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ModItems.crystal_starmetal), new ItemStack[] { new ItemStack(ModItems.powder_dura_steel, 3), new ItemStack(ModItems.powder_cobalt, 3), new ItemStack(ModItems.powder_astatine, 2), new ItemStack(ModItems.ingot_mercury, 5) }); recipes.put(new ComparableStack(ModItems.crystal_cobalt), new ItemStack[] { new ItemStack(ModItems.powder_cobalt, 2), new ItemStack(ModItems.powder_iron, 3), new ItemStack(ModItems.powder_copper, 3), new ItemStack(ModItems.powder_lithium_tiny, 1) }); } - + @Override public void registerPost() { - + if(!IMCCentrifuge.buffer.isEmpty()) { recipes.putAll(IMCCentrifuge.buffer); MainRegistry.logger.info("Fetched " + IMCCentrifuge.buffer.size() + " IMC centrifuge recipes!"); IMCCentrifuge.buffer.clear(); } } - + public static ItemStack[] getOutput(ItemStack stack) { - + if(stack == null || stack.getItem() == null) return null; - + ComparableStack comp = new ComparableStack(stack).makeSingular(); - + if(recipes.containsKey(comp)) return RecipesCommon.copyStackArray(recipes.get(comp)); - + for(Entry entry : recipes.entrySet()) { if(entry.getKey().isApplicable(stack)) { return RecipesCommon.copyStackArray(entry.getValue()); } } - + return null; } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry entry : CentrifugeRecipes.recipes.entrySet()) { recipes.put(entry.getKey(), entry.getValue()); } - + return recipes; } diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 3e8513f7c..fe40362e0 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -9,6 +9,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; +import com.hbm.blocks.BlockEnums; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.inventory.FluidStack; @@ -18,6 +19,7 @@ import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; @@ -26,7 +28,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class ChemplantRecipes extends SerializableRecipe { - + /** * Nice order: The order in which the ChemRecipe are added to the recipes list * Meta order: Fixed using the id param, saved in indexMapping @@ -34,13 +36,13 @@ public class ChemplantRecipes extends SerializableRecipe { public static HashMap indexMapping = new HashMap(); public static List recipes = new ArrayList(); - + @Override public void registerDefaults() { - + //6-30, formerly oil cracking, coal liquefaction and solidifciation registerOtherOil(); - + recipes.add(new ChemRecipe(36, "COOLANT", 50) .inputItems(new OreDictStack(KNO.dust())) .inputFluids(new FluidStack(Fluids.WATER, 1800)) @@ -99,7 +101,7 @@ public class ChemplantRecipes extends SerializableRecipe { new FluidStack(Fluids.XYLENE, 500), new FluidStack(Fluids.OXYGEN, 100)) .outputItems(new ItemStack(ModItems.ingot_pet)));*/ - + //Laminate Glass going here recipes.add(new ChemRecipe(97, "LAMINATE", 100) .inputFluids( @@ -374,7 +376,7 @@ public class ChemplantRecipes extends SerializableRecipe { recipes.add(new ChemRecipe(101, "CC_CENTRIFUGE", 200) .inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.SULFURIC_ACID, 8_000)) .outputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250), new FluidStack(Fluids.CALCIUM_CHLORIDE, 250))); - + recipes.add(new ChemRecipe(102, "THORIUM_SALT", 60) .inputFluids(new FluidStack(Fluids.THORIUM_SALT_DEPLETED, 16_000)) .inputItems(new OreDictStack(TH232.nugget(), 2)) @@ -411,7 +413,7 @@ public class ChemplantRecipes extends SerializableRecipe { .inputFluids(new FluidStack(1000, Fluids.BITUMEN)) .outputItems(new ItemStack(ModBlocks.asphalt, 16))); } - + public static class ChemRecipe { public int listing; @@ -422,49 +424,49 @@ public class ChemplantRecipes extends SerializableRecipe { public ItemStack[] outputs; public FluidStack[] outputFluids; private int duration; - + public ChemRecipe(int index, String name, int duration) { this.id = index; this.name = name; this.duration = duration; this.listing = recipes.size(); - + this.inputs = new AStack[4]; this.outputs = new ItemStack[4]; this.inputFluids = new FluidStack[2]; this.outputFluids = new FluidStack[2]; - + if(!indexMapping.containsKey(id)) { indexMapping.put(id, this); } else { throw new IllegalStateException("Chemical plant recipe " + name + " has been registered with duplicate id " + id + " used by " + indexMapping.get(id).name + "!"); } } - + public ChemRecipe inputItems(AStack... in) { for(int i = 0; i < in.length; i++) this.inputs[i] = in[i]; return this; } - + public ChemRecipe inputFluids(FluidStack... in) { for(int i = 0; i < in.length; i++) this.inputFluids[i] = in[i]; return this; } - + public ChemRecipe outputItems(ItemStack... out) { for(int i = 0; i < out.length; i++) this.outputs[i] = out[i]; return this; } - + public ChemRecipe outputFluids(FluidStack... out) { for(int i = 0; i < out.length; i++) this.outputFluids[i] = out[i]; return this; } - + public int getId() { return this.id; } - + public int getDuration() { return this.duration; } @@ -486,7 +488,7 @@ public class ChemplantRecipes extends SerializableRecipe { int id = obj.get("id").getAsInt(); String name = obj.get("name").getAsString(); int duration = obj.get("duration").getAsInt(); - + recipes.add(new ChemRecipe(id, name, duration) .inputFluids( this.readFluidArray( (JsonArray) obj.get("fluidInput"))) .inputItems( this.readAStackArray( (JsonArray) obj.get("itemInput"))) @@ -522,7 +524,7 @@ public class ChemplantRecipes extends SerializableRecipe { ex.printStackTrace(); } } - + public String getComment() { return "Rules: All in- and output arrays need to be present, even if empty. IDs need to be unique, but not sequential. It's safe if you add your own" + " recipes starting with ID 1000. Template order depends on the order of the recipes in this JSON file. The 'name' field is responsible for" diff --git a/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java index 75b97e3a5..ce4c4dfb5 100644 --- a/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CokerRecipes.java @@ -24,7 +24,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class CokerRecipes extends SerializableRecipe { - + private static HashMap> recipes = new HashMap(); @Override @@ -58,7 +58,7 @@ public class CokerRecipes extends SerializableRecipe { registerSFAuto(WOODOIL, 340_000L, new ItemStack(Items.coal, 1, 1), GAS_COKER); registerRecipe(WATZ, 4_000, new ItemStack(ModItems.ingot_mud, 4), null); - registerRecipe(REDMUD, 1_000, new ItemStack(Items.iron_ingot, 1), new FluidStack(MERCURY, 50)); + registerRecipe(REDMUD, 450, new ItemStack(Items.iron_ingot, 1), new FluidStack(MERCURY, 50)); registerRecipe(BITUMEN, 16_000, DictFrame.fromOne(ModItems.coke, EnumCokeType.PETROLEUM), new FluidStack(OIL_COKER, 1_600)); registerRecipe(LUBRICANT, 12_000, DictFrame.fromOne(ModItems.coke, EnumCokeType.PETROLEUM), new FluidStack(OIL_COKER, 1_200)); registerRecipe(CALCIUM_SOLUTION, 125, new ItemStack(ModItems.powder_calcium), new FluidStack(SPENTSTEAM, 100)); @@ -74,17 +74,17 @@ public class CokerRecipes extends SerializableRecipe { private static void registerSFAuto(FluidType fluid, long tuPerSF, ItemStack fuel, FluidType type) { long tuFlammable = fluid.hasTrait(FT_Flammable.class) ? fluid.getTrait(FT_Flammable.class).getHeatEnergy() : 0; long tuCombustible = fluid.hasTrait(FT_Combustible.class) ? fluid.getTrait(FT_Combustible.class).getCombustionEnergy() : 0; - + long tuPerBucket = Math.max(tuFlammable, tuCombustible); - + double penalty = 1;//1.1D; //no penalty - + int mB = (int) (tuPerSF * 1000L * penalty / tuPerBucket); if(mB > 10_000) mB -= (mB % 1000); else if(mB > 1_000) mB -= (mB % 100); else if(mB > 100) mB -= (mB % 10); - + FluidStack byproduct = type == null ? null : new FluidStack(type, Math.max(10, mB / 10)); registerRecipe(fluid, mB, fuel, byproduct); @@ -92,28 +92,28 @@ public class CokerRecipes extends SerializableRecipe { private static void registerRecipe(FluidType type, int quantity, ItemStack output, FluidStack byproduct) { recipes.put(type, new Triplet(quantity, output, byproduct)); } - + public static Triplet getOutput(FluidType type) { return recipes.get(type); } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry> entry : CokerRecipes.recipes.entrySet()) { - + FluidType type = entry.getKey(); int amount = entry.getValue().getX(); ItemStack out = entry.getValue().getY().copy(); FluidStack byproduct = entry.getValue().getZ(); - + if(out != null && byproduct != null) recipes.put(ItemFluidIcon.make(type, amount), new ItemStack[] {out, ItemFluidIcon.make(byproduct)}); if(out != null && byproduct == null) recipes.put(ItemFluidIcon.make(type, amount), new ItemStack[] {out}); if(out == null && byproduct != null) recipes.put(ItemFluidIcon.make(type, amount), new ItemStack[] {ItemFluidIcon.make(byproduct)}); } - + return recipes; } diff --git a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java index 8f4bf4b83..89753cd42 100644 --- a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java @@ -18,6 +18,7 @@ import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ItemEnums.EnumAshType; import com.hbm.items.ItemEnums.EnumBriquetteType; import com.hbm.items.ItemEnums.EnumCokeType; @@ -42,7 +43,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(COAL.gem(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100))); recipes.put(COAL.dust(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100))); recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.briquette, EnumBriquetteType.COAL)), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 150))); - + recipes.put(LIGNITE.gem(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50))); recipes.put(LIGNITE.dust(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50))); recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.briquette, EnumBriquetteType.LIGNITE)), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 100))); @@ -52,7 +53,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(CINNABAR.crystal(), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.MERCURY, 100))); recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 100))); recipes.put(SODALITE.gem(), new Pair(new ItemStack(ModItems.powder_sodium), new FluidStack(Fluids.CHLORINE, 100))); - recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250))); + recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.chunk_ore, ItemEnums.EnumChunkType.CRYOLITE)), new Pair(new ItemStack(ModItems.powder_aluminium, 1), new FluidStack(Fluids.LYE, 150))); recipes.put(NA.dust(), new Pair(null, new FluidStack(Fluids.SODIUM, 100))); recipes.put(LIMESTONE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CARBONDIOXIDE, 50))); @@ -67,7 +68,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(new ComparableStack(Items.reeds), new Pair(new ItemStack(Items.sugar, 2), new FluidStack(Fluids.ETHANOL, 50))); recipes.put(new ComparableStack(Blocks.clay), new Pair(new ItemStack(Blocks.brick_block, 1), null)); - + for(BedrockOreType type : BedrockOreType.values()) { recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type)), new Pair(ItemBedrockOreNew.make(BedrockOreGrade.BASE_ROASTED, type), new FluidStack(Fluids.VITRIOL, 50))); recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY, type)), new Pair(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_ROASTED, type), new FluidStack(Fluids.VITRIOL, 50))); @@ -76,21 +77,21 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.RAD_BYPRODUCT, type)), new Pair(ItemBedrockOreNew.make(BedrockOreGrade.RAD_ROASTED, type), new FluidStack(Fluids.VITRIOL, 50))); } } - + public static Pair getOutput(ItemStack stack) { - + if(stack == null || stack.getItem() == null) return null; - + ComparableStack comp = new ComparableStack(stack.getItem(), 1, stack.getItemDamage()); - + if(recipes.containsKey(comp)) { Pair out = recipes.get(comp); return new Pair(out.getKey() == null ? null : out.getKey().copy(), out.getValue()); } - + String[] dictKeys = comp.getDictKeys(); - + for(String key : dictKeys) { if(recipes.containsKey(key)) { @@ -98,19 +99,19 @@ public class CombinationRecipes extends SerializableRecipe { return new Pair(out.getKey() == null ? null : out.getKey().copy(), out.getValue()); } } - + return null; } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry> entry : CombinationRecipes.recipes.entrySet()) { Object key = entry.getKey(); Pair val = entry.getValue(); Object o = key instanceof String ? new OreDictStack((String) key) : key; - + if(val.getKey() != null && val.getValue() != null) { recipes.put(o, new ItemStack[] {val.getKey(), ItemFluidIcon.make(val.getValue())}); } else if(val.getKey() != null) { @@ -119,7 +120,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(o, new ItemStack[] {ItemFluidIcon.make(val.getValue())}); } } - + return recipes; } @@ -139,10 +140,10 @@ public class CombinationRecipes extends SerializableRecipe { AStack in = this.readAStack(obj.get("input").getAsJsonArray()); FluidStack fluid = null; ItemStack out = null; - + if(obj.has("fluid")) fluid = this.readFluidStack(obj.get("fluid").getAsJsonArray()); if(obj.has("output")) out = this.readItemStack(obj.get("output").getAsJsonArray()); - + if(in instanceof ComparableStack) { recipes.put(((ComparableStack) in).makeSingular(), new Pair(out, fluid)); } else if(in instanceof OreDictStack) { @@ -157,7 +158,7 @@ public class CombinationRecipes extends SerializableRecipe { Pair Pair = rec.getValue(); ItemStack output = Pair.key; FluidStack fluid = Pair.value; - + writer.name("input"); if(in instanceof String) { this.writeAStack(new OreDictStack((String) in), writer); diff --git a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java index a17779bd6..814baafe2 100644 --- a/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java @@ -48,7 +48,7 @@ import net.minecraftforge.oredict.OreDictionary; //This time we're doing this right //...right? public class CrystallizerRecipes extends SerializableRecipe { - + //'Object' is either a ComparableStack or the key for the ore dict private static HashMap, CrystallizerRecipe> recipes = new HashMap(); private static HashMap amounts = new HashMap(); // for use in the partitioner @@ -83,12 +83,13 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(LI.ore(), new CrystallizerRecipe(ModItems.crystal_lithium, baseTime), sulfur); //registerRecipe(STAR.ore(), new CrystallizerRecipe(ModItems.crystal_starmetal, baseTime), sulfur); registerRecipe(CO.ore(), new CrystallizerRecipe(ModItems.crystal_cobalt, baseTime), sulfur); - + + registerRecipe(new ComparableStack(ModItems.powder_calcium), new CrystallizerRecipe(new ItemStack(ModItems.powder_cement, 8), utilityTime), new FluidStack(Fluids.REDMUD, 75)); registerRecipe(MALACHITE.ingot(), new CrystallizerRecipe(ItemScraps.create(new MaterialStack(Mats.MAT_COPPER, MaterialShapes.INGOT.q(1))), 300), new FluidStack(Fluids.SULFURIC_ACID, 250)); - + registerRecipe("oreRareEarth", new CrystallizerRecipe(ModItems.crystal_rare, baseTime), sulfur); registerRecipe("oreCinnabar", new CrystallizerRecipe(ModItems.crystal_cinnebar, baseTime)); - + registerRecipe(new ComparableStack(ModBlocks.ore_nether_fire), new CrystallizerRecipe(ModItems.crystal_phosphorus, baseTime)); registerRecipe(new ComparableStack(ModBlocks.ore_tikite), new CrystallizerRecipe(ModItems.crystal_trixite, baseTime), sulfur); registerRecipe(new ComparableStack(ModBlocks.gravel_diamond), new CrystallizerRecipe(ModItems.crystal_diamond, baseTime)); @@ -111,7 +112,7 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.MUSTARDWILLOW)), new CrystallizerRecipe(new ItemStack(ModItems.powder_cadmium), 100).setReq(10), new FluidStack(Fluids.RADIOSOLVENT, 250)); registerRecipe(new ComparableStack(ModItems.scrap_oil), new CrystallizerRecipe(new ItemStack(ModItems.nugget_arsenic), 100).setReq(16), new FluidStack(Fluids.RADIOSOLVENT, 100)); registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE)), new CrystallizerRecipe(new ItemStack(ModItems.ingot_cft), baseTime).setReq(4), new FluidStack(Fluids.XYLENE, 1_000)); - + registerRecipe(DIAMOND.dust(), new CrystallizerRecipe(Items.diamond, utilityTime)); registerRecipe(EMERALD.dust(), new CrystallizerRecipe(Items.emerald, utilityTime)); registerRecipe(LAPIS.dust(), new CrystallizerRecipe(new ItemStack(Items.dye, 1, 4), utilityTime)); @@ -121,10 +122,10 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(CD.dust(), new CrystallizerRecipe(ModItems.ingot_rubber, utilityTime), new FluidStack(Fluids.FISHOIL, 250)); registerRecipe(LATEX.ingot(), new CrystallizerRecipe(ModItems.ingot_rubber, mixingTime), new FluidStack(Fluids.SOURGAS, 25)); registerRecipe(new ComparableStack(ModItems.powder_sawdust), new CrystallizerRecipe(ModItems.cordite, mixingTime), new FluidStack(Fluids.NITROGLYCERIN, 250)); - + registerRecipe(new ComparableStack(ModItems.meteorite_sword_treated), new CrystallizerRecipe(ModItems.meteorite_sword_etched, baseTime)); registerRecipe(new ComparableStack(ModItems.powder_impure_osmiridium), new CrystallizerRecipe(ModItems.crystal_osmiridium, baseTime), new FluidStack(Fluids.SCHRABIDIC, 1_000)); - + for(int i = 0; i < ScrapType.values().length; i++) { registerRecipe(new ComparableStack(ModItems.scrap_plastic, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.circuit_star_piece, 1, i), baseTime)); } @@ -132,9 +133,9 @@ public class CrystallizerRecipes extends SerializableRecipe { FluidStack nitric = new FluidStack(Fluids.NITRIC_ACID, 500); FluidStack organic = new FluidStack(Fluids.SOLVENT, 500); FluidStack hiperf = new FluidStack(Fluids.RADIOSOLVENT, 500); - + int oreTime = 200; - + for(EnumBedrockOre ore : EnumBedrockOre.values()) { int i = ore.ordinal(); @@ -150,7 +151,7 @@ public class CrystallizerRecipes extends SerializableRecipe { for(BedrockOreType type : BedrockOreType.values()) { registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.BASE_WASHED, type), washing), new FluidStack(Fluids.WATER, 250)); registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.BASE_ROASTED, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.BASE_WASHED, type), washing), new FluidStack(Fluids.WATER, 250)); - + registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SULFURIC, type), bedrock), new FluidStack(Fluids.SULFURIC_ACID, 250)); registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_ROASTED, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SULFURIC, type), bedrock), new FluidStack(Fluids.SULFURIC_ACID, 250)); @@ -197,10 +198,10 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_NOSOLVENT, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type), bedrock), secondary); registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_RAD, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type), bedrock), secondary); registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_NORAD, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type), bedrock), secondary); - + registerRecipe(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)), new CrystallizerRecipe(ItemBedrockOreNew.make(BedrockOreGrade.BASE, type), bedrock).setReq(64), new FluidStack(Fluids.NITRIC_ACID, 1000)); } - + FluidStack[] dyes = new FluidStack[] {new FluidStack(Fluids.WOODOIL, 100), new FluidStack(Fluids.FISHOIL, 100)}; for(FluidStack dye : dyes) { registerRecipe(COAL.dust(), new CrystallizerRecipe(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.BLACK, 4), mixingTime), dye); @@ -220,7 +221,7 @@ public class CrystallizerRecipes extends SerializableRecipe { registerRecipe(KEY_SAND, new CrystallizerRecipe(Blocks.clay, 20), new FluidStack(Fluids.COLLOID, 1_000)); registerRecipe(new ComparableStack(ModBlocks.sand_quartz), new CrystallizerRecipe(new ItemStack(ModItems.ball_dynamite, 16), 20), new FluidStack(Fluids.NITROGLYCERIN, 1_000)); registerRecipe(NETHERQUARTZ.dust(), new CrystallizerRecipe(new ItemStack(ModItems.ball_dynamite, 4), 20), new FluidStack(Fluids.NITROGLYCERIN, 250)); - + /// COMPAT CERTUS QUARTZ /// List quartz = OreDictionary.getOres("crystalCertusQuartz"); if(quartz != null && !quartz.isEmpty()) { @@ -234,69 +235,69 @@ public class CrystallizerRecipes extends SerializableRecipe { if(dustWhitePhosphorus != null && !dustWhitePhosphorus.isEmpty()) { registerRecipe(P_WHITE.dust(), new CrystallizerRecipe(new ItemStack(ModItems.ingot_phosphorus), utilityTime), new FluidStack(Fluids.AROMATICS, 50)); } - + if(!IMCCrystallizer.buffer.isEmpty()) { recipes.putAll(IMCCrystallizer.buffer); MainRegistry.logger.info("Fetched " + IMCCrystallizer.buffer.size() + " IMC crystallizer recipes!"); IMCCrystallizer.buffer.clear(); } } - + public static CrystallizerRecipe getOutput(ItemStack stack, FluidType type) { - + if(stack == null || stack.getItem() == null) return null; - + ComparableStack comp = new ComparableStack(stack.getItem(), 1, stack.getItemDamage()); Pair compKey = new Pair(comp, type); if(recipes.containsKey(compKey)) return recipes.get(compKey); - + String[] dictKeys = comp.getDictKeys(); - + for(String key : dictKeys) { Pair dictKey = new Pair(key, type); if(recipes.containsKey(dictKey)) return recipes.get(dictKey); } - + comp.meta = OreDictionary.WILDCARD_VALUE; if(recipes.containsKey(compKey)) return recipes.get(compKey); - + return null; } - + public static int getAmount(ItemStack stack) { - + if(stack == null || stack.getItem() == null) return 0; - + ComparableStack comp = new ComparableStack(stack.getItem(), 1, stack.getItemDamage()); if(amounts.containsKey(comp)) return amounts.get(comp); - + String[] dictKeys = comp.getDictKeys(); - + for(String key : dictKeys) { if(amounts.containsKey(key)) return amounts.get(key); } - + comp.meta = OreDictionary.WILDCARD_VALUE; if(amounts.containsKey(comp)) return amounts.get(comp); - + return 0; } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry, CrystallizerRecipe> entry : CrystallizerRecipes.recipes.entrySet()) { - + CrystallizerRecipe recipe = entry.getValue(); - + Pair key = entry.getKey(); Object input = key.getKey(); FluidType acid = key.getValue(); - + if(input instanceof String) { OreDictStack stack = new OreDictStack((String) input, recipe.itemAmount); recipes.put(new Object[] {ItemFluidIcon.make(acid, recipe.acidAmount), stack}, recipe.output); @@ -308,34 +309,34 @@ public class CrystallizerRecipes extends SerializableRecipe { recipes.put(new Object[] {ItemFluidIcon.make(acid, recipe.acidAmount), stack}, recipe.output); } } - + return recipes; } - + public static void registerRecipe(Object input, CrystallizerRecipe recipe) { registerRecipe(input, recipe, new FluidStack(Fluids.PEROXIDE, 500)); } - + public static void registerRecipe(Object input, CrystallizerRecipe recipe, FluidStack stack) { recipe.acidAmount = stack.fill; recipes.put(new Pair(input, stack.type), recipe); amounts.put(input, recipe.itemAmount); } - + public static class CrystallizerRecipe { public int acidAmount; public int itemAmount = 1; public int duration; public ItemStack output; - + public CrystallizerRecipe(Block output, int duration) { this(new ItemStack(output), duration); } public CrystallizerRecipe(Item output, int duration) { this(new ItemStack(output), duration); } - + public CrystallizerRecipe setReq(int amount) { this.itemAmount = amount; return this; } - + public CrystallizerRecipe(ItemStack output, int duration) { this.output = output; this.duration = duration; @@ -361,7 +362,7 @@ public class CrystallizerRecipes extends SerializableRecipe { AStack input = this.readAStack(obj.get("input").getAsJsonArray()); FluidStack fluid = this.readFluidStack(obj.get("fluid").getAsJsonArray()); int duration = obj.get("duration").getAsInt(); - + CrystallizerRecipe cRecipe = new CrystallizerRecipe(output, duration).setReq(input.stacksize); input.stacksize = 1; cRecipe.acidAmount = fluid.fill; diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java index 2d98d3e76..e3f3ae010 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserFluidRecipes.java @@ -13,13 +13,14 @@ import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import net.minecraft.item.ItemStack; public class ElectrolyserFluidRecipes extends SerializableRecipe { - + public static HashMap recipes = new HashMap(); @Override @@ -28,27 +29,29 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe { recipes.put(Fluids.HEAVYWATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.DEUTERIUM, 200), new FluidStack(Fluids.OXYGEN, 200), 10)); recipes.put(Fluids.VITRIOL, new ElectrolysisRecipe(1_000, new FluidStack(Fluids.SULFURIC_ACID, 500), new FluidStack(Fluids.CHLORINE, 500), new ItemStack(ModItems.powder_iron), new ItemStack(ModItems.ingot_mercury))); recipes.put(Fluids.SLOP, new ElectrolysisRecipe(1_000, new FluidStack(Fluids.MERCURY, 250), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.niter, 2), new ItemStack(ModItems.powder_limestone, 2), new ItemStack(ModItems.sulfur))); + recipes.put(Fluids.REDMUD, new ElectrolysisRecipe(450, new FluidStack(Fluids.MERCURY, 150), new FluidStack(Fluids.LYE, 100), new ItemStack(ModItems.powder_titanium, 3), new ItemStack(ModItems.powder_iron, 3), new ItemStack(ModItems.powder_aluminium, 2))); + recipes.put(Fluids.ALUMINA, new ElectrolysisRecipe(200, new FluidStack(Fluids.CARBONDIOXIDE, 100), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.powder_aluminium, 6), new ItemStack(ModItems.fluorite, 2))); recipes.put(Fluids.POTASSIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.dust))); recipes.put(Fluids.CALCIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125))); } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry entry : ElectrolyserFluidRecipes.recipes.entrySet()) { - + ElectrolysisRecipe recipe = entry.getValue(); FluidStack input = new FluidStack(entry.getKey(), recipe.amount); List outputs = new ArrayList(); if(recipe.output1.type != Fluids.NONE) outputs.add(ItemFluidIcon.make(recipe.output1)); if(recipe.output2.type != Fluids.NONE) outputs.add(ItemFluidIcon.make(recipe.output2)); for(ItemStack byproduct : recipe.byproduct) outputs.add(byproduct); - + recipes.put(ItemFluidIcon.make(input), outputs.toArray()); } - + return recipes; } public static ElectrolysisRecipe getRecipe(FluidType type) { @@ -79,30 +82,30 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe { FluidStack input = this.readFluidStack(obj.get("input").getAsJsonArray()); FluidStack output1 = this.readFluidStack(obj.get("output1").getAsJsonArray()); FluidStack output2 = this.readFluidStack(obj.get("output2").getAsJsonArray()); - + int duration = 20; if(obj.has("duraion")) duration = obj.get("duration").getAsInt(); - + ItemStack[] byproducts = new ItemStack[0]; if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray()); - + recipes.put(input.type, new ElectrolysisRecipe(input.fill, output1, output2, duration, byproducts)); } @Override public void writeRecipe(Object recipe, JsonWriter writer) throws IOException { Entry rec = (Entry) recipe; - + writer.name("input"); this.writeFluidStack(new FluidStack(rec.getKey(), rec.getValue().amount), writer); writer.name("output1"); this.writeFluidStack(rec.getValue().output1, writer); writer.name("output2"); this.writeFluidStack(rec.getValue().output2, writer); - + if(rec.getValue().byproduct != null && rec.getValue().byproduct.length > 0) { writer.name("byproducts").beginArray(); for(ItemStack stack : rec.getValue().byproduct) this.writeItemStack(stack, writer); writer.endArray(); } - + writer.name("duration").value(rec.getValue().duration); } @@ -112,7 +115,7 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe { public int amount; public ItemStack[] byproduct; public int duration; - + public ElectrolysisRecipe(int amount, FluidStack output1, FluidStack output2, ItemStack... byproduct) { this.output1 = output1; this.output2 = output2; diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java index 958673c11..8a51f85c2 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java @@ -16,6 +16,7 @@ import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.items.machine.ItemScraps; @@ -29,7 +30,7 @@ import com.hbm.util.Tuple.*; import net.minecraft.item.ItemStack; public class ElectrolyserMetalRecipes extends SerializableRecipe { - + public static HashMap recipes = new HashMap(); @Override @@ -39,99 +40,101 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_gold), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3), new ItemStack(ModItems.ingot_mercury, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_uranium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_RADIUM, MaterialShapes.NUGGET.q(4)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_thorium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_THORIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_plutonium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_POLONIUM, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_titanium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_copper), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_COPPER, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)), new ItemStack(ModItems.powder_lithium_tiny, 3), new ItemStack(ModItems.sulfur, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_tungsten), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_TUNGSTEN, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_aluminium), new ElectrolysisMetalRecipe( - new MaterialStack(Mats.MAT_ALUMINIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_ALUMINIUM, MaterialShapes.INGOT.q(2)), new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.chunk_ore, 4, ItemEnums.EnumChunkType.CRYOLITE.ordinal()), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + + recipes.put(new ComparableStack(ModItems.crystal_beryllium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_BERYLLIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)), new ItemStack(ModItems.powder_lithium_tiny, 3), new ItemStack(ModItems.powder_quartz, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_lead), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_schraranium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.NUGGET.q(5)), new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.NUGGET.q(2)), new ItemStack(ModItems.nugget_neptunium, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_schrabidium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_rare), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_ZIRCONIUM, MaterialShapes.NUGGET.q(6)), new MaterialStack(Mats.MAT_BORON, MaterialShapes.NUGGET.q(2)), new ItemStack(ModItems.powder_desh_mix, 3))); - + recipes.put(new ComparableStack(ModItems.crystal_trixite), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(3)), new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)), new ItemStack(ModItems.powder_niobium, 4), new ItemStack(ModItems.powder_nitan_mix, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_lithium), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_LITHIUM, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_BORON, MaterialShapes.INGOT.q(2)), new ItemStack(ModItems.powder_quartz, 2), new ItemStack(ModItems.fluorite, 2))); - + recipes.put(new ComparableStack(ModItems.crystal_starmetal), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_DURA, MaterialShapes.INGOT.q(4)), new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)), new ItemStack(ModItems.powder_astatine, 3), new ItemStack(ModItems.ingot_mercury, 8))); - + recipes.put(new ComparableStack(ModItems.crystal_cobalt), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(3)), new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(4)), new ItemStack(ModItems.powder_copper, 4), new ItemStack(ModItems.powder_lithium_tiny, 3))); - + for(BedrockOreType type : BedrockOreType.values()) { ArrayList> productsF = new ArrayList<>(); productsF.add(new Pair(type.primary1, 8)); @@ -166,7 +169,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { continue; } } - + if(product.getKey() instanceof BedrockOreOutput) solidProducts.add(ItemBedrockOreNew.extract((BedrockOreOutput) product.getKey(), product.getValue())); if(product.getKey() instanceof ItemStack) solidProducts.add(((ItemStack) product.getKey()).copy()); } @@ -178,39 +181,39 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { 20, solidProducts.toArray(new ItemStack[0])); } - + public static ElectrolysisMetalRecipe getRecipe(ItemStack stack) { if(stack == null || stack.getItem() == null) return null; ComparableStack comp = new ComparableStack(stack).makeSingular(); - + if(recipes.containsKey(comp)) return recipes.get(comp); - + List names = ItemStackUtil.getOreDictNames(stack); - + for(String name : names) { OreDictStack ore = new OreDictStack(name); if(recipes.containsKey(ore)) return recipes.get(ore); } - + return null; } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry entry : ElectrolyserMetalRecipes.recipes.entrySet()) { - + ElectrolysisMetalRecipe recipe = entry.getValue(); Object[] input = new Object[] { entry.getKey().copy(), ItemFluidIcon.make(Fluids.NITRIC_ACID, 100) }; List outputs = new ArrayList(); if(recipe.output1 != null) outputs.add(ItemScraps.create(recipe.output1, true)); if(recipe.output2 != null) outputs.add(ItemScraps.create(recipe.output2, true)); for(ItemStack byproduct : recipe.byproduct) outputs.add(byproduct); - + recipes.put(input, outputs.toArray()); } - + return recipes; } @@ -232,7 +235,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { @Override public void readRecipe(JsonElement recipe) { JsonObject obj = (JsonObject) recipe; - + AStack input = this.readAStack(obj.get("input").getAsJsonArray()); MaterialStack output1 = null; @@ -251,22 +254,22 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { int amount2 = out2.get(1).getAsInt(); output2 = new MaterialStack(Mats.matByName.get(name2), amount2); } - + ItemStack[] byproducts = new ItemStack[0]; if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray()); - + int duration = 600; if(obj.has("duration")) duration = obj.get("duration").getAsInt(); - + recipes.put(input, new ElectrolysisMetalRecipe(output1, output2, duration, byproducts)); } @Override public void writeRecipe(Object recipe, JsonWriter writer) throws IOException { Entry rec = (Entry) recipe; - + writer.name("input"); this.writeAStack(rec.getKey(), writer); - + if(rec.getValue().output1 != null) { writer.name("output1"); writer.beginArray(); @@ -284,23 +287,23 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { writer.endArray(); writer.setIndent(" "); } - + if(rec.getValue().byproduct != null && rec.getValue().byproduct.length > 0) { writer.name("byproducts").beginArray(); for(ItemStack stack : rec.getValue().byproduct) this.writeItemStack(stack, writer); writer.endArray(); } - + writer.name("duration").value(rec.getValue().duration); } - + public static class ElectrolysisMetalRecipe { - + public MaterialStack output1; public MaterialStack output2; public ItemStack[] byproduct; public int duration; - + public ElectrolysisMetalRecipe(MaterialStack output1, MaterialStack output2, ItemStack... byproduct) { this.output1 = output1; this.output2 = output2; diff --git a/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java b/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java index 8b144c3fb..93e932ef3 100644 --- a/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; public class FractionRecipes extends SerializableRecipe { private static Map> fractions = new HashMap(); - + @Override public void registerDefaults() { fractions.put(Fluids.HEAVYOIL, new Pair(new FluidStack(Fluids.BITUMEN, 30), new FluidStack(Fluids.SMEAR, 70))); @@ -41,38 +41,39 @@ public class FractionRecipes extends SerializableRecipe { fractions.put(Fluids.NAPHTHA_COKER, new Pair(new FluidStack(Fluids.NAPHTHA_CRACK, 75), new FluidStack(Fluids.LIGHTOIL_CRACK, 25))); fractions.put(Fluids.GAS_COKER, new Pair(new FluidStack(Fluids.AROMATICS, 25), new FluidStack(Fluids.CARBONDIOXIDE, 75))); fractions.put(Fluids.CHLOROCALCITE_MIX, new Pair(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 50), new FluidStack(Fluids.COLLOID, 50))); + fractions.put(Fluids.BAUXITE_SOLUTION, new Pair(new FluidStack(Fluids.REDMUD, 50), new FluidStack(Fluids.SODIUM_ALUMINATE, 50))); } - + public static Pair getFractions(FluidType oil) { return fractions.get(oil); } - + public static HashMap getFractionRecipesForNEI() { HashMap recipes = new HashMap(); - + for(Entry> recipe : fractions.entrySet()) { ItemStack[] out = new ItemStack[] { ItemFluidIcon.make(recipe.getValue().getKey()), ItemFluidIcon.make(recipe.getValue().getValue()) }; - + recipes.put(ItemFluidIcon.make(recipe.getKey(), 100), out); } - + return recipes; } - + @Override public String getFileName() { return "hbmFractions.json"; } - + @Override public String getComment() { return "Inputs are always 100mB, set output quantities accordingly."; } - + @Override public Object getRecipeObject() { return fractions; @@ -82,7 +83,7 @@ public class FractionRecipes extends SerializableRecipe { public void deleteRecipes() { fractions.clear(); } - + @Override public void readRecipe(JsonElement recipe) { JsonObject obj = (JsonObject) recipe; @@ -90,14 +91,14 @@ public class FractionRecipes extends SerializableRecipe { FluidType input = Fluids.fromName(obj.get("input").getAsString()); FluidStack output1 = this.readFluidStack(obj.get("output1").getAsJsonArray()); FluidStack output2 = this.readFluidStack(obj.get("output2").getAsJsonArray()); - + fractions.put(input, new Pair(output1, output2)); } - + @Override public void writeRecipe(Object recipe, JsonWriter writer) throws IOException { Entry> rec = (Entry>) recipe; - + writer.name("input").value(rec.getKey().getName()); writer.name("output1"); this.writeFluidStack(rec.getValue().getKey(), writer); writer.name("output2"); this.writeFluidStack(rec.getValue().getValue(), writer); diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index 03a1d95fc..21053cbe3 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -12,6 +12,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; +import com.hbm.blocks.BlockEnums; +import com.hbm.blocks.ModBlocks; import com.hbm.inventory.FluidStack; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; @@ -19,6 +21,7 @@ import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; import com.hbm.items.ItemEnums.EnumAshType; import com.hbm.items.machine.ItemFluidIcon; @@ -30,7 +33,7 @@ import net.minecraftforge.oredict.OreDictionary; public class MixerRecipes extends SerializableRecipe { public static HashMap recipes = new HashMap(); - + @Override public void registerDefaults() { register(Fluids.COOLANT, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.WATER, 1_800)).setSolid(new OreDictStack(KNO.dust()))); @@ -59,7 +62,7 @@ public class MixerRecipes extends SerializableRecipe { register(Fluids.NITRIC_ACID, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust()))); register(Fluids.RADIOSOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250))); register(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.PEROXIDE, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged))); - + register(Fluids.PETROIL, new MixerRecipe(1_000, 30).setStack1(new FluidStack(Fluids.RECLAIMED, 800)).setStack2(new FluidStack(Fluids.LUBRICANT, 200))); register(Fluids.LUBRICANT, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.HEATINGOIL, 500)).setStack2(new FluidStack(Fluids.UNSATURATEDS, 500)), @@ -71,7 +74,7 @@ public class MixerRecipes extends SerializableRecipe { register(Fluids.NITROGLYCERIN, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.PETROLEUM, 1_000)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 1_000)), new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.FISHOIL, 500)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 500))); - + register(Fluids.THORIUM_SALT, new MixerRecipe(1_000, 30).setStack1(new FluidStack(Fluids.CHLORINE, 1000)).setSolid(new OreDictStack(TH232.dust()))); register(Fluids.SYNGAS, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.COALOIL, 500)).setStack2(new FluidStack(Fluids.STEAM, 500))); @@ -86,36 +89,42 @@ public class MixerRecipes extends SerializableRecipe { register(Fluids.DIESEL_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); register(Fluids.DIESEL_CRACK_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL_CRACK, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); register(Fluids.KEROSENE_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); - + register(Fluids.CHLOROCALCITE_SOLUTION, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.WATER, 250)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 250)).setSolid(new OreDictStack(CHLOROCALCITE.dust()))); register(Fluids.CHLOROCALCITE_MIX, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.CHLOROCALCITE_SOLUTION, 500)).setStack2(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new ComparableStack(ModItems.powder_flux))); register(Fluids.PHEROMONE_M, new MixerRecipe(2000, 10).setStack1(new FluidStack(Fluids.PHEROMONE, 1500)).setStack2(new FluidStack(Fluids.BLOOD, 500)).setSolid(new ComparableStack(ModItems.pill_herbal))); + register(Fluids.BAUXITE_SOLUTION, new MixerRecipe(300, 100).setStack1(new FluidStack(Fluids.LYE, 50)).setSolid(new ComparableStack(ModBlocks.stone_resource, 1, BlockEnums.EnumStoneType.BAUXITE.ordinal()))); + register(Fluids.LYE, new MixerRecipe(50, 100).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.powder_ash, 2, EnumAshType.WOOD))); + register(Fluids.ALUMINA, new MixerRecipe(200, 100).setStack1(new FluidStack(Fluids.SODIUM_ALUMINATE, 150)).setSolid(new OreDictStack(AL.dust())), + new MixerRecipe(300, 50).setStack1(new FluidStack(Fluids.SODIUM_ALUMINATE, 150)).setSolid(new ComparableStack(DictFrame.fromOne(ModItems.chunk_ore, ItemEnums.EnumChunkType.CRYOLITE)))); + + register(Fluids.PERFLUOROMETHYL, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.PETROLEUM, 1000)).setStack2(new FluidStack(Fluids.UNSATURATEDS, 500)).setSolid(new OreDictStack(F.dust()))); } - + public static void register(FluidType type, MixerRecipe... rec) { recipes.put(type, rec); } - + public static MixerRecipe[] getOutput(FluidType type) { return recipes.get(type); } - + public static MixerRecipe getOutput(FluidType type, int index) { MixerRecipe[] recs = recipes.get(type); - + if(recs == null) return null; - + return recs[index % recs.length]; } - + @Override public String getFileName() { return "hbmMixer.json"; } - + @Override public Object getRecipeObject() { return recipes; @@ -125,43 +134,43 @@ public class MixerRecipes extends SerializableRecipe { public void deleteRecipes() { recipes.clear(); } - + @Override public void readRecipe(JsonElement recipe) { JsonObject obj = (JsonObject) recipe; - + FluidType outputType = Fluids.fromName(obj.get("outputType").getAsString()); JsonArray recipeArray = obj.get("recipes").getAsJsonArray(); MixerRecipe[] array = new MixerRecipe[recipeArray.size()]; - + for(int i = 0; i < recipeArray.size(); i++) { JsonObject sub = recipeArray.get(i).getAsJsonObject(); MixerRecipe mix = new MixerRecipe(sub.get("outputAmount").getAsInt(), sub.get("duration").getAsInt()); - + if(sub.has("input1")) mix.setStack1(this.readFluidStack(sub.get("input1").getAsJsonArray())); if(sub.has("input2")) mix.setStack2(this.readFluidStack(sub.get("input2").getAsJsonArray())); if(sub.has("solidInput")) mix.setSolid(this.readAStack(sub.get("solidInput").getAsJsonArray())); - + array[i] = mix; - + } - + recipes.put(outputType, array); } - + @Override public void writeRecipe(Object recipe, JsonWriter writer) throws IOException { Entry rec = (Entry) recipe; MixerRecipe[] recipes = rec.getValue(); - + writer.name("outputType").value(rec.getKey().getName()); writer.name("recipes").beginArray(); - + for(MixerRecipe mix : recipes) { writer.beginObject(); writer.name("duration").value(mix.processTime); writer.name("outputAmount").value(mix.output); - + if(mix.input1 != null) { writer.name("input1"); this.writeFluidStack(mix.input1, writer); } if(mix.input2 != null) { writer.name("input2"); this.writeFluidStack(mix.input2, writer); } if(mix.solidInput != null) { writer.name("solidInput"); this.writeAStack(mix.solidInput, writer); } @@ -171,36 +180,36 @@ public class MixerRecipes extends SerializableRecipe { } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry entry : MixerRecipes.recipes.entrySet()) { - + FluidType type = entry.getKey(); MixerRecipe[] recs = entry.getValue(); - + for(MixerRecipe recipe : recs) { FluidStack output = new FluidStack(type, recipe.output); - + List objects = new ArrayList(); if(recipe.input1 != null) objects.add(ItemFluidIcon.make(recipe.input1)); if(recipe.input2 != null) objects.add(ItemFluidIcon.make(recipe.input2)); if(recipe.solidInput != null) objects.add(recipe.solidInput); - + recipes.put(objects.toArray(), ItemFluidIcon.make(output)); } } - + return recipes; } - + public static class MixerRecipe { public FluidStack input1; public FluidStack input2; public AStack solidInput; public int processTime; public int output; - + protected MixerRecipe(int output, int processTime) { this.output = output; this.processTime = processTime; diff --git a/src/main/java/com/hbm/inventory/recipes/RotaryFurnaceRecipes.java b/src/main/java/com/hbm/inventory/recipes/RotaryFurnaceRecipes.java index 7cfba6a50..a74d53d68 100644 --- a/src/main/java/com/hbm/inventory/recipes/RotaryFurnaceRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RotaryFurnaceRecipes.java @@ -29,7 +29,7 @@ import com.hbm.items.machine.ItemScraps; import net.minecraft.item.ItemStack; public class RotaryFurnaceRecipes extends SerializableRecipe { - + public static List recipes = new ArrayList(); @Override @@ -37,7 +37,7 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_STEEL, INGOT.q(1)), 100, 100, new OreDictStack(IRON.ingot()), new OreDictStack(COAL.gem()))); recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_STEEL, INGOT.q(1)), 100, 100, new OreDictStack(IRON.ingot()), new OreDictStack(ANY_COKE.gem()))); - + recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_STEEL, INGOT.q(2)), 200, 25, new OreDictStack(IRON.fragment(), 9), new OreDictStack(COAL.gem()))); recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_STEEL, INGOT.q(3)), 200, 25, new OreDictStack(IRON.fragment(), 9), new OreDictStack(ANY_COKE.gem()))); recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_STEEL, INGOT.q(4)), 400, 25, new OreDictStack(IRON.fragment(), 9), new OreDictStack(ANY_COKE.gem()), new ComparableStack(ModItems.powder_flux))); @@ -47,43 +47,45 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_GUNMETAL, INGOT.q(4)), 200, 100, new OreDictStack(CU.ingot(), 3), new OreDictStack(AL.ingot(), 1))); recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_WEAPONSTEEL, INGOT.q(1)), 200, 400, new FluidStack(Fluids.GAS_COKER, 100), new OreDictStack(STEEL.ingot(), 1), new ComparableStack(ModItems.powder_flux, 2))); recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_SATURN, INGOT.q(2)), 200, 400, new FluidStack(Fluids.REFORMGAS, 250), new OreDictStack(DURA.dust(), 4), new OreDictStack(CU.dust()))); + recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_ALUMINIUM, INGOT.q(2)), 100, 400, new FluidStack(Fluids.SODIUM_ALUMINATE, 250))); + recipes.add(new RotaryFurnaceRecipe(new MaterialStack(MAT_ALUMINIUM, INGOT.q(3)), 40, 200, new FluidStack(Fluids.SODIUM_ALUMINATE, 250), new ComparableStack(ModItems.powder_flux, 2))); } - + public static HashMap getRecipes() { HashMap recipes = new HashMap(); - + for(RotaryFurnaceRecipe recipe : RotaryFurnaceRecipes.recipes) { - + int size = recipe.ingredients.length + (recipe.fluid != null ? 1 : 0); Object[] array = new Object[size]; - + for(int i = 0; i < recipe.ingredients.length; i++) { array[i] = recipe.ingredients[i]; } - + if(recipe.fluid != null) array[size - 1] = ItemFluidIcon.make(recipe.fluid); - + recipes.put(array, ItemScraps.create(recipe.output, true)); } - + return recipes; } - + public static RotaryFurnaceRecipe getRecipe(ItemStack... inputs) { - + outer: for(RotaryFurnaceRecipe recipe : recipes) { List recipeList = new ArrayList(); for(AStack ingredient : recipe.ingredients) recipeList.add(ingredient); - + for(int i = 0; i < inputs.length; i++) { - + ItemStack inputStack = inputs[i]; if(inputStack != null) { - + boolean hasMatch = false; Iterator iterator = recipeList.iterator(); @@ -102,10 +104,10 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { } } } - + if(recipeList.isEmpty()) return recipe; } - + return null; } @@ -127,34 +129,34 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { @Override public void readRecipe(JsonElement recipe) { JsonObject obj = (JsonObject) recipe; - + AStack[] inputs = this.readAStackArray(obj.get("inputs").getAsJsonArray()); FluidStack fluid = obj.has("fluid") ? this.readFluidStack(obj.get("fluid").getAsJsonArray()) : null; - + JsonArray array = obj.get("output").getAsJsonArray(); MaterialStack stack = new MaterialStack(Mats.matByName.get(array.get(0).getAsString()), array.get(1).getAsInt()); - + int duration = obj.get("duration").getAsInt(); int steam = obj.get("steam").getAsInt(); - + recipes.add(new RotaryFurnaceRecipe(stack, duration, steam, fluid, inputs)); } @Override public void writeRecipe(Object obj, JsonWriter writer) throws IOException { RotaryFurnaceRecipe recipe = (RotaryFurnaceRecipe) obj; - + writer.name("inputs").beginArray(); for(AStack aStack : recipe.ingredients) { this.writeAStack(aStack, writer); } writer.endArray(); - + if(recipe.fluid != null) { writer.name("fluid"); this.writeFluidStack(recipe.fluid, writer); } - + writer.name("output").beginArray(); writer.setIndent(""); writer.value(recipe.output.material.names[0]).value(recipe.output.amount); @@ -164,15 +166,15 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { writer.name("duration").value(recipe.duration); writer.name("steam").value(recipe.steam); } - + public static class RotaryFurnaceRecipe { - + public AStack[] ingredients; public FluidStack fluid; public MaterialStack output; public int duration; public int steam; - + public RotaryFurnaceRecipe(MaterialStack output, int duration, int steam, FluidStack fluid, AStack... ingredients) { this.ingredients = ingredients; this.fluid = fluid; @@ -180,7 +182,7 @@ public class RotaryFurnaceRecipes extends SerializableRecipe { this.duration = duration; this.steam = steam; } - + public RotaryFurnaceRecipe(MaterialStack output, int duration, int steam, AStack... ingredients) { this(output, duration, steam, null, ingredients); } diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index 69867b131..6d57569e4 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -28,7 +28,7 @@ public class SILEXRecipes { private static HashMap recipes = new HashMap(); private static HashMap itemTranslation = new HashMap(); private static HashMap dictTranslation = new HashMap(); - + public static void register() { itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.UF6.getID()), new ComparableStack(ModItems.ingot_uranium)); @@ -37,12 +37,12 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_u235), 1) .addOut(new ItemStack(ModItems.nugget_u238), 11) ); - + recipes.put(new ComparableStack(ModItems.ingot_pu_mix), new SILEXRecipe(900, 100, 2) .addOut(new ItemStack(ModItems.nugget_pu239), 6) .addOut(new ItemStack(ModItems.nugget_pu240), 3) ); - + recipes.put(new ComparableStack(ModItems.ingot_am_mix), new SILEXRecipe(900, 100, 2) .addOut(new ItemStack(ModItems.nugget_am241), 3) .addOut(new ItemStack(ModItems.nugget_am242), 6) @@ -67,20 +67,20 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_australium_lesser), 5) .addOut(new ItemStack(ModItems.nugget_australium_greater), 1) ); - + recipes.put(new ComparableStack(ModItems.crystal_schraranium), new SILEXRecipe(900, 100, 3) .addOut(new ItemStack(ModItems.nugget_schrabidium), 5) .addOut(new ItemStack(ModItems.nugget_uranium), 2) .addOut(new ItemStack(ModItems.nugget_neptunium), 2) ); - + recipes.put(new ComparableStack(ModBlocks.ore_tikite), new SILEXRecipe(900, 100, EnumWavelengths.UV) .addOut(new ItemStack(ModItems.powder_plutonium), 2) .addOut(new ItemStack(ModItems.powder_cobalt), 3) .addOut(new ItemStack(ModItems.powder_niobium), 3) .addOut(new ItemStack(ModItems.powder_nitan_mix), 2) ); - + recipes.put(new ComparableStack(ModItems.crystal_trixite), new SILEXRecipe(1200, 100, EnumWavelengths.UV) .addOut(new ItemStack(ModItems.powder_plutonium), 2) .addOut(new ItemStack(ModItems.powder_cobalt), 3) @@ -100,151 +100,161 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.powder_impure_osmiridium), 1) ); - recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.VITRIOL.getID()), new SILEXRecipe(1000, 1000, EnumWavelengths.IR) + recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.VITRIOL.getID()), new SILEXRecipe(1000, 300, EnumWavelengths.IR) .addOut(new ItemStack(ModItems.powder_bromine), 5) .addOut(new ItemStack(ModItems.powder_iodine), 5) .addOut(new ItemStack(ModItems.powder_iron), 5) .addOut(new ItemStack(ModItems.sulfur), 15) ); - + + recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.REDMUD.getID()), new SILEXRecipe(300, 50, EnumWavelengths.VISIBLE) + .addOut(new ItemStack(ModItems.powder_aluminium), 10) + .addOut(new ItemStack(ModItems.powder_neodymium_tiny, 3), 5) + .addOut(new ItemStack(ModItems.powder_boron_tiny, 3), 5) + .addOut(new ItemStack(ModItems.nugget_zirconium), 5) + .addOut(new ItemStack(ModItems.powder_iron), 20) + .addOut(new ItemStack(ModItems.powder_titanium), 15) + .addOut(new ItemStack(ModItems.powder_sodium), 10) + ); + for(int i = 0; i < 5; i++) { - + // UEU // recipes.put(new ComparableStack(ModItems.rbmk_pellet_ueu, 1, i), new SILEXRecipe(600, 100, 1) //NU and MEU will breed more plutonium due to their higher concentrations of U-238 .addOut(new ItemStack(ModItems.nugget_uranium), 86 - i * 11) //NU is unenriched to the point where it'll always be lower burnup; so more Pu239 for longer .addOut(i < 2 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 10 + i * 3) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 3 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 2 + 5 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_ueu, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_uranium), 86 - i * 11) .addOut(i < 2 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 10 + i * 3) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 3 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 1 + 5 * i) ); - + // MEU // recipes.put(new ComparableStack(ModItems.rbmk_pellet_meu, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_uranium_fuel), 84 - i * 16) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 4) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 7 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_meu, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_uranium_fuel), 83 - i * 16) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 4) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 7 * i) ); - + // HEU233 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_heu233, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_u233), 90 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), 6 + 12 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_heu233, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_u233), 89 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), 6 + 12 * i) ); - + // HEU235 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_heu235, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_u235), 90 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 12 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_heu235, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_u235), 89 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 12 * i) ); - + // TH232 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_thmeu, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_thorium_fuel), 84 - i * 20) .addOut(new ItemStack(ModItems.nugget_u233), 6 + i * 4) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), 10 + 16 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_thmeu, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_thorium_fuel), 83 - i * 20) .addOut(new ItemStack(ModItems.nugget_u233), 6 + i * 4) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), 10 + 16 * i) ); - + // LEP // recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_plutonium_fuel), 84 - i * 14) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 2) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 4 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_plutonium_fuel), 83 - i * 14) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 2) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 4 * i) ); - + // MEP // recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_pu_mix), 85 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 10 + 10 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 5 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_pu_mix), 84 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 10 + 10 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 5 * i) ); - + // HEP239 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_pu239), 85 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 15 + 20 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_pu239), 84 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 15 + 20 * i) ); - + // HEP241 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep241, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_pu241), 85 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), 15 + 20 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep241, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_pu241), 84 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), 15 + 20 * i) ); - + // MEN // recipes.put(new ComparableStack(ModItems.rbmk_pellet_men, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_neptunium_fuel), 84 - i * 14) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 2) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), 4 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), 6 + 7 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_men, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_neptunium_fuel), 83 - i * 14) .addOut(i < 1 ? new ItemStack(ModItems.nugget_pu239) : new ItemStack(ModItems.nugget_pu_mix), 6 + i * 2) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), 4 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), 6 + 7 * i) ); - + // HEN // recipes.put(new ComparableStack(ModItems.rbmk_pellet_hen, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_neptunium), 90 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), 6 + 12 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_hen, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_neptunium), 89 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), 4 + 8 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), 6 + 12 * i) ); - + // MOX // recipes.put(new ComparableStack(ModItems.rbmk_pellet_mox, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_mox_fuel), 84 - i * 20) @@ -253,7 +263,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 2 + 3 * i) ); - + //TODO: Readd xenon processing if/when the NEI handler can display more than 6 outputs properly recipes.put(new ComparableStack(ModItems.rbmk_pellet_mox, 1, i + 5), new SILEXRecipe(600, 100, 1) //Plutonium processing isn't possible w/o fucking up the NEI handler or removing xenon .addOut(new ItemStack(ModItems.nugget_mox_fuel), 84 - i * 20) //To prevent people from taking advantage of differing waste types, conform to the latter @@ -262,33 +272,33 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 2 + 3 * i) ); - + // LEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_australium_lesser), 90 - i * 20) .addOut(new ItemStack(ModItems.nugget_lead), 6 + 12 * i) .addOut(new ItemStack(ModItems.nugget_pb209), 4 + 8 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_australium_lesser), 89 - i * 20) .addOut(new ItemStack(ModItems.nugget_lead), 6 + 12 * i) .addOut(new ItemStack(ModItems.nugget_pb209), 4 + 8 * i) ); - + // HEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_australium_greater), 90 - i * 20) .addOut(new ItemStack(ModItems.nugget_au198), 5 + 10 * i) .addOut(new ItemStack(Items.gold_nugget), 3 + 6 * i) .addOut(new ItemStack(ModItems.nugget_pb209), 2 + 4 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_australium_greater), 89 - i * 20) .addOut(new ItemStack(ModItems.nugget_au198), 5 + 10 * i) .addOut(new ItemStack(Items.gold_nugget), 3 + 6 * i) .addOut(new ItemStack(ModItems.nugget_pb209), 2 + 4 * i) ); - + // LES // recipes.put(new ComparableStack(ModItems.rbmk_pellet_les, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_les), 90 - i * 20) @@ -297,7 +307,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 1 + 2 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 1 + 2 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 4 + 8 * i) ); - + //TODO: Readd xenon processing if/when the NEI handler can display more than 6 outputs properly recipes.put(new ComparableStack(ModItems.rbmk_pellet_les, 1, i + 5), new SILEXRecipe(600, 100, 2) //I'd rather not fuck up the NEI handler, so six items it is .addOut(new ItemStack(ModItems.nugget_les), 90 - i * 20) //Just bullshit something about "not enough np237 for extractable amounts of xe135" @@ -305,8 +315,8 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), 2 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 1 + 2 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 1 + 2 * i) - .addOut(new ItemStack(ModItems.powder_coal_tiny), 4 + 8 * i) ); - + .addOut(new ItemStack(ModItems.powder_coal_tiny), 4 + 8 * i) ); + // MES // recipes.put(new ComparableStack(ModItems.rbmk_pellet_mes, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_schrabidium_fuel), 90 - i * 20) @@ -315,7 +325,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 1 + 3 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 2 + 4 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 4 + 6 * i) ); - + //TODO: Readd xenon processing if/when the NEI handler can display more than 6 outputs properly recipes.put(new ComparableStack(ModItems.rbmk_pellet_mes, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_schrabidium_fuel), 90 - i * 20) //ditto @@ -324,7 +334,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 1 + 3 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 2 + 4 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 4 + 6 * i) ); - + // HES // recipes.put(new ComparableStack(ModItems.rbmk_pellet_hes, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_hes), 90 - i * 20) @@ -333,7 +343,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 2 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 4 + 6 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 2 + 4 * i) ); - + //TODO: Readd xenon processing if/when the NEI handler can display more than 6 outputs properly recipes.put(new ComparableStack(ModItems.rbmk_pellet_hes, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_hes), 90 - i * 20) //ditto @@ -342,17 +352,17 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), 2 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.SCHRABIDIUM.ordinal()), 4 + 6 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 2 + 4 * i) ); - + // BALEFIRE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_balefire, 1, i), new SILEXRecipe(400, 100, 3) .addOut(new ItemStack(ModItems.powder_balefire), 90 - i * 20) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 10 + 20 * i) ); - + // FLASHGOLD // recipes.put(new ComparableStack(ModItems.rbmk_pellet_balefire_gold, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_au198), 90 - 20 * i) .addOut(new ItemStack(ModItems.powder_balefire), 10 + 20 * i) ); - + // FLASHLEAD // recipes.put(new ComparableStack(ModItems.rbmk_pellet_flashlead, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_au198), 44 - 10 * i) @@ -360,14 +370,14 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_bismuth), 1 + 6 * i) .addOut(new ItemStack(ModItems.nugget_mercury), 1 + 6 * i) .addOut(new ItemStack(ModItems.nugget_gh336), 10 + 8 * i) ); //Reimumunch - + // POBE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_po210be, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_polonium), 45 - 10 * i) .addOut(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i) .addOut(new ItemStack(ModItems.nugget_lead), 5 + 10 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i) ); - + // PUBE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_pu238be, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_pu238), 45 - 10 * i) @@ -375,7 +385,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_lead), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 2 + 5 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_pu238be, 1, i + 5), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 1) .addOut(new ItemStack(ModItems.nugget_pu238), 44 - 10 * i) @@ -383,7 +393,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_lead), 3 + 5 * i) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 2 + 5 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i) ); - + // RABE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_ra226be, 1, i), new SILEXRecipe(600, 100, 1) .addOut(new ItemStack(ModItems.nugget_ra226), 45 - 10 * i) @@ -391,7 +401,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_lead), 3 + 5 * i) .addOut(new ItemStack(ModItems.nugget_polonium), 2 + 5 * i) .addOut(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i) ); - + // DRX // recipes.put(new ComparableStack(ModItems.rbmk_pellet_drx, 1, i), new SILEXRecipe(600, 100, 4) .addOut(new ItemStack(ModItems.undefined), 1) @@ -400,7 +410,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.undefined), 1) .addOut(new ItemStack(ModItems.undefined), 1) .addOut(new ItemStack(ModItems.undefined), 1) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_drx, 1, i + 5), new SILEXRecipe(600, 100, 4) .addOut(new ItemStack(ModItems.undefined), 1) .addOut(new ItemStack(ModItems.undefined), 1) @@ -408,41 +418,41 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.undefined), 1) .addOut(new ItemStack(ModItems.undefined), 1) .addOut(new ItemStack(ModItems.undefined), 1) ); - + // ZFB BI // recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_bismuth, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_uranium), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu241), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_bismuth), 50 + i * 20) .addOut(new ItemStack(ModItems.nugget_zirconium), 150) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_bismuth, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 3) .addOut(new ItemStack(ModItems.nugget_uranium), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu241), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_bismuth), 50 + i * 20) .addOut(new ItemStack(ModItems.nugget_zirconium), 147) ); - + // ZFB PU-241 // recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_pu241, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_u235), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu240), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu241), 50 + i * 20) .addOut(new ItemStack(ModItems.nugget_zirconium), 150) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_pu241, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 3) .addOut(new ItemStack(ModItems.nugget_u235), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu240), 50 - i * 10) .addOut(new ItemStack(ModItems.nugget_pu241), 50 + i * 20) .addOut(new ItemStack(ModItems.nugget_zirconium), 147) ); - + // ZFB RG-AM // recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_am_mix, 1, i), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.nugget_pu241), 100 - i * 20) .addOut(new ItemStack(ModItems.nugget_am_mix), 50 + i * 20) .addOut(new ItemStack(ModItems.nugget_zirconium), 150) ); - + recipes.put(new ComparableStack(ModItems.rbmk_pellet_zfb_am_mix, 1, i + 5), new SILEXRecipe(600, 100, 2) .addOut(new ItemStack(ModItems.powder_xe135_tiny), 3) .addOut(new ItemStack(ModItems.nugget_pu241), 100 - i * 20) @@ -503,7 +513,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_bismuth), 10) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 29) ); - + recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), new SILEXRecipe(900, 100, 1) .addOut(new ItemStack(ModItems.nugget_pu240), 10) .addOut(new ItemStack(ModItems.nugget_pu241), 25) @@ -519,7 +529,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_u238), 3) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 39) ); - + recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), new SILEXRecipe(900, 100, 1) .addOut(new ItemStack(ModItems.nugget_pu241), 15) .addOut(new ItemStack(ModItems.nugget_neptunium), 5) @@ -536,7 +546,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_u238), 3) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 36) ); - + recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), new SILEXRecipe(900, 100, 2) .addOut(new ItemStack(ModItems.nugget_am241), 25) .addOut(new ItemStack(ModItems.nugget_am242), 35) @@ -591,7 +601,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.nugget_lead), 45) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 17) ); - + recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.SCHRABIDIUM.ordinal()), new SILEXRecipe(900, 100, 1) .addOut(new ItemStack(ModItems.nugget_solinium), 25) .addOut(new ItemStack(ModItems.nugget_euphemium), 18) @@ -623,7 +633,7 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.dust_tiny), 20) .addOut(new ItemStack(ModItems.nuclear_waste_tiny), 32) ); - + recipes.put(new ComparableStack(ModItems.fallout, 1), new SILEXRecipe(900, 100, 2) .addOut(new ItemStack(ModItems.dust_tiny), 90) .addOut(new ItemStack(ModItems.nugget_co60), 2) @@ -632,14 +642,14 @@ public class SILEXRecipes { .addOut(new ItemStack(ModItems.powder_cs137_tiny), 3) .addOut(new ItemStack(ModItems.nugget_au198), 1) ); - + recipes.put(new ComparableStack(Blocks.gravel, 1), new SILEXRecipe(1000, 250, EnumWavelengths.VISIBLE) .addOut(new ItemStack(Items.flint), 80) .addOut(new ItemStack(ModItems.powder_boron), 5) .addOut(new ItemStack(ModItems.powder_lithium), 10) .addOut(new ItemStack(ModItems.fluorite), 5) ); - + recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.FULLERENE.getID()), new SILEXRecipe(1_000, 1_000, EnumWavelengths.VISIBLE).addOut(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE), 1)); } @@ -652,19 +662,19 @@ public class SILEXRecipes { tinyWasteTranslation.put(ModItems.nuclear_waste_short_depleted_tiny, ModItems.nuclear_waste_short_depleted); tinyWasteTranslation.put(ModItems.nuclear_waste_long_depleted_tiny, ModItems.nuclear_waste_long_depleted); } - + public static SILEXRecipe getOutput(ItemStack stack) { - + if(stack == null || stack.getItem() == null) return null; - + ComparableStack comp = translateItem(stack); - + if(recipes.containsKey(comp)) return recipes.get(comp); - + String[] dictKeys = comp.getDictKeys(); - + for(String key : dictKeys) { String translation = translateDict(key); if(recipes.containsKey(translation)) @@ -680,54 +690,54 @@ public class SILEXRecipes { SILEXRecipe tinyVersion = new SILEXRecipe(fluidProduced, result.fluidConsumed, result.laserStrength); // Shared ownership shouldn't be an issue since the resulting recipe isn't modified by the caller tinyVersion.outputs = result.outputs; - + // TODO: Cache? Might break saving recipes, IDK // recipes.put(comp, tinyVersion); return tinyVersion; } } - + return null; } - + public static ComparableStack translateItem(ItemStack stack) { ComparableStack orig = new ComparableStack(stack.getItem(), 1, stack.getItemDamage()); ComparableStack translation = itemTranslation.get(orig); - + if(translation != null) return translation; - + return orig; } - + public static String translateDict(String key) { - + String translation = dictTranslation.get(key); - + if(translation != null) return translation; - + return key; } - + public static List getAllIngredients() { List ing = new ArrayList(); - + for(Entry entry : SILEXRecipes.recipes.entrySet()) ing.add(entry.getKey()); for(Entry entry : SILEXRecipes.itemTranslation.entrySet()) ing.add(entry.getKey()); for(Entry entry : SILEXRecipes.dictTranslation.entrySet()) ing.add(entry.getKey()); - + return ing; } public static Map getRecipes() { - + Map recipes = new HashMap(); List ing = getAllIngredients(); - + for(Object ingredient : ing) { - + if(ingredient instanceof String) { List ingredients = OreDictionary.getOres((String)ingredient); if(ingredients.size() > 0) { @@ -735,41 +745,41 @@ public class SILEXRecipes { if(output != null) recipes.put(ingredients, output); } - + } else if(ingredient instanceof ComparableStack) { SILEXRecipe output = getOutput(((ComparableStack) ingredient).toStack()); if(output != null) recipes.put(((ComparableStack)ingredient).toStack(), output); } } - + return recipes; } - + public static class SILEXRecipe { - + public int fluidProduced; public int fluidConsumed; public EnumWavelengths laserStrength; public List outputs = new ArrayList(); - + public SILEXRecipe(int fluidProduced, int fluidConsumed, EnumWavelengths laserStrength) { this.fluidProduced = fluidProduced; this.fluidConsumed = fluidConsumed; this.laserStrength = laserStrength; } - + public SILEXRecipe(int fluidProduced, int fluidConsumed, int laserStrength) { this(fluidProduced, fluidConsumed, EnumWavelengths.values()[laserStrength]); } - + public SILEXRecipe addOut(ItemStack stack, int weight) { return addOut(new WeightedRandomObject(stack, weight)); - } - + } + public SILEXRecipe addOut(WeightedRandomObject entry) { outputs.add(entry); return this; - } + } } } diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 2aaa8413c..fc48e6998 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -33,24 +33,24 @@ public class ShredderRecipes extends SerializableRecipe { public static HashMap shredderRecipes = new HashMap(); public static HashMap neiShredderRecipes; - + @Override public void registerPost() { - + String[] names = OreDictionary.getOreNames(); - + for(int i = 0; i < names.length; i++) { - + String name = names[i]; - + //if the dict contains invalid names, skip if(name == null || name.isEmpty()) continue; - + if(name.contains("Any")) continue; - + List matches = OreDictionary.getOres(name); - + //if the name isn't assigned to an ore, also skip if(matches == null || matches.isEmpty()) continue; @@ -63,23 +63,23 @@ public class ShredderRecipes extends SerializableRecipe { generateRecipes("crystal", name, matches, 1); //2 ingot units, any generateRecipes("ore", name, matches, 2); - + if(name.length() > 5 && name.substring(0, 5).equals("block")) { ItemStack dust = getDustByName(name.substring(5)); - + if(dust != null && dust.getItem() != ModItems.scrap) { - + dust.stackSize = 9; - + if(getIngotOrGemByName(name.substring(5)) == null) dust.stackSize = 4; - + for(ItemStack stack : matches) { putIfValid(stack, dust, name); } } } - + if(name.length() > 7 && name.substring(0, 8).equals("dustTiny")) { for(ItemStack stack : matches) { putIfValid(stack, new ItemStack(ModItems.dust_tiny), name); @@ -91,40 +91,40 @@ public class ShredderRecipes extends SerializableRecipe { } } } - + @Untested private static void generateRecipes(String prefix, String name, List matches, int outCount) { - + int len = prefix.length(); - + if(name.length() > len && name.substring(0, len).equals(prefix)) { - + String matName = name.substring(len); - + ItemStack dust = getDustByName(matName); - + if(dust != null && dust.getItem() != ModItems.scrap) { - + dust.stackSize = outCount; - + for(ItemStack stack : matches) { putIfValid(stack, dust, name); } } } } - + private static void putIfValid(ItemStack in, ItemStack dust, String name) { if(in != null) { - + if(in.getItem() != null) { setRecipe(new ComparableStack(in), dust); } else { MainRegistry.logger.error("Ore dict entry '" + name + "' has a null item in its stack! How does that even happen?"); Thread.currentThread().dumpStack(); } - + } else { MainRegistry.logger.error("Ore dict entry '" + name + "' has a null stack!"); Thread.currentThread().dumpStack(); @@ -209,15 +209,16 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), new ItemStack(ModItems.powder_desh_mix)); ShredderRecipes.setRecipe(Blocks.sand, new ItemStack(ModItems.dust, 2)); ShredderRecipes.setRecipe(ModBlocks.block_slag, new ItemStack(ModItems.powder_cement, 4)); - + ShredderRecipes.setRecipe(ModBlocks.ore_aluminium, DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.CRYOLITE, 2)); + List logs = OreDictionary.getOres("logWood"); List planks = OreDictionary.getOres("plankWood"); List saplings = OreDictionary.getOres("treeSapling"); - + for(ItemStack log : logs) ShredderRecipes.setRecipe(log, new ItemStack(ModItems.powder_sawdust, 4)); for(ItemStack plank : planks) ShredderRecipes.setRecipe(plank, new ItemStack(ModItems.powder_sawdust, 1)); for(ItemStack sapling : saplings) ShredderRecipes.setRecipe(sapling, new ItemStack(Items.stick, 1)); - + for(EnumBedrockOre ore : EnumBedrockOre.values()) { int i = ore.ordinal(); ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_bedrock, 1, i), new ItemStack(ModItems.ore_enriched, 1, i)); @@ -230,7 +231,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_deepcleaned, 1, i), new ItemStack(ModItems.ore_enriched, 1, i)); ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_seared, 1, i), new ItemStack(ModItems.ore_enriched, 1, i)); } - + for(int i = 0; i < 5; i++) ShredderRecipes.setRecipe(new ItemStack(Items.skull, 1, i), new ItemStack(ModItems.biomass, 4)); /* Crystal processing */ @@ -295,7 +296,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(new ItemStack(ModBlocks.sellafield, 1, 3), new ItemStack(ModItems.scrap_nuclear, 5)); ShredderRecipes.setRecipe(new ItemStack(ModBlocks.sellafield, 1, 4), new ItemStack(ModItems.scrap_nuclear, 7)); ShredderRecipes.setRecipe(new ItemStack(ModBlocks.sellafield, 1, 5), new ItemStack(ModItems.scrap_nuclear, 15)); - + /* Fracking debris scrapping */ ShredderRecipes.setRecipe(ModBlocks.dirt_dead, new ItemStack(ModItems.scrap_oil, 1)); ShredderRecipes.setRecipe(ModBlocks.dirt_oily, new ItemStack(ModItems.scrap_oil, 1)); @@ -335,13 +336,13 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, i), new ItemStack(Items.clay_ball, 4)); ShredderRecipes.setRecipe(new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.string, 4)); } - + /* Shredding bobbleheads */ for(int i = 0; i < BobbleType.values().length; i++) { BobbleType type = BobbleType.values()[i]; ShredderRecipes.setRecipe(new ItemStack(ModBlocks.bobblehead, 1, i), new ItemStack(ModItems.scrap_plastic, 1, type.scrap.ordinal())); } - + /* Debris shredding */ ShredderRecipes.setRecipe(ModItems.debris_concrete, new ItemStack(ModItems.scrap_nuclear, 2)); ShredderRecipes.setRecipe(ModItems.debris_shrapnel, new ItemStack(ModItems.powder_steel_tiny, 5)); @@ -349,96 +350,96 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(ModItems.debris_element, new ItemStack(ModItems.scrap_nuclear, 4)); ShredderRecipes.setRecipe(ModItems.debris_metal, new ItemStack(ModItems.powder_steel_tiny, 3)); ShredderRecipes.setRecipe(ModItems.debris_graphite, new ItemStack(ModItems.powder_coal, 1)); - + /* GC COMPAT */ Block gcMoonBlock = Compat.tryLoadBlock(Compat.MOD_GCC, "moonBlock"); if(gcMoonBlock != null && gcMoonBlock != Blocks.air) { ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 3), new ItemStack(ModBlocks.moon_turf)); //Moon dirt ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 5), new ItemStack(ModBlocks.moon_turf)); //Moon topsoil } - + /* AR COMPAT */ Block arMoonTurf = Compat.tryLoadBlock(Compat.MOD_AR, "turf"); if(arMoonTurf != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf Block arMoonTurfDark = Compat.tryLoadBlock(Compat.MOD_AR, "turfDark"); if(arMoonTurfDark != null && gcMoonBlock != Blocks.air) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds } - + /** * Returns scrap when no dust is found, for quickly adding recipes * @param name * @return */ public static ItemStack getDustByName(String name) { - + List matches = OreDictionary.getOres("dust" + name); - + if(matches != null && !matches.isEmpty()) return matches.get(0).copy(); - + return new ItemStack(ModItems.scrap); } - + /** * Returns null when no ingot or gem is found, for deciding whether the block shredding output should be 9 or 4 dusts * @param name * @return */ public static ItemStack getIngotOrGemByName(String name) { - + List matches = OreDictionary.getOres("ingot" + name); - + if(matches != null && !matches.isEmpty()) return matches.get(0).copy(); - + matches = OreDictionary.getOres("gem" + name); - + if(matches != null && !matches.isEmpty()) return matches.get(0).copy(); - + return null; } - + public static void setRecipe(Item in, ItemStack out) { setRecipe(new ComparableStack(in), out); } - + public static void setRecipe(Block in, ItemStack out) { setRecipe(new ComparableStack(in), out); } - + public static void setRecipe(ItemStack in, ItemStack out) { setRecipe(new ComparableStack(in), out); } - + public static void setRecipe(ComparableStack in, ItemStack out) { if(!shredderRecipes.containsKey(in)) { shredderRecipes.put(in, out); } } - + public static Map getShredderRecipes() { - + //convert the map only once to save on processing power (might be more ram intensive but that can't be THAT bad, right?) if(neiShredderRecipes == null) neiShredderRecipes = new HashMap(shredderRecipes); - + return neiShredderRecipes; } - + public static ItemStack getShredderResult(ItemStack stack) { - + if(stack == null || stack.getItem() == null) return new ItemStack(ModItems.scrap); - + ComparableStack comp = new ComparableStack(stack).makeSingular(); ItemStack sta = shredderRecipes.get(comp); - + if(sta == null) { comp.meta = OreDictionary.WILDCARD_VALUE; sta = shredderRecipes.get(comp); } - + return sta == null ? new ItemStack(ModItems.scrap) : sta; } diff --git a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java index cc1f38a79..f3fc6a15d 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java @@ -55,12 +55,12 @@ public class SolidificationRecipes extends SerializableRecipe { //in the event that these compounds are STILL too useless, add unsat + gas -> kerosene recipe for all those missile junkies //aromatics can be idfk wax or soap or sth, perhaps artificial lubricant? //on that note, add more leaded variants - + private static HashMap> recipes = new HashMap(); @Override public void registerDefaults() { - + registerRecipe(WATER, 1000, Blocks.ice); registerRecipe(LAVA, 1000, Blocks.obsidian); registerRecipe(MERCURY, 125, ModItems.ingot_mercury); @@ -68,7 +68,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerRecipe(SALIENT, 1280, new ItemStack(ModItems.bio_wafer, 8)); //4 (food val) * 2 (sat mod) * 2 (constant) * 10 (quanta) * 8 (batch size) registerRecipe(ENDERJUICE, 100, Items.ender_pearl); registerRecipe(WATZ, 1000, ModItems.ingot_mud); - registerRecipe(REDMUD, 1000, Items.iron_ingot); + registerRecipe(REDMUD, 450, Items.iron_ingot); registerRecipe(SODIUM, 100, ModItems.powder_sodium); registerRecipe(LEAD, 100, ModItems.ingot_lead); registerRecipe(SLOP, 250, ModBlocks.ore_oil_sand); @@ -84,7 +84,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerRecipe(LUBRICANT, SF_LUBE, DictFrame.fromOne(ModItems.oil_tar, EnumTarType.PARAFFIN)); registerRecipe(BALEFIRE, 250, ModItems.solid_fuel_bf); - + registerSFAuto(SMEAR); registerSFAuto(HEATINGOIL); registerSFAuto(HEATINGOIL_VACUUM); @@ -114,7 +114,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerSFAuto(REFORMATE); registerSFAuto(XYLENE); registerSFAuto(BALEFIRE, 24_000_000L, ModItems.solid_fuel_bf); //holy shit this is energy dense*/ - + } private static void registerSFAuto(FluidType fluid) { @@ -123,13 +123,13 @@ public class SolidificationRecipes extends SerializableRecipe { private static void registerSFAuto(FluidType fluid, long tuPerSF, Item fuel) { long tuPerBucket = fluid.getTrait(FT_Flammable.class).getHeatEnergy(); double penalty = 1.25D; - + int mB = (int) (tuPerSF * 1000L * penalty / tuPerBucket); if(mB > 10_000) mB -= (mB % 1000); else if(mB > 1_000) mB -= (mB % 100); else if(mB > 100) mB -= (mB % 10); - + mB = Math.max(mB, 1); registerRecipe(fluid, mB, fuel); @@ -140,24 +140,24 @@ public class SolidificationRecipes extends SerializableRecipe { private static void registerRecipe(FluidType type, int quantity, ItemStack output) { recipes.put(type, new Pair(quantity, output)); } - + public static Pair getOutput(FluidType type) { return recipes.get(type); } public static HashMap getRecipes() { - + HashMap recipes = new HashMap(); - + for(Entry> entry : SolidificationRecipes.recipes.entrySet()) { - + FluidType type = entry.getKey(); int amount = entry.getValue().getKey(); ItemStack out = entry.getValue().getValue().copy(); - + recipes.put(ItemFluidIcon.make(type, amount), out); } - + return recipes; } diff --git a/src/main/java/com/hbm/items/ItemEnums.java b/src/main/java/com/hbm/items/ItemEnums.java index e794945d0..1adbc375b 100644 --- a/src/main/java/com/hbm/items/ItemEnums.java +++ b/src/main/java/com/hbm/items/ItemEnums.java @@ -51,7 +51,9 @@ public class ItemEnums { } public static enum EnumChunkType { - RARE, MALACHITE + RARE, + MALACHITE, + CRYOLITE } public static enum EnumAchievementType { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index a4da0ac16..3550e6a8e 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -65,13 +65,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; public class ModItems { - + public static void mainRegistry() { initializeItem(); registerItem(); } - + public static Item redstone_sword; public static Item big_sword; @@ -103,7 +103,7 @@ public class ModItems { public static Item sulfur; public static Item nitra; public static Item nitra_small; - + public static Item coke; public static Item lignite; public static Item powder_lignite; @@ -161,15 +161,15 @@ public class ModItems { public static Item ingot_graphite; public static Item ingot_firebrick; public static Item ingot_smore; - + public static Item ingot_gh336; public static Item nugget_gh336; - + public static Item ingot_australium; public static Item nugget_australium; public static Item nugget_australium_lesser; public static Item nugget_australium_greater; - + public static Item ingot_desh; public static Item nugget_desh; public static Item ingot_dineutronium; @@ -193,7 +193,7 @@ public class ModItems { public static Item bottle_mercury; public static Item ore_byproduct; //byproduct of variable purity and quantity, can be treated as a nugget, might require shredding or acidizing, depends on the type - + public static Item ore_bedrock; public static Item ore_centrifuged; public static Item ore_cleaned; @@ -345,7 +345,7 @@ public class ModItems { public static Item item_secret; public static Item chemical_dye; public static Item crayon; - + public static Item undefined; public static Item ball_resin; @@ -357,7 +357,7 @@ public class ModItems { public static Item ingot_pet; public static Item ingot_pc; public static Item ingot_pvc; - + public static Item ingot_fiberglass; public static Item ingot_asbestos; public static Item powder_asbestos; @@ -510,7 +510,7 @@ public class ModItems { public static Item powder_actinium_tiny; public static Item powder_boron_tiny; public static Item powder_meteorite_tiny; - + public static Item powder_coltan_ore; public static Item powder_coltan; public static Item powder_tektite; @@ -552,7 +552,7 @@ public class ModItems { public static Item biomass_compressed; public static Item bio_wafer; public static Item plant_item; - + public static Item coil_copper; public static Item coil_copper_torus; public static Item coil_tungsten; @@ -564,7 +564,7 @@ public class ModItems { public static Item reactor_core; public static Item rtg_unit; public static Item levitation_unit; - + public static Item coil_advanced_alloy; public static Item coil_advanced_torus; public static Item coil_magnetized_tungsten; @@ -575,11 +575,11 @@ public class ModItems { public static Item component_emitter; public static Item chlorine_pinwheel; public static Item deuterium_filter; - + public static Item parts_legendary; public static Item circuit; - + public static Item crt_display; public static ItemEnumMulti circuit_star_piece; public static ItemEnumMulti circuit_star_component; @@ -592,7 +592,7 @@ public class ModItems { public static Item mechanism_launcher_1; public static Item mechanism_launcher_2; public static Item mechanism_special; - + public static Item assembly_nuke; public static Item casing; @@ -621,19 +621,19 @@ public class ModItems { public static Item toothpicks; public static Item ducttape; public static Item catalyst_clay; - + public static Item warhead_generic_small; public static Item warhead_generic_medium; public static Item warhead_generic_large; - public static Item warhead_incendiary_small; + public static Item warhead_incendiary_small; public static Item warhead_incendiary_medium; - public static Item warhead_incendiary_large; - public static Item warhead_cluster_small; + public static Item warhead_incendiary_large; + public static Item warhead_cluster_small; public static Item warhead_cluster_medium; - public static Item warhead_cluster_large; - public static Item warhead_buster_small; + public static Item warhead_cluster_large; + public static Item warhead_buster_small; public static Item warhead_buster_medium; - public static Item warhead_buster_large; + public static Item warhead_buster_large; public static Item warhead_nuclear; public static Item warhead_mirv; public static Item warhead_volcano; @@ -701,12 +701,12 @@ public class ModItems { public static Item stamp_44; public static Item stamp_9; public static Item stamp_50; - + public static Item stamp_desh_357; public static Item stamp_desh_44; public static Item stamp_desh_9; public static Item stamp_desh_50; - + public static Item blades_steel; public static Item blades_titanium; public static Item blades_advanced_alloy; @@ -734,7 +734,7 @@ public class ModItems { public static Item part_carbon; public static Item part_copper; public static Item part_plutonium; - + public static Item laser_crystal_co2; public static Item laser_crystal_bismuth; public static Item laser_crystal_cmb; @@ -747,7 +747,7 @@ public class ModItems { public static Item crackpipe; public static Item pellet_rtg_depleted; - + public static Item pellet_rtg_radium; public static Item pellet_rtg_weak; public static Item pellet_rtg; @@ -758,13 +758,13 @@ public class ModItems { public static Item pellet_rtg_americium; public static Item pellet_rtg_gold; public static Item pellet_rtg_lead; - + public static Item tritium_deuterium_cake; public static Item piston_selenium; public static Item piston_set; public static Item drillbit; - + //public static Item crystal_energy; //public static Item pellet_coolant; @@ -774,7 +774,7 @@ public class ModItems { public static Item rune_hagalaz; public static Item rune_jera; public static Item rune_thurisaz; - + public static Item ams_catalyst_blank; public static Item ams_catalyst_aluminium; public static Item ams_catalyst_beryllium; @@ -809,7 +809,7 @@ public class ModItems { public static Item fusion_shield_desh; public static Item fusion_shield_chlorophyte; public static Item fusion_shield_vaporwave; - + public static Item cell_empty; public static Item cell_uf6; public static Item cell_puf6; @@ -824,7 +824,7 @@ public class ModItems { public static Item demon_core_closed; public static Item pa_coil; - + public static Item particle_empty; public static Item particle_hydrogen; public static Item particle_copper; @@ -841,7 +841,7 @@ public class ModItems { public static Item particle_sparkticle; public static Item particle_digamma; public static Item particle_lutece; - + public static Item pellet_antimatter; public static Item singularity_micro; public static Item singularity; @@ -997,14 +997,14 @@ public class ModItems { public static Item coin_ufo; //public static Item coin_siege; //public static Item source; - + public static Item rod_empty; public static Item rod; public static Item rod_dual_empty; public static Item rod_dual; public static Item rod_quad_empty; public static Item rod_quad; - + public static Item rod_zirnox_empty; public static Item rod_zirnox_tritium; public static ItemEnumMulti rod_zirnox; @@ -1028,7 +1028,7 @@ public class ModItems { public static Item waste_u235; public static Item waste_schrabidium; public static Item waste_zfb_mox; - + public static Item waste_plate_u233; public static Item waste_plate_u235; public static Item waste_plate_mox; @@ -1036,7 +1036,7 @@ public class ModItems { public static Item waste_plate_sa326; public static Item waste_plate_ra226be; public static Item waste_plate_pu238be; - + public static Item pile_rod_uranium; public static Item pile_rod_pu239; public static Item pile_rod_plutonium; @@ -1044,7 +1044,7 @@ public class ModItems { public static Item pile_rod_boron; public static Item pile_rod_lithium; public static Item pile_rod_detector; - + public static Item plate_fuel_u233; public static Item plate_fuel_u235; public static Item plate_fuel_mox; @@ -1056,7 +1056,7 @@ public class ModItems { public static Item pwr_fuel; public static Item pwr_fuel_hot; public static Item pwr_fuel_depleted; - + public static Item rbmk_lid; public static Item rbmk_lid_glass; public static Item rbmk_fuel_empty; @@ -1160,8 +1160,9 @@ public class ModItems { public static Item containment_box; public static Item plastic_bag; + public static Item casing_bag; - + public static Item test_nuke_igniter; public static Item test_nuke_propellant; public static Item test_nuke_tier1_shielding; @@ -1170,7 +1171,7 @@ public class ModItems { public static Item test_nuke_tier2_bullet; public static Item test_nuke_tier1_target; public static Item test_nuke_tier2_target; - + public static Item cordite; public static Item ballistite; public static Item ball_dynamite; @@ -1238,7 +1239,7 @@ public class ModItems { public static Item launch_code_piece; public static Item launch_code; public static Item launch_key; - + public static Item missile_assembly; public static Item missile_generic; public static Item missile_anti_ballistic; @@ -1309,7 +1310,7 @@ public class ModItems { public static Item mp_fuselage_10_kerosene_sleek; public static Item mp_fuselage_10_kerosene_metal; public static Item mp_fuselage_10_kerosene_taint; - + public static Item mp_fuselage_10_solid; public static Item mp_fuselage_10_solid_flames; public static Item mp_fuselage_10_solid_insulation; @@ -1322,7 +1323,7 @@ public class ModItems { public static Item mp_fuselage_10_xenon; public static Item mp_fuselage_10_xenon_bhole; - + public static Item mp_fuselage_10_long_kerosene; public static Item mp_fuselage_10_long_kerosene_camo; public static Item mp_fuselage_10_long_kerosene_desert; @@ -1334,7 +1335,7 @@ public class ModItems { public static Item mp_fuselage_10_long_kerosene_taint; public static Item mp_fuselage_10_long_kerosene_dash; public static Item mp_fuselage_10_long_kerosene_vap; - + public static Item mp_fuselage_10_long_solid; public static Item mp_fuselage_10_long_solid_flames; public static Item mp_fuselage_10_long_solid_insulation; @@ -1342,12 +1343,12 @@ public class ModItems { public static Item mp_fuselage_10_long_solid_soviet_glory; public static Item mp_fuselage_10_long_solid_bullet; public static Item mp_fuselage_10_long_solid_silvermoonlight; - + public static Item mp_fuselage_10_15_kerosene; public static Item mp_fuselage_10_15_solid; public static Item mp_fuselage_10_15_hydrogen; public static Item mp_fuselage_10_15_balefire; - + public static Item mp_fuselage_15_kerosene; public static Item mp_fuselage_15_kerosene_camo; public static Item mp_fuselage_15_kerosene_desert; @@ -1363,7 +1364,7 @@ public class ModItems { public static Item mp_fuselage_15_kerosene_pip; public static Item mp_fuselage_15_kerosene_taint; public static Item mp_fuselage_15_kerosene_yuck; - + public static Item mp_fuselage_15_solid; public static Item mp_fuselage_15_solid_insulation; public static Item mp_fuselage_15_solid_desh; @@ -1378,13 +1379,13 @@ public class ModItems { public static Item mp_fuselage_15_hydrogen; public static Item mp_fuselage_15_hydrogen_cathedral; - + public static Item mp_fuselage_15_balefire; public static Item mp_fuselage_15_20_kerosene; public static Item mp_fuselage_15_20_kerosene_magnusson; public static Item mp_fuselage_15_20_solid; - + public static Item mp_fuselage_20_kerosene; public static Item mp_warhead_10_he; @@ -1404,7 +1405,7 @@ public class ModItems { public static Item mp_warhead_15_balefire; public static Item mp_warhead_15_turbine; public static Item mp_warhead_20_he; - + public static Item mp_chip_1; public static Item mp_chip_2; public static Item mp_chip_3; @@ -1420,7 +1421,7 @@ public class ModItems { public static Item missile_skin_soviet_glory; public static Item missile_skin_soviet_stank; public static Item missile_skin_metal; - + public static Item missile_custom; public static Item missile_carrier; @@ -1448,7 +1449,7 @@ public class ModItems { public static Item ammo_dgk; public static Item ammo_arty; public static Item ammo_himars; - + public static Item gun_b92; public static Item gun_b92_ammo; public static Item gun_cryocannon; @@ -1508,7 +1509,7 @@ public class ModItems { public static Item ammo_standard; public static Item ammo_secret; - + public static Item crucible; public static Item stick_dynamite; @@ -1516,7 +1517,7 @@ public class ModItems { public static Item stick_tnt; public static Item stick_semtex; public static Item stick_c4; - + public static Item grenade_generic; public static Item grenade_strong; public static Item grenade_frag; @@ -1611,7 +1612,7 @@ public class ModItems { public static Item flame_conspiracy; public static Item flame_politics; public static Item flame_opinion; - + //public static Item gadget_explosive; public static Item early_explosive_lenses; public static Item explosive_lenses; @@ -1683,7 +1684,7 @@ public class ModItems { public static Item battery_sc_gold; public static Item battery_sc_lead; public static Item battery_sc_americium; - + public static Item battery_potato; public static Item battery_potatos; public static Item hev_battery; @@ -1708,12 +1709,12 @@ public class ModItems { public static Item overfuse; public static Item arc_electrode; public static Item arc_electrode_burnt; - + /*public static Item factory_core_titanium; public static Item factory_core_advanced;*/ public static Item upgrade_muffler; - + public static Item upgrade_template; public static Item upgrade_speed_1; public static Item upgrade_speed_2; @@ -1878,7 +1879,7 @@ public class ModItems { public static Item jetpack_vector; public static Item wings_limp; public static Item wings_murk; - + public static Item jackt; public static Item jackt2; @@ -1962,7 +1963,7 @@ public class ModItems { public static Item matchstick; public static Item balefire_and_steel; - + public static Item mask_of_infamy; public static Item schrabidium_hammer; @@ -2156,7 +2157,7 @@ public class ModItems { //public static Item turret_control; public static Item turret_chip; //public static Item turret_biometry; - + public static Item spawn_chopper; public static Item spawn_worm; public static Item spawn_ufo; @@ -2248,15 +2249,15 @@ public class ModItems { public static Item bob_chemistry; public static Item bob_oil; public static Item bob_nuclear; - + public static Item mysteryshovel; public static Item memory; public static void initializeItem() - { + { redstone_sword = new RedstoneSword(ToolMaterial.STONE).setUnlocalizedName("redstone_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":redstone_sword"); big_sword = new BigSword(ToolMaterial.EMERALD).setUnlocalizedName("big_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":big_sword"); - + test_nuke_igniter = new Item().setUnlocalizedName("test_nuke_igniter").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_igniter"); test_nuke_propellant = new Item().setUnlocalizedName("test_nuke_propellant").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_propellant"); test_nuke_tier1_shielding = new Item().setUnlocalizedName("test_nuke_tier1_shielding").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier1_shielding"); @@ -2265,7 +2266,7 @@ public class ModItems { test_nuke_tier2_bullet = new Item().setUnlocalizedName("test_nuke_tier2_bullet").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier2_bullet"); test_nuke_tier1_target = new Item().setUnlocalizedName("test_nuke_tier1_target").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier1_target"); test_nuke_tier2_target = new Item().setUnlocalizedName("test_nuke_tier2_target").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier2_target"); - + ingot_th232 = new Item().setUnlocalizedName("ingot_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_th232"); ingot_uranium = new Item().setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium"); ingot_u233 = new Item().setUnlocalizedName("ingot_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u233"); @@ -2372,7 +2373,7 @@ public class ModItems { item_secret = new ItemEnumMulti(EnumSecretType.class, true, true).setUnlocalizedName("item_secret").setCreativeTab(null).setTextureName(RefStrings.MODID + ":item_secret"); chemical_dye = new ItemChemicalDye().setUnlocalizedName("chemical_dye").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":chemical_dye"); crayon = new ItemCrayon().setUnlocalizedName("crayon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crayon"); - + undefined = new ItemCustomLore().setUnlocalizedName("undefined").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":undefined"); billet_uranium = new Item().setUnlocalizedName("billet_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_uranium"); @@ -2467,7 +2468,7 @@ public class ModItems { ingot_cft = new Item().setUnlocalizedName("ingot_cft").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cft"); ore_byproduct = new ItemByproduct().setUnlocalizedName("ore_byproduct").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":byproduct"); - + ore_bedrock = new ItemBedrockOre().setUnlocalizedName("ore_bedrock").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_bedrock"); ore_centrifuged = new ItemBedrockOre().setUnlocalizedName("ore_centrifuged").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_centrifuged"); ore_cleaned = new ItemBedrockOre().setUnlocalizedName("ore_cleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_cleaned"); @@ -2515,10 +2516,10 @@ public class ModItems { powder_ash = new ItemEnumMulti(EnumAshType.class, true, true).setUnlocalizedName("powder_ash").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ash"); powder_limestone = new Item().setUnlocalizedName("powder_limestone").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_limestone"); powder_cement = new ItemLemon(2, 0.5F, false).setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement"); - + ingot_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gh336"); nugget_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_gh336"); - + ingot_australium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("ingot_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_australium"); nugget_australium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("nugget_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_australium"); nugget_australium_lesser = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("nugget_australium_lesser").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_australium_lesser"); @@ -2614,7 +2615,7 @@ public class ModItems { gem_volcanic = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("gem_volcanic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gem_volcanic"); gem_rad = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("gem_rad").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gem_rad"); gem_alexandrite = new ItemAlexandrite().setUnlocalizedName("gem_alexandrite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gem_alexandrite"); - + powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lead"); powder_tantalium = new ItemCustomLore().setUnlocalizedName("powder_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_tantalium"); powder_neptunium = new Item().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); @@ -2713,7 +2714,7 @@ public class ModItems { powder_borax = new Item().setUnlocalizedName("powder_borax").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_borax"); powder_chlorocalcite = new Item().setUnlocalizedName("powder_chlorocalcite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_chlorocalcite"); powder_molysite = new Item().setUnlocalizedName("powder_molysite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_molysite"); - + fragment_neodymium = new Item().setUnlocalizedName("fragment_neodymium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_neodymium"); fragment_cobalt = new Item().setUnlocalizedName("fragment_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_cobalt"); fragment_niobium = new Item().setUnlocalizedName("fragment_niobium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_niobium"); @@ -2724,7 +2725,7 @@ public class ModItems { fragment_meteorite = new Item().setUnlocalizedName("fragment_meteorite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_meteorite"); fragment_coltan = new Item().setUnlocalizedName("fragment_coltan").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_coltan"); chunk_ore = new ItemEnumMulti(EnumChunkType.class, true, true).setUnlocalizedName("chunk_ore").setCreativeTab(MainRegistry.partsTab); - + biomass = new Item().setUnlocalizedName("biomass").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":biomass"); biomass_compressed = new Item().setUnlocalizedName("biomass_compressed").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":biomass_compressed"); bio_wafer = new ItemLemon(4, 2F, false).setUnlocalizedName("bio_wafer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bio_wafer"); @@ -2753,10 +2754,10 @@ public class ModItems { flywheel_beryllium = new Item().setUnlocalizedName("flywheel_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flywheel_beryllium"); deuterium_filter = new Item().setUnlocalizedName("deuterium_filter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":deuterium_filter"); parts_legendary = new ItemEnumMulti(EnumLegendaryType.class, false, true).setUnlocalizedName("parts_legendary").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":parts_legendary"); - + gear_large = new ItemGear().setUnlocalizedName("gear_large").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gear_large"); sawblade = new Item().setUnlocalizedName("sawblade").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sawblade"); - + shell = new ItemAutogen(MaterialShapes.SHELL).oun("shellntm").setUnlocalizedName("shell").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":shell"); pipe = new ItemAutogen(MaterialShapes.PIPE).oun("pipentm").setUnlocalizedName("pipe").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pipe"); fins_flat = new Item().setUnlocalizedName("fins_flat").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fins_flat"); @@ -2775,7 +2776,7 @@ public class ModItems { toothpicks = new Item().setUnlocalizedName("toothpicks").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":toothpicks"); ducttape = new Item().setUnlocalizedName("ducttape").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ducttape"); catalyst_clay = new Item().setUnlocalizedName("catalyst_clay").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":catalyst_clay"); - + warhead_generic_small = new Item().setUnlocalizedName("warhead_generic_small").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_generic_small"); warhead_generic_medium = new Item().setUnlocalizedName("warhead_generic_medium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_generic_medium"); warhead_generic_large = new Item().setUnlocalizedName("warhead_generic_large").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_generic_large"); @@ -2791,11 +2792,11 @@ public class ModItems { warhead_nuclear = new Item().setUnlocalizedName("warhead_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_nuclear"); warhead_mirv = new Item().setUnlocalizedName("warhead_mirv").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_mirv"); warhead_volcano = new Item().setUnlocalizedName("warhead_volcano").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":warhead_volcano"); - + fuel_tank_small = new Item().setUnlocalizedName("fuel_tank_small").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fuel_tank_small"); fuel_tank_medium = new Item().setUnlocalizedName("fuel_tank_medium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fuel_tank_medium"); fuel_tank_large = new Item().setUnlocalizedName("fuel_tank_large").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fuel_tank_large"); - + thruster_small = new Item().setUnlocalizedName("thruster_small").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_small"); thruster_medium = new Item().setUnlocalizedName("thruster_medium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_medium"); thruster_large = new Item().setUnlocalizedName("thruster_large").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_large"); @@ -2823,7 +2824,7 @@ public class ModItems { shimmer_handle = new Item().setUnlocalizedName("shimmer_handle").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":shimmer_handle"); entanglement_kit = new ItemCustomLore().setUnlocalizedName("entanglement_kit").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":entanglement_kit"); - + circuit = new ItemCircuit().setUnlocalizedName("circuit").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit"); crt_display = new Item().setUnlocalizedName("crt_display").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crt_display"); circuit_star_piece = (ItemEnumMulti) new ItemEnumMulti(ScrapType.class, true, true).setUnlocalizedName("circuit_star_piece").setCreativeTab(null); @@ -2838,11 +2839,11 @@ public class ModItems { mechanism_special = new Item().setUnlocalizedName("mechanism_special").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":mechanism_7"); assembly_nuke = new Item().setUnlocalizedName("assembly_nuke").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_nuke"); casing = new ItemEnumMulti(ItemEnums.EnumCasingType.class, true, true).setUnlocalizedName("casing").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":casing"); - + wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wiring_red_copper"); pellet_rtg_depleted = new ItemRTGPelletDepleted().setContainerItem(plate_iron).setUnlocalizedName("pellet_rtg_depleted").setCreativeTab(MainRegistry.controlTab); - + pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); pellet_rtg_weak = new ItemRTGPellet(5).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(1.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); @@ -2853,13 +2854,13 @@ public class ModItems { pellet_rtg_polonium = new ItemRTGPellet(50).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 200 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); pellet_rtg_lead = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); - + tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); - + piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":piston_selenium"); piston_set = new ItemPistons().setUnlocalizedName("piston_set").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1); drillbit = new ItemDrillbit().setUnlocalizedName("drillbit").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1); - + rune_blank = new ItemCustomLore().setEffect().setUnlocalizedName("rune_blank").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_blank"); rune_isa = new ItemCustomLore().setEffect().setUnlocalizedName("rune_isa").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_isa"); rune_dagaz = new ItemCustomLore().setEffect().setUnlocalizedName("rune_dagaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_dagaz"); @@ -2883,7 +2884,7 @@ public class ModItems { ams_catalyst_strontium = new ItemCatalyst(0xDD0D35, 1000000, 1.15F, 1.00F, 1.00F).setUnlocalizedName("ams_catalyst_strontium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_strontium"); ams_catalyst_thorium = new ItemCatalyst(0x653B22, 2500000, 1.00F, 0.95F, 1.05F).setUnlocalizedName("ams_catalyst_thorium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_thorium"); ams_catalyst_tungsten = new ItemCatalyst(0xF5FF48, 0, 1.25F, 1.15F, 0.85F).setUnlocalizedName("ams_catalyst_tungsten").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_tungsten"); - + cell_empty = new Item().setUnlocalizedName("cell_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cell_empty"); cell_uf6 = new Item().setUnlocalizedName("cell_uf6").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_uf6"); cell_puf6 = new Item().setUnlocalizedName("cell_puf6").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_puf6"); @@ -2896,7 +2897,7 @@ public class ModItems { demon_core_open = new ItemDemonCore().setUnlocalizedName("demon_core_open").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":demon_core_open"); demon_core_closed = new Item().setUnlocalizedName("demon_core_closed").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":demon_core_closed"); - + pa_coil = new ItemPACoil().setUnlocalizedName("pa_coil").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":pa_coil"); particle_empty = new Item().setUnlocalizedName("particle_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":particle_empty"); @@ -2916,7 +2917,7 @@ public class ModItems { particle_digamma = new ItemDigamma(60).setUnlocalizedName("particle_digamma").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_digamma"); particle_lutece = new Item().setUnlocalizedName("particle_lutece").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.particle_empty).setTextureName(RefStrings.MODID + ":particle_lutece"); singularity_micro = new ItemDrop().setUnlocalizedName("singularity_micro").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_micro"); - + singularity = new ItemDrop().setUnlocalizedName("singularity").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity"); singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt"); singularity_super_heated = new ItemDrop().setUnlocalizedName("singularity_super_heated").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_5"); @@ -2959,7 +2960,7 @@ public class ModItems { stamp_desh_44 = new ItemStamp(0, StampType.C44).setUnlocalizedName("stamp_desh_44").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_44_desh"); stamp_desh_9 = new ItemStamp(0, StampType.C9).setUnlocalizedName("stamp_desh_9").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_9_desh"); stamp_desh_50 = new ItemStamp(0, StampType.C50).setUnlocalizedName("stamp_desh_50").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_50_desh"); - + blades_steel = new ItemBlades(200).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_steel"); blades_titanium = new ItemBlades(350).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_titanium"); blades_advanced_alloy = new ItemBlades(700).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); @@ -2979,7 +2980,7 @@ public class ModItems { .aot(Mats.MAT_CARBON, "wire_carbon").aot(Mats.MAT_SCHRABIDIUM, "wire_schrabidium") .aot(Mats.MAT_MAGTUNG, "wire_magnetized_tungsten").setUnlocalizedName("wire_fine").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_fine"); wire_dense = new ItemAutogen(MaterialShapes.DENSEWIRE).setUnlocalizedName("wire_dense").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_dense"); - + part_barrel_light = new ItemAutogen(MaterialShapes.LIGHTBARREL).setUnlocalizedName("part_barrel_light").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":part_barrel_light"); part_barrel_heavy = new ItemAutogen(MaterialShapes.HEAVYBARREL).setUnlocalizedName("part_barrel_heavy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":part_barrel_heavy"); part_receiver_light = new ItemAutogen(MaterialShapes.LIGHTRECEIVER).setUnlocalizedName("part_receiver_light").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":part_receiver_light"); @@ -2993,24 +2994,24 @@ public class ModItems { part_carbon = new Item().setUnlocalizedName("part_carbon").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_carbon"); part_copper = new Item().setUnlocalizedName("part_copper").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_copper"); part_plutonium = new Item().setUnlocalizedName("part_plutonium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_plutonium"); - + laser_crystal_co2 = new ItemFELCrystal(EnumWavelengths.IR).setUnlocalizedName("laser_crystal_co2").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":laser_crystal_co2"); laser_crystal_bismuth = new ItemFELCrystal(EnumWavelengths.VISIBLE).setUnlocalizedName("laser_crystal_bismuth").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":laser_crystal_bismuth"); laser_crystal_cmb = new ItemFELCrystal(EnumWavelengths.UV).setUnlocalizedName("laser_crystal_cmb").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":laser_crystal_cmb"); laser_crystal_dnt = new ItemFELCrystal(EnumWavelengths.GAMMA).setUnlocalizedName("laser_crystal_dnt").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":laser_crystal_dnt"); laser_crystal_digamma = new ItemFELCrystal(EnumWavelengths.DRX).setUnlocalizedName("laser_crystal_digamma").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":laser_crystal_digamma"); - + thermo_element = new Item().setUnlocalizedName("thermo_element").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":thermo_element"); catalytic_converter = new Item().setUnlocalizedName("catalytic_converter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":catalytic_converter"); fuel_additive = new ItemEnumMulti(ItemEnums.EnumFuelAdditive.class, true, true).setUnlocalizedName("fuel_additive").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fuel_additive"); - + canister_empty = new ItemCustomLore().setUnlocalizedName("canister_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":canister_empty"); 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 ItemGasTank().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_empty"); - + syringe_empty = new Item().setUnlocalizedName("syringe_empty").setFull3D().setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":syringe_empty"); syringe_antidote = new ItemSyringe().setUnlocalizedName("syringe_antidote").setFull3D().setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":syringe_antidote"); syringe_poison = new ItemSyringe().setUnlocalizedName("syringe_poison").setFull3D().setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":syringe_poison"); @@ -3029,39 +3030,39 @@ public class ModItems { user.attackEntityFrom(DamageSource.magic, 5F); } }).setUnlocalizedName("iv_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_empty"); - + iv_blood = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.radaway", new ItemStack(ModItems.iv_empty)); user.heal(5F); }).setUnlocalizedName("iv_blood").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_blood"); - + iv_xp_empty = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { if(EnchantmentUtil.getTotalExperience(user) >= 100) { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.syringe", new ItemStack(ModItems.iv_xp)); EnchantmentUtil.setExperience(user, EnchantmentUtil.getTotalExperience(user) - 100); } }).setUnlocalizedName("iv_xp_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_xp_empty"); - + iv_xp = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "random.orb", new ItemStack(ModItems.iv_xp_empty)); EnchantmentUtil.addExperience(user, 100, false); }).setUnlocalizedName("iv_xp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_xp"); - + radaway = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.radaway", new ItemStack(ModItems.iv_empty)); ItemSimpleConsumable.addPotionEffect(user, HbmPotion.radaway, 140, 0); }).setUnlocalizedName("radaway").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radaway"); - + radaway_strong = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.radaway", new ItemStack(ModItems.iv_empty)); ItemSimpleConsumable.addPotionEffect(user, HbmPotion.radaway, 350, 0); }).setUnlocalizedName("radaway_strong").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radaway_strong"); - + radaway_flush = new ItemSimpleConsumable().setUseActionServer((stack, user) -> { ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.radaway", new ItemStack(ModItems.iv_empty)); ItemSimpleConsumable.addPotionEffect(user, HbmPotion.radaway, 500, 2); }).setUnlocalizedName("radaway_flush").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radaway_flush"); - + med_bag = new ItemSyringe().setUnlocalizedName("med_bag").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":med_bag"); radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox"); @@ -3085,7 +3086,7 @@ public class ModItems { cigarette = new ItemCigarette().setUnlocalizedName("cigarette").setFull3D().setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cigarette"); crackpipe = new ItemCigarette().setUnlocalizedName("crackpipe").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":crackpipe"); bdcl = new ItemBDCL().setUnlocalizedName("bdcl").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bdcl"); - + attachment_mask = new ItemModGasmask().setUnlocalizedName("attachment_mask").setTextureName(RefStrings.MODID + ":attachment_mask"); attachment_mask_mono = new ItemModGasmask().setUnlocalizedName("attachment_mask_mono").setTextureName(RefStrings.MODID + ":attachment_mask_mono"); back_tesla = new ItemModTesla().setUnlocalizedName("back_tesla").setTextureName(RefStrings.MODID + ":back_tesla"); @@ -3159,7 +3160,7 @@ public class ModItems { cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_korl"); cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_fritz"); ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":ring_pull"); - + can_empty = new Item().setUnlocalizedName("can_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_empty"); can_smart = new ItemEnergy().makeCan().setUnlocalizedName("can_smart").setTextureName(RefStrings.MODID + ":can_smart"); can_creature = new ItemEnergy().makeCan().setUnlocalizedName("can_creature").setTextureName(RefStrings.MODID + ":can_creature"); @@ -3188,12 +3189,12 @@ public class ModItems { chocolate = new ItemPill(0).setUnlocalizedName("chocolate").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":chocolate"); canned_conserve = (ItemEnumMulti) new ItemConserve().setUnlocalizedName("canned_conserve").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned"); can_key = new Item().setUnlocalizedName("can_key").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_key"); - + boat_rubber = new ItemBoatRubber().setUnlocalizedName("boat_rubber").setTextureName(RefStrings.MODID + ":boat_rubber"); cart = new ItemModMinecart().setUnlocalizedName("cart"); train = new ItemTrain().setUnlocalizedName("train"); drone = new ItemDrone().setUnlocalizedName("drone"); - + coin_creeper = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("coin_creeper").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":coin_creeper"); coin_radiation = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("coin_radiation").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":coin_radiation"); coin_maskman = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("coin_maskman").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":coin_maskman"); @@ -3206,7 +3207,7 @@ public class ModItems { rod_dual = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_dual").setContainerItem(ModItems.rod_dual_empty).setCreativeTab(MainRegistry.controlTab); rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_quad").setContainerItem(ModItems.rod_quad_empty).setCreativeTab(MainRegistry.controlTab); - + rod_zirnox_empty = new Item().setUnlocalizedName("rod_zirnox_empty").setMaxStackSize(64).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_empty"); //rod_zirnox_natural_uranium_fuel = new ItemZirnoxRodDeprecated(250000, 30).setUnlocalizedName("rod_zirnox_natural_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_natural_uranium_fuel"); //rod_zirnox_uranium_fuel = new ItemZirnoxRodDeprecated(200000, 50).setUnlocalizedName("rod_zirnox_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel"); @@ -3221,7 +3222,7 @@ public class ModItems { rod_zirnox_tritium = new Item().setUnlocalizedName("rod_zirnox_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_tritium"); //rod_zirnox_zfb_mox = new ItemZirnoxRodDeprecated(50000, 35).setUnlocalizedName("rod_zirnox_zfb_mox").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_zfb_mox"); rod_zirnox = (ItemEnumMulti) new ItemZirnoxRod().setUnlocalizedName("rod_zirnox").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox"); - + rod_zirnox_natural_uranium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_natural_uranium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel_depleted"); rod_zirnox_uranium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_uranium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel_depleted"); rod_zirnox_thorium_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_thorium_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_thorium_fuel_depleted"); @@ -3231,7 +3232,7 @@ public class ModItems { rod_zirnox_u235_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_u235_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_u235_fuel_depleted"); rod_zirnox_les_fuel_depleted = new Item().setUnlocalizedName("rod_zirnox_les_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_les_fuel_depleted"); rod_zirnox_zfb_mox_depleted = new Item().setUnlocalizedName("rod_zirnox_zfb_mox_depleted").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_zfb_mox_depleted"); - + waste_natural_uranium = new ItemDepletedFuel().setUnlocalizedName("waste_natural_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_uranium = new ItemDepletedFuel().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_thorium = new ItemDepletedFuel().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); @@ -3241,7 +3242,7 @@ public class ModItems { waste_u235 = new ItemDepletedFuel().setUnlocalizedName("waste_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); waste_schrabidium = new ItemDepletedFuel().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); waste_zfb_mox = new ItemDepletedFuel().setUnlocalizedName("waste_zfb_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_zfb_mox"); - + waste_plate_u233 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_uranium"); waste_plate_u235 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_uranium"); waste_plate_mox = new ItemDepletedFuel().setUnlocalizedName("waste_plate_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_mox"); @@ -3249,7 +3250,7 @@ public class ModItems { waste_plate_sa326 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_sa326").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_sa326"); waste_plate_ra226be = new ItemDepletedFuel().setUnlocalizedName("waste_plate_ra226be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_ra226be"); waste_plate_pu238be = new ItemDepletedFuel().setUnlocalizedName("waste_plate_pu238be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_pu238be"); - + pile_rod_uranium = new ItemPileRod().setUnlocalizedName("pile_rod_uranium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_uranium"); pile_rod_pu239 = new ItemPileRod().setUnlocalizedName("pile_rod_pu239").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_pu239"); pile_rod_plutonium = new ItemPileRod().setUnlocalizedName("pile_rod_plutonium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_plutonium"); @@ -3257,7 +3258,7 @@ public class ModItems { pile_rod_boron = new ItemPileRod().setUnlocalizedName("pile_rod_boron").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_boron"); pile_rod_lithium = new ItemPileRod().setUnlocalizedName("pile_rod_lithium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_lithium"); pile_rod_detector = new ItemPileRod().setUnlocalizedName("pile_rod_detector").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_detector"); - + plate_fuel_u233 = new ItemPlateFuel(2200000).setFunction(FunctionEnum.SQUARE_ROOT, 50).setUnlocalizedName("plate_fuel_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_u233"); plate_fuel_u235 = new ItemPlateFuel(2200000).setFunction(FunctionEnum.SQUARE_ROOT, 40).setUnlocalizedName("plate_fuel_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_u235"); plate_fuel_mox = new ItemPlateFuel(2400000).setFunction(FunctionEnum.LOGARITHM, 50).setUnlocalizedName("plate_fuel_mox").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_mox"); @@ -3269,10 +3270,10 @@ public class ModItems { pwr_fuel = new ItemPWRFuel().setUnlocalizedName("pwr_fuel").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pwr_fuel"); pwr_fuel_hot = new ItemEnumMulti(EnumPWRFuel.class, true, false).setUnlocalizedName("pwr_fuel_hot").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pwr_fuel_hot"); pwr_fuel_depleted = new ItemEnumMulti(EnumPWRFuel.class, true, false).setUnlocalizedName("pwr_fuel_depleted").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pwr_fuel_depleted"); - + rbmk_lid = new ItemRBMKLid().setUnlocalizedName("rbmk_lid").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid"); rbmk_lid_glass = new ItemRBMKLid().setUnlocalizedName("rbmk_lid_glass").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid_glass"); - + rbmk_pellet_ueu = (ItemRBMKPellet) new ItemRBMKPellet("Unenriched Uranium").setUnlocalizedName("rbmk_pellet_ueu").setTextureName(RefStrings.MODID + ":rbmk_pellet_ueu"); rbmk_pellet_meu = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Uranium-235").setUnlocalizedName("rbmk_pellet_meu").setTextureName(RefStrings.MODID + ":rbmk_pellet_meu"); rbmk_pellet_heu233 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Uranium-233").setUnlocalizedName("rbmk_pellet_heu233").setTextureName(RefStrings.MODID + ":rbmk_pellet_heu233"); @@ -3304,7 +3305,7 @@ public class ModItems { rbmk_pellet_zfb_pu241 = (ItemRBMKPellet) new ItemRBMKPellet("Zirconium Fast Breeder - HEU-235/HEP-240#Pu-241").setUnlocalizedName("rbmk_pellet_zfb_pu241").setTextureName(RefStrings.MODID + ":rbmk_pellet_zfb_pu241"); rbmk_pellet_zfb_am_mix = (ItemRBMKPellet) new ItemRBMKPellet("Zirconium Fast Breeder - HEP-241#MEA").setUnlocalizedName("rbmk_pellet_zfb_am_mix").setTextureName(RefStrings.MODID + ":rbmk_pellet_zfb_am_mix"); rbmk_pellet_drx = (ItemRBMKPellet) new ItemRBMKPellet(EnumChatFormatting.OBFUSCATED + "can't you hear, can't you hear the thunder?").setUnlocalizedName("rbmk_pellet_drx").setTextureName(RefStrings.MODID + ":rbmk_pellet_drx"); - + rbmk_fuel_empty = new Item().setUnlocalizedName("rbmk_fuel_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_fuel_empty"); rbmk_fuel_ueu = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_ueu) .setYield(100000000D) @@ -3563,14 +3564,14 @@ public class ModItems { .setMeltingPoint(100000) .setUnlocalizedName("rbmk_fuel_curve").setTextureName(RefStrings.MODID + ":rbmk_fuel_curve"); */ - + watz_pellet = new ItemWatzPellet().setUnlocalizedName("watz_pellet").setTextureName(RefStrings.MODID + ":watz_pellet"); watz_pellet_depleted = new ItemWatzPellet().setUnlocalizedName("watz_pellet_depleted").setTextureName(RefStrings.MODID + ":watz_pellet"); icf_pellet_empty = new Item().setUnlocalizedName("icf_pellet_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":icf_pellet_empty"); icf_pellet = new ItemICFPellet().setUnlocalizedName("icf_pellet").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":icf_pellet"); icf_pellet_depleted = new Item().setUnlocalizedName("icf_pellet_depleted").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":icf_pellet_depleted"); - + trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); nuclear_waste_long = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long"); nuclear_waste_long_tiny = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_tiny"); @@ -3590,8 +3591,9 @@ public class ModItems { scrap_nuclear = new Item().setUnlocalizedName("scrap_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap_nuclear"); containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":containment_box"); plastic_bag = new ItemPlasticBag().setUnlocalizedName("plastic_bag").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plastic_bag"); + casing_bag = new ItemCasingBag().setUnlocalizedName("casing_bag").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":casing_bag"); - + debris_graphite = new Item().setUnlocalizedName("debris_graphite").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_graphite"); debris_metal = new Item().setUnlocalizedName("debris_metal").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_metal"); debris_fuel = new Item().setUnlocalizedName("debris_fuel").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_fuel"); @@ -3599,7 +3601,7 @@ public class ModItems { debris_exchanger = new Item().setUnlocalizedName("debris_exchanger").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_exchanger"); debris_shrapnel =new Item().setUnlocalizedName("debris_shrapnel").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_shrapnel"); debris_element =new Item().setUnlocalizedName("debris_element").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":debris_element"); - + pellet_cluster = new ItemCustomLore().setUnlocalizedName("pellet_cluster").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_cluster"); powder_fire = new ItemCustomLore().setUnlocalizedName("powder_fire").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_red_phosphorus"); powder_ice = new ItemCustomLore().setUnlocalizedName("powder_ice").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ice"); @@ -3697,7 +3699,7 @@ public class ModItems { mp_thruster_20_solid = new ItemCustomMissilePart().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F).setWittyText("It's basically just a big hole at the end of the fuel tank.").setUnlocalizedName("mp_thruster_20_solid"); mp_thruster_20_solid_multi = new ItemCustomMissilePart().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F) .setUnlocalizedName("mp_thruster_20_solid_multi"); mp_thruster_20_solid_multier = new ItemCustomMissilePart().makeThruster(FuelType.SOLID, 1F, 100F, PartSize.SIZE_20).setHealth(35F).setWittyText("Did I miscount? Hope not.").setUnlocalizedName("mp_thruster_20_solid_multier"); - + mp_stability_10_flat = new ItemCustomMissilePart().makeStability(0.5F, PartSize.SIZE_10).setHealth(10F) .setUnlocalizedName("mp_stability_10_flat"); mp_stability_10_cruise = new ItemCustomMissilePart().makeStability(0.25F, PartSize.SIZE_10).setHealth(5F) .setUnlocalizedName("mp_stability_10_cruise"); mp_stability_10_space = new ItemCustomMissilePart().makeStability(0.35F, PartSize.SIZE_10).setHealth(5F).setRarity(Rarity.COMMON).setWittyText("Standing there alone, the ship is waiting / All systems are go, are you sure?") .setUnlocalizedName("mp_stability_10_space"); @@ -3705,7 +3707,7 @@ public class ModItems { mp_stability_15_thin = new ItemCustomMissilePart().makeStability(0.35F, PartSize.SIZE_15).setHealth(5F) .setUnlocalizedName("mp_stability_15_thin"); mp_stability_15_soyuz = new ItemCustomMissilePart().makeStability(0.25F, PartSize.SIZE_15).setHealth(15F).setRarity(Rarity.COMMON).setWittyText("Союз!").setUnlocalizedName("mp_stability_15_soyuz"); mp_stability_20_flat = new ItemCustomMissilePart().makeStability(0.5F, PartSize.SIZE_20) .setUnlocalizedName("mp_s_20"); - + mp_fuselage_10_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10).setAuthor("Hoboy").setHealth(20F).setUnlocalizedName("mp_fuselage_10_kerosene"); mp_fuselage_10_kerosene_camo = ((ItemCustomMissilePart) mp_fuselage_10_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Camo").setUnlocalizedName("mp_fuselage_10_kerosene_camo"); mp_fuselage_10_kerosene_desert = ((ItemCustomMissilePart) mp_fuselage_10_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_10_kerosene_desert"); @@ -3715,7 +3717,7 @@ public class ModItems { mp_fuselage_10_kerosene_sleek = ((ItemCustomMissilePart) mp_fuselage_10_kerosene).copy().setRarity(Rarity.RARE).setTitle("IF-R&D").setHealth(35F).setUnlocalizedName("mp_fuselage_10_kerosene_sleek"); mp_fuselage_10_kerosene_metal = ((ItemCustomMissilePart) mp_fuselage_10_kerosene).copy().setRarity(Rarity.UNCOMMON).setTitle("Bolted Metal").setHealth(30F).setAuthor("Hoboy").setUnlocalizedName("mp_fuselage_10_kerosene_metal"); mp_fuselage_10_kerosene_taint = ((ItemCustomMissilePart) mp_fuselage_10_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_10_kerosene_taint"); - + mp_fuselage_10_solid = new ItemCustomMissilePart().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10).setHealth(25F) .setUnlocalizedName("mp_fuselage_10_solid"); mp_fuselage_10_solid_flames = ((ItemCustomMissilePart) mp_fuselage_10_solid).copy().setRarity(Rarity.UNCOMMON).setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_solid_flames"); mp_fuselage_10_solid_insulation = ((ItemCustomMissilePart) mp_fuselage_10_solid).copy().setRarity(Rarity.COMMON).setTitle("Orange Insulation").setHealth(30F).setUnlocalizedName("mp_fuselage_10_solid_insulation"); @@ -3725,10 +3727,10 @@ public class ModItems { mp_fuselage_10_solid_moonlit = ((ItemCustomMissilePart) mp_fuselage_10_solid).copy().setRarity(Rarity.UNCOMMON).setAuthor("The Master & Hoboy").setTitle("Moonlit").setUnlocalizedName("mp_fuselage_10_solid_moonlit"); mp_fuselage_10_solid_battery = ((ItemCustomMissilePart) mp_fuselage_10_solid).copy().setRarity(Rarity.UNCOMMON).setAuthor("wolfmonster222").setHealth(30F).setTitle("Ecstatic").setWittyText("I got caught eating batteries again :(").setUnlocalizedName("mp_fuselage_10_solid_battery"); mp_fuselage_10_solid_duracell = ((ItemCustomMissilePart) mp_fuselage_10_solid).copy().setRarity(Rarity.RARE).setAuthor("Hoboy").setTitle("Duracell").setHealth(30F).setWittyText("The crunchiest battery on the market!").setUnlocalizedName("mp_fuselage_10_solid_duracell"); - + mp_fuselage_10_xenon = new ItemCustomMissilePart().makeFuselage(FuelType.XENON, 5000F, PartSize.SIZE_10, PartSize.SIZE_10).setHealth(20F) .setUnlocalizedName("mp_fuselage_10_xenon"); mp_fuselage_10_xenon_bhole = ((ItemCustomMissilePart) mp_fuselage_10_xenon).copy().setRarity(Rarity.RARE).setAuthor("Sten89").setTitle("Morceus-1457").setUnlocalizedName("mp_fuselage_10_xenon_bhole"); - + mp_fuselage_10_long_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10).setAuthor("Hoboy").setHealth(30F).setUnlocalizedName("mp_fuselage_10_long_kerosene"); mp_fuselage_10_long_kerosene_camo = ((ItemCustomMissilePart) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Camo").setUnlocalizedName("mp_fuselage_10_long_kerosene_camo"); mp_fuselage_10_long_kerosene_desert = ((ItemCustomMissilePart) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_10_long_kerosene_desert"); @@ -3740,7 +3742,7 @@ public class ModItems { mp_fuselage_10_long_kerosene_dash = ((ItemCustomMissilePart) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("Sam").setTitle("Dash").setWittyText("I wash my hands of it.").setCreativeTab(null).setUnlocalizedName("mp_fuselage_10_long_kerosene_dash"); mp_fuselage_10_long_kerosene_taint = ((ItemCustomMissilePart) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_10_long_kerosene_taint"); mp_fuselage_10_long_kerosene_vap = ((ItemCustomMissilePart) mp_fuselage_10_long_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("VT-6/24").setTitle("Minty Contrail").setWittyText("Upper rivet!").setUnlocalizedName("mp_fuselage_10_long_kerosene_vap"); - + mp_fuselage_10_long_solid = new ItemCustomMissilePart().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10).setHealth(35F) .setUnlocalizedName("mp_fuselage_10_long_solid"); mp_fuselage_10_long_solid_flames = ((ItemCustomMissilePart) mp_fuselage_10_long_solid).copy().setRarity(Rarity.UNCOMMON).setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_long_solid_flames"); mp_fuselage_10_long_solid_insulation = ((ItemCustomMissilePart) mp_fuselage_10_long_solid).copy().setRarity(Rarity.COMMON).setTitle("Orange Insulation").setHealth(40F).setUnlocalizedName("mp_fuselage_10_long_solid_insulation"); @@ -3748,12 +3750,12 @@ public class ModItems { mp_fuselage_10_long_solid_soviet_glory = ((ItemCustomMissilePart) mp_fuselage_10_long_solid).copy().setRarity(Rarity.EPIC).setAuthor("Hoboy").setHealth(45F).setTitle("Soviet Glory").setWittyText("Fully Automated Luxury Gay Space Communism!").setUnlocalizedName("mp_fuselage_10_long_solid_soviet_glory"); mp_fuselage_10_long_solid_bullet = ((ItemCustomMissilePart) mp_fuselage_10_long_solid).copy().setRarity(Rarity.COMMON).setAuthor("Sam").setTitle("Bullet Bill").setUnlocalizedName("mp_fuselage_10_long_solid_bullet"); mp_fuselage_10_long_solid_silvermoonlight = ((ItemCustomMissilePart) mp_fuselage_10_long_solid).copy().setRarity(Rarity.UNCOMMON).setAuthor("The Master").setTitle("Silver Moonlight").setUnlocalizedName("mp_fuselage_10_long_solid_silvermoonlight"); - + mp_fuselage_10_15_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15).setHealth(40F).setUnlocalizedName("mp_fuselage_10_15_kerosene"); mp_fuselage_10_15_solid = new ItemCustomMissilePart().makeFuselage(FuelType.SOLID, 10000F, PartSize.SIZE_10, PartSize.SIZE_15).setHealth(40F) .setUnlocalizedName("mp_fuselage_10_15_solid"); mp_fuselage_10_15_hydrogen = new ItemCustomMissilePart().makeFuselage(FuelType.HYDROGEN, 10000F, PartSize.SIZE_10, PartSize.SIZE_15).setHealth(40F).setUnlocalizedName("mp_fuselage_10_15_hydrogen"); mp_fuselage_10_15_balefire = new ItemCustomMissilePart().makeFuselage(FuelType.BALEFIRE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15).setHealth(40F).setUnlocalizedName("mp_fuselage_10_15_balefire"); - + mp_fuselage_15_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15).setAuthor("Hoboy").setHealth(50F).setUnlocalizedName("mp_fuselage_15_kerosene"); mp_fuselage_15_kerosene_camo = ((ItemCustomMissilePart) mp_fuselage_15_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Camo").setUnlocalizedName("mp_fuselage_15_kerosene_camo"); mp_fuselage_15_kerosene_desert = ((ItemCustomMissilePart) mp_fuselage_15_kerosene).copy().setRarity(Rarity.COMMON).setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_15_kerosene_desert"); @@ -3769,7 +3771,7 @@ public class ModItems { mp_fuselage_15_kerosene_pip = ((ItemCustomMissilePart) mp_fuselage_15_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("The Doctor").setTitle("LittlePip").setWittyText("31!").setCreativeTab(null).setUnlocalizedName("mp_fuselage_15_kerosene_pip"); mp_fuselage_15_kerosene_taint = ((ItemCustomMissilePart) mp_fuselage_15_kerosene).copy().setRarity(Rarity.UNCOMMON).setAuthor("Sam").setTitle("Tainted").setWittyText("DUN-DUN!").setUnlocalizedName("mp_fuselage_15_kerosene_taint"); mp_fuselage_15_kerosene_yuck = ((ItemCustomMissilePart) mp_fuselage_15_kerosene).copy().setRarity(Rarity.EPIC).setAuthor("Hoboy").setTitle("Flesh").setWittyText("Note: Never clean DNA vials with your own spit.").setHealth(60F).setUnlocalizedName("mp_fuselage_15_kerosene_yuck"); - + mp_fuselage_15_solid = new ItemCustomMissilePart().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15).setHealth(60F) .setUnlocalizedName("mp_fuselage_15_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); mp_fuselage_15_solid_insulation = ((ItemCustomMissilePart) mp_fuselage_15_solid).copy().setRarity(Rarity.COMMON).setTitle("Orange Insulation").setHealth(65F).setUnlocalizedName("mp_fuselage_15_solid_insulation"); mp_fuselage_15_solid_desh = ((ItemCustomMissilePart) mp_fuselage_15_solid).copy().setRarity(Rarity.RARE).setAuthor("Hoboy").setTitle("Desh Plating").setHealth(80F).setUnlocalizedName("mp_fuselage_15_solid_desh"); @@ -3781,18 +3783,18 @@ public class ModItems { mp_fuselage_15_solid_panorama = ((ItemCustomMissilePart) mp_fuselage_15_solid).copy().setRarity(Rarity.RARE).setAuthor("Hoboy").setTitle("Panorama").setUnlocalizedName("mp_fuselage_15_solid_panorama"); mp_fuselage_15_solid_roses = ((ItemCustomMissilePart) mp_fuselage_15_solid).copy().setRarity(Rarity.UNCOMMON).setAuthor("Hoboy").setTitle("Bed of roses").setUnlocalizedName("mp_fuselage_15_solid_roses"); mp_fuselage_15_solid_mimi = ((ItemCustomMissilePart) mp_fuselage_15_solid).copy().setRarity(Rarity.RARE).setTitle("Mimi-chan").setUnlocalizedName("mp_fuselage_15_solid_mimi"); - + mp_fuselage_15_hydrogen = new ItemCustomMissilePart().makeFuselage(FuelType.HYDROGEN, 15000F, PartSize.SIZE_15, PartSize.SIZE_15).setHealth(50F) .setUnlocalizedName("mp_fuselage_15_hydrogen").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); mp_fuselage_15_hydrogen_cathedral = ((ItemCustomMissilePart) mp_fuselage_15_hydrogen).copy().setRarity(Rarity.UNCOMMON).setAuthor("Satan").setTitle("Unholy Cathedral").setUnlocalizedName("mp_fuselage_15_hydrogen_cathedral"); - + mp_fuselage_15_balefire = new ItemCustomMissilePart().makeFuselage(FuelType.BALEFIRE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15).setHealth(75F) .setUnlocalizedName("mp_fuselage_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - + mp_fuselage_15_20_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 20000, PartSize.SIZE_15, PartSize.SIZE_20).setAuthor("Hoboy").setHealth(70F).setUnlocalizedName("mp_fuselage_15_20_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); mp_fuselage_15_20_kerosene_magnusson = ((ItemCustomMissilePart)mp_fuselage_15_20_kerosene).copy().setRarity(Rarity.RARE).setAuthor("VT-6/24").setTitle("White Forest Rocket").setWittyText("And get your cranio-conjugal parasite away from my nose cone!").setUnlocalizedName("mp_fuselage_15_20_kerosene_magnusson"); mp_fuselage_15_20_solid = new ItemCustomMissilePart().makeFuselage(FuelType.SOLID, 20000, PartSize.SIZE_15, PartSize.SIZE_20).setHealth(70F).setUnlocalizedName("mp_fuselage_15_20_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - + mp_fuselage_20_kerosene = new ItemCustomMissilePart().makeFuselage(FuelType.KEROSENE, 1000F, PartSize.SIZE_20, PartSize.SIZE_20) .setUnlocalizedName("mp_f_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - + mp_warhead_10_he = new ItemCustomMissilePart().makeWarhead(WarheadType.HE, 15F, 1.5F, PartSize.SIZE_10).setHealth(5F) .setUnlocalizedName("mp_warhead_10_he").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_10_incendiary = new ItemCustomMissilePart().makeWarhead(WarheadType.INC, 15F, 1.5F, PartSize.SIZE_10).setHealth(5F) .setUnlocalizedName("mp_warhead_10_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_10_buster = new ItemCustomMissilePart().makeWarhead(WarheadType.BUSTER, 5F, 1.5F, PartSize.SIZE_10).setHealth(5F) .setUnlocalizedName("mp_warhead_10_buster").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); @@ -3810,7 +3812,7 @@ public class ModItems { mp_warhead_15_balefire = new ItemCustomMissilePart().makeWarhead(WarheadType.BALEFIRE, 100F, 7.5F, PartSize.SIZE_15).setRarity(Rarity.LEGENDARY).setAuthor("VT-6/24").setHealth(15F).setWittyText("Hightower, never forgetti.").setUnlocalizedName("mp_warhead_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_15_turbine = new ItemCustomMissilePart().makeWarhead(WarheadType.TURBINE, 200F, 5F, PartSize.SIZE_15).setRarity(Rarity.SEWS_CLOTHES_AND_SUCKS_HORSE_COCK).setHealth(250F).setUnlocalizedName("mp_warhead_15_turbine").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_20_he = new ItemCustomMissilePart().makeWarhead(WarheadType.HE, 15F, 1F, PartSize.SIZE_20) .setUnlocalizedName("mp_w_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - + mp_chip_1 = new ItemCustomMissilePart().makeChip(0.1F) .setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); mp_chip_2 = new ItemCustomMissilePart().makeChip(0.05F) .setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); mp_chip_3 = new ItemCustomMissilePart().makeChip(0.01F) .setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); @@ -3826,14 +3828,14 @@ public class ModItems { missile_skin_soviet_glory = new ItemCustomLore().setUnlocalizedName("missile_skin_soviet_glory").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_skin_soviet_glory"); missile_skin_soviet_stank = new ItemCustomLore().setUnlocalizedName("missile_skin_soviet_stank").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_skin_soviet_stank"); missile_skin_metal = new ItemCustomLore().setUnlocalizedName("missile_skin_metal").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_skin_metal"); - + ammo_shell = (ItemEnumMulti) new ItemAmmo(Ammo240Shell.class).setCreativeTab(MainRegistry.weaponTab).setUnlocalizedName("ammo_shell"); ammo_dgk = new ItemCustomLore().setUnlocalizedName("ammo_dgk").setCreativeTab(MainRegistry.weaponTab); ammo_fireext = (ItemEnumMulti) new ItemAmmo(AmmoFireExt.class).setCreativeTab(MainRegistry.weaponTab).setUnlocalizedName("ammo_fireext"); ammo_misc = new ItemAmmo(AmmoMisc.class).setUnlocalizedName("ammo_misc"); ammo_arty = new ItemAmmoArty().setUnlocalizedName("ammo_arty"); ammo_himars = new ItemAmmoHIMARS().setUnlocalizedName("ammo_himars"); - + gun_b92_ammo = new GunB92Cell().setUnlocalizedName("gun_b92_ammo").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92_ammo_alt"); gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92"); gun_cryolator_ammo = new Item().setUnlocalizedName("gun_cryolator_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryolator_ammo"); @@ -3842,13 +3844,13 @@ public class ModItems { ToolMaterial matCrucible = EnumHelper.addToolMaterial("CRUCIBLE", 10, 3, 50.0F, 100.0F, 0); crucible = new ItemCrucible(5000, 1F, matCrucible).setUnlocalizedName("crucible").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":crucible"); - + stick_dynamite = new ItemGrenade(3).setUnlocalizedName("stick_dynamite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_dynamite"); stick_dynamite_fishing = new ItemGrenadeFishing(3).setUnlocalizedName("stick_dynamite_fishing").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_dynamite_fishing"); stick_tnt = new Item().setUnlocalizedName("stick_tnt").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_tnt"); stick_semtex = new Item().setUnlocalizedName("stick_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_semtex"); stick_c4 = new Item().setUnlocalizedName("stick_c4").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_c4"); - + grenade_generic = new ItemGrenade(4).setUnlocalizedName("grenade_generic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_generic"); grenade_strong = new ItemGrenade(5).setUnlocalizedName("grenade_strong").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_strong"); grenade_frag = new ItemGrenade(4).setUnlocalizedName("grenade_frag").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_frag_alt"); @@ -3889,13 +3891,13 @@ public class ModItems { grenade_if_spark = new ItemGrenade(7).setUnlocalizedName("grenade_if_spark").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_spark"); grenade_if_hopwire = new ItemGrenade(7).setUnlocalizedName("grenade_if_hopwire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_hopwire"); grenade_if_null = new ItemGrenade(7).setUnlocalizedName("grenade_if_null").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_null"); - + grenade_smart = new ItemGrenade(-1).setUnlocalizedName("grenade_smart").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_smart"); grenade_mirv = new ItemGrenade(1).setUnlocalizedName("grenade_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_mirv"); grenade_breach = new ItemGrenade(-1).setUnlocalizedName("grenade_breach").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_breach"); grenade_burst = new ItemGrenade(1).setUnlocalizedName("grenade_burst").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_burst"); nuclear_waste_pearl = new ItemGrenade(-1).setUnlocalizedName("nuclear_waste_pearl").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":nuclear_waste_pearl"); - + weaponized_starblaster_cell = new WeaponizedCell().setUnlocalizedName("weaponized_starblaster_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92_ammo_weaponized"); bomb_waffle = new ItemWaffle(20, false).setUnlocalizedName("bomb_waffle").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bomb_waffle"); @@ -3936,12 +3938,12 @@ public class ModItems { reacher = new Item().setUnlocalizedName("reacher").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":reacher"); bismuth_tool = new ItemAmatExtractor().setUnlocalizedName("bismuth_tool").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":bismuth_tool"); meltdown_tool = new ItemDyatlov().setUnlocalizedName("meltdown_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":meltdown_tool"); - + flame_pony = new ItemCustomLore().setUnlocalizedName("flame_pony").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_pony"); flame_conspiracy = new ItemCustomLore().setUnlocalizedName("flame_conspiracy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_conspiracy"); flame_politics = new ItemCustomLore().setUnlocalizedName("flame_politics").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_politics"); flame_opinion = new ItemCustomLore().setUnlocalizedName("flame_opinion").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_opinion"); - + //gadget_explosive = new Item().setUnlocalizedName("gadget_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive"); early_explosive_lenses = new ItemCustomLore().setUnlocalizedName("early_explosive_lenses").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); explosive_lenses = new ItemCustomLore().setUnlocalizedName("explosive_lenses").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); @@ -3953,7 +3955,7 @@ public class ModItems { boy_bullet = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); boy_target = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); boy_shielding = new Item().setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); - + //man_explosive = new Item().setUnlocalizedName("man_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive"); man_igniter = new Item().setUnlocalizedName("man_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_igniter"); man_core = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); @@ -3971,9 +3973,9 @@ public class ModItems { solinium_igniter = new ItemSolinium().setUnlocalizedName("solinium_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_igniter"); solinium_propellant = new ItemSolinium().setUnlocalizedName("solinium_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_propellant"); solinium_core = new ItemSolinium().setUnlocalizedName("solinium_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_core"); - + n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge"); - + egg_balefire_shard = new Item().setUnlocalizedName("egg_balefire_shard").setMaxStackSize(16).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard"); egg_balefire = new Item().setUnlocalizedName("egg_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire"); @@ -4013,7 +4015,7 @@ public class ModItems { battery_spark_cell_10000 = new ItemBattery(100000000L * 10000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_10000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_10000"); battery_spark_cell_power = new ItemBattery(100000000L * 1000000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_power"); cube_power = new ItemBattery(1000000000000000000L, 1000000000000000L, 1000000000000000L).setUnlocalizedName("cube_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cube_power"); - + battery_sc_uranium = new ItemSelfcharger(5).setUnlocalizedName("battery_sc_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_uranium"); battery_sc_technetium = new ItemSelfcharger(25).setUnlocalizedName("battery_sc_technetium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_technetium"); battery_sc_plutonium = new ItemSelfcharger(100).setUnlocalizedName("battery_sc_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_plutonium"); @@ -4021,7 +4023,7 @@ public class ModItems { battery_sc_gold = new ItemSelfcharger(2500).setUnlocalizedName("battery_sc_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_gold"); battery_sc_lead = new ItemSelfcharger(5000).setUnlocalizedName("battery_sc_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_lead"); battery_sc_americium = new ItemSelfcharger(10000).setUnlocalizedName("battery_sc_americium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_americium"); - + battery_potato = new ItemBattery(1000, 0, 100).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato"); battery_potatos = new ItemPotatos(500000, 0, 100).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos"); hev_battery = new ItemFusionCore(150000).setUnlocalizedName("hev_battery").setMaxStackSize(4).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":hev_battery"); @@ -4054,14 +4056,14 @@ public class ModItems { ams_core_wormhole = new ItemAMSCore(1500000000L, 200, 15).setUnlocalizedName("ams_core_wormhole").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_wormhole"); ams_core_eyeofharmony = new ItemAMSCore(2500000000L, 300, 10).setUnlocalizedName("ams_core_eyeofharmony").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_eyeofharmony"); ams_core_thingy = new ItemAMSCore(5000000000L, 250, 5).setUnlocalizedName("ams_core_thingy").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":ams_core_thingy"); - + fusion_shield_tungsten = new ItemFusionShield(60 * 60 * 60 * 5, 3500).setUnlocalizedName("fusion_shield_tungsten").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_tungsten"); fusion_shield_desh = new ItemFusionShield(60 * 60 * 60 * 10, 4500).setUnlocalizedName("fusion_shield_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_desh"); fusion_shield_chlorophyte = new ItemFusionShield(60 * 60 * 60 * 15, 9000).setUnlocalizedName("fusion_shield_chlorophyte").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_chlorophyte"); fusion_shield_vaporwave = new ItemFusionShield(60 * 60 * 60 * 10, 1916169).setUnlocalizedName("fusion_shield_vaporwave").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_shield_vaporwave"); upgrade_muffler = new ItemMuffler().setUnlocalizedName("upgrade_muffler").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":upgrade_muffler"); - + upgrade_template = new ItemCustomLore().setUnlocalizedName("upgrade_template").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":upgrade_template"); upgrade_speed_1 = new ItemMachineUpgrade(UpgradeType.SPEED, 1).setUnlocalizedName("upgrade_speed_1").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_speed_1"); upgrade_speed_2 = new ItemMachineUpgrade(UpgradeType.SPEED, 2).setUnlocalizedName("upgrade_speed_2").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_speed_2"); @@ -4093,7 +4095,7 @@ public class ModItems { upgrade_5g = new ItemMachineUpgrade().setUnlocalizedName("upgrade_5g").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_5g"); upgrade_stack = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_stack").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_stack"); upgrade_ejector = new ItemMetaUpgrade(3).setUnlocalizedName("upgrade_ejector").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":upgrade_ejector"); - + wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand"); wand_s = new ItemWandS().setUnlocalizedName("wand_s").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_s"); wand_d = new ItemWandD().setUnlocalizedName("wand_d").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_d"); @@ -4106,7 +4108,7 @@ public class ModItems { structure_custommachine = new ItemCMStructure().setUnlocalizedName("structure_custommachine").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":structure_custommachine"); rod_of_discord = new ItemDiscord().setUnlocalizedName("rod_of_discord").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":rod_of_discord"); - + nuke_starter_kit = new ItemStarterKit().setUnlocalizedName("nuke_starter_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_starter_kit"); nuke_advanced_kit = new ItemStarterKit().setUnlocalizedName("nuke_advanced_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_advanced_kit"); nuke_commercially_kit = new ItemStarterKit().setUnlocalizedName("nuke_commercially_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_commercially_kit"); @@ -4135,9 +4137,9 @@ public class ModItems { loot_10 = new ItemLootCrate().setUnlocalizedName("loot_10").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":loot_10"); loot_15 = new ItemLootCrate().setUnlocalizedName("loot_15").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":loot_15"); loot_misc = new ItemLootCrate().setUnlocalizedName("loot_misc").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":loot_misc"); - + ammo_container = new ItemAmmoContainer().setUnlocalizedName("ammo_container").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_container"); - + ingot_euphemium = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_euphemium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_euphemium"); nugget_euphemium = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_euphemium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_euphemium"); watch = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("watch").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":watch"); @@ -4188,7 +4190,7 @@ public class ModItems { padlock = new ItemLock(0.1).setUnlocalizedName("padlock").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock"); padlock_reinforced = new ItemLock(0.02).setUnlocalizedName("padlock_reinforced").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock_reinforced"); padlock_unbreakable = new ItemLock(0).setUnlocalizedName("padlock_unbreakable").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":padlock_unbreakable"); - + mech_key = new ItemCustomLore().setUnlocalizedName("mech_key").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":mech_key"); template_folder = new ItemTemplateFolder().setUnlocalizedName("template_folder").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":template_folder"); @@ -4219,7 +4221,7 @@ public class ModItems { FluidTank.noDualUnload.add(fluid_barrel_infinite); FluidTank.noDualUnload.add(inf_water); FluidTank.noDualUnload.add(inf_water_mk2); - + disperser_canister_empty = new Item().setUnlocalizedName("disperser_canister_empty").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":disperser_canister"); disperser_canister = new ItemDisperser().setUnlocalizedName("disperser_canister").setContainerItem(ModItems.disperser_canister_empty).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":disperser_canister"); @@ -4242,7 +4244,7 @@ public class ModItems { ArmorMaterial aMatRags = EnumHelper.addArmorMaterial("HBM_RAGS", 150, new int[] { 1, 1, 1, 1 }, 0); aMatRags.customCraftingMaterial = ModItems.rag; - + goggles = new ArmorModel(ArmorMaterial.IRON, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles"); ashglasses = new ArmorAshGlasses(ArmorMaterial.IRON, 0).setUnlocalizedName("ashglasses").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ashglasses"); gas_mask = new ArmorGasMask().setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask"); @@ -4321,10 +4323,10 @@ public class ModItems { robes_plate = new ArmorFSB(ArmorMaterial.CHAIN, 1, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_plate").setTextureName(RefStrings.MODID + ":robes_plate"); robes_legs = new ArmorFSB(ArmorMaterial.CHAIN, 2, RefStrings.MODID + ":textures/armor/robes_2.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_legs").setTextureName(RefStrings.MODID + ":robes_legs"); robes_boots = new ArmorFSB(ArmorMaterial.CHAIN, 3, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_boots").setTextureName(RefStrings.MODID + ":robes_boots"); - + initializeItem2(); } - + public static void initializeItem2() { ArmorMaterial aMatZirconium = EnumHelper.addArmorMaterial("HBM_ZIRCONIUM", 1000, new int[] { 2, 5, 3, 1 }, 100); @@ -4374,7 +4376,7 @@ public class ModItems { dieselsuit_plate = new ArmorDiesel(aMatDiesel, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_plate"); dieselsuit_legs = new ArmorDiesel(aMatDiesel, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_legs"); dieselsuit_boots = new ArmorDiesel(aMatDiesel, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_boots"); - + ArmorMaterial aMatAJR = EnumHelper.addArmorMaterial("HBM_T45AJR", 150, new int[] { 3, 8, 6, 3 }, 100); aMatAJR.customCraftingMaterial = ModItems.plate_armor_ajr; ajr_helmet = new ArmorAJR(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25) @@ -4389,7 +4391,7 @@ public class ModItems { ajr_plate = new ArmorAJR(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_plate").setTextureName(RefStrings.MODID + ":ajr_plate"); ajr_legs = new ArmorAJR(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_legs").setTextureName(RefStrings.MODID + ":ajr_legs"); ajr_boots = new ArmorAJR(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_boots").setTextureName(RefStrings.MODID + ":ajr_boots"); - + ajro_helmet = new ArmorAJRO(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25) .enableVATS(true) .setHasGeigerSound(true) @@ -4402,7 +4404,7 @@ public class ModItems { ajro_plate = new ArmorAJRO(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_plate").setTextureName(RefStrings.MODID + ":ajro_plate"); ajro_legs = new ArmorAJRO(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_legs").setTextureName(RefStrings.MODID + ":ajro_legs"); ajro_boots = new ArmorAJRO(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_boots").setTextureName(RefStrings.MODID + ":ajro_boots"); - + rpa_helmet = new ArmorRPA(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25) .enableVATS(true) .setHasGeigerSound(true) @@ -4416,7 +4418,7 @@ public class ModItems { rpa_plate = new ArmorRPA(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_plate").setTextureName(RefStrings.MODID + ":rpa_plate"); rpa_legs = new ArmorRPA(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_legs").setTextureName(RefStrings.MODID + ":rpa_legs"); rpa_boots = new ArmorRPA(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_boots").setTextureName(RefStrings.MODID + ":rpa_boots"); - + ArmorMaterial aMatBJ = EnumHelper.addArmorMaterial("HBM_BLACKJACK", 150, new int[] { 3, 8, 6, 3 }, 100); aMatBJ.customCraftingMaterial = ModItems.plate_armor_lunar; bj_helmet = new ArmorBJ(aMatBJ, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100) @@ -4446,7 +4448,7 @@ public class ModItems { envsuit_plate = new ArmorEnvsuit(aMatEnv, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_plate").setTextureName(RefStrings.MODID + ":envsuit_plate"); envsuit_legs = new ArmorEnvsuit(aMatEnv, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_legs").setTextureName(RefStrings.MODID + ":envsuit_legs"); envsuit_boots = new ArmorEnvsuit(aMatEnv, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 100_000, 1_000, 250, 0).cloneStats((ArmorFSB) envsuit_helmet).setUnlocalizedName("envsuit_boots").setTextureName(RefStrings.MODID + ":envsuit_boots"); - + ArmorMaterial aMatHEV = EnumHelper.addArmorMaterial("HBM_HEV", 150, new int[] { 3, 8, 6, 3 }, 100); aMatHEV.customCraftingMaterial = ModItems.plate_armor_hev; hev_helmet = new ArmorHEV(aMatHEV, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0) @@ -4515,19 +4517,19 @@ public class ModItems { jackt = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); jackt2 = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); - + chainsaw = new ItemChainsaw(25, -0.05, MainRegistry.tMatChainsaw, EnumToolType.AXE, 5000, 1, 250, Fluids.DIESEL, Fluids.DIESEL_CRACK, Fluids.KEROSENE, Fluids.BIOFUEL, Fluids.GASOLINE, Fluids.GASOLINE_LEADED, Fluids.PETROIL, Fluids.PETROIL_LEADED, Fluids.COALGAS, Fluids.COALGAS_LEADED) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addHitAbility(new WeaponAbility.ChainsawAbility(10)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setShears().setUnlocalizedName("chainsaw").setTextureName(RefStrings.MODID + ":chainsaw"); - + schrabidium_sword = new ItemSwordAbility(75, 0, MainRegistry.tMatSchrab) .addHitAbility(new WeaponAbility.RadiationAbility(50F)) .addHitAbility(new WeaponAbility.VampireAbility(2F)) .setRarity(EnumRarity.rare).setUnlocalizedName("schrabidium_sword").setTextureName(RefStrings.MODID + ":schrabidium_sword"); - + schrabidium_pickaxe = new ItemToolAbility(20, 0, MainRegistry.tMatSchrab, EnumToolType.PICKAXE) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4537,7 +4539,7 @@ public class ModItems { .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.ShredderAbility()) .setRarity(EnumRarity.rare).setUnlocalizedName("schrabidium_pickaxe").setTextureName(RefStrings.MODID + ":schrabidium_pickaxe"); - + schrabidium_axe = new ItemToolAbility(25, 0, MainRegistry.tMatSchrab, EnumToolType.AXE) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4548,7 +4550,7 @@ public class ModItems { .addBreakAbility(new ToolAbility.ShredderAbility()) .addHitAbility(new WeaponAbility.BeheaderAbility()) .setRarity(EnumRarity.rare).setUnlocalizedName("schrabidium_axe").setTextureName(RefStrings.MODID + ":schrabidium_axe"); - + schrabidium_shovel = new ItemToolAbility(15, 0, MainRegistry.tMatSchrab, EnumToolType.SHOVEL) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4558,9 +4560,9 @@ public class ModItems { .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.ShredderAbility()) .setRarity(EnumRarity.rare).setUnlocalizedName("schrabidium_shovel").setTextureName(RefStrings.MODID + ":schrabidium_shovel"); - + schrabidium_hoe = new HoeSchrabidium(MainRegistry.tMatSchrab).setUnlocalizedName("schrabidium_hoe").setTextureName(RefStrings.MODID + ":schrabidium_hoe"); - + titanium_sword = new ItemSwordAbility(6.5F, 0, MainRegistry.tMatTitan).setUnlocalizedName("titanium_sword").setTextureName(RefStrings.MODID + ":titanium_sword"); titanium_pickaxe = new ItemToolAbility(4.5F, 0, MainRegistry.tMatTitan, EnumToolType.PICKAXE).setUnlocalizedName("titanium_pickaxe").setTextureName(RefStrings.MODID + ":titanium_pickaxe"); titanium_axe = new ItemToolAbility(5.5F, 0, MainRegistry.tMatTitan, EnumToolType.AXE) @@ -4573,56 +4575,56 @@ public class ModItems { .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("steel_axe").setTextureName(RefStrings.MODID + ":steel_axe"); steel_shovel = new ItemToolAbility(3F, 0, MainRegistry.tMatSteel, EnumToolType.SHOVEL).setUnlocalizedName("steel_shovel").setTextureName(RefStrings.MODID + ":steel_shovel"); steel_hoe = new ModHoe(MainRegistry.tMatSteel).setUnlocalizedName("steel_hoe").setTextureName(RefStrings.MODID + ":steel_hoe"); - + alloy_sword = new ItemSwordAbility(8F, 0, MainRegistry.tMatAlloy) .addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("alloy_sword").setTextureName(RefStrings.MODID + ":alloy_sword"); - + alloy_pickaxe = new ItemToolAbility(5F, 0, MainRegistry.tMatAlloy, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_pickaxe").setTextureName(RefStrings.MODID + ":alloy_pickaxe"); - + alloy_axe = new ItemToolAbility(7F, 0, MainRegistry.tMatAlloy, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(3)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("alloy_axe").setTextureName(RefStrings.MODID + ":alloy_axe"); - + alloy_shovel = new ItemToolAbility(4F, 0, MainRegistry.tMatAlloy, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_shovel").setTextureName(RefStrings.MODID + ":alloy_shovel"); - + alloy_hoe = new ModHoe(MainRegistry.tMatAlloy).setUnlocalizedName("alloy_hoe").setTextureName(RefStrings.MODID + ":alloy_hoe"); - + cmb_sword = new ItemSwordAbility(35F, 0, MainRegistry.tMatCMB) .addHitAbility(new WeaponAbility.StunAbility(2)) .addHitAbility(new WeaponAbility.VampireAbility(2F)).setUnlocalizedName("cmb_sword").setTextureName(RefStrings.MODID + ":cmb_sword"); - + cmb_pickaxe = new ItemToolAbility(10F, 0, MainRegistry.tMatCMB, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(3)).setUnlocalizedName("cmb_pickaxe").setTextureName(RefStrings.MODID + ":cmb_pickaxe"); - + cmb_axe = new ItemToolAbility(30F, 0, MainRegistry.tMatCMB, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(3)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("cmb_axe").setTextureName(RefStrings.MODID + ":cmb_axe"); - + cmb_shovel = new ItemToolAbility(8F, 0, MainRegistry.tMatCMB, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(3)).setUnlocalizedName("cmb_shovel").setTextureName(RefStrings.MODID + ":cmb_shovel"); - + cmb_hoe = new ModHoe(MainRegistry.tMatCMB).setUnlocalizedName("cmb_hoe").setTextureName(RefStrings.MODID + ":cmb_hoe"); - + elec_sword = new ItemSwordAbilityPower(12.5F, 0, MainRegistry.tMatElec, 500000, 1000, 100) .addHitAbility(new WeaponAbility.StunAbility(5)).setUnlocalizedName("elec_sword").setTextureName(RefStrings.MODID + ":elec_sword_anim"); - + elec_pickaxe = new ItemToolAbilityPower(6F, 0, MainRegistry.tMatElec, EnumToolType.PICKAXE, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(2)).setUnlocalizedName("elec_pickaxe").setTextureName(RefStrings.MODID + ":elec_drill_anim"); - + elec_axe = new ItemToolAbilityPower(10F, 0, MainRegistry.tMatElec, EnumToolType.AXE, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)) @@ -4630,37 +4632,37 @@ public class ModItems { .addBreakAbility(new LuckAbility(2)) .addHitAbility(new WeaponAbility.ChainsawAbility(15)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setShears().setUnlocalizedName("elec_axe").setTextureName(RefStrings.MODID + ":elec_chainsaw_anim"); - + elec_shovel = new ItemToolAbilityPower(5F, 0, MainRegistry.tMatElec, EnumToolType.SHOVEL, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(2)).setUnlocalizedName("elec_shovel").setTextureName(RefStrings.MODID + ":elec_shovel_anim"); - + desh_sword = new ItemSwordAbility(12.5F, 0, MainRegistry.tMatDesh) .addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("desh_sword").setTextureName(RefStrings.MODID + ":desh_sword"); - + desh_pickaxe = new ItemToolAbility(5F, -0.05, MainRegistry.tMatDesh, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(2)).setUnlocalizedName("desh_pickaxe").setTextureName(RefStrings.MODID + ":desh_pickaxe"); - + desh_axe = new ItemToolAbility(7.5F, -0.05, MainRegistry.tMatDesh, EnumToolType.AXE) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(2)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("desh_axe").setTextureName(RefStrings.MODID + ":desh_axe"); - + desh_shovel = new ItemToolAbility(4F, -0.05, MainRegistry.tMatDesh, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)) .addBreakAbility(new ToolAbility.SilkAbility()) .addBreakAbility(new LuckAbility(2)).setUnlocalizedName("desh_shovel").setTextureName(RefStrings.MODID + ":desh_shovel"); - + desh_hoe = new ModHoe(MainRegistry.tMatDesh).setUnlocalizedName("desh_hoe").setTextureName(RefStrings.MODID + ":desh_hoe"); - + cobalt_sword = new ItemSwordAbility(12F, 0, MainRegistry.tMatCobalt).setUnlocalizedName("cobalt_sword").setTextureName(RefStrings.MODID + ":cobalt_sword"); cobalt_pickaxe = new ItemToolAbility(4F, 0, MainRegistry.tMatCobalt, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(4)) @@ -4723,7 +4725,7 @@ public class ModItems { .addBreakAbility(new LuckAbility(5)) .addHitAbility(new WeaponAbility.StunAbility(3)).setUnlocalizedName("starmetal_shovel").setTextureName(RefStrings.MODID + ":starmetal_shovel"); starmetal_hoe = new ModHoe(matStarmetal).setUnlocalizedName("starmetal_hoe").setTextureName(RefStrings.MODID + ":starmetal_hoe"); - + centri_stick = new ItemToolAbility(3F, 0, MainRegistry.tMatElec, EnumToolType.MINER) .addBreakAbility(new ToolAbility.CentrifugeAbility()).setMaxDamage(50).setUnlocalizedName("centri_stick").setTextureName(RefStrings.MODID + ":centri_stick"); smashing_hammer = new ItemToolAbility(12F, -0.1, MainRegistry.tMatSteel, EnumToolType.MINER) @@ -4756,7 +4758,7 @@ public class ModItems { .addBreakAbility(new ToolAbility.HammerAbility(3)) .addBreakAbility(new ToolAbility.HammerAbility(4)) .addBreakAbility(new ToolAbility.RecursionAbility(9)).setUnlocalizedName("drax_mk3").setTextureName(RefStrings.MODID + ":drax_mk3"); - + ToolMaterial matBismuth = EnumHelper.addToolMaterial("HBM_BISMUTH", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.ingot_bismuth)); bismuth_pickaxe = new ItemToolAbility(15F, 0, matBismuth, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4778,7 +4780,7 @@ public class ModItems { .addHitAbility(new WeaponAbility.VampireAbility(3F)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("bismuth_axe").setTextureName(RefStrings.MODID + ":bismuth_axe"); - + ToolMaterial matVolcano = EnumHelper.addToolMaterial("HBM_VOLCANIC", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.ingot_bismuth)); volcanic_pickaxe = new ItemToolAbility(15F, 0, matVolcano, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4799,7 +4801,7 @@ public class ModItems { .addHitAbility(new WeaponAbility.FireAbility(10)) .addHitAbility(new WeaponAbility.VampireAbility(3F)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("volcanic_axe").setTextureName(RefStrings.MODID + ":volcanic_axe"); - + ToolMaterial matChlorophyte = EnumHelper.addToolMaterial("HBM_CHLOROPHYTE", 4, 0, 75F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.powder_chlorophyte)); chlorophyte_pickaxe = new ItemToolAbility(20F, 0, matChlorophyte, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(2)) @@ -4846,7 +4848,7 @@ public class ModItems { .addHitAbility(new WeaponAbility.StunAbility(15)) .addHitAbility(new WeaponAbility.PhosphorusAbility(90)) .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("mese_axe").setTextureName(RefStrings.MODID + ":mese_axe"); - + dnt_sword = new ItemSwordAbility(12F, 0, matMese).setUnlocalizedName("dnt_sword").setTextureName(RefStrings.MODID + ":dnt_sword"); ToolMaterial matDwarf = EnumHelper.addToolMaterial("HBM_DWARVEN", 2, 0, 4F, 0.0F, 10).setRepairItem(new ItemStack(ModItems.ingot_copper)); @@ -4866,7 +4868,7 @@ public class ModItems { meteorite_sword_irradiated = new ItemSwordMeteorite(35F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_irradiated").setTextureName(RefStrings.MODID + ":meteorite_sword"); meteorite_sword_fused = new ItemSwordMeteorite(50F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_fused").setTextureName(RefStrings.MODID + ":meteorite_sword"); meteorite_sword_baleful = new ItemSwordMeteorite(75F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword"); - + mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); hazmat_helmet = new ArmorHazmatMask(MainRegistry.aMatHaz, 0, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_helmet").setTextureName(RefStrings.MODID + ":hazmat_helmet"); @@ -4887,7 +4889,7 @@ public class ModItems { hazmat_paa_plate = new ArmorHazmat(MainRegistry.aMatPaa, 1, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_plate").setTextureName(RefStrings.MODID + ":hazmat_paa_plate"); hazmat_paa_legs = new ArmorHazmat(MainRegistry.aMatPaa, 2, RefStrings.MODID + ":textures/armor/hazmat_paa_2.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_legs").setTextureName(RefStrings.MODID + ":hazmat_paa_legs"); hazmat_paa_boots = new ArmorHazmat(MainRegistry.aMatPaa, 3, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_boots").setTextureName(RefStrings.MODID + ":hazmat_paa_boots"); - + ArmorMaterial aMatLiquidator = EnumHelper.addArmorMaterial("HBM_LIQUIDATOR", 750, new int[] { 3, 8, 6, 3 }, 10); aMatLiquidator.customCraftingMaterial = ModItems.plate_lead; liquidator_helmet = new ArmorLiquidatorMask(aMatLiquidator, 0, RefStrings.MODID + ":textures/armor/liquidator_helmet.png") @@ -4942,7 +4944,7 @@ public class ModItems { multitool_mega = new ItemMultitoolPassive().setUnlocalizedName("multitool_mega").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_joule = new ItemMultitoolPassive().setUnlocalizedName("multitool_joule").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_decon = new ItemMultitoolPassive().setUnlocalizedName("multitool_decon").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); - + saw = new ModSword(MainRegistry.enumToolMaterialSaw).setUnlocalizedName("weapon_saw").setFull3D().setTextureName(RefStrings.MODID + ":saw"); bat = new ModSword(MainRegistry.enumToolMaterialBat).setUnlocalizedName("weapon_bat").setFull3D().setTextureName(RefStrings.MODID + ":bat"); bat_nail = new ModSword(MainRegistry.enumToolMaterialBatNail).setUnlocalizedName("weapon_bat_nail").setFull3D().setTextureName(RefStrings.MODID + ":bat_nail"); @@ -4956,13 +4958,13 @@ public class ModItems { crystal_horn = new ItemCustomLore().setUnlocalizedName("crystal_horn").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_horn"); crystal_charred = new ItemCustomLore().setUnlocalizedName("crystal_charred").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_charred"); - + bucket_mud = new ItemModBucket(ModBlocks.mud_block).setUnlocalizedName("bucket_mud").setContainerItem(Items.bucket).setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":bucket_mud"); bucket_acid = new ItemModBucket(ModBlocks.acid_block).setUnlocalizedName("bucket_acid").setContainerItem(Items.bucket).setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":bucket_acid"); bucket_toxic = new ItemModBucket(ModBlocks.toxic_block).setUnlocalizedName("bucket_toxic").setContainerItem(Items.bucket).setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":bucket_toxic"); bucket_schrabidic_acid = new ItemModBucket(ModBlocks.schrabidic_block).setUnlocalizedName("bucket_schrabidic_acid").setContainerItem(Items.bucket).setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":bucket_schrabidic_acid"); bucket_sulfuric_acid = new ItemModBucket(ModBlocks.sulfuric_acid_block).setUnlocalizedName("bucket_sulfuric_acid").setContainerItem(Items.bucket).setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":bucket_sulfuric_acid"); - + door_metal = new ItemModDoor().setUnlocalizedName("door_metal").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_metal"); door_office = new ItemModDoor().setUnlocalizedName("door_office").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_office"); door_bunker = new ItemModDoor().setUnlocalizedName("door_bunker").setCreativeTab(MainRegistry.blockTab).setTextureName(RefStrings.MODID + ":door_bunker"); @@ -4974,7 +4976,7 @@ public class ModItems { record_ss = new ItemModRecord("ss").setUnlocalizedName("record_ss").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_ss"); record_vc = new ItemModRecord("vc").setUnlocalizedName("record_vc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_vc"); record_glass = new ItemModRecord("glass").setUnlocalizedName("record_glass").setCreativeTab(null).setTextureName(RefStrings.MODID + ":record_glass"); - + book_guide = new ItemGuideBook().setUnlocalizedName("book_guide").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":book_guide"); book_lore = new ItemBookLore().setUnlocalizedName("book_lore").setCreativeTab(null).setTextureName(RefStrings.MODID + ":book_pages"); holotape_image = new ItemHolotapeImage().setUnlocalizedName("holotape_image").setCreativeTab(null).setTextureName(RefStrings.MODID + ":holotape"); @@ -5031,12 +5033,12 @@ public class ModItems { bob_chemistry = new Item().setUnlocalizedName("bob_chemistry").setTextureName(RefStrings.MODID + ":bob_chemistry"); bob_oil = new Item().setUnlocalizedName("bob_oil").setTextureName(RefStrings.MODID + ":bob_oil"); bob_nuclear = new Item().setUnlocalizedName("bob_nuclear").setTextureName(RefStrings.MODID + ":bob_nuclear"); - + mysteryshovel = new ItemMS().setUnlocalizedName("mysteryshovel").setFull3D().setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cursed_shovel"); memory = new ItemBattery(Long.MAX_VALUE / 100L, 100000000000000L, 100000000000000L).setUnlocalizedName("memory").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mo8_anim"); GunFactory.init(); - + FluidContainerRegistry.registerFluidContainer(new FluidStack(ModBlocks.mud_fluid, 1000), new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket)); FluidContainerRegistry.registerFluidContainer(new FluidStack(ModBlocks.acid_fluid, 1000), new ItemStack(ModItems.bucket_acid), new ItemStack(Items.bucket)); FluidContainerRegistry.registerFluidContainer(new FluidStack(ModBlocks.toxic_fluid, 1000), new ItemStack(ModItems.bucket_toxic), new ItemStack(Items.bucket)); @@ -5049,12 +5051,12 @@ public class ModItems { BucketHandler.INSTANCE.buckets.put(ModBlocks.sulfuric_acid_block, ModItems.bucket_sulfuric_acid); MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); } - + private static void registerItem() { //Weapons GameRegistry.registerItem(redstone_sword, redstone_sword.getUnlocalizedName()); GameRegistry.registerItem(big_sword, big_sword.getUnlocalizedName()); - + //Test Nuke GameRegistry.registerItem(test_nuke_igniter, test_nuke_igniter.getUnlocalizedName()); GameRegistry.registerItem(test_nuke_propellant, test_nuke_propellant.getUnlocalizedName()); @@ -5178,7 +5180,7 @@ public class ModItems { GameRegistry.registerItem(ingot_fiberglass, ingot_fiberglass.getUnlocalizedName()); GameRegistry.registerItem(ingot_asbestos, ingot_asbestos.getUnlocalizedName()); GameRegistry.registerItem(ingot_raw, ingot_raw.getUnlocalizedName()); - + //Billets GameRegistry.registerItem(billet_uranium, billet_uranium.getUnlocalizedName()); GameRegistry.registerItem(billet_u233, billet_u233.getUnlocalizedName()); @@ -5233,7 +5235,7 @@ public class ModItems { GameRegistry.registerItem(billet_balefire_gold, billet_balefire_gold.getUnlocalizedName()); GameRegistry.registerItem(billet_flashlead, billet_flashlead.getUnlocalizedName()); GameRegistry.registerItem(billet_nuclear_waste, billet_nuclear_waste.getUnlocalizedName()); - + //Dusts & Other GameRegistry.registerItem(cinnebar, cinnebar.getUnlocalizedName()); GameRegistry.registerItem(nugget_mercury, nugget_mercury.getUnlocalizedName()); @@ -5354,7 +5356,7 @@ public class ModItems { GameRegistry.registerItem(powder_ash, powder_ash.getUnlocalizedName()); GameRegistry.registerItem(powder_limestone, powder_limestone.getUnlocalizedName()); GameRegistry.registerItem(powder_cement, powder_cement.getUnlocalizedName()); - + //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); GameRegistry.registerItem(powder_ice, powder_ice.getUnlocalizedName()); @@ -5368,7 +5370,7 @@ public class ModItems { GameRegistry.registerItem(ball_tatb, ball_tatb.getUnlocalizedName()); GameRegistry.registerItem(ball_resin, ball_resin.getUnlocalizedName()); GameRegistry.registerItem(ball_fireclay, ball_fireclay.getUnlocalizedName()); - + //Ores GameRegistry.registerItem(ore_bedrock, ore_bedrock.getUnlocalizedName()); GameRegistry.registerItem(ore_centrifuged, ore_centrifuged.getUnlocalizedName()); @@ -5384,7 +5386,7 @@ public class ModItems { GameRegistry.registerItem(bedrock_ore_base, bedrock_ore_base.getUnlocalizedName()); GameRegistry.registerItem(bedrock_ore, bedrock_ore.getUnlocalizedName()); GameRegistry.registerItem(bedrock_ore_fragment, bedrock_ore_fragment.getUnlocalizedName()); - + //Crystals GameRegistry.registerItem(crystal_coal, crystal_coal.getUnlocalizedName()); GameRegistry.registerItem(crystal_iron, crystal_iron.getUnlocalizedName()); @@ -5419,7 +5421,7 @@ public class ModItems { GameRegistry.registerItem(gem_volcanic, gem_volcanic.getUnlocalizedName()); GameRegistry.registerItem(gem_rad, gem_rad.getUnlocalizedName()); GameRegistry.registerItem(gem_alexandrite, gem_alexandrite.getUnlocalizedName()); - + //Fragments GameRegistry.registerItem(fragment_neodymium, fragment_neodymium.getUnlocalizedName()); GameRegistry.registerItem(fragment_cobalt, fragment_cobalt.getUnlocalizedName()); @@ -5431,7 +5433,7 @@ public class ModItems { GameRegistry.registerItem(fragment_meteorite, fragment_meteorite.getUnlocalizedName()); GameRegistry.registerItem(fragment_coltan, fragment_coltan.getUnlocalizedName()); GameRegistry.registerItem(chunk_ore, chunk_ore.getUnlocalizedName()); - + //Things that look like rotten flesh but aren't GameRegistry.registerItem(biomass, biomass.getUnlocalizedName()); GameRegistry.registerItem(biomass_compressed, biomass_compressed.getUnlocalizedName()); @@ -5516,7 +5518,7 @@ public class ModItems { GameRegistry.registerItem(plate_bismuth, plate_bismuth.getUnlocalizedName()); GameRegistry.registerItem(plate_euphemium, plate_euphemium.getUnlocalizedName()); GameRegistry.registerItem(plate_dineutronium, plate_dineutronium.getUnlocalizedName()); - + //Armor Plates GameRegistry.registerItem(plate_armor_titanium, plate_armor_titanium.getUnlocalizedName()); GameRegistry.registerItem(plate_armor_ajr, plate_armor_ajr.getUnlocalizedName()); @@ -5524,18 +5526,18 @@ public class ModItems { GameRegistry.registerItem(plate_armor_lunar, plate_armor_lunar.getUnlocalizedName()); GameRegistry.registerItem(plate_armor_fau, plate_armor_fau.getUnlocalizedName()); GameRegistry.registerItem(plate_armor_dnt, plate_armor_dnt.getUnlocalizedName()); - + //Heavy/Cast Plate GameRegistry.registerItem(plate_cast, plate_cast.getUnlocalizedName()); GameRegistry.registerItem(plate_welded, plate_welded.getUnlocalizedName()); GameRegistry.registerItem(shell, shell.getUnlocalizedName()); GameRegistry.registerItem(pipe, pipe.getUnlocalizedName()); GameRegistry.registerItem(heavy_component, heavy_component.getUnlocalizedName()); - + //Bolts GameRegistry.registerItem(bolt, bolt.getUnlocalizedName()); GameRegistry.registerItem(bolt_spike, bolt_spike.getUnlocalizedName()); - + //Cloth GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName()); GameRegistry.registerItem(hazmat_cloth_red, hazmat_cloth_red.getUnlocalizedName()); @@ -5545,11 +5547,11 @@ public class ModItems { GameRegistry.registerItem(rag_damp, rag_damp.getUnlocalizedName()); GameRegistry.registerItem(rag_piss, rag_piss.getUnlocalizedName()); GameRegistry.registerItem(filter_coal, filter_coal.getUnlocalizedName()); - + //Wires GameRegistry.registerItem(wire_fine, wire_fine.getUnlocalizedName()); GameRegistry.registerItem(wire_dense, wire_dense.getUnlocalizedName()); - + //Parts GameRegistry.registerItem(coil_copper, coil_copper.getUnlocalizedName()); GameRegistry.registerItem(coil_copper_torus, coil_copper_torus.getUnlocalizedName()); @@ -5589,18 +5591,18 @@ public class ModItems { GameRegistry.registerItem(part_mechanism, part_mechanism.getUnlocalizedName()); GameRegistry.registerItem(part_stock, part_stock.getUnlocalizedName()); GameRegistry.registerItem(part_grip, part_grip.getUnlocalizedName()); - + //Plant Products GameRegistry.registerItem(plant_item, plant_item.getUnlocalizedName()); - + //Teleporter Parts //GameRegistry.registerItem(telepad, telepad.getUnlocalizedName()); GameRegistry.registerItem(entanglement_kit, entanglement_kit.getUnlocalizedName()); - + //AMS Parts GameRegistry.registerItem(component_limiter, component_limiter.getUnlocalizedName()); GameRegistry.registerItem(component_emitter, component_emitter.getUnlocalizedName()); - + //Bomb Parts GameRegistry.registerItem(fins_flat, fins_flat.getUnlocalizedName()); GameRegistry.registerItem(fins_small_steel, fins_small_steel.getUnlocalizedName()); @@ -5650,7 +5652,7 @@ public class ModItems { GameRegistry.registerItem(seg_10, seg_10.getUnlocalizedName()); GameRegistry.registerItem(seg_15, seg_15.getUnlocalizedName()); GameRegistry.registerItem(seg_20, seg_20.getUnlocalizedName()); - + //Chopper parts GameRegistry.registerItem(chopper_head, chopper_head.getUnlocalizedName()); GameRegistry.registerItem(chopper_gun, chopper_gun.getUnlocalizedName()); @@ -5659,19 +5661,19 @@ public class ModItems { GameRegistry.registerItem(chopper_wing, chopper_wing.getUnlocalizedName()); GameRegistry.registerItem(chopper_blades, chopper_blades.getUnlocalizedName()); GameRegistry.registerItem(combine_scrap, combine_scrap.getUnlocalizedName()); - + //Hammer Parts GameRegistry.registerItem(shimmer_head, shimmer_head.getUnlocalizedName()); GameRegistry.registerItem(shimmer_axe_head, shimmer_axe_head.getUnlocalizedName()); GameRegistry.registerItem(shimmer_handle, shimmer_handle.getUnlocalizedName()); - + //Circuits GameRegistry.registerItem(circuit, circuit.getUnlocalizedName()); GameRegistry.registerItem(crt_display, crt_display.getUnlocalizedName()); GameRegistry.registerItem(circuit_star_piece, circuit_star_piece.getUnlocalizedName()); GameRegistry.registerItem(circuit_star_component, circuit_star_component.getUnlocalizedName()); GameRegistry.registerItem(circuit_star, circuit_star.getUnlocalizedName()); - + //Gun Mechanisms GameRegistry.registerItem(mechanism_revolver_1, mechanism_revolver_1.getUnlocalizedName()); GameRegistry.registerItem(mechanism_revolver_2, mechanism_revolver_2.getUnlocalizedName()); @@ -5683,19 +5685,19 @@ public class ModItems { //Casing GameRegistry.registerItem(casing, casing.getUnlocalizedName()); - + //Bullet Assemblies GameRegistry.registerItem(assembly_nuke, assembly_nuke.getUnlocalizedName()); - + //Wiring GameRegistry.registerItem(wiring_red_copper, wiring_red_copper.getUnlocalizedName()); - + //Flame War in a Box GameRegistry.registerItem(flame_pony, flame_pony.getUnlocalizedName()); GameRegistry.registerItem(flame_conspiracy, flame_conspiracy.getUnlocalizedName()); GameRegistry.registerItem(flame_politics, flame_politics.getUnlocalizedName()); GameRegistry.registerItem(flame_opinion, flame_opinion.getUnlocalizedName()); - + //Pellets GameRegistry.registerItem(pellet_rtg_radium, pellet_rtg_radium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_weak, pellet_rtg_weak.getUnlocalizedName()); @@ -5718,12 +5720,12 @@ public class ModItems { GameRegistry.registerItem(pellet_charged, pellet_charged.getUnlocalizedName()); GameRegistry.registerItem(pellet_gas, pellet_gas.getUnlocalizedName()); GameRegistry.registerItem(magnetron, magnetron.getUnlocalizedName()); - + //Engine Pieces GameRegistry.registerItem(piston_selenium, piston_selenium.getUnlocalizedName()); GameRegistry.registerItem(piston_set, piston_set.getUnlocalizedName()); GameRegistry.registerItem(drillbit, drillbit.getUnlocalizedName()); - + //Cells GameRegistry.registerItem(cell_empty, cell_empty.getUnlocalizedName()); GameRegistry.registerItem(cell_uf6, cell_uf6.getUnlocalizedName()); @@ -5738,10 +5740,10 @@ public class ModItems { //DEMON CORE GameRegistry.registerItem(demon_core_open, demon_core_open.getUnlocalizedName()); GameRegistry.registerItem(demon_core_closed, demon_core_closed.getUnlocalizedName()); - + //PA GameRegistry.registerItem(pa_coil, pa_coil.getUnlocalizedName()); - + //Particle Containers GameRegistry.registerItem(particle_empty, particle_empty.getUnlocalizedName()); GameRegistry.registerItem(particle_hydrogen, particle_hydrogen.getUnlocalizedName()); @@ -5759,7 +5761,7 @@ public class ModItems { GameRegistry.registerItem(particle_sparkticle, particle_sparkticle.getUnlocalizedName()); GameRegistry.registerItem(particle_digamma, particle_digamma.getUnlocalizedName()); GameRegistry.registerItem(particle_lutece, particle_lutece.getUnlocalizedName()); - + //Singularities, black holes and other cosmic horrors GameRegistry.registerItem(singularity_micro, singularity_micro.getUnlocalizedName()); GameRegistry.registerItem(singularity, singularity.getUnlocalizedName()); @@ -5769,21 +5771,21 @@ public class ModItems { GameRegistry.registerItem(singularity_spark, singularity_spark.getUnlocalizedName()); GameRegistry.registerItem(crystal_xen, crystal_xen.getUnlocalizedName()); GameRegistry.registerItem(pellet_antimatter, pellet_antimatter.getUnlocalizedName()); - + //Infinite Tanks GameRegistry.registerItem(inf_water, inf_water.getUnlocalizedName()); GameRegistry.registerItem(inf_water_mk2, inf_water_mk2.getUnlocalizedName()); - + //Canisters GameRegistry.registerItem(fuel_additive, fuel_additive.getUnlocalizedName()); GameRegistry.registerItem(canister_empty, canister_empty.getUnlocalizedName()); GameRegistry.registerItem(canister_full, canister_full.getUnlocalizedName()); GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName()); - + //Gas Tanks GameRegistry.registerItem(gas_empty, gas_empty.getUnlocalizedName()); GameRegistry.registerItem(gas_full, gas_full.getUnlocalizedName()); - + //Universal Tank GameRegistry.registerItem(fluid_tank_empty, fluid_tank_empty.getUnlocalizedName()); GameRegistry.registerItem(fluid_tank_full, fluid_tank_full.getUnlocalizedName()); @@ -5842,7 +5844,7 @@ public class ModItems { GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); GameRegistry.registerItem(fusion_core_infinite, fusion_core_infinite.getUnlocalizedName()); - + //Folders GameRegistry.registerItem(template_folder, template_folder.getUnlocalizedName()); GameRegistry.registerItem(journal_pip, journal_pip.getUnlocalizedName()); @@ -5853,7 +5855,7 @@ public class ModItems { GameRegistry.registerItem(bobmazon_weapons, bobmazon_weapons.getUnlocalizedName()); GameRegistry.registerItem(bobmazon_tools, bobmazon_tools.getUnlocalizedName()); GameRegistry.registerItem(bobmazon_hidden, bobmazon_hidden.getUnlocalizedName()); - + //Hydraulic Press Stamps GameRegistry.registerItem(stamp_stone_flat, stamp_stone_flat.getUnlocalizedName()); GameRegistry.registerItem(stamp_stone_plate, stamp_stone_plate.getUnlocalizedName()); @@ -5889,12 +5891,12 @@ public class ModItems { GameRegistry.registerItem(stamp_desh_9, stamp_desh_9.getUnlocalizedName()); GameRegistry.registerItem(stamp_desh_50, stamp_desh_50.getUnlocalizedName()); GameRegistry.registerItem(stamp_book, stamp_book.getUnlocalizedName()); - + //Molds GameRegistry.registerItem(mold_base, mold_base.getUnlocalizedName()); GameRegistry.registerItem(mold, mold.getUnlocalizedName()); GameRegistry.registerItem(scraps, scraps.getUnlocalizedName()); - + //Machine Upgrades GameRegistry.registerItem(upgrade_muffler, upgrade_muffler.getUnlocalizedName()); GameRegistry.registerItem(upgrade_template, upgrade_template.getUnlocalizedName()); @@ -5928,7 +5930,7 @@ public class ModItems { GameRegistry.registerItem(upgrade_5g, upgrade_5g.getUnlocalizedName()); GameRegistry.registerItem(upgrade_stack, upgrade_stack.getUnlocalizedName()); GameRegistry.registerItem(upgrade_ejector, upgrade_ejector.getUnlocalizedName()); - + //Machine Templates GameRegistry.registerItem(siren_track, siren_track.getUnlocalizedName()); GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName()); @@ -5939,7 +5941,7 @@ public class ModItems { GameRegistry.registerItem(chemistry_template, chemistry_template.getUnlocalizedName()); GameRegistry.registerItem(chemistry_icon, chemistry_icon.getUnlocalizedName()); GameRegistry.registerItem(crucible_template, crucible_template.getUnlocalizedName()); - + //Machine Items GameRegistry.registerItem(fuse, fuse.getUnlocalizedName()); GameRegistry.registerItem(redcoil_capacitor, redcoil_capacitor.getUnlocalizedName()); @@ -5956,21 +5958,21 @@ public class ModItems { GameRegistry.registerItem(overfuse, overfuse.getUnlocalizedName()); GameRegistry.registerItem(arc_electrode, arc_electrode.getUnlocalizedName()); GameRegistry.registerItem(arc_electrode_burnt, arc_electrode_burnt.getUnlocalizedName()); - + //Particle Collider Fuel GameRegistry.registerItem(part_lithium, part_lithium.getUnlocalizedName()); GameRegistry.registerItem(part_beryllium, part_beryllium.getUnlocalizedName()); GameRegistry.registerItem(part_carbon, part_carbon.getUnlocalizedName()); GameRegistry.registerItem(part_copper, part_copper.getUnlocalizedName()); GameRegistry.registerItem(part_plutonium, part_plutonium.getUnlocalizedName()); - + //FEL laser crystals GameRegistry.registerItem(laser_crystal_co2, laser_crystal_co2.getUnlocalizedName()); GameRegistry.registerItem(laser_crystal_bismuth, laser_crystal_bismuth.getUnlocalizedName()); GameRegistry.registerItem(laser_crystal_cmb, laser_crystal_cmb.getUnlocalizedName()); GameRegistry.registerItem(laser_crystal_dnt, laser_crystal_dnt.getUnlocalizedName()); GameRegistry.registerItem(laser_crystal_digamma, laser_crystal_digamma.getUnlocalizedName()); - + //Catalyst Rune Sigils GameRegistry.registerItem(rune_blank, rune_blank.getUnlocalizedName()); GameRegistry.registerItem(rune_isa, rune_isa.getUnlocalizedName()); @@ -5978,7 +5980,7 @@ public class ModItems { GameRegistry.registerItem(rune_hagalaz, rune_hagalaz.getUnlocalizedName()); GameRegistry.registerItem(rune_jera, rune_jera.getUnlocalizedName()); GameRegistry.registerItem(rune_thurisaz, rune_thurisaz.getUnlocalizedName()); - + //AMS Catalysts GameRegistry.registerItem(ams_catalyst_blank, ams_catalyst_blank.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_aluminium, ams_catalyst_aluminium.getUnlocalizedName()); @@ -5996,17 +5998,17 @@ public class ModItems { GameRegistry.registerItem(ams_catalyst_strontium, ams_catalyst_strontium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_thorium, ams_catalyst_thorium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_tungsten, ams_catalyst_tungsten.getUnlocalizedName()); - + //Shredder Blades GameRegistry.registerItem(blades_steel, blades_steel.getUnlocalizedName()); GameRegistry.registerItem(blades_titanium, blades_titanium.getUnlocalizedName()); GameRegistry.registerItem(blades_advanced_alloy, blades_advanced_alloy.getUnlocalizedName()); GameRegistry.registerItem(blades_desh, blades_desh.getUnlocalizedName()); - + //Generator Stuff GameRegistry.registerItem(thermo_element, thermo_element.getUnlocalizedName()); GameRegistry.registerItem(catalytic_converter, catalytic_converter.getUnlocalizedName()); - + //AMS Components GameRegistry.registerItem(ams_focus_blank, ams_focus_blank.getUnlocalizedName()); GameRegistry.registerItem(ams_focus_limiter, ams_focus_limiter.getUnlocalizedName()); @@ -6017,13 +6019,13 @@ public class ModItems { GameRegistry.registerItem(ams_core_wormhole, ams_core_wormhole.getUnlocalizedName()); GameRegistry.registerItem(ams_core_eyeofharmony, ams_core_eyeofharmony.getUnlocalizedName()); GameRegistry.registerItem(ams_core_thingy, ams_core_thingy.getUnlocalizedName()); - + //Fusion Shields GameRegistry.registerItem(fusion_shield_tungsten, fusion_shield_tungsten.getUnlocalizedName()); GameRegistry.registerItem(fusion_shield_desh, fusion_shield_desh.getUnlocalizedName()); GameRegistry.registerItem(fusion_shield_chlorophyte, fusion_shield_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(fusion_shield_vaporwave, fusion_shield_vaporwave.getUnlocalizedName()); - + //Breeding Rods GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName()); GameRegistry.registerItem(rod, rod.getUnlocalizedName()); @@ -6031,7 +6033,7 @@ public class ModItems { GameRegistry.registerItem(rod_dual, rod_dual.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_empty, rod_quad_empty.getUnlocalizedName()); GameRegistry.registerItem(rod_quad, rod_quad.getUnlocalizedName()); - + //ZIRNOX parts GameRegistry.registerItem(rod_zirnox_empty, rod_zirnox_empty.getUnlocalizedName()); //GameRegistry.registerItem(rod_zirnox_natural_uranium_fuel, rod_zirnox_natural_uranium_fuel.getUnlocalizedName()); @@ -6047,7 +6049,7 @@ public class ModItems { GameRegistry.registerItem(rod_zirnox_tritium, rod_zirnox_tritium.getUnlocalizedName()); //GameRegistry.registerItem(rod_zirnox_zfb_mox, rod_zirnox_zfb_mox.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox, rod_zirnox.getUnlocalizedName()); - + GameRegistry.registerItem(rod_zirnox_natural_uranium_fuel_depleted, rod_zirnox_natural_uranium_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_uranium_fuel_depleted, rod_zirnox_uranium_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_thorium_fuel_depleted, rod_zirnox_thorium_fuel_depleted.getUnlocalizedName()); @@ -6057,7 +6059,7 @@ public class ModItems { GameRegistry.registerItem(rod_zirnox_u235_fuel_depleted, rod_zirnox_u235_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_les_fuel_depleted, rod_zirnox_les_fuel_depleted.getUnlocalizedName()); GameRegistry.registerItem(rod_zirnox_zfb_mox_depleted, rod_zirnox_zfb_mox_depleted.getUnlocalizedName()); - + //Depleted Fuel GameRegistry.registerItem(waste_natural_uranium, waste_natural_uranium.getUnlocalizedName()); GameRegistry.registerItem(waste_uranium, waste_uranium.getUnlocalizedName()); @@ -6068,7 +6070,7 @@ public class ModItems { GameRegistry.registerItem(waste_u235, waste_u235.getUnlocalizedName()); GameRegistry.registerItem(waste_schrabidium, waste_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(waste_zfb_mox, waste_zfb_mox.getUnlocalizedName()); - + GameRegistry.registerItem(waste_plate_u233, waste_plate_u233.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_u235, waste_plate_u235.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_mox, waste_plate_mox.getUnlocalizedName()); @@ -6076,7 +6078,7 @@ public class ModItems { GameRegistry.registerItem(waste_plate_ra226be, waste_plate_ra226be.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_sa326, waste_plate_sa326.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_pu238be, waste_plate_pu238be.getUnlocalizedName()); - + //Pile parts GameRegistry.registerItem(pile_rod_uranium, pile_rod_uranium.getUnlocalizedName()); GameRegistry.registerItem(pile_rod_pu239, pile_rod_pu239.getUnlocalizedName()); @@ -6085,7 +6087,7 @@ public class ModItems { GameRegistry.registerItem(pile_rod_boron, pile_rod_boron.getUnlocalizedName()); GameRegistry.registerItem(pile_rod_lithium, pile_rod_lithium.getUnlocalizedName()); GameRegistry.registerItem(pile_rod_detector, pile_rod_detector.getUnlocalizedName()); - + //Plate Fuels GameRegistry.registerItem(plate_fuel_u233, plate_fuel_u233.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_u235, plate_fuel_u235.getUnlocalizedName()); @@ -6094,12 +6096,12 @@ public class ModItems { GameRegistry.registerItem(plate_fuel_sa326, plate_fuel_sa326.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_ra226be, plate_fuel_ra226be.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_pu238be, plate_fuel_pu238be.getUnlocalizedName()); - + //PWR Parts GameRegistry.registerItem(pwr_fuel, pwr_fuel.getUnlocalizedName()); GameRegistry.registerItem(pwr_fuel_hot, pwr_fuel_hot.getUnlocalizedName()); GameRegistry.registerItem(pwr_fuel_depleted, pwr_fuel_depleted.getUnlocalizedName()); - + //RBMK parts GameRegistry.registerItem(rbmk_lid, rbmk_lid.getUnlocalizedName()); GameRegistry.registerItem(rbmk_lid_glass, rbmk_lid_glass.getUnlocalizedName()); @@ -6169,14 +6171,14 @@ public class ModItems { GameRegistry.registerItem(rbmk_pellet_zfb_pu241, rbmk_pellet_zfb_pu241.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_zfb_am_mix, rbmk_pellet_zfb_am_mix.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_drx, rbmk_pellet_drx.getUnlocalizedName()); - + GameRegistry.registerItem(watz_pellet, watz_pellet.getUnlocalizedName()); GameRegistry.registerItem(watz_pellet_depleted, watz_pellet_depleted.getUnlocalizedName()); GameRegistry.registerItem(icf_pellet_empty, icf_pellet_empty.getUnlocalizedName()); GameRegistry.registerItem(icf_pellet, icf_pellet.getUnlocalizedName()); GameRegistry.registerItem(icf_pellet_depleted, icf_pellet_depleted.getUnlocalizedName()); - + GameRegistry.registerItem(debris_graphite, debris_graphite.getUnlocalizedName()); GameRegistry.registerItem(debris_metal, debris_metal.getUnlocalizedName()); GameRegistry.registerItem(debris_fuel, debris_fuel.getUnlocalizedName()); @@ -6185,7 +6187,7 @@ public class ModItems { GameRegistry.registerItem(debris_shrapnel, debris_shrapnel.getUnlocalizedName()); GameRegistry.registerItem(debris_element, debris_element.getUnlocalizedName()); GameRegistry.registerItem(undefined, undefined.getUnlocalizedName()); - + GameRegistry.registerItem(scrap_plastic, scrap_plastic.getUnlocalizedName()); GameRegistry.registerItem(scrap, scrap.getUnlocalizedName()); GameRegistry.registerItem(scrap_oil, scrap_oil.getUnlocalizedName()); @@ -6203,13 +6205,13 @@ public class ModItems { GameRegistry.registerItem(nuclear_waste_tiny, nuclear_waste_tiny.getUnlocalizedName()); GameRegistry.registerItem(nuclear_waste_vitrified, nuclear_waste_vitrified.getUnlocalizedName()); GameRegistry.registerItem(nuclear_waste_vitrified_tiny, nuclear_waste_vitrified_tiny.getUnlocalizedName()); - + //Spawners GameRegistry.registerItem(spawn_chopper, spawn_chopper.getUnlocalizedName()); GameRegistry.registerItem(spawn_worm, spawn_worm.getUnlocalizedName()); GameRegistry.registerItem(spawn_ufo, spawn_ufo.getUnlocalizedName()); GameRegistry.registerItem(spawn_duck, spawn_duck.getUnlocalizedName()); - + //Computer Tools GameRegistry.registerItem(designator, designator.getUnlocalizedName()); GameRegistry.registerItem(designator_range, designator_range.getUnlocalizedName()); @@ -6236,6 +6238,7 @@ public class ModItems { GameRegistry.registerItem(pollution_detector, pollution_detector.getUnlocalizedName()); GameRegistry.registerItem(containment_box, containment_box.getUnlocalizedName()); GameRegistry.registerItem(plastic_bag, plastic_bag.getUnlocalizedName()); + GameRegistry.registerItem(casing_bag, casing_bag.getUnlocalizedName()); //Keys and Locks @@ -6253,7 +6256,7 @@ public class ModItems { GameRegistry.registerItem(launch_code_piece, launch_code_piece.getUnlocalizedName()); GameRegistry.registerItem(launch_code, launch_code.getUnlocalizedName()); GameRegistry.registerItem(launch_key, launch_key.getUnlocalizedName()); - + //Missiles //Tier 0 GameRegistry.registerItem(missile_test, missile_test.getUnlocalizedName()); @@ -6293,7 +6296,7 @@ public class ModItems { GameRegistry.registerItem(missile_soyuz, missile_soyuz.getUnlocalizedName()); GameRegistry.registerItem(missile_soyuz_lander, missile_soyuz_lander.getUnlocalizedName()); GameRegistry.registerItem(missile_custom, missile_custom.getUnlocalizedName()); - + //Missile Parts GameRegistry.registerItem(mp_thruster_10_kerosene, mp_thruster_10_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_10_kerosene_tec, mp_thruster_10_kerosene_tec.getUnlocalizedName()); @@ -6431,7 +6434,7 @@ public class ModItems { GameRegistry.registerItem(missile_skin_soviet_glory, missile_skin_soviet_glory.getUnlocalizedName()); GameRegistry.registerItem(missile_skin_soviet_stank, missile_skin_soviet_stank.getUnlocalizedName()); GameRegistry.registerItem(missile_skin_metal, missile_skin_metal.getUnlocalizedName());*/ - + //Satellites GameRegistry.registerItem(sat_mapper, sat_mapper.getUnlocalizedName()); GameRegistry.registerItem(sat_scanner, sat_scanner.getUnlocalizedName()); @@ -6447,16 +6450,16 @@ public class ModItems { GameRegistry.registerItem(sat_coord, sat_coord.getUnlocalizedName()); GameRegistry.registerItem(sat_designator, sat_designator.getUnlocalizedName()); GameRegistry.registerItem(sat_relay, sat_relay.getUnlocalizedName()); - + //Guns GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName()); GameRegistry.registerItem(gun_cryocannon, gun_cryocannon.getUnlocalizedName()); GameRegistry.registerItem(gun_fireext, gun_fireext.getUnlocalizedName()); GameRegistry.registerItem(crucible, crucible.getUnlocalizedName()); - + GameRegistry.registerItem(gun_debug, gun_debug.getUnlocalizedName()); GameRegistry.registerItem(ammo_debug, ammo_debug.getUnlocalizedName()); - + GameRegistry.registerItem(gun_pepperbox, gun_pepperbox.getUnlocalizedName()); GameRegistry.registerItem(gun_light_revolver, gun_light_revolver.getUnlocalizedName()); GameRegistry.registerItem(gun_light_revolver_atlas, gun_light_revolver_atlas.getUnlocalizedName()); @@ -6504,10 +6507,10 @@ public class ModItems { GameRegistry.registerItem(gun_folly, gun_folly.getUnlocalizedName()); GameRegistry.registerItem(gun_double_barrel, gun_double_barrel.getUnlocalizedName()); GameRegistry.registerItem(gun_double_barrel_sacred_dragon, gun_double_barrel_sacred_dragon.getUnlocalizedName()); - + GameRegistry.registerItem(ammo_standard, ammo_standard.getUnlocalizedName()); GameRegistry.registerItem(ammo_secret, ammo_secret.getUnlocalizedName()); - + //Ammo GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_cryolator_ammo, gun_cryolator_ammo.getUnlocalizedName()); @@ -6517,9 +6520,9 @@ public class ModItems { GameRegistry.registerItem(ammo_dgk, ammo_dgk.getUnlocalizedName()); GameRegistry.registerItem(ammo_arty, ammo_arty.getUnlocalizedName()); GameRegistry.registerItem(ammo_himars, ammo_himars.getUnlocalizedName()); - + GameRegistry.registerItem(ammo_container, ammo_container.getUnlocalizedName()); - + //Grenades GameRegistry.registerItem(stick_dynamite, stick_dynamite.getUnlocalizedName()); //heave-ho! GameRegistry.registerItem(stick_dynamite_fishing, stick_dynamite_fishing.getUnlocalizedName()); @@ -6576,16 +6579,16 @@ public class ModItems { GameRegistry.registerItem(disperser_canister, disperser_canister.getUnlocalizedName()); GameRegistry.registerItem(glyphid_gland_empty, glyphid_gland_empty.getUnlocalizedName()); GameRegistry.registerItem(glyphid_gland, glyphid_gland.getUnlocalizedName()); - + GameRegistry.registerItem(ullapool_caber, ullapool_caber.getUnlocalizedName()); GameRegistry.registerItem(weaponized_starblaster_cell, weaponized_starblaster_cell.getUnlocalizedName()); - + //Capes GameRegistry.registerItem(cape_radiation, cape_radiation.getUnlocalizedName()); GameRegistry.registerItem(cape_gasmask, cape_gasmask.getUnlocalizedName()); GameRegistry.registerItem(cape_schrabidium, cape_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(cape_hidden, cape_hidden.getUnlocalizedName()); - + //Tools GameRegistry.registerItem(dwarven_pickaxe, dwarven_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_sword, schrabidium_sword.getUnlocalizedName()); @@ -6688,7 +6691,7 @@ public class ModItems { GameRegistry.registerItem(meteorite_sword_irradiated, meteorite_sword_irradiated.getUnlocalizedName()); GameRegistry.registerItem(meteorite_sword_fused, meteorite_sword_fused.getUnlocalizedName()); GameRegistry.registerItem(meteorite_sword_baleful, meteorite_sword_baleful.getUnlocalizedName()); - + //Multitool GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName()); GameRegistry.registerItem(multitool_dig, multitool_dig.getUnlocalizedName()); @@ -6700,7 +6703,7 @@ public class ModItems { GameRegistry.registerItem(multitool_mega, multitool_mega.getUnlocalizedName()); GameRegistry.registerItem(multitool_joule, multitool_joule.getUnlocalizedName()); GameRegistry.registerItem(multitool_decon, multitool_decon.getUnlocalizedName()); - + //Syringes & Pills GameRegistry.registerItem(syringe_empty, syringe_empty.getUnlocalizedName()); GameRegistry.registerItem(syringe_antidote, syringe_antidote.getUnlocalizedName()); @@ -6739,7 +6742,7 @@ public class ModItems { GameRegistry.registerItem(jetpack_tank, jetpack_tank.getUnlocalizedName()); GameRegistry.registerItem(gun_kit_1, gun_kit_1.getUnlocalizedName()); GameRegistry.registerItem(gun_kit_2, gun_kit_2.getUnlocalizedName()); - + //Food GameRegistry.registerItem(bomb_waffle, bomb_waffle.getUnlocalizedName()); GameRegistry.registerItem(schnitzel_vegan, schnitzel_vegan.getUnlocalizedName()); @@ -6774,7 +6777,7 @@ public class ModItems { GameRegistry.registerItem(canteen_fab, canteen_fab.getUnlocalizedName()); GameRegistry.registerItem(mucho_mango, mucho_mango.getUnlocalizedName()); GameRegistry.registerItem(chocolate, chocolate.getUnlocalizedName()); - + //Energy Drinks GameRegistry.registerItem(can_empty, can_empty.getUnlocalizedName()); GameRegistry.registerItem(can_smart, can_smart.getUnlocalizedName()); @@ -6786,11 +6789,11 @@ public class ModItems { GameRegistry.registerItem(can_bepis, can_bepis.getUnlocalizedName()); GameRegistry.registerItem(can_breen, can_breen.getUnlocalizedName()); GameRegistry.registerItem(can_mug, can_mug.getUnlocalizedName()); - + //Coffee GameRegistry.registerItem(coffee, coffee.getUnlocalizedName()); GameRegistry.registerItem(coffee_radium, coffee_radium.getUnlocalizedName()); - + //Cola GameRegistry.registerItem(bottle_empty, bottle_empty.getUnlocalizedName()); GameRegistry.registerItem(bottle_nuka, bottle_nuka.getUnlocalizedName()); @@ -6804,13 +6807,13 @@ public class ModItems { GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName()); GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName()); GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); - + //Flasks GameRegistry.registerItem(flask_infusion, flask_infusion.getUnlocalizedName()); - + //Canned Food GameRegistry.registerItem(canned_conserve, canned_conserve.getUnlocalizedName()); - + //Money GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName()); @@ -6847,7 +6850,7 @@ public class ModItems { GameRegistry.registerItem(cigarette, cigarette.getUnlocalizedName()); GameRegistry.registerItem(crackpipe, crackpipe.getUnlocalizedName()); GameRegistry.registerItem(bdcl, bdcl.getUnlocalizedName()); - + //Armor mods GameRegistry.registerItem(attachment_mask, attachment_mask.getUnlocalizedName()); GameRegistry.registerItem(attachment_mask_mono, attachment_mask_mono.getUnlocalizedName()); @@ -6899,17 +6902,17 @@ public class ModItems { GameRegistry.registerItem(shackles, shackles.getUnlocalizedName()); GameRegistry.registerItem(injector_5htp, injector_5htp.getUnlocalizedName()); GameRegistry.registerItem(injector_knife, injector_knife.getUnlocalizedName()); - + //Vehicles GameRegistry.registerItem(boat_rubber, boat_rubber.getUnlocalizedName()); GameRegistry.registerItem(cart, cart.getUnlocalizedName()); GameRegistry.registerItem(train, train.getUnlocalizedName()); GameRegistry.registerItem(drone, drone.getUnlocalizedName()); - + //High Explosive Lenses GameRegistry.registerItem(early_explosive_lenses, early_explosive_lenses.getUnlocalizedName()); GameRegistry.registerItem(explosive_lenses, explosive_lenses.getUnlocalizedName()); - + //The Gadget //GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName()); GameRegistry.registerItem(gadget_wireing, gadget_wireing.getUnlocalizedName()); @@ -6921,37 +6924,37 @@ public class ModItems { GameRegistry.registerItem(boy_bullet, boy_bullet.getUnlocalizedName()); GameRegistry.registerItem(boy_propellant, boy_propellant.getUnlocalizedName()); GameRegistry.registerItem(boy_igniter, boy_igniter.getUnlocalizedName());; - + //Fat Man //GameRegistry.registerItem(man_explosive, man_explosive.getUnlocalizedName()); GameRegistry.registerItem(man_igniter, man_igniter.getUnlocalizedName()); GameRegistry.registerItem(man_core, man_core.getUnlocalizedName()); - + //Ivy Mike GameRegistry.registerItem(mike_core, mike_core.getUnlocalizedName()); GameRegistry.registerItem(mike_deut, mike_deut.getUnlocalizedName()); GameRegistry.registerItem(mike_cooling_unit, mike_cooling_unit.getUnlocalizedName()); - + //Tsar Bomba GameRegistry.registerItem(tsar_core, tsar_core.getUnlocalizedName()); - + //FLEIJA GameRegistry.registerItem(fleija_igniter, fleija_igniter.getUnlocalizedName()); GameRegistry.registerItem(fleija_propellant, fleija_propellant.getUnlocalizedName()); GameRegistry.registerItem(fleija_core, fleija_core.getUnlocalizedName()); - + //Solinium GameRegistry.registerItem(solinium_igniter, solinium_igniter.getUnlocalizedName()); GameRegistry.registerItem(solinium_propellant, solinium_propellant.getUnlocalizedName()); GameRegistry.registerItem(solinium_core, solinium_core.getUnlocalizedName()); - + //N2 GameRegistry.registerItem(n2_charge, n2_charge.getUnlocalizedName()); - + //FSTBMB GameRegistry.registerItem(egg_balefire_shard, egg_balefire_shard.getUnlocalizedName()); GameRegistry.registerItem(egg_balefire, egg_balefire.getUnlocalizedName()); - + //Conventional Armor GameRegistry.registerItem(goggles, goggles.getUnlocalizedName()); GameRegistry.registerItem(ashglasses, ashglasses.getUnlocalizedName()); @@ -6965,7 +6968,7 @@ public class ModItems { GameRegistry.registerItem(hat, hat.getUnlocalizedName()); GameRegistry.registerItem(beta, beta.getUnlocalizedName()); GameRegistry.registerItem(no9, no9.getUnlocalizedName()); - + GameRegistry.registerItem(steel_helmet, steel_helmet.getUnlocalizedName()); GameRegistry.registerItem(steel_plate, steel_plate.getUnlocalizedName()); GameRegistry.registerItem(steel_legs, steel_legs.getUnlocalizedName()); @@ -6978,7 +6981,7 @@ public class ModItems { GameRegistry.registerItem(alloy_plate, alloy_plate.getUnlocalizedName()); GameRegistry.registerItem(alloy_legs, alloy_legs.getUnlocalizedName()); GameRegistry.registerItem(alloy_boots, alloy_boots.getUnlocalizedName()); - + //Custom Rods GameRegistry.registerItem(custom_tnt, custom_tnt.getUnlocalizedName()); GameRegistry.registerItem(custom_nuke, custom_nuke.getUnlocalizedName()); @@ -6987,7 +6990,7 @@ public class ModItems { GameRegistry.registerItem(custom_dirty, custom_dirty.getUnlocalizedName()); GameRegistry.registerItem(custom_schrab, custom_schrab.getUnlocalizedName()); GameRegistry.registerItem(custom_fall, custom_fall.getUnlocalizedName()); - + //Power Armor GameRegistry.registerItem(steamsuit_helmet, steamsuit_helmet.getUnlocalizedName()); GameRegistry.registerItem(steamsuit_plate, steamsuit_plate.getUnlocalizedName()); @@ -7038,7 +7041,7 @@ public class ModItems { GameRegistry.registerItem(trenchmaster_plate, trenchmaster_plate.getUnlocalizedName()); GameRegistry.registerItem(trenchmaster_legs, trenchmaster_legs.getUnlocalizedName()); GameRegistry.registerItem(trenchmaster_boots, trenchmaster_boots.getUnlocalizedName()); - + //Nobody will ever read this anyway, so it shouldn't matter. GameRegistry.registerItem(chainsaw, chainsaw.getUnlocalizedName()); GameRegistry.registerItem(igniter, igniter.getUnlocalizedName()); @@ -7054,7 +7057,7 @@ public class ModItems { GameRegistry.registerItem(reacher, reacher.getUnlocalizedName()); GameRegistry.registerItem(bismuth_tool, bismuth_tool.getUnlocalizedName()); GameRegistry.registerItem(meltdown_tool, meltdown_tool.getUnlocalizedName()); - + GameRegistry.registerItem(hazmat_helmet, hazmat_helmet.getUnlocalizedName()); GameRegistry.registerItem(hazmat_plate, hazmat_plate.getUnlocalizedName()); GameRegistry.registerItem(hazmat_legs, hazmat_legs.getUnlocalizedName()); @@ -7132,11 +7135,11 @@ public class ModItems { GameRegistry.registerItem(wings_murk, wings_murk.getUnlocalizedName()); //GameRegistry.registerItem(australium_iv, australium_iv.getUnlocalizedName()); //GameRegistry.registerItem(australium_v, australium_v.getUnlocalizedName()); - + //Expensive Ass Shit GameRegistry.registerItem(crystal_horn, crystal_horn.getUnlocalizedName()); GameRegistry.registerItem(crystal_charred, crystal_charred.getUnlocalizedName()); - + //OP Tools GameRegistry.registerItem(wand, wand.getUnlocalizedName()); GameRegistry.registerItem(wand_s, wand_s.getUnlocalizedName()); @@ -7155,7 +7158,7 @@ public class ModItems { GameRegistry.registerItem(page_of_, page_of_.getUnlocalizedName()); GameRegistry.registerItem(book_lemegeton, book_lemegeton.getUnlocalizedName()); GameRegistry.registerItem(burnt_bark, burnt_bark.getUnlocalizedName()); - + //Kits GameRegistry.registerItem(nuke_starter_kit, nuke_starter_kit.getUnlocalizedName()); GameRegistry.registerItem(nuke_advanced_kit, nuke_advanced_kit.getUnlocalizedName()); @@ -7182,19 +7185,19 @@ public class ModItems { GameRegistry.registerItem(kit_toolbox_empty, kit_toolbox_empty.getUnlocalizedName()); GameRegistry.registerItem(kit_toolbox, kit_toolbox.getUnlocalizedName()); GameRegistry.registerItem(letter, letter.getUnlocalizedName()); - + //Misile Loot Boxes GameRegistry.registerItem(loot_10, loot_10.getUnlocalizedName()); GameRegistry.registerItem(loot_15, loot_15.getUnlocalizedName()); GameRegistry.registerItem(loot_misc, loot_misc.getUnlocalizedName()); - + //THIS is a bucket. GameRegistry.registerItem(bucket_mud, bucket_mud.getUnlocalizedName()); GameRegistry.registerItem(bucket_acid, bucket_acid.getUnlocalizedName()); GameRegistry.registerItem(bucket_toxic, bucket_toxic.getUnlocalizedName()); GameRegistry.registerItem(bucket_schrabidic_acid, bucket_schrabidic_acid.getUnlocalizedName()); GameRegistry.registerItem(bucket_sulfuric_acid, bucket_sulfuric_acid.getUnlocalizedName()); - + //Door Items GameRegistry.registerItem(door_metal, door_metal.getUnlocalizedName()); GameRegistry.registerItem(door_office, door_office.getUnlocalizedName()); @@ -7207,14 +7210,14 @@ public class ModItems { GameRegistry.registerItem(record_ss, record_ss.getUnlocalizedName()); GameRegistry.registerItem(record_vc, record_vc.getUnlocalizedName()); GameRegistry.registerItem(record_glass, record_glass.getUnlocalizedName()); - + //wow we're far down the item registry, is this the cellar? GameRegistry.registerItem(book_guide, book_guide.getUnlocalizedName()); GameRegistry.registerItem(book_lore, book_lore.getUnlocalizedName()); GameRegistry.registerItem(holotape_image, holotape_image.getUnlocalizedName()); GameRegistry.registerItem(holotape_damaged, holotape_damaged.getUnlocalizedName()); GameRegistry.registerItem(clay_tablet, clay_tablet.getUnlocalizedName()); - + //Technical Items GameRegistry.registerItem(chlorine1, chlorine1.getUnlocalizedName()); GameRegistry.registerItem(chlorine2, chlorine2.getUnlocalizedName()); @@ -7258,7 +7261,7 @@ public class ModItems { GameRegistry.registerItem(mysteryshovel, mysteryshovel.getUnlocalizedName()); GameRegistry.registerItem(memory, memory.getUnlocalizedName()); } - + public static void addRemap(String unloc, Item item, Enum sub) { addRemap(unloc, item, sub.ordinal()); } diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java index dd46758f1..6729b027f 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java +++ b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java @@ -34,7 +34,7 @@ public class ItemBedrockOreNew extends Item { public IIcon[] icons = new IIcon[BedrockOreType.values().length * BedrockOreGrade.values().length]; public IIcon[] overlays = new IIcon[ProcessingTrait.values().length]; - + public ItemBedrockOreNew() { this.setHasSubtypes(true); this.setMaxDamage(0); @@ -44,10 +44,10 @@ public class ItemBedrockOreNew extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister reg) { - + if(reg instanceof TextureMap) { TextureMap map = (TextureMap) reg; - + for(int i = 0; i < BedrockOreGrade.values().length; i++) { BedrockOreGrade grade = BedrockOreGrade.values()[i]; for(int j = 0; j < BedrockOreType.values().length; j++) { BedrockOreType type = BedrockOreType.values()[j]; String placeholderName = RefStrings.MODID + ":bedrock_ore_" + grade.prefix + "_" + type.suffix + "-" + (i * BedrockOreType.values().length + j); @@ -57,7 +57,7 @@ public class ItemBedrockOreNew extends Item { } } } - + for(int i = 0; i < overlays.length; i++) { ProcessingTrait trait = ProcessingTrait.values()[i]; overlays[i] = reg.registerIcon(RefStrings.MODID + ":bedrock_ore_overlay." + trait.name().toLowerCase(Locale.US)); @@ -67,7 +67,7 @@ public class ItemBedrockOreNew extends Item { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list) { - + for(int j = 0; j < BedrockOreType.values().length; j++) { BedrockOreType type = BedrockOreType.values()[j]; for(int i = 0; i < BedrockOreGrade.values().length; i++) { BedrockOreGrade grade = BedrockOreGrade.values()[i]; list.add(this.make(grade, type)); @@ -80,7 +80,7 @@ public class ItemBedrockOreNew extends Item { public boolean requiresMultipleRenderPasses() { return true; } - + @Override public int getRenderPasses(int metadata) { return 1 + this.getGrade(metadata).traits.length; @@ -105,15 +105,15 @@ public class ItemBedrockOreNew extends Item { String type = StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".type." + this.getType(meta).suffix + ".name"); return StatCollector.translateToLocalFormatted(this.getUnlocalizedNameInefficiently(stack) + ".grade." + this.getGrade(meta).name().toLowerCase(Locale.US) + ".name", type); } - + @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - + for(ProcessingTrait trait : this.getGrade(stack.getItemDamage()).traits) { list.add(I18nUtil.resolveKey(this.getUnlocalizedNameInefficiently(stack) + ".trait." + trait.name().toLowerCase(Locale.US))); } } - + public static class BedrockOreOutput { public NTMMaterial mat; public int amount; @@ -122,21 +122,21 @@ public class ItemBedrockOreNew extends Item { this.amount = amount; } } - + public static BedrockOreOutput o(NTMMaterial mat, int amount) { return new BedrockOreOutput(mat, amount); } public static enum BedrockOreType { // primary sulfuric solvent radsolvent - LIGHT_METAL( 0xFFFFFF, 0x353535, "light", o(MAT_IRON, 9), o(MAT_COPPER, 9), o(MAT_TITANIUM, 9), o(MAT_ALUMINIUM, 5), o(MAT_ALUMINIUM, 4), o(MAT_CHLOROCALCITE, 5), o(MAT_LITHIUM, 5), o(MAT_SODIUM, 3), o(MAT_CHLOROCALCITE, 6), o(MAT_LITHIUM, 6), o(MAT_SODIUM, 6)), + LIGHT_METAL( 0xFFFFFF, 0x353535, "light", o(MAT_IRON, 9), o(MAT_COPPER, 9), o(MAT_TITANIUM, 6), o(MAT_BAUXITE, 9), o(MAT_CRYOLITE, 3), o(MAT_CHLOROCALCITE, 5), o(MAT_LITHIUM, 5), o(MAT_SODIUM, 3), o(MAT_CHLOROCALCITE, 6), o(MAT_LITHIUM, 6), o(MAT_SODIUM, 6)), HEAVY_METAL( 0x868686, 0x000000, "heavy", o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 2), o(MAT_GOLD, 2), o(MAT_BERYLLIUM, 3), o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 5), o(MAT_BISMUTH, 1), o(MAT_BISMUTH, 1), o(MAT_GOLD, 6)), RARE_EARTH( 0xE6E6B6, 0x1C1C00, "rare", o(MAT_COBALT, 5), o(MAT_RAREEARTH, 5),o(MAT_BORON, 5), o(MAT_LANTHANIUM, 3), o(MAT_NIOBIUM, 4), o(MAT_NEODYMIUM, 3), o(MAT_STRONTIUM, 3), o(MAT_ZIRCONIUM, 3), o(MAT_NIOBIUM, 5), o(MAT_NEODYMIUM, 5), o(MAT_STRONTIUM, 3)), ACTINIDE( 0xC1C7BD, 0x2B3227, "actinide", o(MAT_URANIUM, 4), o(MAT_THORIUM, 4), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_TECHNETIUM, 1), o(MAT_TECHNETIUM, 1), o(MAT_U238, 1)), NON_METAL( 0xAFAFAF, 0x0F0F0F, "nonmetal", o(MAT_COAL, 9), o(MAT_SULFUR, 9), o(MAT_LIGNITE, 9), o(MAT_KNO, 6), o(MAT_FLUORITE, 6), o(MAT_PHOSPHORUS, 5), o(MAT_FLUORITE, 6), o(MAT_SULFUR, 6), o(MAT_CHLOROCALCITE, 6), o(MAT_SILICON, 2), o(MAT_SILICON, 2)), CRYSTALLINE( 0xE2FFFA, 0x1E8A77, "crystal", o(MAT_REDSTONE, 9), o(MAT_CINNABAR, 4), o(MAT_SODALITE, 9), o(MAT_ASBESTOS, 6), o(MAT_DIAMOND, 3), o(MAT_CINNABAR, 3), o(MAT_ASBESTOS, 5), o(MAT_EMERALD, 3), o(MAT_BORAX, 3), o(MAT_MOLYSITE, 3), o(MAT_SODALITE, 9)); //sediment - + public int light; public int dark; public String suffix; @@ -144,7 +144,7 @@ public class ItemBedrockOreNew extends Item { public BedrockOreOutput byproductAcid1, byproductAcid2, byproductAcid3; public BedrockOreOutput byproductSolvent1, byproductSolvent2, byproductSolvent3; public BedrockOreOutput byproductRad1, byproductRad2, byproductRad3; - + private BedrockOreType(int light, int dark, String suffix, BedrockOreOutput p1, BedrockOreOutput p2, BedrockOreOutput bA1, BedrockOreOutput bA2, BedrockOreOutput bA3, BedrockOreOutput bS1, BedrockOreOutput bS2, BedrockOreOutput bS3, BedrockOreOutput bR1, BedrockOreOutput bR2, BedrockOreOutput bR3) { this.light = light; this.dark = dark; @@ -155,14 +155,14 @@ public class ItemBedrockOreNew extends Item { this.byproductRad1 = bR1; this.byproductRad2 = bR2; this.byproductRad3 = bR3; } } - + public static MaterialStack toFluid(BedrockOreOutput o, double amount) { if(o.mat != null && o.mat.smeltable == SmeltingBehavior.SMELTABLE) { return new MaterialStack(o.mat, (int) Math.ceil(MaterialShapes.FRAGMENT.q(o.amount) * amount)); } return null; } - + public static ItemStack extract(BedrockOreOutput o, double amount) { return new ItemStack(ModItems.bedrock_ore_fragment, Math.min((int) Math.ceil(o.amount * amount), 64), o.mat.id); } @@ -179,7 +179,7 @@ public class ItemBedrockOreNew extends Item { public static final int roasted = 0xCFCFCF; public static final int arc = 0xC3A2A2; public static final int washed = 0xDBE2CB; - + public static enum ProcessingTrait { ROASTED, ARC, @@ -189,7 +189,7 @@ public class ItemBedrockOreNew extends Item { SOLVENT, RAD } - + public static enum BedrockOreGrade { BASE(none, "base"), //from the slopper BASE_ROASTED(roasted, "base", ROASTED), //optional combination oven step, yields vitriol @@ -205,45 +205,45 @@ public class ItemBedrockOreNew extends Item { PRIMARY_FIRST(0xFFD3D4, "primary", CENTRIFUGED), //higher first material yield PRIMARY_SECOND(0xD3FFEB, "primary", CENTRIFUGED), //higher second material yield CRUMBS(none, "crumbs", CENTRIFUGED), //endpoint for primary, recycling - + SULFURIC_BYPRODUCT(none, "sulfuric", CENTRIFUGED, SULFURIC), //from centrifuging SULFURIC_ROASTED(roasted, "sulfuric", ROASTED, SULFURIC), //comboven again SULFURIC_ARC(arc, "sulfuric", ARC, SULFURIC), //alternate step SULFURIC_WASHED(washed, "sulfuric", WASHED, SULFURIC), //sulfuric endpoint - + SOLVENT_BYPRODUCT(none, "solvent", CENTRIFUGED, SOLVENT), //from centrifuging SOLVENT_ROASTED(roasted, "solvent", ROASTED, SOLVENT), //comboven again SOLVENT_ARC(arc, "solvent", ARC, SOLVENT), //alternate step SOLVENT_WASHED(washed, "solvent", WASHED, SOLVENT), //solvent endpoint - + RAD_BYPRODUCT(none, "rad", CENTRIFUGED, RAD), //from centrifuging RAD_ROASTED(roasted, "rad", ROASTED, RAD), //comboven again RAD_ARC(arc, "rad", ARC, RAD), //alternate step RAD_WASHED(washed, "rad", WASHED, RAD); //rad endpoint - + public int tint; public String prefix; public ProcessingTrait[] traits; - + private BedrockOreGrade(int tint, String prefix, ProcessingTrait... traits) { this.tint = tint; this.prefix = prefix; this.traits = traits; } } - + public static ItemStack make(BedrockOreGrade grade, BedrockOreType type) { return make(grade, type, 1); } - + public static ItemStack make(BedrockOreGrade grade, BedrockOreType type, int amount) { return new ItemStack(ModItems.bedrock_ore, amount, grade.ordinal() << 4 | type.ordinal()); } - + public BedrockOreGrade getGrade(int meta) { return EnumUtil.grabEnumSafely(BedrockOreGrade.class, meta >> 4); } - + public BedrockOreType getType(int meta) { return EnumUtil.grabEnumSafely(BedrockOreType.class, meta & 15); } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index efdcb62a9..7fe3b89e9 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -414,14 +414,14 @@ book_lore.bf_bomb_2.page.1=And yet I can't even blame them. Swirlmat makes no go book_lore.bf_bomb_2.page.2=Even worse, this thing is an energy source. The existence of our sample is a violation of ALARA: the lab was vacated when it arrived, and the only person brave enough (one Dr. Melfyn) donned a level A hazmat just to carry it 20 meters. book_lore.bf_bomb_2.page.3=The empirical data isn't better, as we're breaking the first law of thermodynamics with how much energy it radiates. Being anywhere near that thing - even behind a meter of lead - was terrifying. We sprinted out of the chamber upon conclusion of the spectroscopy book_lore.bf_bomb_2.page.4=and we got nothing new out of it. Those idiots in the science team, god, did not even waver after all that. Sitting through those "discussions" was horrible; that quack of a head researcher even rumored that the test ban would be lifted, that we could be -book_lore.bf_bomb_2.page.5=building bombs out of the shit in the coming weeks, who in their right mind would work on that? Hell, the one sane assistant (an Andrew) nicknamed it "balefire" - because burning to death on a funeral pyre would be painless by comparison. +book_lore.bf_bomb_2.page.5=building bombs out of the shit in the coming weeks, who in their right mind would work on that? Hell, the one sane assistant (an Andrew) nicknamed it "balefire" - because burning to death on a funeral pyre would be painless by comparison. book_lore.bf_bomb_3.name=Private Notes book_lore.bf_bomb_3.author=M. Porter book_lore.bf_bomb_3.page.0=The team and I have made some breakthroughs. Emphasis on the separation - isolating myself from the more devout has made working there so much more bearable. While we still have no idea about the actual properties of balefire (it's difficult to analyze book_lore.bf_bomb_3.page.1=a sample that fries your equipment) its interactions with other matter has proved fruitful. Notably, they synthesized a "gaseous" form: Andrew, of all people, informed me that it was really a colloid consisting of microscopic balefire particles, suspended in some book_lore.bf_bomb_3.page.2=noble gas. Each particle is enveloped by a positively-charged 'bubble' of ionized gas, preventing it from settling. Who could've guessed that fatal gamma radiation had a benefit? Not me. $ I'm choosing not to think about how they transformed the sample into -book_lore.bf_bomb_3.page.3=particulate, but I can't understate the utility of this gaseous balefire - it's made it much safer to experiment on. $ Speaking of safety, the head researcher (in an act of callous disregard) made a discovery that also nearly took his head off. +book_lore.bf_bomb_3.page.3=particulate, but I can't understate the utility of this gaseous balefire - it's made it much safer to experiment on. $ Speaking of safety, the head researcher (in an act of callous disregard) made a discovery that also nearly took his head off. book_lore.bf_bomb_3.page.4=He decided to get "dirty" by letting a cell of our new colloid interact directly with some very expensive antimatter: the resulting explosion turned the table it was on into a piece of radiation-bleached slag, carved a near-perfect hemisphere through book_lore.bf_bomb_3.page.5=the top, and gave the head a healthy dose of ARS. I guess we know how to make it explode now, but god, some people... @@ -1404,10 +1404,12 @@ hbm.key.toggleHUD=Toggle HUD hbm.key.trainInv=Train Inventory hbm.key.reload=Reload +hbmfluid.alumina=Alumina hbmfluid.amat=Antimatter hbmfluid.aromatics=Aromatic Hydrocarbons hbmfluid.aschrab=Antischrabidium hbmfluid.balefire=BF Rocket Fuel +hbmfluid.bauxite_solution=Bauxite Solution hbmfluid.biofuel=Biofuel hbmfluid.biogas=Biogas hbmfluid.bitumen=Bitumen @@ -1474,6 +1476,7 @@ hbmfluid.lightoil_ds=Desulfurized Light Oil hbmfluid.lightoil_vacuum=Vacuum Light Oil hbmfluid.lpg=LPG hbmfluid.lubricant=Engine Lubricant +hbmfluid.lye=Lye hbmfluid.mercury=Mercury hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Hot Mug Root Beer @@ -1526,6 +1529,7 @@ hbmfluid.smoke_leaded=Leaded Smoke hbmfluid.smoke_poison=Poison Smoke hbmfluid.sodium=Liquid Sodium hbmfluid.sodium_hot=Hot Liquid Sodium +hbmfluid.sodium_aluminate=Sodium Aluminate hbmfluid.solvent=Solvent hbmfluid.sourgas=Sour Gas hbmfluid.spentsteam=Low-Pressure Steam @@ -1571,6 +1575,7 @@ hbmmat.arsenic=Arsenic hbmmat.arsenicbronze=Arsenic Bronze hbmmat.asbestos=Asbestos hbmmat.bakelite=Bakelite +hbmmat.bauxite=Bauxite hbmmat.beryllium=Beryllium hbmmat.bismuth=Bismuth hbmmat.bismuthbronze=Bismuth Bronze @@ -1591,6 +1596,7 @@ hbmmat.cobalt=Cobalt hbmmat.cobalt60=Cobalt-60 hbmmat.coltan=Coltan hbmmat.copper=Copper +hbmmat.cryolite=Cryolite hbmmat.desh=Desh hbmmat.diamond=Diamond hbmmat.dineutronium=Dineutronium @@ -2494,6 +2500,7 @@ item.chopper_torso.name=Hunter Chopper Body item.chopper_wing.name=Hunter Chopper Wing item.chunk_ore.malachite.name=Malachite Chunk item.chunk_ore.rare.name=Rare Earth Ore Chunk +item.chunk_ore.cryolite.name=Cryolite Chunk item.cigarette.name=FFI-Brand Cigarette item.cinnebar.name=Cinnabar item.circuit.advanced.name=Military Grade Circuit Board diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/alumina.png b/src/main/resources/assets/hbm/textures/gui/fluids/alumina.png new file mode 100644 index 0000000000000000000000000000000000000000..8a72bc22d3b93ad473abb80c239c099165187318 GIT binary patch literal 538 zcmV+#0_FXQP)v1wg zDus@WoManfs9nzN>`HvUTwZUt8vxEZthIztN@0w_ITvx7rfj!cj(JW2h;MIiuTo09 z_ed#GN};vJdyn@%KIWWz!l6bRV~|oZO%wAxW37$JQcBV^MF>Gzma(|&I=uG_8GyAm z78qk_ng(kvkH;gj8DmgNal73jp63}I`ZLDF^K!W`&ocl*2&9zsegBU)<2a%NGl2IV zYb{!9ilSf~$EYCBbK16LnkJlc^nJg0&@>I>I5JJs(?f0BMyUW{Qpe*FDJ5EK&gV0_ zu4`V(l3!iN`FxIJtm~R#7^3sxJe^J$W7upqi;0`Eyc+hnnKdpV* ci?Cq70XRi10;h-%EC2ui07*qoM6N<$f~6(xx&QzG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/bauxite_solution.png b/src/main/resources/assets/hbm/textures/gui/fluids/bauxite_solution.png new file mode 100644 index 0000000000000000000000000000000000000000..e5746aafa03df387a372d1a27765e6cd0fe0d242 GIT binary patch literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhz0G|-o-;)FXPYL)x(f50Y%b#A)k4<)uiuLd1YyX=O`hQx`&n~zBOB4Uk z4E?`2{$-Wf|JmXHmnZ*Ulku+J`ct$0msZFBll?z5+WzbJzLTr@e`V_b4LSc8#QdKZ z^?!oT|EYoh=SM#%)O}oH@PBps{}~})+nkcG@7Lhz>uB5&cFgxVPIrzz_JIw kd|am|K0df1Y-i~Y_PrcDoria?n-B7wr>mdKI;Vst01Y+ih5!Hn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lye.png b/src/main/resources/assets/hbm/textures/gui/fluids/lye.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe302618e7ecc3c6cc62a03aca34ae993e1ad72 GIT binary patch literal 807 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lg}0X`wFFV9T-c60ILV-v1yZ+vjL_wIqNrza+TxxVo8wFMt8&;9#g)&D2! z{{O%B|Nq;~(-Lm&ZNIa>^ZKrq`-ghYZLEHHr0?3!=9_!kE^etixu)#d$;oFoRGnH| zetTcXue-}19qs>kW!{qMvt` z{r|M*|Nl$>|KI%o|MmYLhkoB%@&E1iC&wqgIY0CN zE=(yvpK=y>L>4nJ@ErzW#^d=bK!Oq_t`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI&T7 z_b_h*s@awr;hE;?sl~tnQV z0J5OE3=IrGvM;ZGvp97trwYh?aA0gfe6Ee-KQn|bVS&932C%D+c9Z- z9rBqy_3JKGX`dufUYtMJQ&g0iKi}?qVL^dv57}B=zRPF=QAT7bGE3MLWE?+RX zf8>@zma^(%4ym`?=0`bqZ8DqU^hiJB-o%#A>$jY|z`k_piJ5sGzxMtwG;G&+d-7-b hm4CVCLRWUZkzct@da|h@Gbnl(JYD@<);T3K0RR`MUfBQu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/sodium_aluminate.png b/src/main/resources/assets/hbm/textures/gui/fluids/sodium_aluminate.png new file mode 100644 index 0000000000000000000000000000000000000000..54bf773008d9048f3d29f49b1cf4cfdcea770b62 GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}N0G|-o|4Ur|&$0bG%lg-Ji$621{x5L+ztZdf_K2U;%>T`{`8~t(|9pr4 zi=6+@wfn!^!KY4Mt|LI1`X<$jAitcNCDF+0FtM&jPYR zAOVO$`e8Jhr3}E3n!wJ$0#spOWNg5=0Aeag2kQceNmGDq5MTnD!vt0tWN86pL3J4# z7=UD7Uj1fq>Q+t_kh#Ls#W6%9*w#OK5|bgvl7+`T6(rNc!>|92ztSfkG*v|L?;)NK z9SV0g#(ujSwI!i^(#2VFZvMSdB_X25zVZhH56G~&n_ukg@z7i9nQ8Fywo}R3S)tSA zUKa0?pPqelqr8H@gZaneTkqfQ`)k{mE9Uih_sN*AHF~cnbOiFP4!kDRzG>>0LoZy8 zZTdUyfUiiZ*IKvr3tc`g)X9+V|Nr-kNsr~*(#u9mr#{Tr?_!G=v1gVAx!=>(&t;uc GLK6VgY`yOQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/chunk_ore.cryolite.png b/src/main/resources/assets/hbm/textures/items/chunk_ore.cryolite.png new file mode 100644 index 0000000000000000000000000000000000000000..0684f64b076d05bf0cf37c9ed5b4d0f808e08e82 GIT binary patch literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk zJ)_@yn70AdY)g&sO!M^AV&DLBSQ(@kSs56CEH5CIhO$Af(O_f-i!%Y)hKx*L*F^!@ zne8lK@hl)41QLK4q#s73S<1l7z%YTGfd#0-z{uEuaRJ0skPg-b5R;|=*&x6KG=~YS zGRV>b$b#xJG%x_kzP$R);?%92DxhswJY5_^Ec~xdvds_)6lvXm^X8hLfkz~a)!GuW zv>kOsRCziMag}kKMMXqpY`qncEh&DfW0FFKvY#fGmX%r3;#Q?)oPH4z#(j#%I-aGM zZ$59FALgjEM7Stn$LDAFir?9O=bbI@XPwvaY3JXzKYTB4u%68i$+O#dr( zON-KvJv;ThwmI_fclVEF{Eq9oQ_LQ{I}+OToL4feZDE-Ab};q@_l zlcwjDt1=Fp;@J^BHU6B3)3v9MG9Sy|Y`=bevA*7#zYV|A4N6PjY-u$Sca2f~c}tpRDrP81dx5!NV#i=Xl(m@IEwTdyTw^$*$XrW1J+~rhSs0*}7Eo*t*ya z>kDO0ulN6WWX0A`&tk9k&DGh_vRRemT1dXCph$W!rbV zT+TP1-6Xo=PIPJ9{`t!D@?S2|d#StS6029ly|+rmthTW(fm544Pk!)m`PcuBFDv#Z zKJB)8sW3OBE+c>cx^F6zCvVp*$+EiZ^C9Oa|9kz$`h_JSK`Uq6VbwQV_y2xFe9O@p URkfR=tUz(?>FVdQ&MBb@0LnimK>z>% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_LYE.png b/src/main/resources/assets/hbm/textures/models/tank/tank_LYE.png new file mode 100644 index 0000000000000000000000000000000000000000..4603dc8e9f99c1cf53e962a902ec7278a83e3350 GIT binary patch literal 1182 zcmeAS@N?(olHy`uVBq!ia0vp^RY2Us!3-o@e0(nfDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheasfUeuE+a=|KDA-W5KW=8{ocd84X9>YYJ_K+r>7PJ2av3CK2N zWMU8i(osO1+0FtM&jPYRAOVO$`e8Jhr3^qHOkihV0je-CGB#jb05KJ$gLMJKq$xl) z2rvQ7VFIfRva|rQpt=kV3_!9kuYR*Qbt?xL$jrQ+E{-7;ac^fdmd!TcaoxPs^Y;J$ z4R-Cxv4nkZpD@hPQ^RzUhmnd_i@eiaM=Xky)}n@cdV$Yx)yTtNWoi$ z7J;Y?z3cn-`4sP575poGv+&iBn=IkHC;Tf;Ma9pau=?|}qS|X)&!!$Kda?3V`TOiu zIZdnCL}qt)cC_#Mb~e>XZkBm?eQnQVzgOOO3ZRnSh3{Vflb8D2vU_!`e}z}o;gz~q z|0XBeKYW*UU3lK3KbPLfbNkyoWIXeJ)v{A+J5mk=6`yphFF3e!=a&V=2cNbrKRfl` zHNIDKwue0CowE|8B;$Zn@kz^cs|UAYiq6gC+hHz#??APTanD5a(BM>I9m54TVtia= zfUY`mO!^;3yy%mKCgR6B+NBKK{waTbT)txECeCSV0>kX*^SDKsga_>3HJ`EV!jhd_ zS%&BDRIUgt-n%N)x>(%V(2Z~P#AoknUm0v{U2ulIB_nfHnBx8B*#f%uAR}TIbYA6o z^?dcO&yyqmMkXp11<2lAT*;$&Wyj7>#bQ%D8*Q$v+v(+QV}AZhgJDsO?yZ@X%dLEJ zT+i?%cT9VmWohzhD$BabdMYlb`LkB#IElB|>pHHw&#c&zm%A=-?`dC-g|laA`}Aaa z-r`Y=lDJ|PK4U`rn*CqpEES_BIWi=t#LQX6@7OV|_f@G}|N8Zn@!}av>V9f3b(jl` z^MsR9SF?a|e%)&Km9_U`Tt5ZuHWxo^+O<$ZIreM$BV#GhxlO8UAtu+q af44tsUw1CZIjb6Mw<&;$Tn{n`lt literal 0 HcmV?d00001