aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/loaders/load/FuelLoader.java84
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java38
2 files changed, 63 insertions, 59 deletions
diff --git a/src/main/java/gregtech/loaders/load/FuelLoader.java b/src/main/java/gregtech/loaders/load/FuelLoader.java
index 639b5359a3..544267c366 100644
--- a/src/main/java/gregtech/loaders/load/FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/FuelLoader.java
@@ -2,7 +2,6 @@ package gregtech.loaders.load;
import static gregtech.api.enums.Mods.BloodMagic;
import static gregtech.api.enums.Mods.EnderIO;
-import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels;
import static gregtech.api.recipe.RecipeMaps.hugeNaquadahReactorFuels;
import static gregtech.api.recipe.RecipeMaps.largeNaquadahReactorFuels;
@@ -20,6 +19,7 @@ import gregtech.api.enums.FluidState;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.fluid.GTFluidFactory;
import gregtech.api.util.GTLog;
@@ -85,43 +85,47 @@ public class FuelLoader implements Runnable {
.addTo(ultraHugeNaquadahReactorFuels);
// BloodMagic
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
- .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L))
- .duration(0)
- .eut(0)
- .metadata(FUEL_VALUE, 400)
- .addTo(magicFuels);
+ if (BloodMagic.isModLoaded()) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
+ .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 400)
+ .addTo(magicFuels);
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
- .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
- .duration(0)
- .eut(0)
- .metadata(FUEL_VALUE, 1000)
- .addTo(magicFuels);
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
+ .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 1000)
+ .addTo(magicFuels);
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
- .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
- .duration(0)
- .eut(0)
- .metadata(FUEL_VALUE, 8000)
- .addTo(magicFuels);
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
+ .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 8000)
+ .addTo(magicFuels);
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27))
- .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
- .duration(0)
- .eut(0)
- .metadata(FUEL_VALUE, 20000)
- .addTo(magicFuels);
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27))
+ .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 20000)
+ .addTo(magicFuels);
+ }
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4))
- .metadata(FUEL_VALUE, 4)
- .metadata(FUEL_TYPE, 5)
- .addTo(GTRecipeConstants.Fuel);
+ if (Mods.Thaumcraft.isModLoaded()) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(Mods.Thaumcraft.ID, "ItemResource", 1L, 4))
+ .metadata(FUEL_VALUE, 4)
+ .metadata(FUEL_TYPE, 5)
+ .addTo(GTRecipeConstants.Fuel);
+ }
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.experience_bottle, 1))
.metadata(FUEL_VALUE, 10)
@@ -137,10 +141,12 @@ public class FuelLoader implements Runnable {
.metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2)
.metadata(FUEL_TYPE, Materials.NetherStar.mFuelType)
.addTo(GTRecipeConstants.Fuel);
- GTValues.RA.stdBuilder()
- .itemInputs(GTModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
- .metadata(FUEL_VALUE, 250)
- .metadata(FUEL_TYPE, 1)
- .addTo(GTRecipeConstants.Fuel);
+ if (Mods.EnderIO.isModLoaded()) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
+ .metadata(FUEL_VALUE, 250)
+ .metadata(FUEL_TYPE, 1)
+ .addTo(GTRecipeConstants.Fuel);
+ }
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 12e127c3b7..bdf93c22be 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -649,27 +649,25 @@ public final class ModItems {
dustFertUN32 = ItemUtils
.generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
- ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
- ItemStack temp2 = null;
-
if (Forestry.isModLoaded()) {
- temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
- }
- if (temp1 != null) {
- fluidFertBasic = FluidUtils.generateFluidNonMolten(
- "Fertiliser",
- "Fertiliser",
- 32,
- new short[] { 45, 170, 45, 100 },
- temp1,
- null,
- true);
- GTValues.RA.stdBuilder()
- .itemInputs(temp2)
- .fluidOutputs(new FluidStack(fluidFertBasic, 36))
- .duration(5 * TICKS)
- .eut(16)
- .addTo(fluidExtractionRecipes);
+ ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
+ ItemStack temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
+ if (temp1 != null && temp2 != null) {
+ fluidFertBasic = FluidUtils.generateFluidNonMolten(
+ "Fertiliser",
+ "Fertiliser",
+ 32,
+ new short[] { 45, 170, 45, 100 },
+ temp1,
+ null,
+ true);
+ GTValues.RA.stdBuilder()
+ .itemInputs(temp2)
+ .fluidOutputs(new FluidStack(fluidFertBasic, 36))
+ .duration(5 * TICKS)
+ .eut(16)
+ .addTo(fluidExtractionRecipes);
+ }
}
fluidFertUN32 = FluidUtils.generateFluidNonMolten(
"UN32Fertiliser",
generated by cgit (git 2.46.0) at 2025-03-04 18:57:42 +0000