From b9de712dcfb935861059cb92a60c0d698cd302d4 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:22:00 +0800 Subject: pin comb type id instead of depending on array ordinal (#980) * pin comb type id instead of depending on array ordinal * fix up _NULL related problems * fix out of bound * make it private * add some more test --- src/main/java/gregtech/api/GregTech_API.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 980eab18de..d38c9181dd 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -40,7 +40,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.oredict.OreDictionary; import java.util.ArrayList; import java.util.Collection; @@ -194,18 +193,7 @@ public class GregTech_API { private static final Map> sConfigurationLists = new HashMap<>(); private static final Map, BiFunction> sRealCircuitProgrammerList = new LinkedHashMap<>(); public static final Map, BiFunction> sCircuitProgrammerList = Collections.unmodifiableMap(sRealCircuitProgrammerList); - static { - registerCircuitProgrammer(new Predicate() { - private final int screwdriverOreId = OreDictionary.getOreID("craftingToolScrewdriver"); - @Override - public boolean test(ItemStack stack) { - for (int i : OreDictionary.getOreIDs(stack)) - if (i == screwdriverOreId) - return true; - return false; - } - }, true); - } + /** * The List of Dimensions, which are Whitelisted for the Teleporter. This list should not contain other Planets. * Mystcraft Dimensions and other Dimensional Things should be allowed. -- cgit