From 3b4b4d6b7e6fa44f4bd2723cb4418dd09e10ae79 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 1 Dec 2024 17:00:22 -0600 Subject: [PATCH] Remove unused world gen MixinData thread local --- .../BatchGenerationEnvironment.java | 17 ----------------- .../worldGeneration/step/StepFeatures.java | 1 - .../fabric/FabricServerProxy.java | 2 -- .../distanthorizons/forge/ForgeServerProxy.java | 2 -- 4 files changed, 22 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 8d62c2c65..c952f4921 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -198,24 +198,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } public static ThreadLocal isDistantGeneratorThread = new ThreadLocal<>(); - public static ThreadLocal onDistantGenerationMixinData = new ThreadLocal<>(); public static boolean isCurrentThreadDistantGeneratorThread() { return (isDistantGeneratorThread.get() != null); } - public static void putDistantGenerationMixinData(Object data) - { - LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread()); - onDistantGenerationMixinData.set(data); - } - public static Object getDistantGenerationMixinData() - { - LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread()); - return onDistantGenerationMixinData.get(); - } - - public static void clearDistantGenerationMixinData() - { - LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread()); - onDistantGenerationMixinData.remove(); - } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index 382d777dc..8e5378d27 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -91,7 +91,6 @@ public final class StepFeatures #endif Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter()); - BatchGenerationEnvironment.clearDistantGenerationMixinData(); } catch (Exception e) { diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java index ee04944e5..39eca6973 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java @@ -51,7 +51,6 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy private static final Logger LOGGER = DhLoggerBuilder.getLogger(); private final boolean isDedicatedServer; - public static Supplier isGenerationThreadChecker = null; @@ -87,7 +86,6 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy public void registerEvents() { LOGGER.info("Registering Fabric Server Events"); - isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread; /* Register the mod needed event callbacks */ diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java index c949b43d0..c09394baa 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java @@ -59,7 +59,6 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy private final ServerApi serverApi = ServerApi.INSTANCE; private final boolean isDedicated; - public static Supplier isGenerationThreadChecker = null; @@ -82,7 +81,6 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy public ForgeServerProxy(boolean isDedicated) { this.isDedicated = isDedicated; - isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread; }