aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-04-30 08:09:47 +0100
committerGitHub <noreply@github.com>2024-04-30 09:09:47 +0200
commit27bbb51c837704e2ff380276858483b6e42d06da (patch)
treef07508ad7bd0602a635d06bff95c05e13ed8bd2e /src/main/java/gregtech/loaders/postload
parent111adeda4ccf433ec193e57671f54eece2db0c69 (diff)
downloadGT5-Unofficial-27bbb51c837704e2ff380276858483b6e42d06da.tar.gz
GT5-Unofficial-27bbb51c837704e2ff380276858483b6e42d06da.tar.bz2
GT5-Unofficial-27bbb51c837704e2ff380276858483b6e42d06da.zip
GT recipe.cfg cleanup (#2579)
* ichorium block fixes * alu ingot fix * iridium ore fix * gt vanilla assembling fixes * ic2 assembler recipe fix * forestry assembler recipe fixes * spotless * electrolyzer * more iridium ore fixes * another ichorium block fix * obsidian stick fix * remove unused railcraft obsidian recipes * remove disabled melon recipe * bring custom plasma fuel values to code * spotless * remove most recipe config uses * fully remove recipe.cfg * dont change recipemapbackend for now
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java299
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java152
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java89
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java7
4 files changed, 195 insertions, 352 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 2aa5aed5b2..da749e5b31 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -16,8 +16,6 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -48,14 +46,8 @@ public class GT_CraftingRecipeLoader implements Runnable {
new ItemStack(Items.bucket, 1),
bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES,
new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) });
- if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bucket", true)) {
- GT_ModHandler.addCraftingRecipe(
- new ItemStack(Items.bucket, 1),
- bits_no_remove_buffered,
- new Object[] { aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) });
- }
ItemStack tMat = new ItemStack(Items.iron_ingot);
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.PressurePlate", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
GT_ModHandler.addCraftingRecipe(
@@ -65,7 +57,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) });
}
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Door", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, tMat, tMat, null, tMat, tMat, null))) {
GT_ModHandler.addCraftingRecipe(
@@ -75,7 +67,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
}
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Cauldron", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, null, tMat, tMat, null, tMat, tMat, tMat, tMat))) {
GT_ModHandler.addCraftingRecipe(
@@ -85,7 +77,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
}
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Hopper", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler
.removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) {
@@ -97,7 +89,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
"craftingChest" });
}
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bars", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
tStack.stackSize /= 2;
@@ -108,6 +100,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
}
}
+
GT_ModHandler.addCraftingRecipe(
GT_ModHandler.getIC2Item("ironFence", 6L),
bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE,
@@ -115,7 +108,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) });
tMat = new ItemStack(Items.gold_ingot);
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Gold.PressurePlate", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) {
GT_ModHandler.addCraftingRecipe(
@@ -126,7 +119,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
}
}
tMat = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L);
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Rubber.Sheet", true)) {
+ {
ItemStack tStack;
if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) {
GT_ModHandler.addCraftingRecipe(
@@ -728,21 +721,9 @@ public class GT_CraftingRecipeLoader implements Runnable {
null,
GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)),
- GT_OreDictUnificator.get(
- OrePrefixes.ingot,
- Materials.Bronze,
- GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) ? 1L
- : 2L))) {
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L))) {
GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe");
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enchantmenttable", false)) {
- GT_Log.out.println(
- "GT_Mod: Removing the Recipe of the Enchantment Table, to have more Fun at enchanting with the Anvil and Books from Dungeons.");
- GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.enchanting_table, 1));
- }
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enderchest", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.ender_chest, 1));
- }
tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L);
GT_ModHandler.addCraftingRecipe(
@@ -1863,104 +1844,78 @@ public class GT_CraftingRecipeLoader implements Runnable {
GT_Log.out.println("GT_Mod: Applying harder Recipes for several Blocks."); // TODO: Not Buffered
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "blockbreaker", false)) {
- tStack = GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.cobblestone, 1),
- new ItemStack(Items.iron_pickaxe, 1),
- new ItemStack(Blocks.cobblestone, 1),
- new ItemStack(Blocks.cobblestone, 1),
- new ItemStack(Blocks.piston, 1),
- new ItemStack(Blocks.cobblestone, 1),
- new ItemStack(Blocks.cobblestone, 1),
- new ItemStack(Items.redstone, 1),
- new ItemStack(Blocks.cobblestone, 1));
- GT_ModHandler.removeRecipeDelayed(tStack);
- GT_ModHandler.addCraftingRecipe(
- tStack,
- bits_no_remove_buffered,
- new Object[] { "RGR", "RPR", "RCR", 'G', OreDictNames.craftingGrinder, 'C',
- OrePrefixes.circuit.get(Materials.Advanced), 'R', OrePrefixes.plate.get(Materials.Steel), 'P',
- OreDictNames.craftingPiston });
- }
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "beryliumreflector", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
- bits_no_remove_buffered,
- new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N',
- GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) });
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
- bits_no_remove_buffered,
- new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N',
- GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C',
- OrePrefixes.plate.get(Materials.TungstenCarbide) });
- }
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "reflector", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
- bits_no_remove_buffered,
- new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G',
- OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plateDouble.get(Materials.Steel) });
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
- bits_no_remove_buffered,
- new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G',
- OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plate.get(Materials.Beryllium) });
- }
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "cropharvester", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("crophavester", 1L),
- bits_no_remove_buffered,
- new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.Good),
- 'A', ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W',
- OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV });
- }
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "rtg", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("RTGenerator", 1L),
- bits_no_remove_buffered,
- new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
- OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV });
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
+ bits_no_remove_buffered,
+ new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N',
+ GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1),
+ bits_no_remove_buffered,
+ new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N',
+ GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C',
+ OrePrefixes.plate.get(Materials.TungstenCarbide) });
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
+ bits_no_remove_buffered,
+ new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G',
+ OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plateDouble.get(Materials.Steel) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("reactorReflector", 1L, 1),
+ bits_no_remove_buffered,
+ new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G',
+ OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plate.get(Materials.Beryllium) });
+
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("crophavester", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.Good),
+ 'A', ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W',
+ OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV });
+
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("RTGenerator", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
+ OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV });
+
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("RTHeatGenerator", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
+ OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B',
+ GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) });
+
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("carbonrotor", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S',
+ OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) });
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("steelrotor", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S',
+ OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("ironrotor", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S',
+ OrePrefixes.screw.get(Materials.WroughtIron), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("woodrotor", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S',
+ OrePrefixes.screw.get(Materials.WroughtIron), 'T', OrePrefixes.stickLong.get(Materials.WroughtIron) });
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("RTHeatGenerator", 1L),
- bits_no_remove_buffered,
- new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C',
- OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B',
- GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) });
- }
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "windRotor", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("carbonrotor", 1L),
- bits_no_remove_buffered,
- new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S',
- OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) });
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("steelrotor", 1L),
- bits_no_remove_buffered,
- new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S',
- OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("ironrotor", 1L),
- bits_no_remove_buffered,
- new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S',
- OrePrefixes.screw.get(Materials.WroughtIron), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) });
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("woodrotor", 1L),
- bits_no_remove_buffered,
- new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S',
- OrePrefixes.screw.get(Materials.WroughtIron), 'T',
- OrePrefixes.stickLong.get(Materials.WroughtIron) });
- }
if (GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L) != null) {
tStack = GT_ModHandler.getRecipeOutput(
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L),
@@ -1972,57 +1927,45 @@ public class GT_CraftingRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L),
new ItemStack(Items.diamond_pickaxe, 1),
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L));
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "quarry", true)) {
- GT_ModHandler.removeRecipeByOutputDelayed(tStack);
- GT_ModHandler.addCraftingRecipe(
- tStack,
- bits_no_remove_buffered,
- new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D',
- OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I',
- OrePrefixes.gear.get(Materials.Steel), 'P',
- GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) });
- }
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "quarry", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(tStack);
- }
- }
-
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "sugarpaper", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper));
- GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar));
- GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2),
- GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) });
- GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
- GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) });
+ GT_ModHandler.removeRecipeByOutputDelayed(tStack);
GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2),
- GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] { " C ", "SSS", " C ", 'S', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1),
- 'C', new ItemStack(Blocks.stone_slab) });
+ tStack,
+ bits_no_remove_buffered,
+ new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D',
+ OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I',
+ OrePrefixes.gear.get(Materials.Steel), 'P', GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) });
}
+ GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper));
+ GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar));
+ GT_ModHandler.addCraftingRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2),
+ GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1),
+ GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) });
+ GT_ModHandler.addCraftingRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2),
+ GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { " C ", "SSS", " C ", 'S', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1),
+ 'C', new ItemStack(Blocks.stone_slab) });
+
GT_Log.out.println("GT_Mod: Applying Recipes for Tools");
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "nanosaber", true))) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L));
- GT_ModHandler.addCraftingRecipe(
- GT_ModHandler.getIC2Item("nanoSaber", 1L),
- bits_no_remove_buffered,
- new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I',
- OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C',
- OrePrefixes.circuit.get(Materials.Elite) });
- }
+ GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L));
+ GT_ModHandler.addCraftingRecipe(
+ GT_ModHandler.getIC2Item("nanoSaber", 1L),
+ bits_no_remove_buffered,
+ new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I',
+ OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C',
+ OrePrefixes.circuit.get(Materials.Elite) });
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "namefix", true)) {
- GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1));
- GT_ModHandler.addCraftingRecipe(
- new ItemStack(Items.flint_and_steel, 1),
- bits_no_remove_buffered,
- new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" });
- }
+ GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1));
+ GT_ModHandler.addCraftingRecipe(
+ new ItemStack(Items.flint_and_steel, 1),
+ bits_no_remove_buffered,
+ new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" });
GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("diamondDrill", 1L));
@@ -2034,20 +1977,6 @@ public class GT_CraftingRecipeLoader implements Runnable {
GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("electricTreetap", 1L));
- GT_Log.out.println("GT_Mod: Removing Q-Armor Recipes if configured.");
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QHelmet", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumHelmet", 1L));
- }
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QPlate", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L));
- }
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QLegs", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumLeggings", 1L));
- }
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QBoots", false)) {
- GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumBoots", 1L));
- }
-
if (GraviSuite.isModLoaded()) {
GT_ModHandler.removeRecipeByOutputDelayed(
GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W));
diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
index 0d54398d79..35b18769f0 100644
--- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
@@ -8,8 +8,6 @@ import net.minecraft.item.ItemStack;
import com.glodblock.github.loader.ItemAndBlockHolder;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Mods;
import gregtech.api.util.GT_Log;
@@ -20,88 +18,84 @@ public class GT_RecyclerBlacklistLoader implements Runnable {
@Override
public void run() {
GT_Log.out.println("GT_Mod: Adding Stuff to the Recycler Blacklist.");
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "easymobgrinderrecycling", true)) {
- addToRecyclerBlackList(new ItemStack(Items.arrow, 1, 0));
- addToRecyclerBlackList(new ItemStack(Items.bone, 1, 0));
- addToRecyclerBlackList(ItemList.Dye_Bonemeal.get(1L));
+ addToRecyclerBlackList(new ItemStack(Items.arrow, 1, 0));
+ addToRecyclerBlackList(new ItemStack(Items.bone, 1, 0));
+ addToRecyclerBlackList(ItemList.Dye_Bonemeal.get(1L));
- addToRecyclerBlackList(new ItemStack(Items.rotten_flesh, 1, 0));
+ addToRecyclerBlackList(new ItemStack(Items.rotten_flesh, 1, 0));
- addToRecyclerBlackList(new ItemStack(Items.string, 1, 0));
+ addToRecyclerBlackList(new ItemStack(Items.string, 1, 0));
- addToRecyclerBlackList(new ItemStack(Items.egg, 1, 0));
+ addToRecyclerBlackList(new ItemStack(Items.egg, 1, 0));
+ ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0);
+ while (tStack != null) {
+ addToRecyclerBlackList(tStack);
+ tStack = GT_ModHandler
+ .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack);
}
- if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "easystonerecycling", true)) {
- ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0);
- while (tStack != null) {
- addToRecyclerBlackList(tStack);
- tStack = GT_ModHandler
- .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack);
+ addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767));
+ addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767));
+ addToRecyclerBlackList(new ItemStack(Blocks.cobblestone_wall, 1, 32767));
+ addToRecyclerBlackList(new ItemStack(Blocks.sandstone_stairs, 1, 32767));
+ addToRecyclerBlackList(new ItemStack(Blocks.stone_stairs, 1, 32767));
+ addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767));
+ addToRecyclerBlackList(GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null));
+ addToRecyclerBlackList(
+ GT_ModHandler
+ .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler
+ .getRecipeOutput(new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.cobblestone, 1, 0),
+ null,
+ null,
+ new ItemStack(Blocks.cobblestone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.stone, 1, 0),
+ null,
+ new ItemStack(Blocks.stone, 1, 0),
+ null,
+ new ItemStack(Blocks.stone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.stone, 1, 0),
+ new ItemStack(Blocks.glass, 1, 0),
+ new ItemStack(Blocks.stone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.cobblestone, 1, 0),
+ new ItemStack(Blocks.glass, 1, 0),
+ new ItemStack(Blocks.cobblestone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.glass, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.sand, 1, 0),
+ new ItemStack(Blocks.glass, 1, 0),
+ new ItemStack(Blocks.sand, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0),
+ new ItemStack(Blocks.sandstone, 1, 0)));
+ addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0)));
+ addToRecyclerBlackList(
+ GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0)));
+ if (Mods.Chisel.isModLoaded()) {
+ for (int i = 1; i <= 15; i++) {
+ addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i));
}
- addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767));
- addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767));
- addToRecyclerBlackList(new ItemStack(Blocks.cobblestone_wall, 1, 32767));
- addToRecyclerBlackList(new ItemStack(Blocks.sandstone_stairs, 1, 32767));
- addToRecyclerBlackList(new ItemStack(Blocks.stone_stairs, 1, 32767));
- addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767));
- addToRecyclerBlackList(GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null));
- addToRecyclerBlackList(
- GT_ModHandler
- .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler
- .getRecipeOutput(new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.cobblestone, 1, 0),
- null,
- null,
- new ItemStack(Blocks.cobblestone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.stone, 1, 0),
- null,
- new ItemStack(Blocks.stone, 1, 0),
- null,
- new ItemStack(Blocks.stone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.stone, 1, 0),
- new ItemStack(Blocks.glass, 1, 0),
- new ItemStack(Blocks.stone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.cobblestone, 1, 0),
- new ItemStack(Blocks.glass, 1, 0),
- new ItemStack(Blocks.cobblestone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.glass, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.sand, 1, 0),
- new ItemStack(Blocks.glass, 1, 0),
- new ItemStack(Blocks.sand, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0),
- new ItemStack(Blocks.sandstone, 1, 0)));
- addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0)));
- addToRecyclerBlackList(
- GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0)));
- if (Mods.Chisel.isModLoaded()) {
- for (int i = 1; i <= 15; i++) {
- addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i));
- }
- for (int i = 0; i <= 15; i++) {
- addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i));
- }
+ for (int i = 0; i <= 15; i++) {
+ addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i));
}
}
if (Mods.AE2FluidCraft.isModLoaded()) {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 2e49773894..76fcbfe346 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -38,8 +38,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -999,25 +997,6 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- getModItem(Forestry.ID, "sturdyMachine", 1L, 0),
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4))
- .itemOutputs(ItemList.FR_Casing_Hardened.get(1))
- .fluidInputs(Materials.Water.getFluid(5000))
- .duration(3 * SECONDS + 4 * TICKS)
- .eut(32)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8),
- GT_Utility.getIntegratedCircuit(8))
- .itemOutputs(ItemList.FR_Casing_Sturdy.get(1))
- .duration(1 * SECONDS + 12 * TICKS)
- .eut(16)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
new ItemStack(Blocks.wool, 1, 32767))
.itemOutputs(new ItemStack(Blocks.torch, 6, 0))
@@ -1667,16 +1646,14 @@ public class AssemblerRecipes implements Runnable {
.eut(TierEU.RECIPE_LuV)
.addTo(assemblerRecipes);
- if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) {
- GT_Values.RA.stdBuilder()
- .itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
- new ItemStack(Items.coal, 1, 32767))
- .itemOutputs(new ItemStack(Blocks.torch, 4))
- .duration(2 * SECONDS)
- .eut(20)
- .addTo(assemblerRecipes);
- }
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+ new ItemStack(Items.coal, 1, 32767))
+ .itemOutputs(new ItemStack(Blocks.torch, 4))
+ .duration(2 * SECONDS)
+ .eut(20)
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
@@ -1698,15 +1675,6 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 6),
- GT_Utility.getIntegratedCircuit(6))
- .itemOutputs(new ItemStack(Items.iron_door, 1))
- .duration(30 * SECONDS)
- .eut(4)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7),
GT_Utility.getIntegratedCircuit(7))
.itemOutputs(new ItemStack(Items.cauldron, 1))
@@ -1734,15 +1702,6 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 6),
- GT_Utility.getIntegratedCircuit(6))
- .itemOutputs(new ItemStack(Items.iron_door, 1))
- .duration(30 * SECONDS)
- .eut(4)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7),
GT_Utility.getIntegratedCircuit(7))
.itemOutputs(new ItemStack(Items.cauldron, 1))
@@ -2446,20 +2405,6 @@ public class AssemblerRecipes implements Runnable {
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
- .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8), new ItemStack(Blocks.brick_block, 1))
- .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1))
- .duration(20 * SECONDS)
- .eut(4)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(GT_ModHandler.getIC2Item("waterMill", 2), GT_Utility.getIntegratedCircuit(2))
- .itemOutputs(GT_ModHandler.getIC2Item("generator", 1))
- .duration(5 * MINUTES + 20 * SECONDS)
- .eut(8)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
.itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(ItemList.IC2_ReBattery.get(6))
.duration(40 * SECONDS)
@@ -2475,15 +2420,6 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 4),
- GT_ModHandler.getIC2Item("generator", 1))
- .itemOutputs(GT_ModHandler.getIC2Item("waterMill", 2))
- .duration(5 * MINUTES + 20 * SECONDS)
- .eut(8)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5),
new ItemStack(Blocks.chest, 1, 32767))
.itemOutputs(new ItemStack(Blocks.hopper))
@@ -2520,15 +2456,6 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 2),
- GT_ModHandler.getIC2Item("generator", 1))
- .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1))
- .duration(5 * MINUTES + 20 * SECONDS)
- .eut(8)
- .addTo(assemblerRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(
GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1))
.itemOutputs(ItemList.Component_Sawblade_Diamond.get(1))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
index 180e751d35..c24dd2dbae 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
@@ -463,13 +463,6 @@ public class Pulverizer implements Runnable {
.duration(60 * SECONDS)
.eut(TierEU.RECIPE_HV)
.addTo(maceratorRecipes);
-
- GT_Values.RA.stdBuilder()
- .itemInputs(getModItem(Railcraft.ID, "cube.crushed.obsidian", 1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L))
- .duration(20 * SECONDS)
- .eut(2)
- .addTo(maceratorRecipes);
}
if (AppliedEnergistics2.isModLoaded()) {