From be2eff1507c7d49cecc70847477c2ea18c2c17cd Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:19:25 +0100 Subject: Fix NEI GT Pipe/wire issue (#1090) * Fix NEI GT Pipe/wire issue Fixes NEI displaying every variation of wire/pipe recipe instead of specific ones. * Adjust fix. * Adjust fix again. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> --- src/main/java/gregtech/api/enums/OrePrefixes.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/main/java/gregtech/api/enums/OrePrefixes.java') diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 0edd7a7b3d..fa8bb0b2cb 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -202,7 +202,7 @@ public enum OrePrefixes { pipeRestrictiveMedium("Medium Restrictive Pipes", "Medium Restrictive ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, M * 3, 64, 80), pipeRestrictiveLarge("Large Restrictive Pipes", "Large Restrictive ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, M * 6, 64, 81), pipeRestrictiveHuge("Huge Restrictive Pipes", "Huge Restrictive ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, M * 12, 64, 82), - pipe("Pipes", "", " Pipe", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, 77), + pipe("Pipes", "", " Pipe", true, false, false, false, false, false, false, false, false, false, 0, -1, 64, 77), wireGt16("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, 64, -1), wireGt12("12x Wires", "12x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 6, 64, -1), wireGt08("8x Wires", "8x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 4, 64, -1), @@ -376,19 +376,7 @@ public enum OrePrefixes { for (OrePrefixes tPrefix2 : values()) if (tPrefix2.name().startsWith("ore")) tPrefix1.addFamiliarPrefix(tPrefix2); - for (OrePrefixes tPrefix1 : values()) - if (tPrefix1.name().startsWith("pipe")) - for (OrePrefixes tPrefix2 : values()) - if (tPrefix2.name().startsWith("pipe")) - tPrefix1.addFamiliarPrefix(tPrefix2); - for (OrePrefixes tPrefix1 : values()) - if (tPrefix1.name().startsWith("wireGt")) - for (OrePrefixes tPrefix2 : values()) - if (tPrefix2.name().startsWith("wireGt")) - tPrefix1.addFamiliarPrefix(tPrefix2); - for (OrePrefixes tPrefix1 : values()) - if (tPrefix1.name().startsWith("cableGt")) for (OrePrefixes tPrefix2 : values()) - if (tPrefix2.name().startsWith("cableGt")) tPrefix1.addFamiliarPrefix(tPrefix2); + // These are only the important ones. gem.mNotGeneratedItems.add(Materials.Coal); -- cgit