aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorDraknyte1 <3060479+draknyte1@users.noreply.github.com>2018-06-17 17:03:11 +1000
committerDraknyte1 <3060479+draknyte1@users.noreply.github.com>2018-06-17 17:03:11 +1000
commit5833b560841561c543376d1dad0bbdccfc4cbfe1 (patch)
treec0b28dac19b16b2f97eaa4bc124df9a7bc940763 /src/Java/gtPlusPlus/core/recipe
parent14884a2935d738fbf999a05870cda5f6eb63853a (diff)
downloadGT5-Unofficial-5833b560841561c543376d1dad0bbdccfc4cbfe1.tar.gz
GT5-Unofficial-5833b560841561c543376d1dad0bbdccfc4cbfe1.tar.bz2
GT5-Unofficial-5833b560841561c543376d1dad0bbdccfc4cbfe1.zip
^ Version bump.
$ Tried to fix Containment Frame not having a valid recipe.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java25
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java14
2 files changed, 19 insertions, 20 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 2588a88143..57db26a521 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -3,17 +3,8 @@ package gtPlusPlus.core.recipe;
import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
-
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
@@ -23,9 +14,12 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class RECIPES_General {
@@ -160,15 +154,6 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for Mining Explosives.");
}
- //Mystic Frame
- if (RecipeUtils.recipeBuilder(
- CI.sensor_HV, CI.fieldGenerator_MV, CI.sensor_HV,
- CI.craftingToolHammer_Hard, ItemList.Casing_SolidSteel.get(1), CI.craftingToolSolderingIron,
- CI.emitter_HV, CI.fieldGenerator_MV, CI.emitter_HV,
- ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2))){
- Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
- }
-
//Alkalus Coin
if (RecipeUtils.recipeBuilder(
"gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond",
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index b73b82ac8b..1cf1685f91 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -10,6 +10,7 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -1336,6 +1337,19 @@ public class RECIPES_Machines {
}
+
+
+
+ //Mystic Frame
+ if (RecipeUtils.addShapedGregtechRecipe(
+ "circuitMaster", ItemList.Field_Generator_MV.get(1, CI.circuitTier7), "circuitElite",
+ CI.craftingToolScrewdriver, GregtechItemList.Casing_Multi_Use.get(1), CI.craftingToolWrench,
+ ItemList.Sensor_HV.get(1, CI.circuitTier7), ItemList.Field_Generator_HV.get(1, CI.circuitTier7), ItemList.Emitter_HV.get(1, CI.circuitTier7),
+ ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2))){
+ Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
+ }
+
+
Logger.INFO("Done loading recipes for the Various machine blocks.");
}
}