aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/recipes')
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 5485e0f76f..e9f36aba42 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -48,6 +48,7 @@ import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
import gregtech.api.enums.TierEU;
+import gregtech.api.util.ExternalMaterials;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -68,9 +69,6 @@ public class AssemblerRecipes implements Runnable {
this.loadOutputHatchesRecipes();
this.withIC2NuclearControl();
- Materials LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium;
- Materials LuVMat2 = BartWorks.isModLoaded() ? Materials.get("Rhodium-PlatedPalladium") : Materials.Chrome;
-
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
@@ -1629,7 +1627,7 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 16),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, ExternalMaterials.getRuridit(), 16),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(ItemList.LuV_Coil.get(1))
.noFluidInputs()
@@ -2149,7 +2147,9 @@ public class AssemblerRecipes implements Runnable {
.addTo(sAssemblerRecipes);
GT_Values.RA.stdBuilder()
- .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat2, 8), GT_Utility.getIntegratedCircuit(8))
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 8),
+ GT_Utility.getIntegratedCircuit(8))
.itemOutputs(ItemList.Casing_LuV.get(1))
.noFluidInputs()
.noFluidOutputs()
@@ -7371,13 +7371,13 @@ public class AssemblerRecipes implements Runnable {
}
public void withBartWorks() {
- if (BartWorks.isModLoaded()) {
+ if (!BartWorks.isModLoaded()) {
return;
}
GT_Values.RA.stdBuilder()
.itemInputs(
- getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 6L, 88),
+ GT_OreDictUnificator.get(OrePrefixes.plate, ExternalMaterials.getRhodiumPlatedPalladium(), 6),
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1))
.itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1))
.noFluidInputs()
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
index 4ef36a7f98..d71b4b853f 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
@@ -1,6 +1,5 @@
package gregtech.loaders.postload.recipes;
-import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.util.GT_RecipeBuilder.HOURS;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
@@ -19,6 +18,7 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
+import gregtech.api.util.ExternalMaterials;
import gregtech.api.util.GT_OreDictUnificator;
public class AssemblyLineRecipes implements Runnable {
@@ -30,7 +30,7 @@ public class AssemblyLineRecipes implements Runnable {
solderIndalloy = GTPlusPlus.isModLoaded() ? FluidRegistry.getFluid("molten.indalloy140")
: FluidRegistry.getFluid("molten.solderingalloy");
- LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium;
+ LuVMat = ExternalMaterials.getRuridit();
}
@Override