From 40bace5469c1182d805b10a9e2ee5f7ed6d6c13f Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 27 Jun 2022 13:00:44 +0800 Subject: tungsten and rocket fuel --- .../common/register/BotWerkstoffMaterialPool.java | 38 +- .../common/register/WerkstoffMaterialPool.java | 2294 ++++++++++---------- .../com/elisis/gtnhlanth/loader/BotRecipes.java | 187 +- 3 files changed, 1292 insertions(+), 1227 deletions(-) diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index e5e21a97d3..5439d373c9 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -11,13 +11,13 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; /* - * + * * Originally authored by botn365 under the MIT License. See BotdustriesLICENSE * */ @SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { - + public static final Werkstoff TungsticAcid = new Werkstoff( new short[]{0xf5, 0xf1, 0x16}, "Tungstic Acid", @@ -55,7 +55,7 @@ public class BotWerkstoffMaterialPool implements Runnable { // ); public static final Werkstoff AmmoniumNitrate = new Werkstoff( new short[]{0x81,0xcc,0x00}, - "Ammonium nitrate", + "Ammonium Nitrate", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -99,7 +99,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Ethylcarbamate = new Werkstoff( new short[]{0x0d,0xa9,0xb8}, "Ethyl Carbamate", - subscriptNumbers("CH3CH2OCNH2"), + subscriptNumbers("CH3CH2O2CNH2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -149,6 +149,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff AmmoniumDinitramide = new Werkstoff( new short[]{0x8a,0x0f,0xd1}, "Ammonium Dinitramide", + subscriptNumbers("H4N4O4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -167,6 +168,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff OXylene = new Werkstoff( new short[]{0x88,0x94,0xa8}, "O-Xylene", + subscriptNumbers("C8H10"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -176,6 +178,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff PhthalicAnhydride = new Werkstoff( new short[]{0x7c,0x99,0x42}, "Phthalic Anhydride", + subscriptNumbers("C8H4O3"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -184,7 +187,8 @@ public class BotWerkstoffMaterialPool implements Runnable { ); public static final Werkstoff VanadiumPentoxide = new Werkstoff( new short[]{0x69,0x69,0x69}, - " Vanadium Pentoxide", + "Vanadium Pentoxide", + subscriptNumbers("V2O5"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -194,6 +198,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff TertButylbenzene = new Werkstoff( new short[]{0,0,0}, "Tert-Butylbenzene", + subscriptNumbers("C10H14"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -203,6 +208,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff( new short[]{0xcc,0x86,0x5a}, "2-tert-butyl-anthraquinone", + subscriptNumbers("C18H16O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -212,6 +218,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff( new short[]{0xad,0x53,0x1a}, "2-tert-butyl-anthrahydroquinone", + subscriptNumbers("C18H17O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -221,6 +228,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff HydrogenPeroxide = new Werkstoff( new short[]{0xad,0x53,0x1a}, "Hydrogen Peroxide", + subscriptNumbers("H2O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), @@ -230,6 +238,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Hydrazine = new Werkstoff( new short[]{0xb5,0x07,0x07}, "hydrazine", + subscriptNumbers("N2H4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -239,6 +248,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff DimethylSulfate = new Werkstoff( new short[]{0xff,0xfb,0x00}, "Dimethyl Sulfate", + subscriptNumbers("(CH3O)2SO2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -248,6 +258,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Monomethylhydrazine = new Werkstoff( new short[]{0xff,0x61,0x00}, "Monomethylhydrazine", + subscriptNumbers("CH6N2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -257,6 +268,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Formaldehyde = new Werkstoff( new short[]{0x2e,0xd9,0x83}, "Formaldehyde", + subscriptNumbers("CH2O"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -266,6 +278,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff EthylAcetate = new Werkstoff( new short[]{0x0c,0xfb,0x32b}, "Ethyl Acetate", + subscriptNumbers("C4H8O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -275,6 +288,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Acetylhydrazine = new Werkstoff( new short[]{0xd1,0x5c,0x5c}, "Acetylhydrazine", + subscriptNumbers("C2H6N2O"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -284,6 +298,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff( new short[]{0x80,0x06,0x00}, "Unsymmetrical Dimethylhydrazine", + subscriptNumbers("H2NN(CH3)2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -311,6 +326,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Nitromethane = new Werkstoff( new short[]{0x87,0x7d,0x60}, "Nitromethane", + subscriptNumbers("CH3NO2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -320,6 +336,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff BoronTrioxide = new Werkstoff( new short[]{0xe3,0xa6,0xd3}, "Boron Trioxide", + subscriptNumbers("B2O3"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -329,6 +346,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff BoronTrifluoride = new Werkstoff( new short[]{0xd0,0xe0,0x3f}, "Boron Trifluoride", + subscriptNumbers("BF3"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -338,6 +356,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff( new short[]{0x57,0x69,0x2d}, "Nitronium Tetrafluoroborate", + subscriptNumbers("NO2BF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -347,6 +366,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Trinitramid = new Werkstoff( new short[]{0x28,0x2b,0x70}, "Trinitramid", + subscriptNumbers("N4O6"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -356,6 +376,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff( new short[]{0x28,0x2b,0x70}, "Ammonia Boronfluoride Solution", + subscriptNumbers("NH4BF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -365,6 +386,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff( new short[]{0xbe,0x6e,0xe0}, "Sodium Tetrafluoroborate", + subscriptNumbers("NaBF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -374,6 +396,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff SodiumFluoride = new Werkstoff( new short[]{0x9f,0x70,0xe6}, "Sodium Fluoride", + subscriptNumbers("NaF"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), @@ -383,6 +406,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff Tetrafluoroborate = new Werkstoff( new short[]{0x6a,0x53,0x8c}, "Tetrafluoroborate", + subscriptNumbers("BF4"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -392,7 +416,7 @@ public class BotWerkstoffMaterialPool implements Runnable { @Override public void run() { // TODO Auto-generated method stub - + } - + } diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index ba4a9a7fdf..93482d70ca 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1,1147 +1,1147 @@ -package com.elisis.gtnhlanth.common.register; - -import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; - -import java.util.Arrays; - -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.util.EnumUtils; -import com.github.bartimaeusnek.bartworks.util.Pair; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.enums.TextureSet; - -@SuppressWarnings({"unchecked"}) -public class WerkstoffMaterialPool implements Runnable { - - private static final int offsetID = 11_000; - private static final int offsetID2 = 11_100; - private static final int offsetID3 = 11_300; - - /* - * public static final Werkstoff __ = new Werkstoff( - new short[] {_, _, _}, - "__", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable(), - offsetID_, - TextureSet.SET_DULL - ); - */ - - //Misc. - public static final Werkstoff Hafnium = new Werkstoff( - new short[] {232, 224, 219}, - "Hafnium", - subscriptNumbers("Hf"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), //Perhaps use hafnia liquid in elemental hafnium synthesis - offsetID, - TextureSet.SET_DULL - ); - - public static final Werkstoff LowPurityHafnium = new Werkstoff( - new short[] {240, 223, 208}, - "Low-Purity Hafnium", - subscriptNumbers("??Hf??"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis - offsetID + 1, - TextureSet.SET_DULL - ); - - public static final Werkstoff Hafnia = new Werkstoff( - new short[] {247, 223, 203}, - "Hafnia", - subscriptNumbers("HfO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis - offsetID + 2, - TextureSet.SET_DULL - ); - - public static final Werkstoff HafniumTetrachloride = new Werkstoff( - new short[] {238, 247, 249}, - "Hafnium Tetrachloride", - subscriptNumbers("HfCl4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 3, - TextureSet.SET_DULL - ); - - public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff( - new short[] {238, 247, 249}, - "Hafnium Tetrachloride Solution", - subscriptNumbers("HfCl4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 4, - TextureSet.SET_FLUID - ); - - public static final Werkstoff HafniumIodide = new Werkstoff( - new short[] {216, 60, 1}, - "Hafnium Iodide", - subscriptNumbers("HfI4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 5, - TextureSet.SET_DULL - ); - - public static final Werkstoff HafniumRunoff = new Werkstoff( - new short[] {74, 65, 42}, //Literally the statistically ugliest colour - "Hafnium Runoff", - subscriptNumbers("??????"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 6, - TextureSet.SET_DULL - ); - - public static final Werkstoff Zirconium = new Werkstoff( - new short[] {225,230,225}, - "Zirconium", - subscriptNumbers("Zr"), - new Werkstoff.Stats().setBlastFurnace(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), - offsetID + 7, - TextureSet.SET_DULL - - ); - - public static final Werkstoff Zirconia = new Werkstoff( - new short[] {177,152,101}, - "Zirconia", - subscriptNumbers("ZrO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 8, - TextureSet.SET_DULL - - ); - - public static final Werkstoff ZirconiumTetrachloride = new Werkstoff( - new short[] {179, 164, 151}, - "Zirconium Tetrachloride", - subscriptNumbers("ZrCl4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 9, - TextureSet.SET_DULL - ); - - public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff( - new short[] {179, 164, 151}, - "Zirconium Tetrachloride Solution", - subscriptNumbers("ZrCl4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), //Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty material - offsetID + 10, - TextureSet.SET_FLUID - ); - - public static final Werkstoff HafniaZirconiaBlend = new Werkstoff( - new short[] {247, 223, 203}, - "Hafnia-Zirconia Blend", // Maybe Hafnon?? - subscriptNumbers("??HfZr??"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 11, - TextureSet.SET_DULL - ); - - public static final Werkstoff Iodine = new Werkstoff( - new short[] {171, 40, 175}, - "Iodine", - subscriptNumbers("I"), - new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(), - offsetID + 12, - TextureSet.SET_FLUID - ); - - - //Lanthanide Line - public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff( - new short[] {111, 78, 55}, - "Muddy Monazite Rare Earth Solution", - subscriptNumbers("??LaNdZr??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 14, - TextureSet.SET_FLUID - ); - - public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff( - new short[] {160, 120, 90}, - "Diluted Monazite Rare Earth Mud", - subscriptNumbers("??LaNdHf??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 15, - TextureSet.SET_FLUID - ); - - public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff( - new short[] {237, 201, 175}, - "Diluted Monazite Sulfate", - subscriptNumbers("??LaNd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 16, - TextureSet.SET_FLUID - ); - - public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff( - new short[] {250, 223, 173}, - "Nitrogenated Monazite Rare Earth Concentrate", - subscriptNumbers("??LaNd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 17, - TextureSet.SET_FLUID - ); - - public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff( - new short[] {244, 202, 22}, - "Nitric Monazite Leached Concentrate", - subscriptNumbers("??LaNd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 18, - TextureSet.SET_FLUID - ); - - public static final Werkstoff MonaziteSulfate = new Werkstoff( - new short[] {152, 118, 84}, - "Monazite Sulfate", - subscriptNumbers("??CeEu??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 19, - TextureSet.SET_DULL - ); - - public static final Werkstoff AcidicMonazitePowder = new Werkstoff( - new short[] {50, 23, 77}, - "Acidic Monazite Powder", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 20, - TextureSet.SET_DULL - ); - - public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff( - new short[] {72, 60, 50}, - "Monazite Rare Earth Filtrate", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 21, - TextureSet.SET_DULL - ); - - public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff( - new short[] {50, 23, 77}, - "Neutralized Monazite Rare Earth Filtrate", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 22, - TextureSet.SET_DULL - ); - - public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff( - new short[] {193, 154, 107}, - "Monazite Rare Earth Hydroxide Concentrate", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 23, - TextureSet.SET_DULL - ); - - public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff( - new short[] {250, 214, 165}, - "Dried Monazite Rare Earth Concentrate", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 24, - TextureSet.SET_DULL - ); - - public static final Werkstoff CeriumDioxide = new Werkstoff( - new short[] {255, 255, 255}, - "Cerium Dioxide", - subscriptNumbers("CeO2"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust().enforceUnification(), - offsetID + 25, - TextureSet.SET_DULL - ); - - public static final Werkstoff CeriumChloride = new Werkstoff( - new short[] {255, 255, 255}, - "Cerium Chloride", - subscriptNumbers("CeCl3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 26, - TextureSet.SET_DULL - ); - - public static final Werkstoff CeriumOxalate = new Werkstoff( - new short[] {255, 255, 224}, - "Cerium Oxalate", - subscriptNumbers("Ce2(C2O4)3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 27, - TextureSet.SET_DULL - ); - - public static final Werkstoff CeriumIIIOxide = new Werkstoff( - new short[] {255, 255, 102}, - "Cerium (III) Oxide", - subscriptNumbers("Ce2O3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 28, - TextureSet.SET_DULL, - Arrays.asList(Materials.Cerium, Materials.Oxygen), - new Pair<>(Materials.Cerium, 2), - new Pair<>(Materials.Oxygen, 3) - ); - - public static final Werkstoff CeriumRichMixture = new Werkstoff( - new short[] {244, 164, 96}, - "Cerium-Rich Mixture", - subscriptNumbers("??Ce??"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 29, - TextureSet.SET_DULL - ); - - public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff( - new short[] {250, 214, 165}, - "Cooled Monazite Rare Earth Concentrate", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 30, - TextureSet.SET_DULL - ); - - public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff( - new short[] {250, 214, 165}, - "MonaziteRarer Earth Sediment", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 31, - TextureSet.SET_DULL - ); - - public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff( - new short[] {250, 214, 165}, - "Heterogenous Halogenic Monazite Rare Earth Mixture", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 32, - TextureSet.SET_DULL - ); - - public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff( - new short[] {250, 214, 165}, - "Saturated Monazite Rare Earth", - subscriptNumbers("????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 33, - TextureSet.SET_DULL - ); - - public static final Werkstoff SamaricResidue = new Werkstoff( - new short[] {248, 243, 231}, - "Samaric Residue", - subscriptNumbers("??SmGd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 34, - TextureSet.SET_DULL - ); - - public static final Werkstoff MonaziteResidue = new Werkstoff( - new short[] {64, 69, 62}, - "Monazite Residue", - subscriptNumbers("??ZrHfTh??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 35, - TextureSet.SET_DULL - ); - - public static final Werkstoff AmmoniumNitrate = new Werkstoff( - new short[] {255, 255, 255}, - "Ammonium Nitrate Solution", - subscriptNumbers("NH4NO3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 36, - TextureSet.SET_FLUID - ); - - public static final Werkstoff ThoriumPhosphateCake = new Werkstoff( - new short[] {188, 143, 143}, - "Thorium-Phosphate Cake", - subscriptNumbers("??ThP??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 37, - TextureSet.SET_DULL - ); - - public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff( - new short[] {217, 144, 88}, - "Thorium-Phosphate Concentrate", - subscriptNumbers("??ThP??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 38, - TextureSet.SET_DULL - ); - - public static final Werkstoff UraniumFiltrate = new Werkstoff( - new short[] {190, 240, 94}, - "UraniumFiltrate", - subscriptNumbers("??U??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 39, - TextureSet.SET_DULL - ); - - public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff( - new short[] {217, 120, 88}, - "Neutralized Uranium Filtrate", - subscriptNumbers("??U??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 40, - TextureSet.SET_DULL - ); - - public static final Werkstoff SeaweedAsh = new Werkstoff( - new short[] {70, 75, 71}, - "Seaweed Ash", - new Werkstoff.Stats(), - Werkstoff.Types.BIOLOGICAL, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 41, - TextureSet.SET_DULL - ); - - public static final Werkstoff SeaweedConcentrate = new Werkstoff( - new short[] {70, 100, 71}, - "Seaweed Concentrate", - subscriptNumbers("??I??"), - new Werkstoff.Stats(), - Werkstoff.Types.BIOLOGICAL, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 42, - TextureSet.SET_FLUID - ); - - public static final Werkstoff PotassiumPermanganate = new Werkstoff( - new short[] {165, 50, 138}, - "Potassium Permanganate", - subscriptNumbers("KMnO4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 43, - TextureSet.SET_DULL - ); - - public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff( - new short[] {165, 50, 138}, - "Potassium Permanganate Solution", - subscriptNumbers("KMnO4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 44, - TextureSet.SET_FLUID - ); - - - public static final Werkstoff SeaweedByproducts = new Werkstoff( - new short[] {125, 50, 138}, - "Seaweed Byproducts", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 45, - TextureSet.SET_FLUID - ); - - public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff( - new short[] {125, 50, 138}, - "Nitric-Leached Monazite Mixture", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 46, - TextureSet.SET_FLUID - ); - - public static final Werkstoff EuropiumOxide = new Werkstoff( - new short[] {255, 255, 255}, - "Europium Oxide", - subscriptNumbers("EuO"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 47, - TextureSet.SET_DULL - ); - - public static final Werkstoff EuropiumSulfide = new Werkstoff( - new short[] {5, 0, 5}, - "Europium Sulfide", - subscriptNumbers("EuS"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 48, - TextureSet.SET_DULL - ); - - public static final Werkstoff UnknownBlend = new Werkstoff( - new short[] {0, 0, 5}, - "UnknownBlend", - subscriptNumbers("?????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 49, - TextureSet.SET_DULL - ); - - - - - // TODO - - - - - // BASTNASITE - public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, - "Muddy Bastnasite Rare Earth Solution", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2, - TextureSet.SET_FLUID - ); - /* - public static final Werkstoff FluorosilicicAcid = new Werkstoff( - new short[] {205, 133, 63}, - "Hexafluorosilicic Acid", - subscriptNumbers("H2SiF6"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 1, - TextureSet.SET_FLUID - ); - */ - public static final Werkstoff SodiumFluorosilicate = new Werkstoff( - new short[] {205, 133, 63}, - "Sodiumfluorosilicate", - subscriptNumbers("Na2SiF6"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 2, - TextureSet.SET_FLUID - ); - - public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, - "Steam-Cracked Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 3, - TextureSet.SET_FLUID - ); - - public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Conditioned Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 4, - TextureSet.SET_FLUID - ); - - public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Diluted Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 5, - TextureSet.SET_FLUID - ); - - public static final Werkstoff FilteredBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Filtered Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 6, - TextureSet.SET_FLUID - ); - - public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff( - new short[] {205, 133, 63}, - "Bastnasite Rare Earth Oxides", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 7, - TextureSet.SET_DULL - ); - - public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff( - new short[] {205, 133, 63}, - "Acid-Leached Bastnasite Rare Earth Oxides", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 8, - TextureSet.SET_DULL - ); - - public static final Werkstoff Gangue = new Werkstoff( - new short[] {0, 0, 0}, - "Gangue", - subscriptNumbers("Useless..."), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 9, - TextureSet.SET_DULL - ); - //TODO: Deal with colouring - public static final Werkstoff RoastedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 45}, - "Roasted Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 10, - TextureSet.SET_DULL - ); - - public static final Werkstoff WetRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Wet Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 11, - TextureSet.SET_DULL - ); - - public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Cerium-Oxidised Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 12, - TextureSet.SET_DULL - ); - - public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Bastnasite Rarer Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 13, - TextureSet.SET_DULL - ); - - public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 90, 60}, - "Nitrogenated Bastnasite Rarer Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 14, - TextureSet.SET_DULL - ); - - public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {170, 90, 60}, - "Bastnasite Rarer Earth Oxide Suspension", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 15, - TextureSet.SET_DULL - ); - - public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, - "Samaric Rare Earth Concentrate", - subscriptNumbers("??SmHoTb??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 16, - TextureSet.SET_DULL - ); - - public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, - "Neodymium Rare Earth Concentrate", - subscriptNumbers("??LaNdPr??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 17, - TextureSet.SET_DULL - ); - - public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff( - new short[] {170, 90, 60}, - "Fluorinated Neodymium Rare Earths", - subscriptNumbers("??LaNdPr??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 18, - TextureSet.SET_DULL - ); - - public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff( - new short[] {82, 112, 102}, - "Praseodymium Tetrafluoride", - subscriptNumbers("PrF4"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 19, - TextureSet.SET_DULL, - Arrays.asList(Materials.Praseodymium, Materials.Fluorine), - new Pair<>(Materials.Praseodymium, 1), - new Pair<>(Materials.Fluorine, 4) - ); - - public static final Werkstoff RareEarthTrifluorides = new Werkstoff( - new short[] {82, 112, 102}, - "Rare Earth Trifluorides", - subscriptNumbers("??LaNd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 20, - TextureSet.SET_DULL - ); - - public static final Werkstoff LanthaniumChloride = new Werkstoff( - new short[] {82, 112, 102}, - "Lanthanium Chloride", - subscriptNumbers("LaCl3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 21, - TextureSet.SET_DULL, - Arrays.asList(Materials.Lanthanum, Materials.Chlorine), - new Pair<>(Materials.Lanthanum, 1), - new Pair<>(Materials.Chlorine, 3) - ); - - public static final Werkstoff NeodymiumOxide = new Werkstoff( - new short[] {82, 112, 102}, - "Neodymium Oxide", - subscriptNumbers("Nd2O3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 22, - TextureSet.SET_DULL, - Arrays.asList(Materials.Neodymium, Materials.Oxygen), - new Pair<>(Materials.Neodymium, 2), - new Pair<>(Materials.Oxygen, 3) - ); - - public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff( - new short[] {255, 182, 193}, - "Fluorinated Samaric Concentrate", - subscriptNumbers("??SmHo??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 23, - TextureSet.SET_DULL - ); - - public static final Werkstoff CalciumFluoride = new Werkstoff( - new short[] {255, 250, 250}, - "Calcium Fluoride", - subscriptNumbers("CaF2"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(), - offsetID2 + 24, - TextureSet.SET_DULL, - Arrays.asList(Materials.Calcium, Materials.Fluorine), - new Pair<>(Materials.Calcium, 1), - new Pair<>(Materials.Fluorine, 2) - ); - - public static final Werkstoff SamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, - "Samarium-Terbium Mixture", - subscriptNumbers("??SmTb??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 25, - TextureSet.SET_DULL - ); - - public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, - "Nitrogenated Samarium-Terbium Mixture", - subscriptNumbers("??SmTb??NH4NO3"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 26, - TextureSet.SET_DULL - ); - - public static final Werkstoff TerbiumNitrate = new Werkstoff( - new short[] {167, 252, 0}, - "Terbium Nitrate", - subscriptNumbers("TbNO3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 27, - TextureSet.SET_DULL, - Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen), - new Pair<>(Materials.Terbium, 1), - new Pair<>(Materials.Nitrogen, 1), - new Pair<>(Materials.Oxygen, 3) - ); - - public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - new short[] {255, 200, 230}, - "Samarium Ore Concentrate", - subscriptNumbers("??Sm??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 28, - TextureSet.SET_DULL - ); - - public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff( - new short[] {255, 170, 220}, - "Dephosphated Samarium Concentrate", - subscriptNumbers("??Sm??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 29, - TextureSet.SET_DULL - ); - - - - // Weird/Exciting Chemicals - public static final Werkstoff Tetrahydrofuran = new Werkstoff( - new short[] {222, 165, 164}, - "Tetrahydrofuran", - subscriptNumbers("(CH2)4O"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3, - TextureSet.SET_FLUID - ); - - //1,4-Butanediol - public static final Werkstoff Butanediol = new Werkstoff( - new short[] {185, 78, 72}, - "1,4-Butanediol", - subscriptNumbers("HO(CH2)4OH"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 1, - TextureSet.SET_FLUID - ); - - //Acidicised 1,4-Butanediol - public static final Werkstoff AcidicButanediol = new Werkstoff( - new short[] {255, 239, 213}, - "Acidicised 1,4-Butanediol", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 2, - TextureSet.SET_FLUID - ); - - //Tellurium-Molybdenum-Oxide Catalyst - public static final Werkstoff MoTeOCatalyst= new Werkstoff( - new short[] {238, 131, 238}, - "Tellurium-Molybdenum-Oxide Catalyst", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 3, - TextureSet.SET_DULL - ); - - //Tellurium Oxide - public static final Werkstoff TelluriumIVOxide = new Werkstoff( - new short[] {229, 199, 187}, - "Tellurium (IV) Oxide", - subscriptNumbers("TeO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 4, - TextureSet.SET_DULL - ); - - public static final Werkstoff MolybdenumIVOxide = new Werkstoff( - new short[] {52, 53, 57}, - "Molybdenum (IV) Oxide", - subscriptNumbers("MoO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 5, - TextureSet.SET_DULL - ); - - public static final Werkstoff Polytetrahydrofuran = new Werkstoff( - new short[] {192, 128, 129}, - "Polytetrahydrofuran", - subscriptNumbers("(C4H8O)OH2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), - offsetID3 + 6, - TextureSet.SET_DULL - ); - - public static final Werkstoff TungstophosphoricAcid = new Werkstoff( - new short[] {223, 255, 0}, - "Tungstophosphoric Acid", - subscriptNumbers("H3PW12O40"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 7, - TextureSet.SET_FLUID - ); - - public static final Werkstoff TolueneDiisocyanate = new Werkstoff( - new short[] {255, 255, 102}, - "Toluene Diisocyanate", - subscriptNumbers("CH3C6H3(NCO)2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 8, - TextureSet.SET_FLUID - ); - - public static final Werkstoff Dinitrotoluene = new Werkstoff( - new short[] {216, 191, 216}, - "Dinitrotoluene", - subscriptNumbers("C7H6N2O4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 9, - TextureSet.SET_FLUID - ); - - public static final Werkstoff Diaminotoluene = new Werkstoff( - new short[] {227, 218, 201}, - "Diaminotoluene", - subscriptNumbers("C6H3(NH2)2CH3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 10, - TextureSet.SET_FLUID - ); - - public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff( - new short[] {255, 255, 255}, - "Toluene Tetramethyl Diisocyanate", - subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 11, - TextureSet.SET_FLUID - ); - - public static final Werkstoff PTMEGElastomer = new Werkstoff( - new short[] {248, 248, 255}, - "PTMEG Elastomer", - new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMolten() - .addMetalItems() - , - offsetID3 + 12, - TextureSet.SET_DULL - ); - - - public static final Werkstoff MagnesiumPeroxide = new Werkstoff( - new short[] {255, 250, 205}, - "Magnesium Peroxide", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 13, - TextureSet.SET_METALLIC - ); - - public static final Werkstoff PotassiumChlorate = new Werkstoff( - new short[] {240, 255, 255}, - "Potassium Chlorate", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), - offsetID3 + 14, - TextureSet.SET_DULL - ); - - public static final Werkstoff MARM247 = new Werkstoff( - new short[] {255, 133, 145}, - "MAR-M247", - new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMolten() - .addMetalItems() - , - offsetID3 + 15, - TextureSet.SET_METALLIC - ); - - public static final Werkstoff DilutedAcetone = new Werkstoff( - new short[] {254, 254, 250}, - "Diluted Acetone", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 16, - TextureSet.SET_FLUID - ); - - - public static void runInit() { - - addSubTags(); - - } - - private static void addSubTags() { - - //WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); - - } - - - - - @Override - public void run() { - - } - - -} +package com.elisis.gtnhlanth.common.register; + +import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; + +import java.util.Arrays; + +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.github.bartimaeusnek.bartworks.util.EnumUtils; +import com.github.bartimaeusnek.bartworks.util.Pair; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TextureSet; + +@SuppressWarnings({"unchecked"}) +public class WerkstoffMaterialPool implements Runnable { + + private static final int offsetID = 11_000; + private static final int offsetID2 = 11_100; + private static final int offsetID3 = 11_300; + + /* + * public static final Werkstoff __ = new Werkstoff( + new short[] {_, _, _}, + "__", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable(), + offsetID_, + TextureSet.SET_DULL + ); + */ + + //Misc. + public static final Werkstoff Hafnium = new Werkstoff( + new short[] {232, 224, 219}, + "Hafnium", + subscriptNumbers("Hf"), + new Werkstoff.Stats(), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), //Perhaps use hafnia liquid in elemental hafnium synthesis + offsetID, + TextureSet.SET_DULL + ); + + public static final Werkstoff LowPurityHafnium = new Werkstoff( + new short[] {240, 223, 208}, + "Low-Purity Hafnium", + subscriptNumbers("??Hf??"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis + offsetID + 1, + TextureSet.SET_DULL + ); + + public static final Werkstoff Hafnia = new Werkstoff( + new short[] {247, 223, 203}, + "Hafnia", + subscriptNumbers("HfO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis + offsetID + 2, + TextureSet.SET_DULL + ); + + public static final Werkstoff HafniumTetrachloride = new Werkstoff( + new short[] {238, 247, 249}, + "Hafnium Tetrachloride", + subscriptNumbers("HfCl4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 3, + TextureSet.SET_DULL + ); + + public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff( + new short[] {238, 247, 249}, + "Hafnium Tetrachloride Solution", + subscriptNumbers("HfCl4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 4, + TextureSet.SET_FLUID + ); + + public static final Werkstoff HafniumIodide = new Werkstoff( + new short[] {216, 60, 1}, + "Hafnium Iodide", + subscriptNumbers("HfI4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 5, + TextureSet.SET_DULL + ); + + public static final Werkstoff HafniumRunoff = new Werkstoff( + new short[] {74, 65, 42}, //Literally the statistically ugliest colour + "Hafnium Runoff", + subscriptNumbers("??????"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 6, + TextureSet.SET_DULL + ); + + public static final Werkstoff Zirconium = new Werkstoff( + new short[] {225,230,225}, + "Zirconium", + subscriptNumbers("Zr"), + new Werkstoff.Stats().setBlastFurnace(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), + offsetID + 7, + TextureSet.SET_DULL + + ); + + public static final Werkstoff Zirconia = new Werkstoff( + new short[] {177,152,101}, + "Zirconia", + subscriptNumbers("ZrO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 8, + TextureSet.SET_DULL + + ); + + public static final Werkstoff ZirconiumTetrachloride = new Werkstoff( + new short[] {179, 164, 151}, + "Zirconium Tetrachloride", + subscriptNumbers("ZrCl4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 9, + TextureSet.SET_DULL + ); + + public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff( + new short[] {179, 164, 151}, + "Zirconium Tetrachloride Solution", + subscriptNumbers("ZrCl4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), //Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty material + offsetID + 10, + TextureSet.SET_FLUID + ); + + public static final Werkstoff HafniaZirconiaBlend = new Werkstoff( + new short[] {247, 223, 203}, + "Hafnia-Zirconia Blend", // Maybe Hafnon?? + subscriptNumbers("??HfZr??"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 11, + TextureSet.SET_DULL + ); + + public static final Werkstoff Iodine = new Werkstoff( + new short[] {171, 40, 175}, + "Iodine", + subscriptNumbers("I"), + new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(), + offsetID + 12, + TextureSet.SET_FLUID + ); + + + //Lanthanide Line + public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff( + new short[] {111, 78, 55}, + "Muddy Monazite Rare Earth Solution", + subscriptNumbers("??LaNdZr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 14, + TextureSet.SET_FLUID + ); + + public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff( + new short[] {160, 120, 90}, + "Diluted Monazite Rare Earth Mud", + subscriptNumbers("??LaNdHf??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 15, + TextureSet.SET_FLUID + ); + + public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff( + new short[] {237, 201, 175}, + "Diluted Monazite Sulfate", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 16, + TextureSet.SET_FLUID + ); + + public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff( + new short[] {250, 223, 173}, + "Nitrogenated Monazite Rare Earth Concentrate", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 17, + TextureSet.SET_FLUID + ); + + public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff( + new short[] {244, 202, 22}, + "Nitric Monazite Leached Concentrate", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 18, + TextureSet.SET_FLUID + ); + + public static final Werkstoff MonaziteSulfate = new Werkstoff( + new short[] {152, 118, 84}, + "Monazite Sulfate", + subscriptNumbers("??CeEu??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 19, + TextureSet.SET_DULL + ); + + public static final Werkstoff AcidicMonazitePowder = new Werkstoff( + new short[] {50, 23, 77}, + "Acidic Monazite Powder", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 20, + TextureSet.SET_DULL + ); + + public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff( + new short[] {72, 60, 50}, + "Monazite Rare Earth Filtrate", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 21, + TextureSet.SET_DULL + ); + + public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff( + new short[] {50, 23, 77}, + "Neutralized Monazite Rare Earth Filtrate", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 22, + TextureSet.SET_DULL + ); + + public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff( + new short[] {193, 154, 107}, + "Monazite Rare Earth Hydroxide Concentrate", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 23, + TextureSet.SET_DULL + ); + + public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff( + new short[] {250, 214, 165}, + "Dried Monazite Rare Earth Concentrate", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 24, + TextureSet.SET_DULL + ); + + public static final Werkstoff CeriumDioxide = new Werkstoff( + new short[] {255, 255, 255}, + "Cerium Dioxide", + subscriptNumbers("CeO2"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust().enforceUnification(), + offsetID + 25, + TextureSet.SET_DULL + ); + + public static final Werkstoff CeriumChloride = new Werkstoff( + new short[] {255, 255, 255}, + "Cerium Chloride", + subscriptNumbers("CeCl3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 26, + TextureSet.SET_DULL + ); + + public static final Werkstoff CeriumOxalate = new Werkstoff( + new short[] {255, 255, 224}, + "Cerium Oxalate", + subscriptNumbers("Ce2(C2O4)3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 27, + TextureSet.SET_DULL + ); + + public static final Werkstoff CeriumIIIOxide = new Werkstoff( + new short[] {255, 255, 102}, + "Cerium (III) Oxide", + subscriptNumbers("Ce2O3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 28, + TextureSet.SET_DULL, + Arrays.asList(Materials.Cerium, Materials.Oxygen), + new Pair<>(Materials.Cerium, 2), + new Pair<>(Materials.Oxygen, 3) + ); + + public static final Werkstoff CeriumRichMixture = new Werkstoff( + new short[] {244, 164, 96}, + "Cerium-Rich Mixture", + subscriptNumbers("??Ce??"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 29, + TextureSet.SET_DULL + ); + + public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff( + new short[] {250, 214, 165}, + "Cooled Monazite Rare Earth Concentrate", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 30, + TextureSet.SET_DULL + ); + + public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff( + new short[] {250, 214, 165}, + "MonaziteRarer Earth Sediment", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 31, + TextureSet.SET_DULL + ); + + public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff( + new short[] {250, 214, 165}, + "Heterogenous Halogenic Monazite Rare Earth Mixture", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 32, + TextureSet.SET_DULL + ); + + public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff( + new short[] {250, 214, 165}, + "Saturated Monazite Rare Earth", + subscriptNumbers("????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 33, + TextureSet.SET_DULL + ); + + public static final Werkstoff SamaricResidue = new Werkstoff( + new short[] {248, 243, 231}, + "Samaric Residue", + subscriptNumbers("??SmGd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 34, + TextureSet.SET_DULL + ); + + public static final Werkstoff MonaziteResidue = new Werkstoff( + new short[] {64, 69, 62}, + "Monazite Residue", + subscriptNumbers("??ZrHfTh??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 35, + TextureSet.SET_DULL + ); + + public static final Werkstoff AmmoniumNitrate = new Werkstoff( + new short[] {255, 255, 255}, + "Ammonium Nitrate Solution", + subscriptNumbers("NH4NO3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 36, + TextureSet.SET_FLUID + ); + + public static final Werkstoff ThoriumPhosphateCake = new Werkstoff( + new short[] {188, 143, 143}, + "Thorium-Phosphate Cake", + subscriptNumbers("??ThP??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 37, + TextureSet.SET_DULL + ); + + public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff( + new short[] {217, 144, 88}, + "Thorium-Phosphate Concentrate", + subscriptNumbers("??ThP??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 38, + TextureSet.SET_DULL + ); + + public static final Werkstoff UraniumFiltrate = new Werkstoff( + new short[] {190, 240, 94}, + "UraniumFiltrate", + subscriptNumbers("??U??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 39, + TextureSet.SET_DULL + ); + + public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff( + new short[] {217, 120, 88}, + "Neutralized Uranium Filtrate", + subscriptNumbers("??U??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 40, + TextureSet.SET_DULL + ); + + public static final Werkstoff SeaweedAsh = new Werkstoff( + new short[] {70, 75, 71}, + "Seaweed Ash", + new Werkstoff.Stats(), + Werkstoff.Types.BIOLOGICAL, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 41, + TextureSet.SET_DULL + ); + + public static final Werkstoff SeaweedConcentrate = new Werkstoff( + new short[] {70, 100, 71}, + "Seaweed Concentrate", + subscriptNumbers("??I??"), + new Werkstoff.Stats(), + Werkstoff.Types.BIOLOGICAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 42, + TextureSet.SET_FLUID + ); + + public static final Werkstoff PotassiumPermanganate = new Werkstoff( + new short[] {165, 50, 138}, + "Potassium Permanganate", + subscriptNumbers("KMnO4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 43, + TextureSet.SET_DULL + ); + + public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff( + new short[] {165, 50, 138}, + "Potassium Permanganate Solution", + subscriptNumbers("KMnO4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 44, + TextureSet.SET_FLUID + ); + + + public static final Werkstoff SeaweedByproducts = new Werkstoff( + new short[] {125, 50, 138}, + "Seaweed Byproducts", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 45, + TextureSet.SET_FLUID + ); + + public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff( + new short[] {125, 50, 138}, + "Nitric-Leached Monazite Mixture", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 46, + TextureSet.SET_FLUID + ); + + public static final Werkstoff EuropiumOxide = new Werkstoff( + new short[] {255, 255, 255}, + "Europium Oxide", + subscriptNumbers("EuO"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 47, + TextureSet.SET_DULL + ); + + public static final Werkstoff EuropiumSulfide = new Werkstoff( + new short[] {5, 0, 5}, + "Europium Sulfide", + subscriptNumbers("EuS"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 48, + TextureSet.SET_DULL + ); + + public static final Werkstoff UnknownBlend = new Werkstoff( + new short[] {0, 0, 5}, + "UnknownBlend", + subscriptNumbers("?????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 49, + TextureSet.SET_DULL + ); + + + + + // TODO + + + + + // BASTNASITE + public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff( + new short[] {205, 133, 63}, + "Muddy Bastnasite Rare Earth Solution", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2, + TextureSet.SET_FLUID + ); + /* + public static final Werkstoff FluorosilicicAcid = new Werkstoff( + new short[] {205, 133, 63}, + "Hexafluorosilicic Acid", + subscriptNumbers("H2SiF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 1, + TextureSet.SET_FLUID + ); + */ + public static final Werkstoff SodiumFluorosilicate = new Werkstoff( + new short[] {205, 133, 63}, + "Sodiumfluorosilicate", + subscriptNumbers("Na2SiF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 2, + TextureSet.SET_FLUID + ); + + public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff( + new short[] {205, 133, 63}, + "Steam-Cracked Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 3, + TextureSet.SET_FLUID + ); + + public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff( + new short[] {205, 133, 63}, + "Conditioned Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 4, + TextureSet.SET_FLUID + ); + + public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff( + new short[] {205, 133, 63}, + "Diluted Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 5, + TextureSet.SET_FLUID + ); + + public static final Werkstoff FilteredBastnasiteMud = new Werkstoff( + new short[] {205, 133, 63}, + "Filtered Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 6, + TextureSet.SET_FLUID + ); + + public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff( + new short[] {205, 133, 63}, + "Bastnasite Rare Earth Oxides", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 7, + TextureSet.SET_DULL + ); + + public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff( + new short[] {205, 133, 63}, + "Acid-Leached Bastnasite Rare Earth Oxides", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 8, + TextureSet.SET_DULL + ); + + public static final Werkstoff Gangue = new Werkstoff( + new short[] {0, 0, 0}, + "Gangue", + subscriptNumbers("Useless..."), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 9, + TextureSet.SET_DULL + ); + //TODO: Deal with colouring + public static final Werkstoff RoastedRareEarthOxides = new Werkstoff( + new short[] {160, 82, 45}, + "Roasted Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 10, + TextureSet.SET_DULL + ); + + public static final Werkstoff WetRareEarthOxides = new Werkstoff( + new short[] {160, 82, 49}, + "Wet Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 11, + TextureSet.SET_DULL + ); + + public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff( + new short[] {160, 82, 49}, + "Cerium-Oxidised Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 12, + TextureSet.SET_DULL + ); + + public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff( + new short[] {160, 82, 49}, + "Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 13, + TextureSet.SET_DULL + ); + + public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff( + new short[] {160, 90, 60}, + "Nitrogenated Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 14, + TextureSet.SET_DULL + ); + + public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff( + new short[] {170, 90, 60}, + "Bastnasite Rarer Earth Oxide Suspension", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 15, + TextureSet.SET_DULL + ); + + public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff( + new short[] {170, 90, 60}, + "Samaric Rare Earth Concentrate", + subscriptNumbers("??SmHoTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 16, + TextureSet.SET_DULL + ); + + public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff( + new short[] {170, 90, 60}, + "Neodymium Rare Earth Concentrate", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 17, + TextureSet.SET_DULL + ); + + public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff( + new short[] {170, 90, 60}, + "Fluorinated Neodymium Rare Earths", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 18, + TextureSet.SET_DULL + ); + + public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff( + new short[] {82, 112, 102}, + "Praseodymium Tetrafluoride", + subscriptNumbers("PrF4"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 19, + TextureSet.SET_DULL, + Arrays.asList(Materials.Praseodymium, Materials.Fluorine), + new Pair<>(Materials.Praseodymium, 1), + new Pair<>(Materials.Fluorine, 4) + ); + + public static final Werkstoff RareEarthTrifluorides = new Werkstoff( + new short[] {82, 112, 102}, + "Rare Earth Trifluorides", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 20, + TextureSet.SET_DULL + ); + + public static final Werkstoff LanthaniumChloride = new Werkstoff( + new short[] {82, 112, 102}, + "Lanthanium Chloride", + subscriptNumbers("LaCl3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 21, + TextureSet.SET_DULL, + Arrays.asList(Materials.Lanthanum, Materials.Chlorine), + new Pair<>(Materials.Lanthanum, 1), + new Pair<>(Materials.Chlorine, 3) + ); + + public static final Werkstoff NeodymiumOxide = new Werkstoff( + new short[] {82, 112, 102}, + "Neodymium Oxide", + subscriptNumbers("Nd2O3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 22, + TextureSet.SET_DULL, + Arrays.asList(Materials.Neodymium, Materials.Oxygen), + new Pair<>(Materials.Neodymium, 2), + new Pair<>(Materials.Oxygen, 3) + ); + + public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff( + new short[] {255, 182, 193}, + "Fluorinated Samaric Concentrate", + subscriptNumbers("??SmHo??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 23, + TextureSet.SET_DULL + ); + + public static final Werkstoff CalciumFluoride = new Werkstoff( + new short[] {255, 250, 250}, + "Calcium Fluoride", + subscriptNumbers("CaF2"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(), + offsetID2 + 24, + TextureSet.SET_DULL, + Arrays.asList(Materials.Calcium, Materials.Fluorine), + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Fluorine, 2) + ); + + public static final Werkstoff SamariumTerbiumMixture = new Werkstoff( + new short[] {223, 182, 193}, + "Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 25, + TextureSet.SET_DULL + ); + + public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff( + new short[] {223, 182, 193}, + "Nitrogenated Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??NH4NO3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 26, + TextureSet.SET_DULL + ); + + public static final Werkstoff TerbiumNitrate = new Werkstoff( + new short[] {167, 252, 0}, + "Terbium Nitrate", + subscriptNumbers("TbNO3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 27, + TextureSet.SET_DULL, + Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen), + new Pair<>(Materials.Terbium, 1), + new Pair<>(Materials.Nitrogen, 1), + new Pair<>(Materials.Oxygen, 3) + ); + + public static final Werkstoff SamariumOreConcentrate = new Werkstoff( + new short[] {255, 200, 230}, + "Samarium Ore Concentrate", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 28, + TextureSet.SET_DULL + ); + + public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff( + new short[] {255, 170, 220}, + "Dephosphated Samarium Concentrate", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 29, + TextureSet.SET_DULL + ); + + + + // Weird/Exciting Chemicals + public static final Werkstoff Tetrahydrofuran = new Werkstoff( + new short[] {222, 165, 164}, + "Tetrahydrofuran", + subscriptNumbers("(CH2)4O"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3, + TextureSet.SET_FLUID + ); + + //1,4-Butanediol + public static final Werkstoff Butanediol = new Werkstoff( + new short[] {185, 78, 72}, + "1,4-Butanediol", + subscriptNumbers("HO(CH2)4OH"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 1, + TextureSet.SET_FLUID + ); + + //Acidicised 1,4-Butanediol + public static final Werkstoff AcidicButanediol = new Werkstoff( + new short[] {255, 239, 213}, + "Acidicised 1,4-Butanediol", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 2, + TextureSet.SET_FLUID + ); + + //Tellurium-Molybdenum-Oxide Catalyst + public static final Werkstoff MoTeOCatalyst= new Werkstoff( + new short[] {238, 131, 238}, + "Tellurium-Molybdenum-Oxide Catalyst", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 3, + TextureSet.SET_DULL + ); + + //Tellurium Oxide + public static final Werkstoff TelluriumIVOxide = new Werkstoff( + new short[] {229, 199, 187}, + "Tellurium (IV) Oxide", + subscriptNumbers("TeO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 4, + TextureSet.SET_DULL + ); + + public static final Werkstoff MolybdenumIVOxide = new Werkstoff( + new short[] {52, 53, 57}, + "Molybdenum (IV) Oxide", + subscriptNumbers("MoO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 5, + TextureSet.SET_DULL + ); + + public static final Werkstoff Polytetrahydrofuran = new Werkstoff( + new short[] {192, 128, 129}, + "Polytetrahydrofuran", + subscriptNumbers("(C4H8O)OH2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), + offsetID3 + 6, + TextureSet.SET_DULL + ); + + public static final Werkstoff TungstophosphoricAcid = new Werkstoff( + new short[] {223, 255, 0}, + "Tungstophosphoric Acid", + subscriptNumbers("H3PW12O40"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 7, + TextureSet.SET_FLUID + ); + + public static final Werkstoff TolueneDiisocyanate = new Werkstoff( + new short[] {255, 255, 102}, + "Toluene Diisocyanate", + subscriptNumbers("CH3C6H3(NCO)2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 8, + TextureSet.SET_FLUID + ); + + public static final Werkstoff Dinitrotoluene = new Werkstoff( + new short[] {216, 191, 216}, + "Dinitrotoluene", + subscriptNumbers("C7H6N2O4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 9, + TextureSet.SET_FLUID + ); + + public static final Werkstoff Diaminotoluene = new Werkstoff( + new short[] {227, 218, 201}, + "Diaminotoluene", + subscriptNumbers("C6H3(NH2)2CH3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 10, + TextureSet.SET_FLUID + ); + + public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff( + new short[] {255, 255, 255}, + "Toluene Tetramethyl Diisocyanate", + subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 11, + TextureSet.SET_FLUID + ); + + public static final Werkstoff PTMEGElastomer = new Werkstoff( + new short[] {248, 248, 255}, + "PTMEG Elastomer", + new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addMetalItems() + , + offsetID3 + 12, + TextureSet.SET_DULL + ); + + + public static final Werkstoff MagnesiumPeroxide = new Werkstoff( + new short[] {255, 250, 205}, + "Magnesium Peroxide", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 13, + TextureSet.SET_METALLIC + ); + + public static final Werkstoff PotassiumChlorate = new Werkstoff( + new short[] {240, 255, 255}, + "Potassium Chlorate", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), + offsetID3 + 14, + TextureSet.SET_DULL + ); + + public static final Werkstoff MARM247 = new Werkstoff( + new short[] {255, 133, 145}, + "MAR-M247", + new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addMetalItems() + , + offsetID3 + 15, + TextureSet.SET_METALLIC + ); + + public static final Werkstoff DilutedAcetone = new Werkstoff( + new short[] {254, 254, 250}, + "Diluted Acetone", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 16, + TextureSet.SET_FLUID + ); + + + public static void runInit() { + + addSubTags(); + + } + + private static void addSubTags() { + + //WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); + + } + + + + + @Override + public void run() { + + } + + +} diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index c7e2c5e342..1a36c08d80 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -63,7 +63,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; /* - * + * * Originally authored by botn365 under the MIT License. See BotdustriesLICENSE * */ @@ -75,33 +75,39 @@ public class BotRecipes { ItemStack C2 = GT_Utility.getIntegratedCircuit(2); ItemStack C24 = GT_Utility.getIntegratedCircuit(24); - GT_Values.RA.addChemicalRecipe(Materials.Calcite.getDust(1), Materials.Empty.getCells(1), + //CaCO3 + 2HCl = H2O + CO2 + CaCl2 + GT_Values.RA.addChemicalRecipe(Materials.Calcite.getDust(5), Materials.Empty.getCells(1), Materials.HydrochloricAcid.getFluid(2000), Materials.Water.getFluid(1000), Materials.CarbonDioxide.getCells(1), WerkstoffLoader.CalciumChloride.get(dust, 3), 80, 120); // tungsten chain - FluidStack sodiumTungsten = SodiumTungstate.getFluidOrGas(4000); - ItemStack scheelite = Materials.Scheelite.getDust(7); + FluidStack sodiumTungsten = SodiumTungstate.getFluidOrGas(1000); + ItemStack scheelite = Materials.Scheelite.getDust(6); - GT_Values.RA.addAutoclaveRecipe(Materials.Tungstate.getDust(7), Materials.SodiumHydroxide.getDust(4), + //Li2WO4 + 2Na = Na2WO4 + 2Li + GT_Values.RA.addAutoclaveRecipe(Materials.Tungstate.getDust(7), Materials.Sodium.getDust(2), Materials.Water.getFluid(4000), sodiumTungsten, Materials.Lithium.getDust(2), 10000, 100, 1920, false); - GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Huebnerit.get(dust, 5), Materials.SodiumHydroxide.getDust(4), + //MnWO4 + 2Na = Na2WO4 + Mn + GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Huebnerit.get(dust, 6), Materials.Sodium.getDust(2), Materials.Water.getFluid(4000), sodiumTungsten, Materials.Manganese.getDust(1), 10000, 100, 1920, false); - GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Ferberite.get(dust, 5), Materials.SodiumHydroxide.getDust(4), + //FeWO4 + 2Na = Na2WO4 + Fe + GT_Values.RA.addAutoclaveRecipe(WerkstoffLoader.Ferberite.get(dust, 6), Materials.Sodium.getDust(2), Materials.Water.getFluid(4000), sodiumTungsten, Materials.Iron.getDust(1), 10000, 100, 1920, false); - ItemStack Ca2Cl = WerkstoffLoader.CalciumChloride.get(dust, 6); + //CaCl2 + Na2WO4 = 2NaCl + CaWO4 + ItemStack Ca2Cl = WerkstoffLoader.CalciumChloride.get(dust, 3); GT_Values.RA.addChemicalRecipe(Ca2Cl, null, sodiumTungsten, null, - scheelite, Materials.Salt.getDust(8), 100, 480); + scheelite, Materials.Salt.getDust(4), 100, 480); - Ca2Cl.stackSize = 6; - ItemStack H2WO4 = TungsticAcid.get(dust, 1); - GT_Values.RA.addChemicalRecipe(scheelite, null, Materials.HydrochloricAcid.getFluid(4000), null, + ItemStack H2WO4 = TungsticAcid.get(dust, 7); + //CaWO4 + 2HCl = H2WO4 + CaCl2 + GT_Values.RA.addChemicalRecipe(scheelite, null, Materials.HydrochloricAcid.getFluid(2000), null, H2WO4, Ca2Cl, 50, 1920); - ItemStack WO3 = TungstenTrioxide.get(dust, 1); + ItemStack WO3 = TungstenTrioxide.get(dust, 4); + //H2WO4 = WO3 + H2O GT_Values.RA.addBlastRecipe(H2WO4, null, null, null, WO3, null, 200, 480, 1200); @@ -109,19 +115,18 @@ public class BotRecipes { // GT_Values.RA.addMixerRecipe(WO3, Materials.Steel.getDust(1), null, null, null, null, // WO3Fe, 100, 1920); - GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(3000), - null,Materials.Tungsten.getDust(1),null,100,1920,1000); + //WO3 + 6H = W + 3H2O + GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(6000), + Materials.Water.getFluid(3000),Materials.Tungsten.getDust(1),null,100,1920,1000); - WO3.stackSize = 2; - GT_Values.RA.addBlastRecipe(WO3, Materials.Carbon.getDust(3), null, Materials.CarbonDioxide.getGas(6000), + WO3.stackSize = 8; + //2WO3 + 3C = 2W + 3CO2 + GT_Values.RA.addBlastRecipe(WO3, Materials.Carbon.getDust(3), null, Materials.CarbonDioxide.getGas(3000), GT_OreDictUnificator.get(ingotHot, Materials.Tungsten, 2L), null, 8000, 1920, 3000); -// WO3Fe.stackSize = 4; -// GT_Values.RA.addBlastRecipe(WO3Fe, Materials.Carbon.getDust(3), Materials.Nitrogen.getGas(4000), Materials.CarbonDioxide.getGas(6000), -// GT_OreDictUnificator.get(ingotHot, Materials.TungstenSteel, 4L), null, 10000, 1920, 3000); - //rocket fuels //LMP103S + //2Cl + CO = COCl2 GT_Values.RA.addChemicalRecipe(Materials.CarbonMonoxide.getCells(1), C2, Materials.Chlorine.getGas(2000), null, Phosgene.get(cell, 1), 50, 480); GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), C2, Materials.CarbonMonoxide.getGas(1000), @@ -139,24 +144,31 @@ public class BotRecipes { GT_Values.RA.addChemicalRecipe(Materials.Chlorine.getCells(2), Materials.CarbonMonoxide.getCells(1), null, BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000), null, Materials.Empty.getCells(3),50, 480); + //COCl2 + C2H6O = HCl + C3H5ClO2 GT_Values.RA.addChemicalRecipe(Phosgene.get(cell, 1), C2, Materials.Ethanol.getFluid(1000), - Materials.HydrochloricAcid.getGas(1000), Ethylchloroformate.get(cell, 1), 20, 1920); + Materials.HydrochloricAcid.getFluid(1000), Ethylchloroformate.get(cell, 1), 20, 1920); + //C3H5ClO2 + 2NH3 = C3H7O2N + NH4Cl GT_Values.RA.addChemicalRecipe(Ethylchloroformate.get(cell, 1), C2, Materials.Ammonia.getGas(2000), WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000), Ethylcarbamate.get(cell, 1), 200, 120); + //C3H7O2N + HNO3 = C3H6N2O4 + H2O GT_Values.RA.addChemicalRecipe(Ethylcarbamate.get(cell, 1), C2, Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000), EthylNnitrocarbamate.get(cell, 1), 40, 1024); + //C3H6N2O4 + NH3 = C3H10N3O4 GT_Values.RA.addChemicalRecipe(EthylNnitrocarbamate.get(cell, 1), C2, Materials.Ammonia.getGas(1000), null, AmmoniumNnitrourethane.get(cell, 1), 40, 1920); - GT_Values.RA.addChemicalRecipe(AmmoniumNnitrourethane.get(cell, 1), DinitrogenPentoxide.get(dust, 1), null, null, - EthylDinitrocarbamate.get(cell, 1), AmmoniumNitrate.get(dust, 1), 200, 480); + //C3H10N3O4 + N2O5 = C3H5N3O6 + N2H4O3 + H + GT_Values.RA.addChemicalRecipe(AmmoniumNnitrourethane.get(cell, 1), DinitrogenPentoxide.get(dust, 7), null, Materials.Hydrogen.getGas(1000), + EthylDinitrocarbamate.get(cell, 1), AmmoniumNitrate.get(dust, 9), 200, 480); + //C3H5N3O6 + 2NH3 = C3H7O2N + H4N4O4 GT_Values.RA.addChemicalRecipe(EthylDinitrocarbamate.get(cell, 1), C2, Materials.Ammonia.getGas(2000), - Ethylcarbamate.getFluidOrGas(980), AmmoniumDinitramide.get(cell, 1), 200, 1920); + Ethylcarbamate.getFluidOrGas(1000), AmmoniumDinitramide.get(cell, 1), 200, 1920); + //LMP-103S GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{C24}, new FluidStack[]{ @@ -168,31 +180,37 @@ public class BotRecipes { null, 1200, 1920); - GT_Values.RA.addChemicalRecipe(Materials.PhosphorousPentoxide.getDust(1), C2, Materials.NitricAcid.getFluid(12000), - Materials.PhosphoricAcid.getFluid(4000), DinitrogenPentoxide.get(dust, 6), 200, 1920); + //P4O10 + 2HNO3 + 5H2O = 4H3PO4 + N2O5 + GT_Values.RA.addChemicalRecipe(Materials.PhosphorousPentoxide.getDust(14), C2, Materials.NitricAcid.getFluid(2000), + Materials.PhosphoricAcid.getFluid(4000), DinitrogenPentoxide.get(dust, 7), 200, 1920); + //H3PO4 = P + H2O GT_Values.RA.addDistilleryRecipe(C2, Materials.PhosphoricAcid.getFluid(1000), Materials.Water.getFluid(500), Materials.Phosphorus.getDust(1), 20, 480, false); ItemStack cells = Ic2Items.cell.copy(); cells.stackSize = 1; + //NH4Cl = HCl + NH3 GT_Values.RA.addDistilleryRecipe(cells,WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000), Materials.HydrochloricAcid.getFluid(1000),Materials.Ammonia.getCells(1),50,120,false); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(AmmoniumNitrate.get(dust, 1), Materials.SodiumHydroxide.getDust(1), null, - Materials.Ammonia.getGas(1000), WerkstoffLoader.SodiumNitrate.get(dust, 2), null, 100, 480); + //N2H4O3 + NaOH = NaNO3 + NH3 + H2O + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), null, + Materials.Ammonia.getGas(1000), WerkstoffLoader.SodiumNitrate.get(dust, 5), null, 100, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{AmmoniumNitrate.get(dust, 1), Materials.SodiumHydroxide.getDust(1), C2}, + new ItemStack[]{AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2}, null, - new FluidStack[]{Materials.Ammonia.getGas(1000)}, - new ItemStack[]{WerkstoffLoader.SodiumNitrate.get(dust, 2)}, + new FluidStack[]{Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000)}, + new ItemStack[]{WerkstoffLoader.SodiumNitrate.get(dust, 5)}, 100, 480 ); - GT_Values.RA.addChemicalRecipe(WerkstoffLoader.SodiumNitrate.get(dust, 4), C2, Materials.SulfuricAcid.getFluid(2000), - Materials.NitricAcid.getFluid(2000), WerkstoffLoader.Sodiumsulfate.get(dust, 1), 200, 120); + //2NaNO3 + H2SO4 = 2HNO3 + Na2SO4 + GT_Values.RA.addChemicalRecipe(WerkstoffLoader.SodiumNitrate.get(dust, 10), C2, Materials.SulfuricAcid.getFluid(1000), + Materials.NitricAcid.getFluid(2000), WerkstoffLoader.Sodiumsulfate.get(dust, 7), 200, 120); + //N2H4O3 + NaOH + H =H2SO4= NH3 + HNO3 + Na + H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ C24, @@ -205,7 +223,8 @@ public class BotRecipes { }, new FluidStack[]{ Materials.Ammonia.getGas(2000), - Materials.NitricAcid.getFluid(2000) + Materials.NitricAcid.getFluid(2000), + Materials.DilutedSulfuricAcid.getFluid(1000) }, new ItemStack[]{Materials.Sodium.getDust(2)}, 300, 480 @@ -213,21 +232,23 @@ public class BotRecipes { //Monomethylhydrazine cells.stackSize = 1; + //C7H8 + CH4O = C8H10 + H2O GT_Values.RA.addCrackingRecipe(1, Materials.Toluene.getFluid(1000), Materials.Methanol.getFluid(1000), OXylene.getFluidOrGas(1000), 600, 4096); - GT_Values.RA.addChemicalRecipe(OXylene.get(cell, 1), VanadiumPentoxide.get(dustTiny), Materials.Oxygen.getGas(3000), - Materials.Water.getFluid(3000), PhthalicAnhydride.get(dust, 1), 800, 1920); - - GT_Values.RA.addBlastRecipe(Materials.Vanadium.getDust(2), C2, null, - null, VanadiumPentoxide.get(dust, 5), null, 200, 120, 700); + //C8H10 + 6O =V2O5= C8H4O3 + 3H2O + GT_Values.RA.addChemicalRecipe(OXylene.get(cell, 1), VanadiumPentoxide.get(dustTiny), Materials.Oxygen.getGas(6000), + Materials.Water.getFluid(3000), PhthalicAnhydride.get(dust, 15), 800, 1920); + //C6H6 + C4H8 = C10H14 GT_Values.RA.addChemicalRecipe(Materials.Benzene.getCells(1), C2, Materials.Butene.getGas(1000), TertButylbenzene.getFluidOrGas(1000), cells, 100, 1920); - GT_Values.RA.addChemicalRecipe(PhthalicAnhydride.get(dust, 1), C2, TertButylbenzene.getFluidOrGas(1000), + //C8H4O3 + C10H14 = C18H16O2 + H2O + GT_Values.RA.addChemicalRecipe(PhthalicAnhydride.get(dust, 15), C2, TertButylbenzene.getFluidOrGas(1000), TwoTertButylAnthraquinone.getFluidOrGas(1000), null, 200, 7680); + //C18H16O2 + H =Pd= C18H17O2 GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Hydrogen.getCells(10), Materials.Palladium.getDustTiny(1), TwoTertButylAnthraquinone.getFluidOrGas(10000), TwoTertButylAnthrahydroquinone.getFluidOrGas(10000), null, null, 1200, 7680); @@ -243,9 +264,11 @@ public class BotRecipes { 1200, 7680 ); - GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(1), C2, TwoTertButylAnthrahydroquinone.getFluidOrGas(1000), - TwoTertButylAnthraquinone.getFluidOrGas(900), HydrogenPeroxide.get(cell, 1), 40, 1920); + //2C18H17O2 + 2O = 2C18H16O2 + H2O2 + GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(2), C2, TwoTertButylAnthrahydroquinone.getFluidOrGas(2000), + TwoTertButylAnthraquinone.getFluidOrGas(2000), HydrogenPeroxide.get(cell, 1), Materials.Empty.getCells(1), 40, 1920); + //2H + 2O =C18H16O2,Pd= H2O2 GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ C24, @@ -257,27 +280,27 @@ public class BotRecipes { TwoTertButylAnthraquinone.getFluidOrGas(10000) }, new FluidStack[]{ - HydrogenPeroxide.getFluidOrGas(10000), - TwoTertButylAnthraquinone.getFluidOrGas(9000) + HydrogenPeroxide.getFluidOrGas(5000), + TwoTertButylAnthraquinone.getFluidOrGas(10000) }, null, 1400, 7680 ); + //H2O2 + 2NH3 = N2H4 + 2H2O GT_Values.RA.addChemicalRecipe(HydrogenPeroxide.get(cell, 1), C2, Materials.Ammonia.getGas(2000), - Materials.Water.getFluid(2000), Hydrazine.get(cell, 2), 100, 120); + Materials.Water.getFluid(2000), Hydrazine.get(cell, 1), 100, 120); + //2CH4O + H2SO4 = C2H6O4S + 2H2O GT_Values.RA.addChemicalRecipe(Materials.SulfuricAcid.getCells(1), C2, Materials.Methanol.getFluid(2000), null, DimethylSulfate.get(cell, 1), 50, 480); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.SulfuricAcid.getCells(1), C1, Materials.Methanol.getFluid(2000), DimethylSulfate.getFluidOrGas(1000), cells, null, 50, 480); - GT_Values.RA.addChemicalRecipe(Hydrazine.get(cell, 2), C2, DimethylSulfate.getFluidOrGas(1000), - Materials.SulfurTrioxide.getGas(1000), Monomethylhydrazine.get(cell, 2), 80, 16000); - - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(DimethylSulfate.get(cell, 1), C1, Hydrazine.getFluidOrGas(2000), - Monomethylhydrazine.getFluidOrGas(2000), Materials.SulfurTrioxide.getCells(1), null, 80, 16000); + //N2H4 + C2H6O4S = SO3 + CH6N2 + CH4O + GT_Values.RA.addChemicalRecipe(Hydrazine.get(cell, 1), Materials.Empty.getCells(1), DimethylSulfate.getFluidOrGas(1000), + Materials.SulfurTrioxide.getGas(1000), Monomethylhydrazine.get(cell, 1), Materials.Methanol.getCells(1), 80, 16000); GT_Values.RA.addMixerRecipe(AmmoniumDinitramide.get(cell, 1), C1, null, null, Monomethylhydrazine.getFluidOrGas(2000), MonomethylhydrazineFuelMix.getFluidOrGas(3000), cells, 20, 480); @@ -289,26 +312,30 @@ public class BotRecipes { //unsimetrical hydazine - GT_Values.RA.addCrackingRecipe(2,Materials.Propane.getGas(1000),Materials.NitricAcid.getFluid(1000), - Nitromethane.getFluidOrGas(1000),300,1920); + //2HNO3 + C3H8 = 2CH3NO2 + 2H2O + C + GT_Values.RA.addCrackingRecipe(2,Materials.Propane.getGas(1000),Materials.NitricAcid.getFluid(2000), + Nitromethane.getFluidOrGas(2000),300,1920); + //HF + BF3 + CH3NO2 + HNO3 + H = CH4O + H2O + NO + NO2BF4 GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{C2}, new FluidStack[]{ Materials.HydrofluoricAcid.getFluid(1000), BoronTrifluoride.getFluidOrGas(1000), Nitromethane.getFluidOrGas(1000), - Materials.NitricAcid.getFluid(1000)}, + Materials.NitricAcid.getFluid(1000), + Materials.Hydrogen.getGas(1000)}, new FluidStack[]{ - Materials.Methane.getGas(1000), + Materials.Methanol.getFluid(1000), Materials.Water.getFluid(1000), Materials.NitricOxide.getGas(1000)}, - new ItemStack[]{NitroniumTetrafluoroborate.get(dust,1)}, + new ItemStack[]{NitroniumTetrafluoroborate.get(dust,8)}, 100,7_680 ); + //NO2BF4 + H4N4O4 = N4O6 + NH4BF4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{C2,NitroniumTetrafluoroborate.get(dust,1)}, + new ItemStack[]{C2,NitroniumTetrafluoroborate.get(dust,8)}, new FluidStack[]{AmmoniumDinitramide.getFluidOrGas(1000)}, new FluidStack[]{ Trinitramid.getFluidOrGas(1000), @@ -318,29 +345,41 @@ public class BotRecipes { 20,30_720 ); + //B2O3 + 6HF = 2BF3 + 3H2O cells.stackSize = 3; - GT_Values.RA.addChemicalRecipe(BoronTrioxide.get(dust,1),cells,Materials.HydrofluoricAcid.getFluid(6000), + GT_Values.RA.addChemicalRecipe(BoronTrioxide.get(dust,5),cells,Materials.HydrofluoricAcid.getFluid(6000), BoronTrifluoride.getFluidOrGas(2000),Materials.Water.getCells(3),50,480); GT_Values.RA.addChemicalRecipe(Materials.Borax.getDust(23),C2,Materials.SulfuricAcid.getFluid(1000), - null,WerkstoffLoader.Sodiumsulfate.get(dust,1),BoronTrioxide.get(dust,2),400,1920); + null,WerkstoffLoader.Sodiumsulfate.get(dust,7),BoronTrioxide.get(dust,10),400,1920); + //NH4BF4 = NH3 + BF4 + H cells.stackSize = 1; - GT_Values.RA.addDistilleryRecipe(cells,AmmoniaBoronfluorideSolution.getFluidOrGas(1000), - Tetrafluoroborate.getFluidOrGas(1000),Materials.Ammonia.getCells(1),20,30_720,false); - - GT_Values.RA.addChemicalRecipe(Materials.SodiumHydroxide.getDust(1),cells,Tetrafluoroborate.getFluidOrGas(1000), - SodiumTetrafluoroborate.getFluidOrGas(1000),Materials.Water.getCells(1),100,1920); - + GT_Values.RA.addUniversalDistillationRecipe(AmmoniaBoronfluorideSolution.getFluidOrGas(1000), + new FluidStack[]{ + Materials.Hydrogen.getGas(1000), + Materials.Ammonia.getGas(1000), + Tetrafluoroborate.getFluidOrGas(1000) + }, null, + 20,30_720); + + //BF4 + Na = NaBF4 + GT_Values.RA.addChemicalRecipe(Materials.Sodium.getDust(1),null,Tetrafluoroborate.getFluidOrGas(1000), + SodiumTetrafluoroborate.getFluidOrGas(1000),null,100,1920); + + //NaBF4 = NaF + BF3 GT_Values.RA.addDistilleryRecipe(C2,SodiumTetrafluoroborate.getFluidOrGas(1000), - BoronTrifluoride.getFluidOrGas(1000),SodiumFluoride.get(dust,1),40,480,false); + BoronTrifluoride.getFluidOrGas(1000),SodiumFluoride.get(dust,2),40,480,false); - GT_Values.RA.addChemicalRecipe(SodiumFluoride.get(dust,2),C2,Materials.SulfuricAcid.getFluid(1000), - Materials.HydrofluoricAcid.getFluid(2000),WerkstoffLoader.Sodiumsulfate.get(dust,1),50,1920); + //2NaF + H2SO4 = 2HF + Na2SO4 + GT_Values.RA.addChemicalRecipe(SodiumFluoride.get(dust,4),C2,Materials.SulfuricAcid.getFluid(1000), + Materials.HydrofluoricAcid.getFluid(2000),WerkstoffLoader.Sodiumsulfate.get(dust,7),50,1920); + //O + CH4O =Ag= CH2O GT_Values.RA.addChemicalRecipe(Materials.Oxygen.getCells(4),Materials.Silver.getDustTiny(1),Materials.Methanol.getFluid(4000), Formaldehyde.getFluidOrGas(4000),cells,100,480); + //N2H4 + C2H4O2 =C2H6O= C2H6N2O + H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{C2}, new FluidStack[]{ @@ -349,20 +388,22 @@ public class BotRecipes { Hydrazine.getFluidOrGas(1000)}, new FluidStack[]{ Acetylhydrazine.getFluidOrGas(1000), - Materials.Ethanol.getFluid(900)}, + Materials.Ethanol.getFluid(1000)}, null, 40,30_720 ); + //C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{C2}, new FluidStack[]{ Acetylhydrazine.getFluidOrGas(1000), - Formaldehyde.getFluidOrGas(1000), - Materials.Hydrogen.getGas(2000)}, + Formaldehyde.getFluidOrGas(2000), + Materials.Hydrogen.getGas(4000)}, new FluidStack[]{ - UnsymmetricalDimethylhydrazine.getFluidOrGas(2000), - Materials.AceticAcid.getFluid(900)}, + UnsymmetricalDimethylhydrazine.getFluidOrGas(1000), + Materials.AceticAcid.getFluid(1000), + Materials.Water.getFluid(1000)}, null, 20, 122_880 ); -- cgit From f1b4f4a19933ec744c62b12541aafc45e2ab88a4 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 27 Jun 2022 20:51:07 +0800 Subject: lanth --- .../common/register/WerkstoffMaterialPool.java | 2 + .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 744 +++++++++++---------- 2 files changed, 391 insertions(+), 355 deletions(-) diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 93482d70ca..d12fb95510 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1081,6 +1081,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff MagnesiumPeroxide = new Werkstoff( new short[] {255, 250, 205}, "Magnesium Peroxide", + subscriptNumbers("MnO2"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), @@ -1091,6 +1092,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff PotassiumChlorate = new Werkstoff( new short[] {240, 255, 255}, "Potassium Chlorate", + subscriptNumbers("KClO3"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index a0e9fdfed7..dd3e5c939f 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -24,148 +24,155 @@ public class RecipeLoader { private static final Materials[] BLACKLIST = null; public static void loadGeneral() { - + /* ZIRCONIUM */ //ZrCl4 + //ZrO2 + 4HCl = ZrCl4 + 2H2O GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 1), - Materials.HydrochloricAcid.getFluid(4000), - Materials.Water.getFluid(2000), - WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 1), + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3), + Materials.HydrochloricAcid.getFluid(4000), + Materials.Water.getFluid(2000), + WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5), 300 ); - + //ZrCl4-H2O GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5), Materials.Water.getFluid(1000), WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000), null, 200 ); - - + //Zr + //ZrCl4·H2O + 2Mg = Zr + 2MgCl2 GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), - WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000), + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), + WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000), null, //No fluid output WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6), 600, 1920, 4500 ); - - + + /* HAFNIUM */ //HfCl4 + //HfO2 + 4HCl = HfCl4 + 2H2O GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 1), - Materials.HydrochloricAcid.getFluid(4000), - Materials.Water.getFluid(2000), - WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 1), + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3), + Materials.HydrochloricAcid.getFluid(4000), + Materials.Water.getFluid(2000), + WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5), 300 ); - + //HfCl4-H2O GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5), Materials.Water.getFluid(1000), WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000), null, 200 ); - + //LP-Hf + //HfCl4 + 2Mg = ??Hf?? + 2MgCl2 GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(2), + GT_Utility.getIntegratedCircuit(2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), - WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000), + WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000), null, //No fluid output WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6), 600, 1920, 2700 ); - + //HfI4 + //??Hf?? + 4I = HfI4 GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), + GT_Utility.getIntegratedCircuit(1), WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.Iodine.getFluidOrGas(4000), + WerkstoffMaterialPool.Iodine.getFluidOrGas(4000), null, - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), 300 ); GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 4), + WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 4), null, null, - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), 300 ); - + //Hf + //HfI4 = Hf + 4I GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(12), - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 1), - null, - WerkstoffMaterialPool.Iodine.getFluidOrGas(2000), + GT_Utility.getIntegratedCircuit(12), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), + null, + WerkstoffMaterialPool.Iodine.getFluidOrGas(4000), WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 1), - WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dustTiny, 1), + WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dustTiny, 1), 600, 1920, 3400 ); - + //Hf * 9 GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(13), - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 9), - null, - WerkstoffMaterialPool.Iodine.getFluidOrGas(18000), + GT_Utility.getIntegratedCircuit(13), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 45), + null, + WerkstoffMaterialPool.Iodine.getFluidOrGas(36000), WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 9), - WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dust, 1), 5400, 1920, 3400 ); - - + + //Zirconia-Hafnia + //??HfZr?? = HfO2 + ZrO2 GT_Values.RA.addCentrifugeRecipe( - WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 1), - null, - null, + WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 1), + null, + null, + null, + WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3), + WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3), + null, null, - WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 1), - null, - null, - null, - null, - new int[] {10000, 10000}, - 600, + null, + null, + new int[] {10000, 10000}, + 600, 1920 ); - + //Ammonium Nitrate + //HNO3 + NH3 = NH4NO3 GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(12), - Materials.NitricAcid.getCells(1), + GT_Utility.getIntegratedCircuit(12), + Materials.NitricAcid.getCells(1), Materials.Ammonia.getGas(1000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000), - Materials.Empty.getCells(1), + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000), + Materials.Empty.getCells(1), 400 ); - + //IODINE-START //SeaweedAsh GT_ModHandler.addSmeltingRecipe( GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1), WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1) ); - + //SeaweedConcentrate GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 1), @@ -178,7 +185,7 @@ public class RecipeLoader { 300, 240 ); - + //SeaweedConcentrate * 4 GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4), @@ -191,7 +198,7 @@ public class RecipeLoader { 1200, 240 ); - + //Iodine GT_Values.RA.addCentrifugeRecipe( Materials.Benzene.getCells(1), @@ -208,21 +215,49 @@ public class RecipeLoader { 760, 480 ); - + //IODINE-END - + + //2MnO2 + 2KOH + KClO3 = 2KMnO4 + H2O + KCl GT_Values.RA.addBlastRecipe( - WerkstoffMaterialPool.MagnesiumPeroxide.get(OrePrefixes.dust, 2), - GT_ModHandler.getModItem("dreamcraft", "PotassiumHydroxideDust", 4), - Materials.Oxygen.getGas(2000), - Materials.Water.getFluid(2000), - WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 2), + Materials.Pyrolusite.getDust(6), + GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5), + null, + null, + Materials.Water.getFluid(1000), + WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), + Materials.RockSalt.getDust(2), + null, null, 150, 480, - 1200 + 1200 ); - + + //Mn + 2O = MnO2 + GT_Values.RA.addChemicalRecipe( + Materials.Manganese.getDust(1), + GT_Utility.getIntegratedCircuit(1), + Materials.Oxygen.getGas(2000), + null, + Materials.Pyrolusite.getDust(3), + 40, + 30 + ); + + //6KOH + 6Cl = KClO3 + 5KCl + 3H2O + GT_Values.RA.addChemicalRecipe( + GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_Utility.getIntegratedCircuit(3), + Materials.Chlorine.getGas(6000), + Materials.Water.getFluid(3000), + Materials.RockSalt.getDust(10), + WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5), + 40, + 30 + ); + /* //Fluorosilicic Acid GT_Values.RA.addChemicalRecipe( @@ -236,77 +271,80 @@ public class RecipeLoader { ); */ //Sodium Fluorosilicate + //2NaCl + H2SiF6 = 2HCl + Na2SiF6 GT_Values.RA.addChemicalRecipe( Materials.Empty.getCells(2), - Materials.Salt.getDust(2), + Materials.Salt.getDust(4), WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000), WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(1000), Materials.HydrochloricAcid.getCells(2), 600, 450 ); - - - + } - + public static void loadLanthanideRecipes() { - // Methanol + //CH4O + CO + 3O =V2O5= H2C2O4 + H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) - }, + }, new FluidStack[] { Materials.Methanol.getFluid(1000), - Materials.CarbonMonoxide.getGas(2000), + Materials.CarbonMonoxide.getGas(1000), Materials.Oxygen.getGas(3000) - }, + }, new FluidStack[] { - MyMaterial.oxalate.getFluidOrGas(1000) - + MyMaterial.oxalate.getFluidOrGas(1000), + Materials.Water.getFluid(1000) }, - null, - 450, + null, + 450, 240 ); - + // Ethanol + //C2H6O + 5O =V2O5= H2C2O4 + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) - }, + }, new FluidStack[] { Materials.Ethanol.getFluid(1000), - Materials.CarbonMonoxide.getGas(3000), - Materials.Oxygen.getGas(3000) - }, + Materials.Oxygen.getGas(5000) + }, new FluidStack[] { - MyMaterial.oxalate.getFluidOrGas(1000) + MyMaterial.oxalate.getFluidOrGas(1000), + Materials.Water.getFluid(2000) }, - null, - 450, + null, + 450, 240 ); - + //GT_Values.RA.addChemicalRecipe( // GT_Utility.getIntegratedCircuit(2), //WerkstoffMaterialPool.CeriumDioxide // //) - + // Cerium Oxalate + //2CeCl3 + 3H2C2O4 = 6HCl + Ce2(C2O4)3 GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 2), + WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 8), MyMaterial.oxalate.getFluidOrGas(3000), Materials.HydrochloricAcid.getFluid(6000), - WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5), + null, 300, - 450 + 450 ); - + // Cerium + //Ce2O3 = 2Ce + 3O GT_Values.RA.addElectrolyzerRecipe( WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5), null, @@ -322,74 +360,73 @@ public class RecipeLoader { 150, 120 ); - - + //CHAIN BEGIN // MONAZITE RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] {Materials.NitricAcid.getFluid(350)}, + new FluidStack[] {Materials.NitricAcid.getFluid(350)}, new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 1)}, - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(200), + WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(200), new ItemStack[] { Materials.SiliconDioxide.getDustSmall(2) }, - 1920, - 200, + 1920, + 200, 800 ); - + RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( new FluidStack[] { - Materials.Water.getFluid(10000), + Materials.Water.getFluid(10000), WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000) }, new ItemStack[] { Materials.Saltpeter.getDust(1) }, - WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000), + WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000), new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), Materials.Monazite.getDustTiny(2) - }, - 480, - 900, + }, + 480, + 900, 10 ); - + GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( - false, - null, + false, + null, new ItemStack[] { WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), Materials.Ilmenite.getDust(1) - }, - null, + }, + null, new int[] { 9000, 7500, 2000, 500, 2000 - }, + }, new FluidStack[] { WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000) }, - null, - 400, - 240, + null, + 400, + 240, 0 ); - + GT_Values.RA.addMixerRecipe( - WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), - null, null, null, null, null, - Materials.Water.getFluid(6000), - WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000), - null, - 480, + WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), + null, null, null, null, null, + Materials.Water.getFluid(6000), + WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000), + null, + 480, 400 ); - + GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(13) @@ -397,15 +434,15 @@ public class RecipeLoader { new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000), WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200) - }, - null, + }, + null, new ItemStack[] { - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), + WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), }, - 480, + 480, 480 ); - + GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(14) @@ -413,61 +450,61 @@ public class RecipeLoader { new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000), WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800) - }, - null, + }, + null, new ItemStack[] { - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), + WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), }, - 4320, + 4320, 480 ); - + GT_Values.RA.addSifterRecipe( - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1), new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) - }, - new int[] {9000, 7000}, - 600, + WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) + }, + new int[] {9000, 7000}, + 600, 256 ); - + GT_Values.RA.addBlastRecipe( - WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1), - null, + WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1), + null, null, null, - WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1), - null, - 300, - 128, + WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1), + null, + 300, + 128, 1500 ); - + GT_Values.RA.addThermalCentrifugeRecipe( WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust), Materials.Thorium.getDust(1), Materials.Phosphate.getDust(1), - null, + null, new int[] { 10000, 10000 }, 200, - 480 + 480 ); - + GT_Values.RA.addChemicalBathRecipe( - WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(320), - WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - null, - null, - new int[] {10000}, - 120, + WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(320), + WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), + null, + null, + new int[] {10000}, + 120, 240 ); - + GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), new ItemStack[] { @@ -479,8 +516,7 @@ public class RecipeLoader { 800, 480 ); - - + GT_Values.RA.addChemicalBathRecipe( WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1), Materials.HydrofluoricAcid.getFluid(100), @@ -489,9 +525,9 @@ public class RecipeLoader { null, new int[] {10000}, 360, - 120 - ); - + 120 + ); + GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1), new ItemStack[] { @@ -506,7 +542,7 @@ public class RecipeLoader { 1000, 30 ); - + GT_Values.RA.addBlastRecipe( WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1), null, @@ -515,10 +551,10 @@ public class RecipeLoader { WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), null, 300, - 120, + 120, 1200 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.DriedMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), null, @@ -528,7 +564,7 @@ public class RecipeLoader { 500, 480 ); - + GT_Values.RA.addMixerRecipe( Materials.Water.getCells(1), null, @@ -540,7 +576,7 @@ public class RecipeLoader { 200, 120 ); - + GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 3), null, @@ -552,54 +588,56 @@ public class RecipeLoader { 220, 120 ); - + GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( false, - null, + null, new ItemStack[] { WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1) - }, - null, + }, + null, new int[] { 1111 - }, + }, new FluidStack[] { WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000) }, new FluidStack[] { WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000) - }, - 400, - 240, + }, + 400, + 240, 0 ); - + //BEGIN Cerium + //CeO2 + 3NH4Cl + H = 3NH3 + CeCl3 + 2H2O GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1), - Materials.Empty.getCells(1), - WerkstoffLoader.AmmoniumChloride.getFluidOrGas(3000), - Materials.Ammonia.getGas(3000), - WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 1), - Materials.Water.getCells(1), + WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 3), + WerkstoffLoader.AmmoniumChloride.get(OrePrefixes.cell, 3), + Materials.Hydrogen.getGas(1000), + Materials.Water.getGas(2000), + WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 4), + Materials.Ammonia.getCells(3), 300, - 450 + 450 ); - + + //Ce2(C2O4)3 + 3C = Ce2O3 + 9CO GT_Values.RA.addBlastRecipe( - WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 1), - null, + WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5), + Materials.Carbon.getDust(3), null, - Materials.CarbonMonoxide.getGas(6000), - WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust), + Materials.CarbonMonoxide.getGas(9000), + WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5), null, 200, 480, 800 ); - + //END Cerium (NMLC) - + GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( //Uses fluid, outputs item. Yet another hacky recipe false, null, @@ -615,29 +653,31 @@ public class RecipeLoader { 240, 0 ); - + GT_Values.RA.addElectromagneticSeparatorRecipe( - WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 1), // Maybe also holmium - null, + WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium + null, new int[] { 9000, 500 - }, - 600, + }, + 600, 1920 ); - + + //EuO + H2S = EuS + H2O GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), null, Materials.HydricSulfide.getGas(1000), Materials.Water.getFluid(1000), - WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2), 300, 8400 ); - + + //EuS = Eu + S GT_Values.RA.addElectrolyzerRecipe( WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2), null, @@ -655,7 +695,7 @@ public class RecipeLoader { 600, 33000 ); - + GT_Values.RA.addBlastRecipe( WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), null, @@ -664,10 +704,10 @@ public class RecipeLoader { WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1), null, 500, - 480, + 480, 1200 ); - + GT_Values.RA.addMixerRecipe( Materials.Salt.getDust(1), WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1), @@ -679,7 +719,7 @@ public class RecipeLoader { 200, 240 ); - + GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.MonaziteHeterogenousHalogenicRareEarthMixture.get(OrePrefixes.dust, 1), WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2), @@ -697,7 +737,7 @@ public class RecipeLoader { null, null, Materials.Chloromethane.getGas(200), - WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6), + WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6), null, //TODO null, null, @@ -707,7 +747,7 @@ public class RecipeLoader { 10000, //10000 }, 700, - 1920 + 1920 ); */ GT_Values.RA.addCentrifugeRecipe( @@ -725,9 +765,9 @@ public class RecipeLoader { 10000, //10000 }, 6300, - 1920 + 1920 ); - + GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 9), new ItemStack[] { @@ -740,31 +780,29 @@ public class RecipeLoader { 400, 1920 ); - - - + // BASTNASITE (god help me) RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] {Materials.NitricAcid.getFluid(350)}, + new FluidStack[] {Materials.NitricAcid.getFluid(350)}, new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 1)}, - WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(200), + WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(200), new ItemStack[] { Materials.SiliconDioxide.getDustSmall(2) }, - 1920, - 200, + 1920, + 200, 800 ); - + GT_Values.RA.addCrackingRecipe( - 1, - WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(1000), - GT_ModHandler.getSteam(1000), - WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.getFluidOrGas(2000), - 600, + 1, + WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(1000), + GT_ModHandler.getSteam(1000), + WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.getFluidOrGas(2000), + 600, 480 ); - + GT_Values.RA.addMixerRecipe( GT_Utility.getIntegratedCircuit(6), WerkstoffMaterialPool.SteamCrackedBasnasiteSolution.get(OrePrefixes.cell, 1), @@ -776,48 +814,48 @@ public class RecipeLoader { 800, 120 ); - + RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( new FluidStack[] { Materials.Water.getFluid(10000), WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000) - }, + }, new ItemStack[] { Materials.Saltpeter.getDust(1) - }, - WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000), + }, + WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000), new ItemStack[] { WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1) - }, - 1920, - 1000, + }, + 1920, + 1000, 10 ); - + GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( - false, - null, + false, + null, new ItemStack[] { Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), //TODO:Change outputs to complement Monazite Materials.Ilmenite.getDust(1) - }, - null, + }, + null, new int[] { 9000, 7500, 1000, 500, 2000 - }, + }, new FluidStack[] { WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000) }, new FluidStack[] { WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400) - }, - 400, - 240, + }, + 400, + 240, 0 ); - + GT_Values.RA.addBlastRecipe( GT_Utility.getIntegratedCircuit(1), null, @@ -829,7 +867,7 @@ public class RecipeLoader { 600, 1400 ); - + GT_Values.RA.addChemicalBathRecipe( WerkstoffMaterialPool.BastnasiteRareEarthOxidePowder.get(OrePrefixes.dust, 1), Materials.HydrochloricAcid.getFluid(500), @@ -838,21 +876,21 @@ public class RecipeLoader { null, new int[] {10000}, 200, - 30 + 30 ); - + GT_Values.RA.addBlastRecipe( GT_Utility.getIntegratedCircuit(1), WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1), Materials.Oxygen.getGas(1000), Materials.Fluorine.getGas(13), WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1), - null, + null, 600, 120, 1200 ); - + GT_Values.RA.addMixerRecipe( GT_Utility.getIntegratedCircuit(7), WerkstoffMaterialPool.RoastedRareEarthOxides.get(OrePrefixes.dust, 1), @@ -864,7 +902,7 @@ public class RecipeLoader { 100, 30 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.WetRareEarthOxides.get(OrePrefixes.dust, 1), null, @@ -874,7 +912,7 @@ public class RecipeLoader { 300, 480 ); - + GT_Values.RA.addCentrifugeRecipe( WerkstoffMaterialPool.CeriumOxidisedRareEarthOxides.get(OrePrefixes.dust, 1), null, @@ -888,11 +926,11 @@ public class RecipeLoader { null, new int[] { 10000, 9000 - }, + }, 600, 480 ); - + GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.BastnasiteRarerEarthOxides.get(OrePrefixes.dust, 1), null, @@ -904,7 +942,7 @@ public class RecipeLoader { 300, 480 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.NitratedBastnasiteRarerEarthOxides.get(OrePrefixes.cell, 1), null, @@ -914,7 +952,7 @@ public class RecipeLoader { 700, 480 ); - + GT_Values.RA.addCentrifugeRecipe( null, null, @@ -930,10 +968,9 @@ public class RecipeLoader { 8000, 5000 }, 900, - 480 + 480 ); - - + //Nd RE GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1), @@ -943,10 +980,9 @@ public class RecipeLoader { WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dustSmall, 2), WerkstoffMaterialPool.NeodymiumOxide.get(OrePrefixes.dustSmall, 2), 450, - 800 + 800 ); - - + //Sm RE GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1), @@ -958,7 +994,7 @@ public class RecipeLoader { 300, 480 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1), WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1), @@ -969,12 +1005,10 @@ public class RecipeLoader { 350, 480 ); - - - + GT_Values.RA.addBlastRecipe( WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2), - Materials.Calcium.getDust(3), + Materials.Calcium.getDust(2), null, WerkstoffMaterialPool.CalciumFluoride.getFluidOrGas(3000), Materials.Holmium.getDustSmall(1), @@ -983,7 +1017,7 @@ public class RecipeLoader { 1920, 1200 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1), BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 1), @@ -994,7 +1028,7 @@ public class RecipeLoader { 600, 480 ); - + GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1), Materials.Copper.getDustSmall(1), @@ -1005,10 +1039,10 @@ public class RecipeLoader { 800, 1920 ); - + GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2), - Materials.Calcium.getDust(3), + WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2), + Materials.Calcium.getDust(3), null, null, WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1), @@ -1016,7 +1050,7 @@ public class RecipeLoader { 300, 1920 ); - + GT_Values.RA.addCentrifugeRecipe( WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 6), null, @@ -1032,12 +1066,12 @@ public class RecipeLoader { 9000, 8000, 10000 }, 200, - 1920 + 1920 ); } - + public static void addRandomChemCrafting() { - + //PTMEG Elastomer GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.Butanediol.get(OrePrefixes.cell, 1), @@ -1048,7 +1082,7 @@ public class RecipeLoader { 1500, 480 ); - + //Toluene Tetramethyl Diisocyanate GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.TolueneDiisocyanate.get(OrePrefixes.cell, 3), @@ -1059,7 +1093,7 @@ public class RecipeLoader { 1200, 480 ); - + //PTHF GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.TungstophosphoricAcid.get(OrePrefixes.cell, 1), @@ -1070,7 +1104,7 @@ public class RecipeLoader { 1000, 120 ); - + //THF GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.AcidicButanediol.get(OrePrefixes.cell, 1), @@ -1081,7 +1115,7 @@ public class RecipeLoader { 800, 480 ); - + //Acidicised Butanediol GT_Values.RA.addMixerRecipe( Materials.SulfuricAcid.getCells(1), @@ -1094,7 +1128,7 @@ public class RecipeLoader { 600, 2000 ); - + //Butanediol GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dustTiny, 1), @@ -1105,7 +1139,7 @@ public class RecipeLoader { 900, 1920 ); - + //Moly-Te-Oxide Catalyst GT_Values.RA.addMixerRecipe( WerkstoffMaterialPool.MolybdenumIVOxide.get(OrePrefixes.dust, 1), @@ -1118,7 +1152,7 @@ public class RecipeLoader { 300, 120 ); - + //Tungstophosphoric Acid GT_Values.RA.addChemicalRecipe( Materials.PhosphoricAcid.getCells(1), @@ -1130,9 +1164,9 @@ public class RecipeLoader { 500, 1024 ); - - - + + + //Toluene Diisocyanate GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.Diaminotoluene.get(OrePrefixes.cell, 1), @@ -1143,7 +1177,7 @@ public class RecipeLoader { 900, 480 ); - + //Diaminotoluene GT_Values.RA.addChemicalRecipe( Materials.Hydrogen.getCells(4), @@ -1154,7 +1188,7 @@ public class RecipeLoader { 300, 480 ); - + //Dinitrotoluene GT_Values.RA.addChemicalRecipe( Materials.NitricAcid.getCells(2), @@ -1174,8 +1208,8 @@ public class RecipeLoader { GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L), ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), GT_Utility.getIntegratedCircuit(2)}, Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, 960); - - + + GT_Values.RA.addMixerRecipe( Materials.Nichrome.getDust(4), Materials.Aluminium.getDust(2), @@ -1195,7 +1229,7 @@ public class RecipeLoader { 800, 7680 ); - + GT_Values.RA.addFluidHeaterRecipe( null, WerkstoffMaterialPool.DilutedAcetone.getFluidOrGas(250), @@ -1203,33 +1237,33 @@ public class RecipeLoader { 120, 120 ); - + // PTMEG Manipulation - + GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0L), - WerkstoffMaterialPool.PTMEGElastomer.getMolten(144), - WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.ingot, 1), - 40, + ItemList.Shape_Mold_Ingot.get(0L), + WerkstoffMaterialPool.PTMEGElastomer.getMolten(144), + WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.ingot, 1), + 40, 64 ); - + GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0L), - WerkstoffMaterialPool.PTMEGElastomer.getMolten(144), - WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.plate, 1), - 40, + ItemList.Shape_Mold_Plate.get(0L), + WerkstoffMaterialPool.PTMEGElastomer.getMolten(144), + WerkstoffMaterialPool.PTMEGElastomer.get(OrePrefixes.plate, 1), + 40, 64 ); - + } - + //public static void loadZylon - + public static void removeCeriumSources() { - + GT_Log.out.print(Tags.MODID + ": AAAAAA"); - + HashSet remove = new HashSet<>(5000); HashSet reAdd = new HashSet<>(5000); @@ -1238,7 +1272,7 @@ public class RecipeLoader { ItemStack input = recipe.mInputs[0]; //GT_Log.out.print("\n" + input.getDisplayName()); if (GT_Utility.isStackValid(input)) { - int[] oreDict = OreDictionary.getOreIDs(input); + int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if ((OreDictionary.getOreName(oreDictID).startsWith("ore") || OreDictionary.getOreName(oreDictID).startsWith("crushed")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) { GT_Log.out.print(OreDictionary.getOreName(oreDictID)); @@ -1369,9 +1403,9 @@ public class RecipeLoader { for (int i = 0; i < tRecipe.mOutputs.length; i ++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustTiny, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustTiny, 1)); } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustSmall(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustSmall, 1)); } @@ -1401,7 +1435,7 @@ public class RecipeLoader { reAdd.add(tRecipe); remove.add(tRecipe); } - + }*/ } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove); @@ -1426,7 +1460,7 @@ public class RecipeLoader { for (int i = 0; i < tRecipe.mOutputs.length; i ++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) { tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); @@ -1451,7 +1485,7 @@ public class RecipeLoader { reAdd.clear(); GT_Log.out.print("Hammer done!\n"); - + //Electrolyzer for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) { //ItemStack input = recipe.mInputs[0]; @@ -1463,7 +1497,7 @@ public class RecipeLoader { for (int i = 0; i < tRecipe.mOutputs.length; i ++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { //TODO: Does not work and I have zero clue why tRecipe.mOutputs[i] = null; @@ -1471,7 +1505,7 @@ public class RecipeLoader { else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) { tRecipe.mOutputs[i] = null; } - + } if (!tRecipe.equals(recipe)){ reAdd.add(tRecipe); @@ -1482,18 +1516,18 @@ public class RecipeLoader { } } } - + GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.removeAll(remove); GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.addAll(reAdd); GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.reInit(); - + GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - + remove.clear(); reAdd.clear(); GT_Log.out.print("Electrolyzer done!\n"); - + /* //TODO: This entire block is highly questionable because GT++ doesn't always load predictably if (LoadedList.GTPP) { @@ -1514,7 +1548,7 @@ public class RecipeLoader { for (int i = 0; i < tRecipe.mOutputs.length; i ++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } } if (!tRecipe.equals(recipe)){ @@ -1536,20 +1570,20 @@ public class RecipeLoader { reAdd.clear(); GT_Log.out.print("Simple Washer done!\n"); - - + + //Dehydrator for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList) { GT_Log.out.print(Arrays.toString(recipe.mInputs)); ItemStack input = recipe.mInputs[0]; - - + + if (GT_Utility.isStackValid(input)) { GT_Recipe tRecipe = recipe.copy(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } } if (!tRecipe.equals(recipe)){ @@ -1557,27 +1591,27 @@ public class RecipeLoader { remove.add(recipe); } break; - } - + } + } - + GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList.removeAll(remove); GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList.addAll(reAdd); GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.reInit(); - + GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - + remove.clear(); reAdd.clear(); - + GT_Log.out.print("Dehydrator done!\n"); - - - + + + } */ - - + + /* DOES NOT WORK, something to do with load times for sifter recipes or some shit //Sifter for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) { @@ -1586,22 +1620,22 @@ public class RecipeLoader { ItemStack input = recipe.mInputs[0]; GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); if (GT_Utility.isStackValid(input)) { - if (true) { + if (true) { GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n"); - //GT_Recipe tRecipe = recipe.copy(); + //GT_Recipe tRecipe = recipe.copy(); remove.add(recipe); break; } } - + } - + GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove); GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd); GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit(); - + GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - + remove.clear(); reAdd.clear(); @@ -1614,26 +1648,26 @@ public class RecipeLoader { GT_Log.out.print(input.getDisplayName() + "\n"); if (GT_Utility.isStackValid(input)) { if (input.getDisplayName().contains("Tin Dust") || input.getDisplayName().contains("Rutile Dust")) { - - GT_Recipe tRecipe = recipe.copy(); + + GT_Recipe tRecipe = recipe.copy(); remove.add(recipe); break; } } } } - + GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList.removeAll(remove); GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList.addAll(reAdd); GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.reInit(); - + GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - + remove.clear(); reAdd.clear(); GT_Log.out.print("Chemical Bath done!\n"); - + //For ByProduct List for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList) { ItemStack input = recipe.mInputs[0]; @@ -1645,7 +1679,7 @@ public class RecipeLoader { for (int i = 0; i < tRecipe.mOutputs.length; i ++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - remove.add(tRecipe); + remove.add(tRecipe); } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) { remove.add(tRecipe); @@ -1668,6 +1702,6 @@ public class RecipeLoader { GT_Log.out.print("ByProduct List done!\n"); } } - - + + -- cgit From f21253ec80de9af008f0465d8952c943dc98b025 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 4 Jul 2022 21:25:40 +0800 Subject: fix --- .../common/register/BotWerkstoffMaterialPool.java | 6 +-- .../com/elisis/gtnhlanth/loader/BotRecipes.java | 47 ++++++++++++---------- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 29 ++++++++++--- 3 files changed, 53 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index 5439d373c9..73e6ec8607 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -119,7 +119,7 @@ public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff( new short[]{0x0d,0x54,0xb8}, "Ammonium N-nitrourethane", - subscriptNumbers("C3H10N3O4"), + subscriptNumbers("C3H9N3O4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -405,8 +405,8 @@ public class BotWerkstoffMaterialPool implements Runnable { ); public static final Werkstoff Tetrafluoroborate = new Werkstoff( new short[]{0x6a,0x53,0x8c}, - "Tetrafluoroborate", - subscriptNumbers("BF4"), + "Tetrafluoroboric Acid", + subscriptNumbers("HBF4"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index 1a36c08d80..4707fb3fab 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -55,6 +55,7 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -117,7 +118,7 @@ public class BotRecipes { //WO3 + 6H = W + 3H2O GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(6000), - Materials.Water.getFluid(3000),Materials.Tungsten.getDust(1),null,100,1920,1000); + GT_ModHandler.getSteam(6000),Materials.Tungsten.getDust(1),null,100,1920,1000); WO3.stackSize = 8; //2WO3 + 3C = 2W + 3CO2 @@ -156,12 +157,12 @@ public class BotRecipes { GT_Values.RA.addChemicalRecipe(Ethylcarbamate.get(cell, 1), C2, Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000), EthylNnitrocarbamate.get(cell, 1), 40, 1024); - //C3H6N2O4 + NH3 = C3H10N3O4 + //C3H6N2O4 + NH3 = C3H9N3O4 GT_Values.RA.addChemicalRecipe(EthylNnitrocarbamate.get(cell, 1), C2, Materials.Ammonia.getGas(1000), null, AmmoniumNnitrourethane.get(cell, 1), 40, 1920); - //C3H10N3O4 + N2O5 = C3H5N3O6 + N2H4O3 + H - GT_Values.RA.addChemicalRecipe(AmmoniumNnitrourethane.get(cell, 1), DinitrogenPentoxide.get(dust, 7), null, Materials.Hydrogen.getGas(1000), + //C3H9N3O4 + N2O5 = C3H5N3O6 + N2H4O3 + GT_Values.RA.addChemicalRecipe(AmmoniumNnitrourethane.get(cell, 1), DinitrogenPentoxide.get(dust, 7), null, null, EthylDinitrocarbamate.get(cell, 1), AmmoniumNitrate.get(dust, 9), 200, 480); //C3H5N3O6 + 2NH3 = C3H7O2N + H4N4O4 @@ -214,19 +215,19 @@ public class BotRecipes { GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ C24, - AmmoniumNitrate.get(dust, 2), - Materials.SodiumHydroxide.getDust(2) + AmmoniumNitrate.get(dust, 9), + Materials.SodiumHydroxide.getDust(3) }, new FluidStack[]{ Materials.SulfuricAcid.getFluid(1000), - Materials.Hydrogen.getGas(2000) + Materials.Hydrogen.getGas(1000) }, new FluidStack[]{ - Materials.Ammonia.getGas(2000), - Materials.NitricAcid.getFluid(2000), + Materials.Ammonia.getGas(1000), + Materials.NitricAcid.getFluid(1000), Materials.DilutedSulfuricAcid.getFluid(1000) }, - new ItemStack[]{Materials.Sodium.getDust(2)}, + new ItemStack[]{Materials.Sodium.getDust(1)}, 300, 480 ); @@ -316,19 +317,23 @@ public class BotRecipes { GT_Values.RA.addCrackingRecipe(2,Materials.Propane.getGas(1000),Materials.NitricAcid.getFluid(2000), Nitromethane.getFluidOrGas(2000),300,1920); - //HF + BF3 + CH3NO2 + HNO3 + H = CH4O + H2O + NO + NO2BF4 + //HF + BF3 + 3CH3NO2 + 6HNO3 = 3CO2 + 8H2O + 8NO + NO2BF4 + //Combine of two reactions: + //BF3 + HF + HNO3 = NO2BF4 + H2O + //3CH3NO2 + 5HNO3 = 3CO2 + 7H2O + 8NO GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{C2}, new FluidStack[]{ Materials.HydrofluoricAcid.getFluid(1000), BoronTrifluoride.getFluidOrGas(1000), - Nitromethane.getFluidOrGas(1000), - Materials.NitricAcid.getFluid(1000), - Materials.Hydrogen.getGas(1000)}, + Nitromethane.getFluidOrGas(3000), + Materials.NitricAcid.getFluid(6000), + }, new FluidStack[]{ - Materials.Methanol.getFluid(1000), - Materials.Water.getFluid(1000), - Materials.NitricOxide.getGas(1000)}, + Materials.CarbonDioxide.getGas(3000), + Materials.Water.getFluid(8000), + Materials.NitricOxide.getGas(8000) + }, new ItemStack[]{NitroniumTetrafluoroborate.get(dust,8)}, 100,7_680 ); @@ -350,21 +355,21 @@ public class BotRecipes { GT_Values.RA.addChemicalRecipe(BoronTrioxide.get(dust,5),cells,Materials.HydrofluoricAcid.getFluid(6000), BoronTrifluoride.getFluidOrGas(2000),Materials.Water.getCells(3),50,480); + //Na2B4O7(H2O)10 + H2SO4 -> 2B2O3 + Na2SO4 + 11H2O GT_Values.RA.addChemicalRecipe(Materials.Borax.getDust(23),C2,Materials.SulfuricAcid.getFluid(1000), null,WerkstoffLoader.Sodiumsulfate.get(dust,7),BoronTrioxide.get(dust,10),400,1920); - //NH4BF4 = NH3 + BF4 + H + //NH4BF4 = NH3 + HBF4 cells.stackSize = 1; GT_Values.RA.addUniversalDistillationRecipe(AmmoniaBoronfluorideSolution.getFluidOrGas(1000), new FluidStack[]{ - Materials.Hydrogen.getGas(1000), Materials.Ammonia.getGas(1000), Tetrafluoroborate.getFluidOrGas(1000) }, null, 20,30_720); - //BF4 + Na = NaBF4 - GT_Values.RA.addChemicalRecipe(Materials.Sodium.getDust(1),null,Tetrafluoroborate.getFluidOrGas(1000), + //HBF4 + NaOH = NaBF4 + H2O + GT_Values.RA.addChemicalRecipe(Materials.SodiumHydroxide.getDust(3),null,Tetrafluoroborate.getFluidOrGas(1000), SodiumTetrafluoroborate.getFluidOrGas(1000),null,100,1920); //NaBF4 = NaF + BF3 diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index dd3e5c939f..39a1f0c9da 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -157,14 +157,33 @@ public class RecipeLoader { //Ammonium Nitrate //HNO3 + NH3 = NH4NO3 - GT_Values.RA.addChemicalRecipe( + GT_Values.RA.addChemicalRecipeForBasicMachineOnly( GT_Utility.getIntegratedCircuit(12), Materials.NitricAcid.getCells(1), Materials.Ammonia.getGas(1000), WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000), Materials.Empty.getCells(1), + null, + 30, 400 - ); + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[] { + GT_Utility.getIntegratedCircuit(12) + }, + new FluidStack[] { + Materials.NitricAcid.getFluid(1000), + Materials.Ammonia.getGas(1000) + }, + new FluidStack[] { + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000) + }, + new ItemStack[] { + }, + 30, + 400 + ); //IODINE-START //SeaweedAsh @@ -1008,7 +1027,7 @@ public class RecipeLoader { GT_Values.RA.addBlastRecipe( WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2), - Materials.Calcium.getDust(2), + Materials.Calcium.getDust(1), null, WerkstoffMaterialPool.CalciumFluoride.getFluidOrGas(3000), Materials.Holmium.getDustSmall(1), @@ -1020,7 +1039,7 @@ public class RecipeLoader { GT_Values.RA.addChemicalRecipe( WerkstoffMaterialPool.SamariumTerbiumMixture.get(OrePrefixes.dust, 1), - BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 1), + BotWerkstoffMaterialPool.AmmoniumNitrate.get(OrePrefixes.dust, 9), null, null, WerkstoffMaterialPool.NitratedSamariumTerbiumMixture.get(OrePrefixes.dust, 1), @@ -1046,7 +1065,7 @@ public class RecipeLoader { null, null, WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1), - Materials.TricalciumPhosphate.getDust(1), + Materials.TricalciumPhosphate.getDust(5), 300, 1920 ); -- cgit From 3f000e8a82e30beb00d02b8110263aed5b503489 Mon Sep 17 00:00:00 2001 From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 4 Jul 2022 21:55:13 +0800 Subject: fix steam amount --- src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index 5ae49a81d4..cec8756451 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -118,7 +118,7 @@ public class BotRecipes { //WO3 + 6H = W + 3H2O GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(6000), - GT_ModHandler.getSteam(6000),Materials.Tungsten.getDust(1),null,100,1920,1000); + GT_ModHandler.getSteam(480000),Materials.Tungsten.getDust(1),null,100,1920,1000); WO3.stackSize = 8; //2WO3 + 3C = 2W + 3CO2 @@ -413,11 +413,9 @@ public class BotRecipes { 20, 122_880 ); - cells.stackSize = 2; GT_Values.RA.addMixerRecipe(UnsymmetricalDimethylhydrazine.get(cell,2),C2,null,null, Trinitramid.getFluidOrGas(1000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120); - cells.stackSize = 1; GT_Values.RA.addMixerRecipe(Trinitramid.get(cell,1),C2,null,null, UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120); @@ -434,10 +432,10 @@ public class BotRecipes { } if (Loader.isModLoaded("miscutils")) { - Class gtppRecipeMap = Class.forName("gregtech.api.util.GTPP_Recipe$GTPP_Recipe_Map"); + Class gtppRecipeMap = Class.forName("gregtech.api.util.GTPP_Recipe$GTPP_Recipe_Map"); Field rocketFuels = gtppRecipeMap.getDeclaredField("sRocketFuels"); rocketFuels.setAccessible(true); - Class rocketFuelsClass = rocketFuels.getType(); + Class rocketFuelsClass = rocketFuels.getType(); Object rocketFuelsObject = rocketFuels.get(null); Method addFuel = rocketFuelsClass.getDeclaredMethod("addFuel",FluidStack.class,FluidStack.class,int.class); addFuel.invoke(rocketFuelsObject,LMP103S.getFluidOrGas(1000),null,666); -- cgit From 4657b8cdbfc1f53c1e7e9a71149f3952c3ad64f7 Mon Sep 17 00:00:00 2001 From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 4 Jul 2022 21:57:42 +0800 Subject: oversight --- src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index cec8756451..77015a4c6e 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -413,9 +413,11 @@ public class BotRecipes { 20, 122_880 ); + cells.stackSize = 2; GT_Values.RA.addMixerRecipe(UnsymmetricalDimethylhydrazine.get(cell,2),C2,null,null, Trinitramid.getFluidOrGas(1000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120); + cells.stackSize = 1; GT_Values.RA.addMixerRecipe(Trinitramid.get(cell,1),C2,null,null, UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),cells,10,120); -- cgit From e43b5a7402e71deeec44d30a7060bea1d7b28fb7 Mon Sep 17 00:00:00 2001 From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 4 Jul 2022 23:17:47 +0800 Subject: Update BotRecipes.java --- src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index 77015a4c6e..cf45b84d78 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -118,7 +118,7 @@ public class BotRecipes { //WO3 + 6H = W + 3H2O GT_Values.RA.addBlastRecipe(WO3,C2,Materials.Hydrogen.getGas(6000), - GT_ModHandler.getSteam(480000),Materials.Tungsten.getDust(1),null,100,1920,1000); + GT_ModHandler.getSteam(3000),Materials.Tungsten.getDust(1),null,100,1920,1000); WO3.stackSize = 8; //2WO3 + 3C = 2W + 3CO2 -- cgit