Use reflection remapper for worldGenContext on bukkit

How this even worked before astounds me
AllayMC · Oct 13, 2024 · 12faae8 · 12faae8
1 parent 5927884
commit 12faae8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/...ms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java b/...ms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java
@@ -42,18 +42,13 @@ public void onWorldInit(WorldInitEvent event) {
             NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), craftWorld.getSeed());
             ChunkMap chunkMap = serverWorld.getChunkSource().chunkMap;
             WorldGenContext worldGenContext = chunkMap.worldGenContext;
-
-            try {
-                ReflectionUtil.setFinalField(chunkMap, "worldGenContext", new WorldGenContext(
-                    worldGenContext.level(),
-                    new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed()),
-                    worldGenContext.structureManager(),
-                    worldGenContext.lightEngine(),
-                    worldGenContext.mainThreadMailBox()
-                ));
-            } catch(NoSuchFieldException e) {
-                throw new RuntimeException(e);
-            }
+            Reflection.CHUNKMAP.setWorldGenContext(chunkMap, new WorldGenContext(
+                worldGenContext.level(),
+                new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed()),
+                worldGenContext.structureManager(),
+                worldGenContext.lightEngine(),
+                worldGenContext.mainThreadMailBox()
+            ));
 
             LOGGER.info("Successfully injected into world.");
 

diff --git a/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java b/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java
@@ -3,8 +3,10 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;
 import net.minecraft.core.MappedRegistry;
+import net.minecraft.server.level.ChunkMap;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.chunk.status.WorldGenContext;
 import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
 import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory;
 import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter;
@@ -19,6 +21,8 @@ public class Reflection {
 
     public static final ReferenceProxy REFERENCE;
 
+    public static final ChunkMapProxy CHUNKMAP;
+
     static {
         ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar();
         ReflectionProxyFactory reflectionProxyFactory = ReflectionProxyFactory.create(reflectionRemapper,
@@ -27,6 +31,7 @@ public class Reflection {
         MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class);
         STRUCTURE_MANAGER = reflectionProxyFactory.reflectionProxy(StructureManagerProxy.class);
         REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class);
+        CHUNKMAP = reflectionProxyFactory.reflectionProxy(ChunkMapProxy.class);
     }
 
 
@@ -49,4 +54,10 @@ public interface ReferenceProxy {
         @MethodName("bindValue")
         <T> void invokeBindValue(Reference<T> instance, T value);
     }
+
+    @Proxies(ChunkMap.class)
+    public interface ChunkMapProxy {
+        @FieldSetter("worldGenContext")
+        void setWorldGenContext(ChunkMap instance, WorldGenContext worldGenContext);
+    }
 }