aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2018-02-01 14:10:50 +1000
committerGitHub <noreply@github.com>2018-02-01 14:10:50 +1000
commit214a67650acf7d50e98e9e1141d48a43c746a137 (patch)
tree46094ae83d8cdd10fa4d9a3464d6424aa6bc2668 /src/Java/gtPlusPlus/xmod
parent7a1c92118a53b5bc6294d65361e16c5859597a10 (diff)
parentc48e1b1600fba54889219719c104e02acee4e6a8 (diff)
downloadGT5-Unofficial-214a67650acf7d50e98e9e1141d48a43c746a137.tar.gz
GT5-Unofficial-214a67650acf7d50e98e9e1141d48a43c746a137.tar.bz2
GT5-Unofficial-214a67650acf7d50e98e9e1141d48a43c746a137.zip
Merge pull request #205 from GTNewHorizons/master
change Tree Farmer Control Block recipes to HV and Ingot/Nugget recipe for GTNH pack
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index a04206ec62..4386807f4d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.loaders;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.recipe.RecipeUtils;
@@ -23,21 +24,22 @@ public class RecipeGen_ShapedCrafting implements Runnable{
public static void generateRecipes(final Material material){
Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
-
- //Nuggets
- GT_ModHandler.addShapelessCraftingRecipe(
- material.getIngot(1),
- new Object[]{
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1)
- });
+ if (!CORE.GTNH) {
+ //Nuggets
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getIngot(1),
+ new Object[]{
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1),
+ material.getNugget(1)
+ });
+ }
//Plates