From 3f42769f30eba7369864c0ee42d5abca0ce28b0c Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 2 Jul 2024 19:26:36 +0100
Subject: [PATCH] Work towards workings spigot regen

---
 .../fawe/v1_21_R1/regen/PaperweightRegen.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/regen/PaperweightRegen.java b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/regen/PaperweightRegen.java
index 07933adfa..0fe401b4d 100644
--- a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/regen/PaperweightRegen.java
+++ b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/regen/PaperweightRegen.java
@@ -1,6 +1,5 @@
 package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_21_R1.regen;
 
-import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager;
 import com.fastasyncworldedit.bukkit.adapter.Regenerator;
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.queue.IChunkCache;
@@ -26,6 +25,7 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.server.level.ChunkHolder;
+import net.minecraft.server.level.ChunkLevel;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ChunkTaskPriorityQueueSorter.Message;
 import net.minecraft.server.level.GenerationChunkHolder;
@@ -102,6 +102,7 @@ public class PaperweightRegen extends Regenerator<ChunkAccess, ProtoChunk, Level
     private static final Field generatorStructureStateField;
     private static final Field ringPositionsField;
     private static final Field hasGeneratedPositionsField;
+    private static final Field worldGenContextField;
 
     //list of chunk stati in correct order without FULL
     private static final Map<ChunkStatus, Concurrency> chunkStati = new LinkedHashMap<>();
@@ -170,6 +171,9 @@ public class PaperweightRegen extends Regenerator<ChunkAccess, ProtoChunk, Level
                     Refraction.pickName("hasGeneratedPositions", "h")
             );
             hasGeneratedPositionsField.setAccessible(true);
+
+            worldGenContextField = ChunkMap.class.getDeclaredField(Refraction.pickName("worldGenContextField", "P"));
+            worldGenContextField.setAccessible(true);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -380,19 +384,12 @@ public class PaperweightRegen extends Regenerator<ChunkAccess, ProtoChunk, Level
             }
         }
 
-
         chunkSourceField.set(freshWorld, freshChunkProvider);
         //let's start then
         structureTemplateManager = server.getStructureManager();
         threadedLevelLightEngine = new NoOpLightEngine(freshChunkProvider);
 
-        this.worldGenContext = new WorldGenContext(
-                freshWorld,
-                chunkGenerator,
-                structureTemplateManager,
-                threadedLevelLightEngine,
-                originalChunkProvider.chunkMap.worldGenContext.mainThreadMailBox()
-        );
+        this.worldGenContext = (WorldGenContext) worldGenContextField.get(freshChunkProvider.chunkMap);
         return true;
     }