aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java5
2 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index 68799b15d1..10c2066997 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -7,7 +7,6 @@ import java.util.Set;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_ModHandler;
@@ -680,13 +679,11 @@ public class RecipeGen_Ore extends RecipeGen_Base {
Logger.MATERIALS("[Electrolyzer] Either both inputs or outputs are null.");
return false;
}
- if ((aInput1 != null)
- && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aInput1, aDuration)) <= 0)) {
+ if ((aInput1 != null) && (aDuration <= 0)) {
Logger.MATERIALS("[Electrolyzer] Fail 1.");
return false;
}
- if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile
- .get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) {
+ if ((aFluidInput != null) && (aDuration <= 0)) {
Logger.MATERIALS("[Electrolyzer] Fail 2.");
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 4c4856a89b..9dd1d47ef1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -192,7 +192,7 @@ public class RecipeGen_Plates extends RecipeGen_Base {
if ((aInput == null) || (aShape == null) || (aOutput == null)) {
return false;
}
- if ((aDuration = GregTech_API.sRecipeFile.get("extruder", aOutput, aDuration)) <= 0) {
+ if (aDuration <= 0) {
return false;
}
RecipeMaps.extruderRecipes.addRecipe(
@@ -213,9 +213,6 @@ public class RecipeGen_Plates extends RecipeGen_Base {
if ((aInput1 == null) || (aOutput1 == null)) {
return false;
}
- if (!GregTech_API.sRecipeFile.get("forgehammer", aOutput1, true)) {
- return false;
- }
RecipeMaps.hammerRecipes.addRecipe(
true,
new ItemStack[] { aInput1 },