diff options
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | build.gradle | 30 | ||||
-rw-r--r-- | dependencies.gradle | 6 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 62076 -> 63375 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
-rwxr-xr-x | gradlew | 5 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java | 3 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java | 19 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java | 11 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java | 10 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 17 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java | 132 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 804 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java | 6 | ||||
-rw-r--r-- | src/main/resources/assets/gtnhlanth/lang/en_US.lang | 12 | ||||
-rw-r--r-- | src/main/resources/assets/gtnhlanth/lang/zh_CN.lang | 12 |
16 files changed, 457 insertions, 622 deletions
diff --git a/.gitignore b/.gitignore index b5e0ad07bc..5e80e0ae57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .gradle .settings /.idea/ +/.vscode/ /run/ /build/ /eclipse/ @@ -25,9 +26,13 @@ whitelist.json *.iml *.ipr *.iws -src/main/resources/mixins.*.json +src/main/resources/mixins.*([!.]).json *.bat *.DS_Store !gradlew.bat -*.bak .factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json diff --git a/build.gradle b/build.gradle index e59189c895..8507c7dfbd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1697697256 +//version: 1701530445 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit buildscript { repositories { - mavenCentral() - - maven { - name 'forge' - url 'https://maven.minecraftforge.net' - } maven { // GTNH RetroFuturaGradle and ASM Fork name "GTNH Maven" url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - maven { - name 'sonatype' - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } - maven { - name 'Scala CI dependencies' - url 'https://repo1.maven.org/maven2/' - } - mavenLocal() } } @@ -302,7 +287,7 @@ if (apiPackage) { } if (accessTransformersFile) { - for (atFile in accessTransformersFile.split(",")) { + for (atFile in accessTransformersFile.split(" ")) { String targetFile = "src/main/resources/META-INF/" + atFile.trim() if (!getFile(targetFile).exists()) { throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) @@ -646,7 +631,7 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.7.1" +def mixinProviderVersion = "0.1.13" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" ext.mixinProviderSpec = mixinProviderSpec @@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.5.1' + def lwjgl3ifyVersion = '1.5.7' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} @@ -1187,9 +1172,8 @@ publishing { version = System.getenv("RELEASE_VERSION") ?: identifiedVersion } } - repositories { - if (usesMavenPublishing.toBoolean()) { + if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) { maven { url = mavenPublishUrl allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven @@ -1311,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.2.1" +def buildscriptGradleVersion = "8.5" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/dependencies.gradle b/dependencies.gradle index 7985914949..5e60d6cf88 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.55:dev') - implementation('com.github.GTNewHorizons:GTplusplus:1.10.21:dev') - implementation('com.github.GTNewHorizons:GoodGenerator:0.7.5:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.96:dev') + implementation('com.github.GTNewHorizons:GTplusplus:1.10.37:dev') + implementation('com.github.GTNewHorizons:GoodGenerator:0.7.10:dev') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex c1962a79e2..033e24c4cd 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17a8ddce2d..1af9e0930b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -130,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 94c9e29cf8..36a34f172a 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -32,8 +32,7 @@ import gregtech.api.util.GT_Log; dependencies = "required-after:IC2; " + "required-after:gregtech; " + "required-after:bartworks; " + "required-after:GoodGenerator; " - + "before:miscutils; " - + "required-after:dreamcraft; ") + + "before:miscutils; ") public class GTNHLanthanides { public static Logger LOG = Logger.getLogger("GTNH:Lanthanides"); diff --git a/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java b/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java new file mode 100644 index 0000000000..9792dcad10 --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java @@ -0,0 +1,19 @@ +package com.elisis.gtnhlanth.api.recipe; + +import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.recipe.RecipeMap; +import gregtech.api.recipe.RecipeMapBackend; +import gregtech.api.recipe.RecipeMapBuilder; +import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter; +import gregtech.nei.formatter.SimpleSpecialValueFormatter; + +public class LanthanidesRecipeMaps { + + public static final RecipeMap<RecipeMapBackend> digesterRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.digester") + .maxIO(1, 1, 1, 1).minInputs(1, 1).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE).build(); + public static final RecipeMap<RecipeMapBackend> dissolutionTankRecipes = RecipeMapBuilder + .of("gtnhlanth.recipe.disstank").maxIO(2, 3, 2, 1).minInputs(1, 1) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.disstank")).build(); +} diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 5e2b03e945..9afc808779 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import com.elisis.gtnhlanth.loader.RecipeAdder; +import com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps; import com.elisis.gtnhlanth.util.DescTextLocalization; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -30,6 +30,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; +import gregtech.api.recipe.RecipeMap; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; @@ -91,6 +92,11 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> } @Override + public RecipeMap<?> getRecipeMap() { + return LanthanidesRecipeMaps.digesterRecipes; + } + + @Override public boolean checkRecipe(ItemStack itemStack) { // GT_Log.out.print("Digester: in checkRecipe\n"); @@ -101,8 +107,7 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> // GT_Log.out.print("Digester: " + Arrays.toString(mInventory)); - // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList; - GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes + GT_Recipe tRecipe = LanthanidesRecipeMaps.digesterRecipes .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems); if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false; diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index 96dd57389d..992cdf5d2d 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import com.elisis.gtnhlanth.loader.RecipeAdder; +import com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps; import com.elisis.gtnhlanth.util.DescTextLocalization; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; @@ -32,6 +32,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; +import gregtech.api.recipe.RecipeMap; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; @@ -88,6 +89,11 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di } @Override + public RecipeMap<?> getRecipeMap() { + return LanthanidesRecipeMaps.dissolutionTankRecipes; + } + + @Override public boolean checkRecipe(ItemStack itemStack) { // GT_Log.out.print("in checkRecipe"); @@ -96,7 +102,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]); long tVoltage = this.getMaxInputVoltage(); - GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes + GT_Recipe tRecipe = LanthanidesRecipeMaps.dissolutionTankRecipes .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems); if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false; diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index b465ecfab3..c63b3a2942 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -3,12 +3,12 @@ package com.elisis.gtnhlanth.loader; import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.*; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.OrePrefixes.*; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import java.util.Collection; import java.util.HashSet; import net.minecraft.item.ItemStack; @@ -141,14 +141,14 @@ public class BotRecipes { GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(12)) .itemOutputs(Phosgene.get(cell, 1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(12)) .itemOutputs(Phosgene.get(cell, 1), Materials.Empty.getCells(1)) .fluidInputs(Materials.CarbonMonoxide.getGas(1000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .eut(TierEU.RECIPE_HV).addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), Materials.Chlorine.getCells(2)) .itemOutputs(Phosgene.get(cell, 1), Materials.Empty.getCells(2)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .eut(TierEU.RECIPE_HV).addTo(chemicalReactorRecipes); GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.CarbonMonoxide.getGas(1000)) .fluidOutputs(BotWerkstoffMaterialPool.Phosgene.getFluidOrGas(1000)).duration(2 * SECONDS + 10 * TICKS) @@ -255,11 +255,10 @@ public class BotRecipes { } public static void removeTungstenElectro() { - Collection<GT_Recipe> electroRecipeMap = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList; HashSet<GT_Recipe> toDel = new HashSet<>(); ItemStack[] toRemove = { Materials.Scheelite.getDust(1), Materials.Tungstate.getDust(1), WerkstoffLoader.Ferberite.get(dust, 1), WerkstoffLoader.Huebnerit.get(dust, 1) }; - for (GT_Recipe tRecipe : electroRecipeMap) { + for (GT_Recipe tRecipe : electrolyzerRecipes.getAllRecipes()) { if (tRecipe.mFakeRecipe) continue; for (int i = 0; i < tRecipe.mInputs.length; i++) { ItemStack tItem = tRecipe.mInputs[i]; @@ -272,7 +271,7 @@ public class BotRecipes { } } } - electroRecipeMap.removeAll(toDel); - GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.reInit(); + electrolyzerRecipes.getBackend().removeRecipes(toDel); + electrolyzerRecipes.getBackend().reInit(); } } diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java deleted file mode 100644 index d8f3e7ff29..0000000000 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.elisis.gtnhlanth.loader; - -import java.util.Collection; -import java.util.HashSet; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.util.GT_Recipe; -import gregtech.nei.HeatingCoilSpecialValueFormatter; - -public class RecipeAdder { - - public static final RecipeAdder instance = new RecipeAdder(); - - public final DigestMap DigesterRecipes = (DigestMap) new DigestMap( - new HashSet<>(100), - "gtnhlanth.recipe.digester", - StatCollector.translateToLocal("tile.recipe.digester"), - null, - "gtnhlanth:textures/gui/Digester", - 1, - 1, - 1, - 1, - 1, - StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity - 1, - "K", - false, - true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) - .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE); - - public final DissolutionTankMap DissolutionTankRecipes = (DissolutionTankMap) new DissolutionTankMap( - new HashSet<>(100), - "gtnhlanth.recipe.disstank", - StatCollector.translateToLocal("tile.recipe.disstank"), - null, - "gtnhlanth:textures/gui/Disstank", - 2, - 3, - 1, - 1, - 1, - StatCollector.translateToLocal("value.disstank") + ": ", // Ratio - 1, - ":1", - false, - true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).setUsualFluidInputCount(2); - - public class DigestMap extends GT_Recipe.GT_Recipe_Map { - - public DigestMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, - String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, - int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { - super( - aRecipeList, - aUnlocalizedName, - aLocalName, - aNEIName, - aNEIGUIPath, - aUsualInputCount, - aUsualOutputCount, - aMinimalInputItems, - aMinimalInputFluids, - aAmperage, - aNEISpecialValuePre, - aNEISpecialValueMultiplier, - aNEISpecialValuePost, - aShowVoltageAmperageInNEI, - aNEIAllowed); - } - - public void addDigesterRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput, - ItemStack[] itemOutputs, int EUt, int ticks, int heat) { - super.addRecipe( - false, - itemInputs, - itemOutputs, - null, - fluidInputs, - new FluidStack[] { fluidOutput }, - ticks, - EUt, - heat); - } - } - - public class DissolutionTankMap extends GT_Recipe.GT_Recipe_Map { - - public DissolutionTankMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, - String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, - int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, - boolean aNEIAllowed) { - super( - aRecipeList, - aUnlocalizedName, - aLocalName, - aNEIName, - aNEIGUIPath, - aUsualInputCount, - aUsualOutputCount, - aMinimalInputItems, - aMinimalInputFluids, - aAmperage, - aNEISpecialValuePre, - aNEISpecialValueMultiplier, - aNEISpecialValuePost, - aShowVoltageAmperageInNEI, - aNEIAllowed); - } - - /** Higher part input fluid first, always **/ - public void addDissolutionTankRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput, - ItemStack[] itemOutputs, int EUt, int ticks, int ratio) { - super.addRecipe( - false, - itemInputs, - itemOutputs, - null, - fluidInputs, - new FluidStack[] { fluidOutput }, - ticks, - EUt, - ratio); - } - } -} diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 950c274475..3b5ebf6f4e 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -1,8 +1,32 @@ package com.elisis.gtnhlanth.loader; +import static com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps.digesterRecipes; +import static com.elisis.gtnhlanth.api.recipe.LanthanidesRecipeMaps.dissolutionTankRecipes; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.*; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; +import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerNonCellRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes; +import static gregtech.api.recipe.RecipeMaps.sifterRecipes; +import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.simpleWasherRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -38,7 +62,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -376,38 +399,37 @@ public class RecipeLoader { // CHAIN BEGIN // MONAZITE - RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] { Materials.NitricAcid.getFluid(700) }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2) }, - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(400), - new ItemStack[] { Materials.SiliconDioxide.getDust(1) }, - 1920, - 400, - 800); + GT_Values.RA.stdBuilder().fluidInputs(Materials.NitricAcid.getFluid(700)) + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2)) + .fluidOutputs(WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(400)) + .itemOutputs(Materials.SiliconDioxide.getDust(1)).eut(1920).duration(400).specialValue(800) + .addTo(digesterRecipes); - RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( - new FluidStack[] { Materials.Water.getFluid(10000), - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000) }, - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1) }, - WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000), - new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), - WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), Materials.Monazite.getDustTiny(2) }, - 480, - 900, - 10); - - RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( - new FluidStack[] { Materials.Water.getFluid(90000), - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000) }, - new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9) }, - WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(99000), - new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4), - WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), Materials.Monazite.getDust(2) }, - 480, - 8100, - 10); + GT_Values.RA.stdBuilder() + .fluidInputs( + Materials.Water.getFluid(10000), + WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000)) + .itemInputs(GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1)) + .fluidOutputs(WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000)) + .itemOutputs( + WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), + WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), + Materials.Monazite.getDustTiny(2)) + .eut(480).duration(900).specialValue(10).noOptimize().addTo(dissolutionTankRecipes); + + GT_Values.RA.stdBuilder() + .fluidInputs( + Materials.Water.getFluid(90000), + WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000)) + .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9)) + .fluidOutputs(WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(99000)) + .itemOutputs( + WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4), + WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), + Materials.Monazite.getDust(2)) + .eut(480).duration(8100).specialValue(10).noOptimize().addTo(dissolutionTankRecipes); - GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( + sifterRecipes.addRecipe( false, null, new ItemStack[] { WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), @@ -560,7 +582,7 @@ public class RecipeLoader { 220, 120); - GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( + sifterRecipes.addRecipe( false, null, new ItemStack[] { WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1) }, @@ -608,7 +630,7 @@ public class RecipeLoader { // END Cerium (NMLC) - GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( // Uses fluid, outputs item. Yet another hacky recipe + vacuumFreezerRecipes.addRecipe( // Uses fluid, outputs item. Yet another hacky recipe false, null, new ItemStack[] { WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), // TODO: @@ -740,14 +762,11 @@ public class RecipeLoader { 1920); // BASTNASITE (god help me) - RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] { Materials.NitricAcid.getFluid(700) }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2) }, - WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(400), - new ItemStack[] { Materials.SiliconDioxide.getDust(1) }, - 1920, - 400, - 800); + GT_Values.RA.stdBuilder().fluidInputs(Materials.NitricAcid.getFluid(700)) + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2)) + .fluidOutputs(WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(400)) + .itemOutputs(Materials.SiliconDioxide.getDust(1)).eut(1920).duration(400).specialValue(800) + .addTo(digesterRecipes); GT_Values.RA.addCrackingRecipe( 1, @@ -768,17 +787,16 @@ 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), - new ItemStack[] { WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1) }, - 1920, - 1000, - 10); - - GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( + GT_Values.RA.stdBuilder() + .fluidInputs( + Materials.Water.getFluid(10000), + WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)) + .itemInputs(Materials.Saltpeter.getDust(1)) + .fluidOutputs(WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000)) + .itemOutputs(WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)).eut(1920).duration(1000) + .specialValue(10).noOptimize().addTo(dissolutionTankRecipes); + + sifterRecipes.addRecipe( false, null, new ItemStack[] { Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), @@ -990,357 +1008,340 @@ public class RecipeLoader { GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lanthanum, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(LanthanumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(LanthanumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(LanthanumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( LanthanumExtractingNanoResin.getFluidOrGas(1000), LanthanumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Praseodymium Part // Digester to produce Praseodymium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Praseodymium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(PraseodymiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(PraseodymiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(PraseodymiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( PraseodymiumExtractingNanoResin.getFluidOrGas(1000), PraseodymiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Cerium Part // Digester to produce Cerium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Cerium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(CeriumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(CeriumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(CeriumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( CeriumExtractingNanoResin.getFluidOrGas(1000), CeriumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledCeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Neodymium Part // Digester to produce Neodymium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Neodymium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(NeodymiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( NeodymiumExtractingNanoResin.getFluidOrGas(1000), NeodymiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Neodymium Part // Digester to produce Neodymium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Neodymium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(NeodymiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(NeodymiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( NeodymiumExtractingNanoResin.getFluidOrGas(1000), NeodymiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Promethium Part // Digester to produce Neodymium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Promethium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(PromethiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( PromethiumExtractingNanoResin.getFluidOrGas(1000), PromethiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Promethium Part // Digester to produce Promethium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Promethium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(PromethiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(PromethiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( PromethiumExtractingNanoResin.getFluidOrGas(1000), PromethiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Samarium Part // Digester to produce Samarium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Samarium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(SamariumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(SamariumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(SamariumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( SamariumExtractingNanoResin.getFluidOrGas(1000), SamariumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledSamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Europium Part // Digester to produce Europium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Europium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(EuropiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(EuropiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(EuropiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( EuropiumExtractingNanoResin.getFluidOrGas(1000), EuropiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledEuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Gadolinium Part // Digester to produce Gadolinium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Gadolinium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(GadoliniumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(GadoliniumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(GadoliniumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( GadoliniumExtractingNanoResin.getFluidOrGas(1000), GadoliniumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledGadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Terbium Part // Digester to produce Terbium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Terbium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(TerbiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(TerbiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(TerbiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( TerbiumExtractingNanoResin.getFluidOrGas(1000), TerbiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledTerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Dysprosium Part // Digester to produce Dysprosium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Dysprosium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(DysprosiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(DysprosiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(DysprosiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800) - .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_ZPM).duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( DysprosiumExtractingNanoResin.getFluidOrGas(1000), DysprosiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledDysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Holmium Part // Digester to produce Holmium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Holmium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(HolmiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(HolmiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(HolmiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( HolmiumExtractingNanoResin.getFluidOrGas(1000), HolmiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledHolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Erbium Part // Digester to produce Erbium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Erbium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(ErbiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(ErbiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(ErbiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( ErbiumExtractingNanoResin.getFluidOrGas(1000), ErbiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Thulium Part // Digester to produce Thulium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Thulium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(ThuliumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(ThuliumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(ThuliumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( ThuliumExtractingNanoResin.getFluidOrGas(1000), ThuliumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Ytterbium Part // Digester to produce Ytterbium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ytterbium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(YtterbiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(YtterbiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(YtterbiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( YtterbiumExtractingNanoResin.getFluidOrGas(1000), YtterbiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledYtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Lutetium Part // Digester to produce Lutetium Chloride Concentrate GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lutetium, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(3)).fluidInputs(Materials.Chlorine.getGas(36000)) .fluidOutputs(LutetiumChlorideConcentrate.getFluidOrGas(3000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); GT_Values.RA.stdBuilder().itemInputs(LutetiumOreConcentrate.get(OrePrefixes.dust, 1)) .itemOutputs(Materials.SiliconDioxide.getDust(1)).fluidInputs(Materials.Chlorine.getGas(12000)) .fluidOutputs(LutetiumChlorideConcentrate.getFluidOrGas(1000)).specialValue(800).eut(TierEU.RECIPE_ZPM) - .duration(2 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(2 * SECONDS).addTo(digesterRecipes); // 1B oreChlorideConcentrate = 1 ore's rare earth metal + 3 any rare earth metal - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( LutetiumExtractingNanoResin.getFluidOrGas(1000), LutetiumChlorideConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Ion Extracting Process to produce Rare Earth Element (example Samarium) by Nano Resin // Get Extracting Nano Resin @@ -1351,9 +1352,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(LanthanumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Praseodymium GT_Values.RA.stdBuilder() @@ -1361,9 +1362,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(PraseodymiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Cerium GT_Values.RA.stdBuilder() @@ -1371,9 +1372,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(CeriumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Neodymium GT_Values.RA.stdBuilder() @@ -1381,9 +1382,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(NeodymiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Promethium GT_Values.RA.stdBuilder() @@ -1391,9 +1392,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Promethium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(PromethiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Sm GT_Values.RA.stdBuilder() @@ -1401,9 +1402,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(SamariumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Europium GT_Values.RA.stdBuilder() @@ -1411,9 +1412,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(EuropiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Gadolinium GT_Values.RA.stdBuilder() @@ -1421,9 +1422,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(GadoliniumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Terbium GT_Values.RA.stdBuilder() @@ -1431,9 +1432,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(TerbiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Dysprosium GT_Values.RA.stdBuilder() @@ -1441,9 +1442,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(DysprosiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Holmium GT_Values.RA.stdBuilder() @@ -1451,9 +1452,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(HolmiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Erbium GT_Values.RA.stdBuilder() @@ -1461,9 +1462,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(ErbiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Thulium GT_Values.RA.stdBuilder() @@ -1471,9 +1472,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(ThuliumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Ytterbium GT_Values.RA.stdBuilder() @@ -1481,9 +1482,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(YtterbiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // Lutetium GT_Values.RA.stdBuilder() @@ -1491,9 +1492,9 @@ public class RecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) - .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)).noItemOutputs() + .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) .fluidOutputs(LutetiumExtractingNanoResin.getFluidOrGas(1000)).eut(TierEU.RECIPE_UV) - .duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .duration(10 * SECONDS).addTo(laserEngraverRecipes); // TODO Electrolyzer recycle Nano Resin and produce molten rare earth metal, @@ -1504,7 +1505,7 @@ public class RecipeLoader { LanthanumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Lanthanum, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Pr GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1513,7 +1514,7 @@ public class RecipeLoader { PraseodymiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Praseodymium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Ce GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1522,7 +1523,7 @@ public class RecipeLoader { CeriumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Cerium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Nd GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1531,7 +1532,7 @@ public class RecipeLoader { NeodymiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Neodymium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Po GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1540,7 +1541,7 @@ public class RecipeLoader { PromethiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Promethium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Sm GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1549,7 +1550,7 @@ public class RecipeLoader { SamariumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Samarium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Eu GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1558,7 +1559,7 @@ public class RecipeLoader { EuropiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Europium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Ga GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1567,7 +1568,7 @@ public class RecipeLoader { GadoliniumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Gadolinium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Tb GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1576,7 +1577,7 @@ public class RecipeLoader { TerbiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Terbium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Dy GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1585,7 +1586,7 @@ public class RecipeLoader { DysprosiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Dysprosium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Ho GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1594,7 +1595,7 @@ public class RecipeLoader { HolmiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Holmium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Er GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1603,7 +1604,7 @@ public class RecipeLoader { ErbiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Erbium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Tm GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1612,7 +1613,7 @@ public class RecipeLoader { ThuliumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Thulium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Yb GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1621,7 +1622,7 @@ public class RecipeLoader { YtterbiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Ytterbium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // Lu GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(2)) @@ -1630,444 +1631,399 @@ public class RecipeLoader { LutetiumExtractingNanoResin.get(OrePrefixes.cell, 1), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Lutetium, 1)) .fluidOutputs(Materials.Chlorine.getGas(3000)).eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // TODO ChlorinitedRareEarthConcentrate process with every 15 Rare Earth Extracting Nano Resin // La - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( LanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( LanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( LanthanumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLanthanumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Pr - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( PraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( PraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( PraseodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPraseodymiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Ce - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( CeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledCeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( CeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledCeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( CeriumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledCeriumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Nd - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( NeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( NeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( NeodymiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledNeodymiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Pm - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( PromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( PromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( PromethiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledPromethiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Sm - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( SamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledSamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( SamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledSamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( SamariumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledSamariumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Eu - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( EuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledEuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( EuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledEuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( EuropiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledEuropiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Ga - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( GadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledGadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( GadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledGadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( GadoliniumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledGadoliniumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Tb - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( TerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledTerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( TerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledTerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( TerbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledTerbiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Dy - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( DysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledDysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( DysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledDysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( DysprosiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledDysprosiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Ho - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( HolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledHolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( HolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledHolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( HolmiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledHolmiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Er - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( ErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( ErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( ErbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledErbiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Tm - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( ThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( ThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( ThuliumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledThuliumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Yb - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( YtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledYtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( YtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledYtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( YtterbiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledYtterbiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // Lu - GT_Values.RA.stdBuilder().noItemInputs() + GT_Values.RA.stdBuilder() .fluidInputs( LutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthConcentrate.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( LutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthEnrichedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().noItemInputs() + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() .fluidInputs( LutetiumExtractingNanoResin.getFluidOrGas(1000), ChlorinatedRareEarthDilutedSolution.getFluidOrGas(1000)) - .noItemOutputs() .fluidOutputs( FilledLutetiumExtractingNanoResin.getFluidOrGas(1000), MyMaterial.wasteLiquid.getFluidOrGas(1000)) - .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_UV).duration(1 * SECONDS).addTo(multiblockChemicalReactorRecipes); // TODO Samarium Ore Concentrate Dust Processing Line Start @@ -2076,14 +2032,14 @@ public class RecipeLoader { .fluidInputs(Materials.NitricAcid.getFluid(200)) .itemOutputs(ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1)) .fluidOutputs(MuddySamariumRareEarthSolution.getFluidOrGas(800)).specialValue(800).eut(TierEU.RECIPE_EV) - .duration(10 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .duration(10 * SECONDS).addTo(digesterRecipes); // 1 CrushedSamariumOre = 3 SamariumOreConcentrate in process GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Samarium, 8)) .fluidInputs(Materials.NitricAcid.getFluid(300)) .itemOutputs(ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 3)) .fluidOutputs(MuddySamariumRareEarthSolution.getFluidOrGas(1200)).specialValue(800) - .eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(RecipeAdder.instance.DigesterRecipes); + .eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(digesterRecipes); // 1B MuddySmSolution + 1B NitricAcid =EV@10s= 2B SamariumRareEarthMud + 0.8 CeriumDioxide + 0.6 // CeriumRichMixture(CeriumOreConcentrate) @@ -2091,19 +2047,18 @@ public class RecipeLoader { .fluidInputs(Materials.NitricAcid.getFluid(1000), MuddySamariumRareEarthSolution.getFluidOrGas(1000)) .itemOutputs(CeriumDioxide.get(OrePrefixes.dust, 1), CeriumOreConcentrate.get(OrePrefixes.dust, 1)) .fluidOutputs(SamariumRareEarthMud.getFluidOrGas(2000)).specialValue(1).outputChances(8000, 6000) - .noOptimize().eut(TierEU.RECIPE_EV).duration(10 * SECONDS) - .addTo(RecipeAdder.instance.DissolutionTankRecipes); + .noOptimize().eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(dissolutionTankRecipes); GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) .fluidInputs(Materials.NitricAcid.getFluid(9000), MuddySamariumRareEarthSolution.getFluidOrGas(9000)) .itemOutputs(CeriumDioxide.get(OrePrefixes.dust, 9), CeriumOreConcentrate.get(OrePrefixes.dust, 9)) .fluidOutputs(SamariumRareEarthMud.getFluidOrGas(18000)).specialValue(1).outputChances(8000, 6000) - .noOptimize().eut(TierEU.RECIPE_IV).duration(300).addTo(RecipeAdder.instance.DissolutionTankRecipes); + .noOptimize().eut(TierEU.RECIPE_IV).duration(300).addTo(dissolutionTankRecipes); // Low Efficiency method in LCR GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.NitricAcid.getFluid(1000), MuddySamariumRareEarthSolution.getFluidOrGas(1000)) .itemOutputs(CeriumDioxide.get(OrePrefixes.dust, 1)) .fluidOutputs(SamariumRareEarthMud.getFluidOrGas(1000)).outputChances(5000).eut(TierEU.RECIPE_EV) - .duration(300).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .duration(300).addTo(multiblockChemicalReactorRecipes); // 1B SamariumRareEarthMud + 9B water =EV@30s= 10B DilutedSamariumRareEarthSolution // + (90% + 60%) NeodymiumREConcentrate @@ -2114,7 +2069,7 @@ public class RecipeLoader { NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 1)) .fluidOutputs(DilutedSamariumRareEarthSolution.getFluidOrGas(10000)).specialValue(9) .outputChances(9000, 6000).noOptimize().eut(TierEU.RECIPE_EV).duration(600) - .addTo(RecipeAdder.instance.DissolutionTankRecipes); + .addTo(dissolutionTankRecipes); GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) .fluidInputs(Materials.Water.getFluid(81000), SamariumRareEarthMud.getFluidOrGas(9000)) .itemOutputs( @@ -2122,12 +2077,12 @@ public class RecipeLoader { NeodymicRareEarthConcentrate.get(OrePrefixes.dust, 9)) .fluidOutputs(DilutedSamariumRareEarthSolution.getFluidOrGas(90000)).specialValue(9) .outputChances(9000, 6000).noOptimize().eut(TierEU.RECIPE_IV).duration(900) - .addTo(RecipeAdder.instance.DissolutionTankRecipes); + .addTo(dissolutionTankRecipes); // Low Efficiency method in LCR - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) .fluidInputs(SamariumRareEarthMud.getFluidOrGas(1000), Materials.Water.getFluid(16000)) .fluidOutputs(DilutedSamariumRareEarthSolution.getFluidOrGas(8000)).eut(TierEU.RECIPE_EV).duration(1200) - .addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); // 2B DilutedSamariumRareEarthSolution + 3B Oxalate // =EV@10s= @@ -2141,14 +2096,14 @@ public class RecipeLoader { ImpureSamariumOxalate.get(OrePrefixes.dust, 5), DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 3)) .fluidOutputs(MuddySamariumRareEarthSolution.getFluidOrGas(50)).outputChances(10000, 1000) - .eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(multiblockChemicalReactorRecipes); // 5 ImpureSamariumOxalate + 6B HCL = 8 ImpureSamariumChloride + 6B CO GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumOxalate.get(OrePrefixes.dust, 5)) .fluidInputs(Materials.HydrochloricAcid.getFluid(6000)) .itemOutputs(ImpureSamariumChloride.get(OrePrefixes.dust, 8)) .fluidOutputs(Materials.CarbonMonoxide.getGas(6000)).eut(960).duration(10 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); + .addTo(multiblockChemicalReactorRecipes); /** * ImpureSamariumChloride has 2 method to process 1. In IV-LuV, fix with NcCL then use electrolyzer to process @@ -2158,12 +2113,12 @@ public class RecipeLoader { // 2 ImpureSamariumChloride + 1 NaCl =LV@5s= 3 SamariumChlorideSodiumChlorideBlend GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 2), Materials.Salt.getDust(1)) - .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).noFluidInputs() - .noFluidOutputs().eut(30).duration(5 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).eut(30).duration(5 * SECONDS) + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 2), Materials.Sodium.getDust(1)) - .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).noFluidInputs() - .noFluidOutputs().eut(30).duration(5 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sMultiblockMixerRecipes); + .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).eut(30).duration(5 * SECONDS) + .addTo(mixerNonCellRecipes); // 6 SamariumChlorideSodiumChlorideBlend =IV@1s= 1 SamariumDust + 1 SodiumDust + 2/9 RarestEarthResidue + 4B // Chlorine @@ -2171,44 +2126,40 @@ public class RecipeLoader { .itemInputs( GT_Utility.getIntegratedCircuit(1), SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 6)) - .noFluidInputs() .itemOutputs( Materials.Samarium.getDust(1), Materials.Sodium.getDust(1), RarestEarthResidue.get(OrePrefixes.dustTiny, 2)) .fluidOutputs(Materials.Chlorine.getGas(4000)).eut(TierEU.RECIPE_IV).duration(1 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(9), SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 54)) - .noFluidInputs() .itemOutputs( Materials.Samarium.getDust(9), Materials.Sodium.getDust(9), RarestEarthResidue.get(OrePrefixes.dust, 1)) .fluidOutputs(Materials.Chlorine.getGas(36000)).eut(30720).duration(2 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes); + .addTo(electrolyzerRecipes); // ZPM molten distilling method // melt ImpureSamariumChloride - GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 1)).noItemOutputs() - .noFluidInputs().fluidOutputs(ImpureSamariumChloride.getMolten(144)).eut(TierEU.RECIPE_EV).duration(24) - .addTo(GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 1)) + .fluidOutputs(ImpureSamariumChloride.getMolten(144)).eut(TierEU.RECIPE_EV).duration(24) + .addTo(fluidExtractionRecipes); // distill with LanthanumDust 36*144L moltenSmCl3 = 16*144L moltenSm + 27B Cl GT_Values.RA.stdBuilder().itemInputs(Materials.Lanthanum.getDust(9)) .itemOutputs(ImpureLanthanumChloride.get(OrePrefixes.dust, 36)) .fluidInputs(ImpureSamariumChloride.getMolten(5184)).fluidOutputs(Materials.Samarium.getMolten(2304)) - .eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize() - .addTo(GT_Recipe.GT_Recipe_Map.sDistillationRecipes); + .eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize().addTo(distillationTowerRecipes); // Centrifuge ImpureLanthanumChlorideDust GT_Values.RA.stdBuilder().itemInputs(ImpureLanthanumChloride.get(OrePrefixes.dust, 36)) .itemOutputs(LanthaniumChloride.get(OrePrefixes.dust, 36), RarestEarthResidue.get(OrePrefixes.dust, 5)) - .noFluidInputs().noFluidOutputs().eut(TierEU.RECIPE_EV).duration(5 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes); + .eut(TierEU.RECIPE_EV).duration(5 * SECONDS).addTo(centrifugeRecipes); /** * DephosphatedSamariumConcentrate has a simple and not shit process. Just burn in furnace, then use @@ -2218,9 +2169,9 @@ public class RecipeLoader { DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1), SamariumOxide.get(OrePrefixes.dustTiny, 2), 114); - GT_Values.RA.stdBuilder().itemInputs(DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)).noFluidInputs() - .itemOutputs(SamariumOxide.get(OrePrefixes.dust, 1), Gangue.get(OrePrefixes.dust, 1)).noFluidOutputs() - .specialValue(1200).eut(514).duration(2 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sBlastRecipes); + GT_Values.RA.stdBuilder().itemInputs(DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)) + .itemOutputs(SamariumOxide.get(OrePrefixes.dust, 1), Gangue.get(OrePrefixes.dust, 1)).specialValue(1200) + .eut(514).duration(2 * SECONDS).addTo(blastFurnaceRecipes); // GT_Values.RA.addBlastRecipe( // DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1), // null, @@ -2420,18 +2371,16 @@ public class RecipeLoader { Materials.Cerium.getDustTiny(1), Materials.Lutetium.getDust(3), Materials.Sapphire.getDust(5)) - .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)).noFluidInputs() - .noFluidOutputs().eut(TierEU.RECIPE_UV).duration(5 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)).eut(TierEU.RECIPE_UV) + .duration(5 * SECONDS).addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(4), Materials.Cerium.getDustTiny(1), Materials.Lutetium.getDust(3), Materials.GreenSapphire.getDust(10)) - .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)).noFluidInputs() - .noFluidOutputs().eut(TierEU.RECIPE_UV).duration(5 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 8)).eut(TierEU.RECIPE_UV) + .duration(5 * SECONDS).addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(4), @@ -2439,8 +2388,7 @@ public class RecipeLoader { Materials.Lutetium.getDust(6), Materials.Aluminiumoxide.getDust(25)) .itemOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 12)) - .fluidInputs(Materials.Oxygen.getGas(9000)).noFluidOutputs().eut(TierEU.RECIPE_UV).duration(400) - .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .fluidInputs(Materials.Oxygen.getGas(9000)).eut(TierEU.RECIPE_UV).duration(400).addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(5), @@ -2452,8 +2400,7 @@ public class RecipeLoader { CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 32)) - .noFluidInputs().noFluidOutputs().eut(TierEU.RECIPE_UV).duration(1800) - .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .eut(TierEU.RECIPE_UV).duration(1800).addTo(mixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(5), @@ -2467,14 +2414,13 @@ public class RecipeLoader { CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 64), CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 32)) - .noFluidInputs().noFluidOutputs().eut(TierEU.RECIPE_UV).duration(1800) - .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); + .eut(TierEU.RECIPE_UV).duration(1800).addTo(mixerRecipes); // Get LuAG Crystal seed GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) - .fluidInputs(Materials.Lutetium.getMolten(144 * 8)).noFluidOutputs().outputChances(514).eut(500000) - .duration(500).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + .fluidInputs(Materials.Lutetium.getMolten(144 * 8)).outputChances(514).eut(500000).duration(500) + .addTo(autoclaveRecipes); // 1 LuAG Blend = 1.1(Og) 1.0(Xe) 0.99(Kr) LuAG in Autoclave GT_Values.RA.stdBuilder() @@ -2484,8 +2430,8 @@ public class RecipeLoader { .itemOutputs( CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(40)).noFluidOutputs().outputChances(8000, 1900) - .eut(TierEU.RECIPE_UHV).duration(512).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(40)).outputChances(8000, 1900).eut(TierEU.RECIPE_UHV) + .duration(512).addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs( CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1), @@ -2493,8 +2439,8 @@ public class RecipeLoader { .itemOutputs( CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Xenon.getFluidOrGas(25)).noFluidOutputs().outputChances(9000, 1000) - .eut(TierEU.RECIPE_UHV).duration(256).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + .fluidInputs(WerkstoffLoader.Xenon.getFluidOrGas(25)).outputChances(9000, 1000).eut(TierEU.RECIPE_UHV) + .duration(256).addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(1), @@ -2502,8 +2448,8 @@ public class RecipeLoader { .itemOutputs( CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).noFluidOutputs().outputChances(10000, 100) - .eut(TierEU.RECIPE_UHV).duration(128).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).outputChances(10000, 100) + .eut(TierEU.RECIPE_UHV).duration(128).addTo(autoclaveRecipes); GT_Values.RA.stdBuilder() .itemInputs( CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1), @@ -2511,17 +2457,17 @@ public class RecipeLoader { .itemOutputs( CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 2)) - .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).noFluidOutputs().outputChances(10000, 2000) - .eut(TierEU.RECIPE_UHV).duration(128).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).outputChances(10000, 2000) + .eut(TierEU.RECIPE_UHV).duration(128).addTo(autoclaveRecipes); // 1 LuAG Blend = 1 LuAG in Vacuum Furnace GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.dust, 1)) .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(108)).noFluidOutputs().specialValue(9100) - .eut(TierEU.RECIPE_UHV).duration(5 * SECONDS).addTo(GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes); + .fluidInputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(108)).specialValue(9100) + .eut(TierEU.RECIPE_UHV).duration(5 * SECONDS).addTo(vacuumFurnaceRecipes); GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) - .noItemOutputs().noFluidInputs().fluidOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(144)) - .eut(30000).duration(1 * SECONDS).addTo(GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes); + .fluidOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(144)).eut(30000).duration(1 * SECONDS) + .addTo(fluidExtractionRecipes); // 16 Adv Crystal SoC for (ItemStack itemStack : OreDictionary.getOres("craftingLensBlue")) { @@ -2529,9 +2475,8 @@ public class RecipeLoader { .itemInputs( GT_Utility.copyAmount(0, itemStack), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(16)).noFluidInputs().noFluidOutputs() - .requiresCleanRoom().eut(160000).duration(40 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .itemOutputs(ItemList.Circuit_Chip_CrystalSoC2.get(16)).requiresCleanRoom().eut(160000) + .duration(40 * SECONDS).addTo(laserEngraverRecipes); } // 16 Crystal SoC @@ -2540,9 +2485,8 @@ public class RecipeLoader { .itemInputs( GT_Utility.copyAmount(0, itemStack), CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(16)).noFluidInputs().noFluidOutputs() - .requiresCleanRoom().eut(160000).duration(40 * SECONDS) - .addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); + .itemOutputs(ItemList.Circuit_Chip_CrystalSoC.get(16)).requiresCleanRoom().eut(160000) + .duration(40 * SECONDS).addTo(laserEngraverRecipes); } } @@ -2557,7 +2501,7 @@ public class RecipeLoader { HashSet<GT_Recipe> reAdd = new HashSet<>(5000); // For Crusher - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.mRecipeList) { + for (GT_Recipe recipe : maceratorRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; // GT_Log.out.print("\n" + input.getDisplayName()); if (GT_Utility.isStackValid(input)) { @@ -2591,9 +2535,9 @@ public class RecipeLoader { } } } - GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.reInit(); + maceratorRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(maceratorRecipes::add); + maceratorRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2603,7 +2547,7 @@ public class RecipeLoader { GT_Log.out.print("Crusher done!\n"); // For Washer - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.mRecipeList) { + for (GT_Recipe recipe : oreWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); @@ -2635,9 +2579,9 @@ public class RecipeLoader { } } } - GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.reInit(); + oreWasherRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(oreWasherRecipes::add); + oreWasherRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2647,7 +2591,7 @@ public class RecipeLoader { GT_Log.out.print("Washer done!\n"); // For Thermal Centrifuge - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.mRecipeList) { + for (GT_Recipe recipe : thermalCentrifugeRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); @@ -2680,9 +2624,9 @@ public class RecipeLoader { } } } - GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.reInit(); + thermalCentrifugeRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(thermalCentrifugeRecipes::add); + thermalCentrifugeRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2692,7 +2636,7 @@ public class RecipeLoader { GT_Log.out.print("Thermal Centrifuge done!\n"); // For Centrifuge - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) { + for (GT_Recipe recipe : centrifugeRecipes.getAllRecipes()) { ItemStack input = null; FluidStack fluidInput = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; @@ -2761,9 +2705,9 @@ public class RecipeLoader { * remove.add(tRecipe); } } */ } - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.reInit(); + centrifugeRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(centrifugeRecipes::add); + centrifugeRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2773,7 +2717,7 @@ public class RecipeLoader { GT_Log.out.print("Centrifuge done!\n"); // For Centrifuge (PA) - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList) { + for (GT_Recipe recipe : centrifugeNonCellRecipes.getAllRecipes()) { ItemStack input = null; FluidStack fluidInput = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; @@ -2828,9 +2772,9 @@ public class RecipeLoader { } } } - GT_Recipe.GT_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sMultiblockCentrifugeRecipes.reInit(); + centrifugeNonCellRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(centrifugeNonCellRecipes::add); + centrifugeNonCellRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2840,7 +2784,7 @@ public class RecipeLoader { GT_Log.out.print("Centrifuge (PA) done!\n"); // For Hammer - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sHammerRecipes.mRecipeList) { + for (GT_Recipe recipe : hammerRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); @@ -2872,9 +2816,9 @@ public class RecipeLoader { } } } - GT_Recipe.GT_Recipe_Map.sHammerRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sHammerRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sHammerRecipes.reInit(); + hammerRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(hammerRecipes::add); + hammerRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2884,7 +2828,7 @@ public class RecipeLoader { GT_Log.out.print("Hammer done!\n"); // Electrolyzer - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) { + for (GT_Recipe recipe : electrolyzerRecipes.getAllRecipes()) { for (ItemStack input : recipe.mInputs) { if (GT_Utility.isStackValid(input)) { GT_Log.out.print(input.getDisplayName() + "\n"); @@ -2924,9 +2868,9 @@ 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(); + electrolyzerRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(electrolyzerRecipes::add); + electrolyzerRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2936,7 +2880,7 @@ public class RecipeLoader { GT_Log.out.print("Electrolyzer done!\n"); // Electrolyzer (PA) - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList) { + for (GT_Recipe recipe : electrolyzerNonCellRecipes.getAllRecipes()) { for (ItemStack input : recipe.mInputs) { if (GT_Utility.isStackValid(input)) { GT_Log.out.print(input.getDisplayName() + "\n"); @@ -2976,9 +2920,9 @@ public class RecipeLoader { } } - GT_Recipe.GT_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sMultiblockElectrolyzerRecipes.reInit(); + electrolyzerNonCellRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(electrolyzerNonCellRecipes::add); + electrolyzerNonCellRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -2989,7 +2933,7 @@ public class RecipeLoader { if (Loader.isModLoaded("miscutils")) { // For Simple Washer - for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList) { + for (GT_Recipe recipe : simpleWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); @@ -3018,9 +2962,9 @@ public class RecipeLoader { } } } - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.removeAll(remove); - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.addAll(reAdd); - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.reInit(); + simpleWasherRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(simpleWasherRecipes::add); + simpleWasherRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -3030,7 +2974,7 @@ public class RecipeLoader { GT_Log.out.print("Simple Washer done!\n"); // Dehydrator - for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList) { + for (GT_Recipe recipe : chemicalDehydratorRecipes.getAllRecipes()) { if (recipe.mInputs.length == 0) { continue; } @@ -3065,9 +3009,9 @@ public class RecipeLoader { } } - 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(); + chemicalDehydratorRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(chemicalDehydratorRecipes::add); + chemicalDehydratorRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); @@ -3079,17 +3023,15 @@ public class RecipeLoader { /* * 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) { if (recipe.mInputs.length == 0) break; ItemStack - * input = recipe.mInputs[0]; GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); if - * (GT_Utility.isStackValid(input)) { if (true) { GT_Log.out.print("Sift ore found and iffed " + - * input.getDisplayName() + "\n"); //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(); GT_Log.out.print("Sifter done!\n"); + * : sifterRecipes.mRecipeList) { if (recipe.mInputs.length == 0) break; ItemStack input = recipe.mInputs[0]; + * GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); if (GT_Utility.isStackValid(input)) { if + * (true) { GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n"); //GT_Recipe tRecipe = + * recipe.copy(); remove.add(recipe); break; } } } sifterRecipes.mRecipeList.removeAll(remove); + * sifterRecipes.mRecipeList.addAll(reAdd); sifterRecipes.reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + + * remove.size() + "! "); remove.clear(); reAdd.clear(); GT_Log.out.print("Sifter done!\n"); */ // Chemical Bath - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList) { + for (GT_Recipe recipe : chemicalBathRecipes.getAllRecipes()) { // ItemStack input = recipe.mInputs[0]; for (ItemStack input : recipe.mInputs) { GT_Log.out.print(input.getDisplayName() + "\n"); @@ -3107,9 +3049,9 @@ public class RecipeLoader { } } - 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(); + chemicalBathRecipes.getBackend().removeRecipes(remove); + reAdd.forEach(chemicalBathRecipes::add); + chemicalBathRecipes.getBackend().reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java index a3fade1f7e..9bc1c17aa2 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java @@ -30,12 +30,12 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; +import gregtech.api.recipe.RecipeMap; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Shaped_Recipe; import gregtech.api.util.GT_Utility; @@ -83,8 +83,8 @@ public class ZPMRubberChanges implements Runnable { } } - for (GT_Recipe_Map map : GT_Recipe_Map.sMappings) { - for (GT_Recipe recipe : map.mRecipeList) { + for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) { + for (GT_Recipe recipe : map.getAllRecipes()) { for (ItemStack stack : ZPMPlusComponents) { rewriteMachineRecipes(stack, RubberGenerated, recipe); } diff --git a/src/main/resources/assets/gtnhlanth/lang/en_US.lang b/src/main/resources/assets/gtnhlanth/lang/en_US.lang index 8f81138d66..5b944ee029 100644 --- a/src/main/resources/assets/gtnhlanth/lang/en_US.lang +++ b/src/main/resources/assets/gtnhlanth/lang/en_US.lang @@ -1,7 +1,9 @@ -tile.recipe.digester=Digester -tile.recipe.disstank=Dissolution Tank -value.digester=Heat Capacity -value.disstank=Ratio +# RecipeMaps +gtnhlanth.recipe.digester=Digester +gtnhlanth.recipe.disstank=Dissolution Tank + +# NEI +value.disstank=Ratio: %s:1 DissolutionTank.hint.0=Dot 1: Clean Stainless Steel Machine Casing DissolutionTank.hint.1=24x Borosilicate Glass @@ -48,4 +50,4 @@ fluid.Toluene Diisocyanate=Toluene Diisocyanate fluid.Dinitrotoluene=Dinitrotoluene fluid.Diaminotoluene=Diaminotoluene fluid.Toluene Tetramethyl Diisocyanate=Toluene Tetramethyl Diisocyanate -fluid.Diluted Acetone=Diluted Acetone
\ No newline at end of file +fluid.Diluted Acetone=Diluted Acetone diff --git a/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang b/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang index b79e58ce9f..2bd95ff47d 100644 --- a/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang +++ b/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang @@ -1,7 +1,9 @@ -tile.recipe.digester=煮解池 -tile.recipe.disstank=溶解罐 -value.digester=热容 -value.disstank=比例 +# RecipeMaps +gtnhlanth.recipe.digester=煮解池 +gtnhlanth.recipe.disstank=溶解罐 + +# NEI +value.disstank=比例: %s:1 DissolutionTank.hint.0=提示方块:1号:洁净不锈钢机械方块 DissolutionTank.hint.1=24x硼玻璃(任意等级) @@ -14,4 +16,4 @@ Digester.hint.1=9x洁净不锈钢机械方块 Digester.hint.2=16x隔热机械方块 Digester.hint.3=16x线圈方块 Digester.hint.4=输入总线、输出总线、输入仓、输出仓 -Digester.hint.5=能源仓、维护仓
\ No newline at end of file +Digester.hint.5=能源仓、维护仓 |