aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java40
1 files changed, 7 insertions, 33 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index b948f251f0..b9926b188b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -1,6 +1,5 @@
package gregtech.loaders.oreprocessing;
-import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
@@ -11,8 +10,6 @@ import static gregtech.api.util.GT_Utility.calculateRecipeEU;
import net.minecraft.item.ItemStack;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -33,6 +30,10 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack) {
+ if (aMaterial == Materials.Ichorium) {
+ return;
+ }
+
if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV
&& GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
@@ -146,23 +147,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
}
}
}
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.storageblockcrafting,
- OrePrefixes.block.get(aMaterial)
- .toString(),
- false)) {
- if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L),
- new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) });
- if (tStack2 != null) GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L),
- new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) });
- if (tStack1 != null) {
- GT_ModHandler.addCraftingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L),
- new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) });
- }
- }
+
if (tStack1 != null) tStack1.stackSize = 9;
if (tStack2 != null) tStack2.stackSize = 9;
if (tStack3 != null) tStack3.stackSize = 9;
@@ -176,15 +161,10 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
.addTo(hammerRecipes);
}
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.storageblockdecrafting,
- OrePrefixes.block.get(aMaterial)
- .toString(),
- tStack2 != null)) {
+ if (tStack2 != null && aMaterial != Materials.NetherQuartz) {
if (tStack3 != null)
GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) });
- if (tStack2 != null)
- GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) });
+ GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) });
if (tStack1 != null)
GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) });
}
@@ -202,12 +182,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
switch (aMaterial.mName) {
case "Mercury" -> System.err.println(
"'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)");
- case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.stdBuilder()
- .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1, aStack))
- .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L))
- .duration(20 * SECONDS)
- .eut(4)
- .addTo(assemblerRecipes);
}
}
}