aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-04-08 22:43:10 +0100
committerGitHub <noreply@github.com>2023-04-08 23:43:10 +0200
commit5445cb79f7f7ade6b77abf79fddc29fa64d9855f (patch)
treeac30fb55bba5c6b9784cb6d60cb1118568924542 /src/main/java/gtPlusPlus/core
parent84791abf2d21371ec7b60ddd58a629be5090e9ba (diff)
downloadGT5-Unofficial-5445cb79f7f7ade6b77abf79fddc29fa64d9855f.tar.gz
GT5-Unofficial-5445cb79f7f7ade6b77abf79fddc29fa64d9855f.tar.bz2
GT5-Unofficial-5445cb79f7f7ade6b77abf79fddc29fa64d9855f.zip
Kill disassembler (#594)
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java11
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java2
2 files changed, 0 insertions, 13 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 14b814be80..f483d1571c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -540,17 +540,6 @@ public class RECIPES_GREGTECH {
aTransParts[i].get(1),
20 * 5,
MaterialUtils.getVoltageForTier(i));
- GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
- false,
- new ItemStack[] { aTransParts[i].get(1) },
- new ItemStack[] { CI.getEmitter(i, 2), CI.getSensor(i, 2) },
- null,
- null,
- new FluidStack[] { GT_Values.NF },
- new FluidStack[] { GT_Values.NF },
- Math.max(300 >> Math.max(i - 1, 0), 1),
- MaterialUtils.getVoltageForTier(i),
- 0);
}
GT_Values.RA.addLaserEngraverRecipe(
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 9c733141c1..1964777df8 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -18,7 +18,6 @@ import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
-import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Disassembler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
@@ -3013,7 +3012,6 @@ public class RECIPES_Machines {
ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2),
45 * 20 * 1 * (6),
MaterialUtils.getVoltageForTier(6));
- GT_MetaTileEntity_Disassembler.addBlacklist(ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 1));
// Player Doors
ItemStack[] aDoorInputs = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.log2),