From dff048466b49d328401ce899bcac8cbf10d0b6b2 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Thu, 8 Jun 2023 21:05:38 +0100 Subject: [PATCH 1/6] adjust to oregen changes --- .../java/codechicken/nei/WorldOverlayRenderer.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 969e3c8b..e92f3244 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -279,16 +279,8 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glVertex3d(x2, y2, z1 + h); } } else if (chunkOverlay == 3) { - int gx1 = (((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4) - - intOffsetX; - int gz1 = (((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4) - - intOffsetZ; - if (entity.chunkCoordX < 0) { - gx1 += 16; - } - if (entity.chunkCoordZ < 0) { - gz1 += 16; - } + int gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX; + int gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ; int gx2 = gx1 + 48; int gz2 = gz1 + 48; From edc0e689b1c4c87347686eaf5263404d9275896d Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Tue, 13 Jun 2023 00:04:00 +0100 Subject: [PATCH 2/6] add compat for old worlds --- .../codechicken/nei/WorldOverlayRenderer.java | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index e92f3244..312de817 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -24,10 +24,13 @@ public class WorldOverlayRenderer implements IKeyStateTracker { public static int mobOverlay = 0; private static byte[] mobSpawnCache; private static long mobOverlayUpdateTime; + private static boolean useNewGTOregenPattern; + private static boolean hasuseNewGTOregenPatternbeenset = false; public static void reset() { mobOverlay = 0; chunkOverlay = 0; + hasuseNewGTOregenPatternbeenset = false; } @Override @@ -279,8 +282,41 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glVertex3d(x2, y2, z1 + h); } } else if (chunkOverlay == 3) { - int gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX; - int gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ; + if (!hasuseNewGTOregenPatternbeenset) { + try { + useNewGTOregenPattern = (boolean) Class.forName("gregtech.common.GT_Worldgenerator") + .getDeclaredField("useNewOregenPattern").get(null); + } catch (Exception ignored) { + NEIClientConfig.logger.info("useNewGTOregenPattern is having problems"); + useNewGTOregenPattern = false; + } + if (!useNewGTOregenPattern) { + NEIClientConfig.logger.info("useNewGTOregenPattern is false"); + } + if (useNewGTOregenPattern) { + NEIClientConfig.logger.info("useNewGTOregenPattern is true"); + } + hasuseNewGTOregenPatternbeenset = true; + } + int gx1; + int gz1; + if (useNewGTOregenPattern) { + // gt oregen uses new regular pattern + gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX; + gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ; + } else { + // gt oregen uses old bugged pattern + gx1 = (((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4) + - intOffsetX; + gz1 = (((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4) + - intOffsetZ; + if (entity.chunkCoordX < 0) { + gx1 += 16; + } + if (entity.chunkCoordZ < 0) { + gz1 += 16; + } + } int gx2 = gx1 + 48; int gz2 = gz1 + 48; From d90fcdc40c7a6b3e3b87825031b49c53ec45d103 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Tue, 13 Jun 2023 01:59:45 +0100 Subject: [PATCH 3/6] remove testing debug --- src/main/java/codechicken/nei/WorldOverlayRenderer.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 312de817..2f5e51f5 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -287,15 +287,8 @@ public class WorldOverlayRenderer implements IKeyStateTracker { useNewGTOregenPattern = (boolean) Class.forName("gregtech.common.GT_Worldgenerator") .getDeclaredField("useNewOregenPattern").get(null); } catch (Exception ignored) { - NEIClientConfig.logger.info("useNewGTOregenPattern is having problems"); useNewGTOregenPattern = false; } - if (!useNewGTOregenPattern) { - NEIClientConfig.logger.info("useNewGTOregenPattern is false"); - } - if (useNewGTOregenPattern) { - NEIClientConfig.logger.info("useNewGTOregenPattern is true"); - } hasuseNewGTOregenPatternbeenset = true; } int gx1; From c7c82407efcb0be79017fbd9055ed802709623c9 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:13:01 +0200 Subject: [PATCH 4/6] Update buildscript --- build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index a8b7532d..39309904 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1684218858 +//version: 1685785062 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -1276,12 +1276,14 @@ tasks.register('faq') { description = 'Prints frequently asked questions about building a project' doLast { - print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + - "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + - "The links can be found in repositories.gradle and build.gradle:repositories, " + - "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + print("If your build fails to fetch dependencies, run './gradlew updateDependencies'. " + + "Or you can manually check if the versions are still on the distributing sites - " + + "the links can be found in repositories.gradle and build.gradle:repositories, " + + "but not build.gradle:buildscript.repositories - those ones are for gradle plugin metadata.\n\n" + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + - "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties. " + + "However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " + + "Java 9 or later.") } } From 7612571e97354c488585dc349f831f3836cfba47 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:15:00 +0200 Subject: [PATCH 5/6] Adjust to changed oregenPattern API --- .../codechicken/nei/WorldOverlayRenderer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 2f5e51f5..218b71e9 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -24,13 +24,13 @@ public class WorldOverlayRenderer implements IKeyStateTracker { public static int mobOverlay = 0; private static byte[] mobSpawnCache; private static long mobOverlayUpdateTime; - private static boolean useNewGTOregenPattern; - private static boolean hasuseNewGTOregenPatternbeenset = false; + private static String oregenPatternName; + private static boolean hasOregenPatternBeenSet = false; public static void reset() { mobOverlay = 0; chunkOverlay = 0; - hasuseNewGTOregenPatternbeenset = false; + hasOregenPatternBeenSet = false; } @Override @@ -282,18 +282,18 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glVertex3d(x2, y2, z1 + h); } } else if (chunkOverlay == 3) { - if (!hasuseNewGTOregenPatternbeenset) { + if (!hasOregenPatternBeenSet) { try { - useNewGTOregenPattern = (boolean) Class.forName("gregtech.common.GT_Worldgenerator") - .getDeclaredField("useNewOregenPattern").get(null); + oregenPatternName = ((Enum) Class.forName("gregtech.common.GT_Worldgenerator") + .getDeclaredField("useNewOregenPattern").get(null)).name(); } catch (Exception ignored) { - useNewGTOregenPattern = false; + oregenPatternName = "AXISSYMMETRICAL"; } - hasuseNewGTOregenPatternbeenset = true; + hasOregenPatternBeenSet = true; } int gx1; int gz1; - if (useNewGTOregenPattern) { + if (oregenPatternName.equals("EQUAL_SPACING")) { // gt oregen uses new regular pattern gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX; gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ; From 12cc231224b00fa4df07e486bd2b81f7e5255ad7 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Wed, 14 Jun 2023 17:28:10 +0100 Subject: [PATCH 6/6] fix fieldname --- src/main/java/codechicken/nei/WorldOverlayRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 218b71e9..40700eac 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -285,7 +285,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker { if (!hasOregenPatternBeenSet) { try { oregenPatternName = ((Enum) Class.forName("gregtech.common.GT_Worldgenerator") - .getDeclaredField("useNewOregenPattern").get(null)).name(); + .getDeclaredField("oregenPattern").get(null)).name(); } catch (Exception ignored) { oregenPatternName = "AXISSYMMETRICAL"; }