Merge remote-tracking branch 'origin/master' into dev

Merge remote-tracking branch 'origin/adjust-NEI-overlay-to-gt-oregen-changes' into dev
fix fieldname
2026-10-27 06:44:00 +00:00 · 2023-06-24 15:01:32 +02:00 · 2023-06-16 20:34:17 +02:00 · 2023-06-14 17:36:57 +01:00 · 2023-06-14 17:15:00 +02:00 · 2023-06-14 17:13:01 +02:00
1 changed files with 29 additions and 8 deletions
@@ -24,10 +24,13 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
    public static int mobOverlay = 0;
    private static byte[] mobSpawnCache;
    private static long mobOverlayUpdateTime;
+    private static String oregenPatternName;
+    private static boolean hasOregenPatternBeenSet = false;

    public static void reset() {
        mobOverlay = 0;
        chunkOverlay = 0;
+        hasOregenPatternBeenSet = false;
    }

    @Override
@@ -279,15 +282,33 @@ 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 (!hasOregenPatternBeenSet) {
+                        try {
+                            oregenPatternName = ((Enum<?>) Class.forName("gregtech.common.GT_Worldgenerator")
+                                    .getDeclaredField("oregenPattern").get(null)).name();
+                        } catch (Exception ignored) {
+                            oregenPatternName = "AXISSYMMETRICAL";
+                        }
+                        hasOregenPatternBeenSet = true;
                    }
-                    if (entity.chunkCoordZ < 0) {
-                        gz1 += 16;
+                    int gx1;
+                    int gz1;
+                    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;
+                    } 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;
Author	SHA1	Message	Date
Martin Robertz	c62d0d864a	Merge remote-tracking branch 'origin/master' into dev	2023-06-24 15:01:32 +02:00
Martin Robertz	8bc00f94fd	Merge remote-tracking branch 'origin/adjust-NEI-overlay-to-gt-oregen-changes' into dev	2023-06-16 20:34:17 +02:00
chochem	12cc231224	fix fieldname	2023-06-14 17:36:57 +01:00
glowredman	7612571e97	Adjust to changed oregenPattern API	2023-06-14 17:15:00 +02:00
glowredman	c7c82407ef	Update buildscript	2023-06-14 17:13:01 +02:00
chochem	d90fcdc40c	remove testing debug	2023-06-13 02:00:10 +01:00
chochem	edc0e689b1	add compat for old worlds	2023-06-13 02:00:10 +01:00
chochem	dff048466b	adjust to oregen changes	2023-06-13 02:00:10 +01:00