Merge branch 'master' into dev/1.19

build.gradle.kts

@@ -39,7 +39,7 @@ allprojects {
 }
 
 afterEvaluate {
-    forSubProjects(":platforms") {
+    forImmediateSubProjects(":platforms") {
         configureDistribution()
     }
     forSubProjects(":common:addons") {

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -1,11 +1,10 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
 import java.io.FileWriter
 import java.net.URL
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginExtension
@@ -39,41 +38,32 @@ fun Project.configureDistribution() {
         }
         
         doLast {
-            // The addons are copied into a JAR because of a ShadowJar bug
-            // which expands *all* JARs, even resource ones, into the fat JAR.
-            // To get around this, we copy all addon JARs into a *new* JAR,
-            // then, ShadowJar expands the newly created JAR, putting the original
-            // JARs where they should go.
-            //
             // https://github.com/johnrengelman/shadow/issues/111
-            val dest = File(buildDir, "/resources/main/addons.jar")
-            dest.parentFile.mkdirs()
+            val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toPath()
             
-            val zip = ZipOutputStream(FileOutputStream(dest))
-            
-            forSubProjects(":common:addons") {
-                val jar = getJarTask()
-                
-                println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-                
-                val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-                
-                val entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}")
-                zip.putNextEntry(entry)
-                FileInputStream(jar.archiveFile.get().asFile).run {
-                    copyTo(zip)
-                    close()
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
+                forSubProjects(":common:addons") {
+                    val jar = getJarTask()
+        
+                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+        
+                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
+                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}");
+        
+                    if(!Files.exists(addonPath)) {
+                        Files.createDirectories(addonPath.parent)
+                        Files.createFile(addonPath)
+                        Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
+                    }
+        
                 }
-                zip.closeEntry()
             }
-            zip.close()
         }
     }
     
     val generateResourceManifest = tasks.create("generateResourceManifest") {
         group = "terra"
         dependsOn(downloadDefaultPacks)
-        dependsOn(installAddons)
         doLast {
             val resources = HashMap<String, MutableList<String>>()
             val packsDir = File("${project.buildDir}/resources/main/packs/")
@@ -118,6 +108,7 @@ fun Project.configureDistribution() {
     
     tasks["processResources"].dependsOn(generateResourceManifest)
     
+    
     tasks.named<ShadowJar>("shadowJar") {
         // Tell shadow to download the packs
         dependsOn(downloadDefaultPacks)
@@ -129,6 +120,8 @@ fun Project.configureDistribution() {
         relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
+    
+        finalizedBy(installAddons)
     }
     
     configure<BasePluginExtension> {

buildSrc/src/main/kotlin/Utils.kt

@@ -29,6 +29,12 @@ fun Project.forSubProjects(project: String, action: Action<Project>) {
     }
 }
 
+fun Project.forImmediateSubProjects(project: String, action: Action<Project>) {
+    project(project).childProjects.forEach {
+        action.execute(it.value)
+    }
+}
+
 fun preRelease(preRelease: Boolean) {
     isPrerelease = preRelease
 }

platforms/bukkit/build.gradle.kts

@@ -14,25 +14,13 @@ val paperURL = "https://papermc.io/api/v2/projects/paper/versions/%version%/buil
 val purpurURL = "https://api.purpurmc.org/v2/purpur/%version%/latest/download"
 
 dependencies {
-    shadedApi(project(":common:implementation:base"))
-    
-    api("org.slf4j:slf4j-api:1.8.0-beta4") {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
-    implementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.Libraries.log4j_slf4j_impl) {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
-    
-    compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-20220519.005047-123")
-    compileOnly(group = "org.spigotmc", name = "spigot", version = "1.18.2-R0.1-SNAPSHOT")
-    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    
-    shadedApi("com.google.guava:guava:30.0-jre")
-    
-    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
+    shaded(project(":platforms:bukkit:common"))
+    shaded(project(":platforms:bukkit:nms:v1_18_R2"))
 }
 
-val jvmFlags = listOf(
+val throttleCoreCount = 0
+
+val jvmFlags = mutableListOf(
     "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200",
     "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch",
     "-XX:G1NewSizePercent=30", "-XX:G1MaxNewSizePercent=40", "-XX:G1HeapRegionSize=8M",
@@ -42,6 +30,10 @@ val jvmFlags = listOf(
     "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs",
     "-Daikars.new.flags=true", "-DIReallyKnowWhatIAmDoingISwear", /*"-javaagent:paperclip.jar"*/
                      )
+if(throttleCoreCount > 0) {
+    jvmFlags.add("-XX:ActiveProcessorCount=$throttleCoreCount")
+}
+
 
 fun downloadPaperclip(url: String, dir: String) {
     val clip = URL(url.replace("%version%", mcVersion))

platforms/bukkit/common/build.gradle.kts

@@ -0,0 +1,18 @@
+repositories {
+
+}
+
+dependencies {
+    shadedApi(project(":common:implementation:base"))
+    
+    api("org.slf4j:slf4j-api:1.8.0-beta4") {
+        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
+    }
+    
+    compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
+    
+    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
+    shadedApi("com.google.guava:guava:30.0-jre")
+    
+    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
+}

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -21,10 +21,6 @@ import cloud.commandframework.brigadier.CloudBrigadierManager;
 import cloud.commandframework.bukkit.CloudBukkitCapabilities;
 import cloud.commandframework.execution.CommandExecutionCoordinator;
 import cloud.commandframework.paper.PaperCommandManager;
-
-import com.dfsek.terra.bukkit.nms.NMSBiomeInjector;
-import com.dfsek.terra.bukkit.nms.NMSInjectListener;
-
 import org.bukkit.Bukkit;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -42,6 +38,7 @@ import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 import com.dfsek.terra.bukkit.listeners.CommonListener;
+import com.dfsek.terra.bukkit.nms.Initializer;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.util.VersionUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
@@ -60,7 +57,6 @@ public class TerraBukkitPlugin extends JavaPlugin {
         }
         
         platform.getEventManager().callEvent(new PlatformInitializationEvent());
-        NMSBiomeInjector.registerBiomes(platform.getRawConfigRegistry());
         
         
         try {
@@ -94,8 +90,13 @@ public class TerraBukkitPlugin extends JavaPlugin {
         }
         
         Bukkit.getPluginManager().registerEvents(new CommonListener(), this); // Register master event listener
-        Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), this); // Register master event listener
         PaperUtil.checkPaper(this);
+    
+        Initializer.init(platform);
+    }
+    
+    public PlatformImpl getPlatform() {
+        return platform;
     }
     
     @SuppressWarnings({ "deprecation", "AccessOfSystemProperties" })

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java

@@ -93,7 +93,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
     
     @Override
     public boolean shouldGenerateDecorations() {
-        return false;
+        return true;
     }
 
     

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java

@@ -0,0 +1,43 @@
+package com.dfsek.terra.bukkit.nms;
+
+import com.dfsek.terra.bukkit.PlatformImpl;
+import com.dfsek.terra.bukkit.TerraBukkitPlugin;
+
+import org.bukkit.Bukkit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+
+
+public interface Initializer {
+    String NMS = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+    String TERRA_PACKAGE = Initializer.class.getPackageName();
+    
+    void initialize(PlatformImpl plugin);
+    
+    static void init(PlatformImpl platform) {
+        Logger logger = LoggerFactory.getLogger(Initializer.class);
+        try {
+            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + NMS + ".NMSInitializer");
+            try {
+                Initializer initializer = (Initializer) initializerClass.getConstructor().newInstance();
+                initializer.initialize(platform);
+            } catch(ReflectiveOperationException e) {
+                throw new RuntimeException("Error initializing NMS bindings. Report this to Terra.", e);
+            }
+        } catch(ClassNotFoundException e) {
+            logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
+            logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
+            logger.error("");
+            logger.error("");
+            for(int i = 0; i < 20; i++) {
+                logger.error("PROCEEDING WITH AN EXISTING TERRA WORLD WILL RESULT IN CORRUPTION!!!");
+            }
+            logger.error("");
+            logger.error("");
+            logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
+            logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
+        }
+    }
+}

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.bukkit.util;
 
+import ca.solostudios.strata.Versions;
+import ca.solostudios.strata.version.Version;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.slf4j.Logger;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitPlatformBiome.java

@@ -17,30 +17,26 @@
 
 package com.dfsek.terra.bukkit.world;
 
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.properties.PropertyHolder;
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.level.biome.BiomeBase;
 
-
-public class BukkitPlatformBiome implements PlatformBiome {
+public class BukkitPlatformBiome implements PlatformBiome, PropertyHolder {
     private final org.bukkit.block.Biome biome;
-    private Holder<BiomeBase> resourceKey;
+    private final Context context = new Context();
     
     public BukkitPlatformBiome(org.bukkit.block.Biome biome) {
         this.biome = biome;
     }
     
-    public void setResourceKey(Holder<BiomeBase> resourceKey) {
-        this.resourceKey = resourceKey;
-    }
-    
-    public Holder<BiomeBase> getResourceKey() {
-        return resourceKey;
-    }
-    
     @Override
     public org.bukkit.block.Biome getHandle() {
         return biome;
     }
+    
+    @Override
+    public Context getContext() {
+        return context;
+    }
 }

platforms/bukkit/nms/v1_18_R2/build.gradle.kts

@@ -0,0 +1,6 @@
+dependencies {
+    api(project(":platforms:bukkit:common"))
+    
+    compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-20220519.005047-123")
+    compileOnly(group = "org.spigotmc", name = "spigot", version = "1.18.2-R0.1-SNAPSHOT")
+}

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInfo.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
+
+import com.dfsek.terra.api.properties.Properties;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.BiomeBase;
+
+
+public record NMSBiomeInfo(ResourceKey<BiomeBase> biomeKey) implements Properties {
+}

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java

@@ -1,32 +1,21 @@
-package com.dfsek.terra.bukkit.nms;
-
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
-import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
-import com.dfsek.terra.registry.master.ConfigRegistry;
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.Holder;
-import net.minecraft.core.HolderSet.Named;
 import net.minecraft.core.IRegistry;
 import net.minecraft.core.IRegistryWritable;
-import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryMaterials;
 import net.minecraft.data.RegistryGeneration;
 import net.minecraft.resources.MinecraftKey;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.biome.BiomeBase;
 import net.minecraft.world.level.biome.BiomeFog;
 import net.minecraft.world.level.biome.BiomeFog.GrassColor;
 import net.minecraft.world.level.biome.BiomeSettingsGeneration;
 import net.minecraft.world.level.biome.BiomeSettingsMobs;
-import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,27 +28,25 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+import com.dfsek.terra.registry.master.ConfigRegistry;
+
 
 public class NMSBiomeInjector {
     private static final Logger LOGGER = LoggerFactory.getLogger(NMSBiomeInjector.class);
+    private static final Map<MinecraftKey, List<MinecraftKey>> terraBiomeMap = new HashMap<>();
+    
     
     public static void registerBiomes(ConfigRegistry configRegistry) {
-        CraftServer craftserver = (CraftServer) Bukkit.getServer();
-        DedicatedServer dedicatedserver = craftserver.getServer();
-        
-        IRegistryWritable<BiomeBase> biomeRegistry = (IRegistryWritable<BiomeBase>) dedicatedserver
-                .aU() // getRegistryManager
-                .b( // getRegistry
-                    IRegistry.aP // biome registry key
-                  );
-        
         try {
             LOGGER.info("Hacking biome registry...");
+            IRegistryWritable<BiomeBase> biomeRegistry = (IRegistryWritable<BiomeBase>) Registries.biomeRegistry();
             Field frozen = RegistryMaterials.class.getDeclaredField("bL"); // registry frozen field
             frozen.setAccessible(true);
             frozen.set(biomeRegistry, false);
-    
-            Map<MinecraftKey, List<MinecraftKey>> terraBiomeMap = new HashMap<>();
             
             configRegistry.forEach(pack -> pack.getRegistry(Biome.class).forEach((key, biome) -> {
                 try {
@@ -74,9 +61,9 @@ public class NMSBiomeInjector {
                     ResourceKey<BiomeBase> delegateKey = ResourceKey.a(IRegistry.aP, new MinecraftKey("terra", createBiomeID(pack, key)));
                     
                     RegistryGeneration.a(RegistryGeneration.i, delegateKey, platform);
-                    Holder<BiomeBase> resourceKey = biomeRegistry.a(delegateKey, platform, Lifecycle.stable());
-                    platformBiome.setResourceKey(resourceKey);
-    
+                    biomeRegistry.a(delegateKey, platform, Lifecycle.stable());
+                    platformBiome.getContext().put(new NMSBiomeInfo(delegateKey));
+                    
                     terraBiomeMap.computeIfAbsent(vanillaMinecraftKey, i -> new ArrayList<>()).add(delegateKey.a());
                     
                     LOGGER.debug("Registered biome: " + delegateKey);
@@ -86,7 +73,7 @@ public class NMSBiomeInjector {
             }));
             
             frozen.set(biomeRegistry, true); // freeze registry again :)
-    
+            
             LOGGER.info("Doing tag garbage....");
             Map<TagKey<BiomeBase>, List<Holder<BiomeBase>>> collect = biomeRegistry
                     .g() // streamKeysAndEntries
@@ -98,38 +85,32 @@ public class NMSBiomeInjector {
             terraBiomeMap
                     .forEach((vb, terraBiomes) ->
                                      getEntry(biomeRegistry, vb)
-                                               .ifPresentOrElse(vanilla -> terraBiomes
-                                                                        .forEach(tb ->
-                                                                                getEntry(biomeRegistry, tb)
-                                                                                .ifPresentOrElse(
-                                                                                        terra -> {
-                                                                                            LOGGER.debug(
-                                                                                                    vanilla.e()
-                                                                                                           .orElseThrow()
-                                                                                                            .a() +
-                                                                                                    " (vanilla for " +
-                                                                                                    terra.e()
-                                                                                                         .orElseThrow()
-                                                                                                         .a() +
-                                                                                                    ": " +
-                                                                                                    vanilla.c()
-                                                                                                           .toList());
-                                                
-                                                                                            vanilla.c()
-                                                                                                   .forEach(
-                                                                                                           tag -> collect
-                                                                                                                   .computeIfAbsent(
-                                                                                                                           tag,
-                                                                                                                           t -> new ArrayList<>())
-                                                                                                                   .add(terra));
-                                                                                        },
-                                                                                        () -> LOGGER.error(
-                                                                                                "No such biome: {}",
-                                                                                                tb))),
-                                                                () -> LOGGER.error("No vanilla biome: {}", vb)));
+                                             .ifPresentOrElse(
+                                                     vanilla -> terraBiomes
+                                                             .forEach(tb -> getEntry(biomeRegistry, tb)
+                                                                     .ifPresentOrElse(
+                                                                             terra -> {
+                                                                                 LOGGER.debug(vanilla.e().orElseThrow().a() +
+                                                                                              " (vanilla for " +
+                                                                                              terra.e().orElseThrow().a() +
+                                                                                              ": " +
+                                                                                              vanilla.c().toList());
+                                                                
+                                                                                 vanilla.c()
+                                                                                        .forEach(
+                                                                                                tag -> collect
+                                                                                                        .computeIfAbsent(tag,
+                                                                                                                         t -> new ArrayList<>())
+                                                                                                        .add(terra));
+                                                                             },
+                                                                             () -> LOGGER.error(
+                                                                                     "No such biome: {}",
+                                                                                     tb))),
+                                                     () -> LOGGER.error("No vanilla biome: {}", vb)));
     
             biomeRegistry.k(); // clearTags
             biomeRegistry.a(ImmutableMap.copyOf(collect)); // populateTags
+            
         } catch(NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException exception) {
             throw new RuntimeException(exception);
         }
@@ -156,13 +137,12 @@ public class NMSBiomeInjector {
         BiomeSettingsMobs biomeSettingMobs = (BiomeSettingsMobs) biomeSettingMobsField.get(vanilla);
         builder.a(biomeSettingMobs);
         
-        Field biomeSettingGenField = BiomeBase.class.getDeclaredField("j");
-        biomeSettingGenField.setAccessible(true);
-        BiomeSettingsGeneration biomeSettingGen = (BiomeSettingsGeneration) biomeSettingGenField.get(vanilla);
-        builder.a(biomeSettingGen)
-                .a(vanilla.c())
-                .b(vanilla.h()) // precipitation
-                .a(vanilla.i()); // temp
+        
+        BiomeSettingsGeneration.a generationBuilder = new BiomeSettingsGeneration.a(); // builder
+        builder.a(generationBuilder.a())
+               .a(vanilla.c())
+               .b(vanilla.h()) // precipitation
+               .a(vanilla.i()); // temp
         
         
         BiomeFog.a effects = new BiomeFog.a(); // Builder

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeProvider.java

@@ -1,14 +1,18 @@
-package com.dfsek.terra.bukkit.nms;
-
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.core.Holder;
+import net.minecraft.core.IRegistry;
+import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.biome.BiomeBase;
 import net.minecraft.world.level.biome.Climate.Sampler;
 import net.minecraft.world.level.biome.WorldChunkManager;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+
+import com.dfsek.terra.api.util.generic.Lazy;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
 
 
 public class NMSBiomeProvider extends WorldChunkManager {
@@ -16,8 +20,13 @@ public class NMSBiomeProvider extends WorldChunkManager {
     private final WorldChunkManager vanilla;
     private final long seed;
     
+    private static final Lazy<IRegistry<BiomeBase>> biomeRegistry = Lazy.lazy(() -> {
+        DedicatedServer dedicatedserver = ((CraftServer) Bukkit.getServer()).getServer();
+        return dedicatedserver.aU().b(IRegistry.aP);
+    });
+    
     public NMSBiomeProvider(BiomeProvider delegate, WorldChunkManager vanilla, long seed) {
-        super(vanilla.b().stream());
+        super(delegate.stream().map(biome -> biomeRegistry.value().g(((BukkitPlatformBiome) biome.getPlatformBiome()).getContext().get(NMSBiomeInfo.class).biomeKey())));
         this.delegate = delegate;
         this.vanilla = vanilla;
         this.seed = seed;
@@ -39,6 +48,7 @@ public class NMSBiomeProvider extends WorldChunkManager {
     
     @Override
     public Holder<BiomeBase> getNoiseBiome(int x, int y, int z, Sampler sampler) {
-        return ((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed).getPlatformBiome()).getResourceKey();
+        //return CraftBlock.biomeToBiomeBase(biomeRegistry.value(), ((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed).getPlatformBiome()).getHandle());
+        return biomeRegistry.value().g(((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed).getPlatformBiome()).getContext().get(NMSBiomeInfo.class).biomeKey());
     }
 }

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java

@@ -0,0 +1,239 @@
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.util.generic.Lazy;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.info.WorldProperties;
+
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Codec;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.core.BlockPosition;
+import net.minecraft.core.Holder;
+import net.minecraft.core.IRegistryCustom;
+import net.minecraft.core.SectionPosition;
+import net.minecraft.server.level.RegionLimitedWorldAccess;
+import net.minecraft.world.level.BlockColumn;
+import net.minecraft.world.level.ChunkCoordIntPair;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.biome.BiomeBase;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.biome.Climate;
+import net.minecraft.world.level.biome.Climate.Sampler;
+import net.minecraft.world.level.block.state.IBlockData;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.chunk.IChunkAccess;
+import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract;
+import net.minecraft.world.level.levelgen.HeightMap;
+import net.minecraft.world.level.levelgen.WorldGenStage;
+import net.minecraft.world.level.levelgen.blending.Blender;
+import net.minecraft.world.level.levelgen.structure.StructureSet;
+import net.minecraft.world.level.levelgen.structure.placement.ConcentricRingsStructurePlacement;
+import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.DefinedStructureManager;
+import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
+
+
+public class NMSChunkGeneratorDelegate extends ChunkGenerator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMSChunkGeneratorDelegate.class);
+    private final NMSBiomeProvider biomeSource;
+    private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate;
+    
+    private final ChunkGenerator vanilla;
+    private final ConfigPack pack;
+    
+    private final long seed;
+    
+    private final Map<ConcentricRingsStructurePlacement, Lazy<List<ChunkCoordIntPair>>> h = new Object2ObjectArrayMap<>();
+    
+    
+    
+    public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, long seed) {
+        super(Registries.structureSet(), Optional.empty(), biomeProvider, biomeProvider, seed);
+        this.delegate = pack.getGeneratorProvider().newInstance(pack);
+        this.vanilla = vanilla;
+        this.biomeSource = biomeProvider;
+        this.pack = pack;
+        this.seed = seed;
+    }
+    
+    @Override //applyCarvers
+    public void a(RegionLimitedWorldAccess regionlimitedworldaccess, long var2, BiomeManager var4, StructureManager var5,
+                  IChunkAccess ichunkaccess, WorldGenStage.Features var7) {
+        // no-op
+    }
+    
+    @Override // getSeaLevel
+    public int g() {
+        return vanilla.g();
+    }
+    
+    @Override //fillFromNoise
+    public CompletableFuture<IChunkAccess> a(Executor executor, Blender blender, StructureManager structuremanager,
+                                             IChunkAccess ichunkaccess) {
+        return vanilla.a(executor, blender, structuremanager, ichunkaccess);
+    }
+    
+    
+    @Override //buildSurface. Used to be buildBase
+    public void a(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager, IChunkAccess ichunkaccess) {
+    
+    }
+    
+    @Override
+    protected Codec<? extends ChunkGenerator> b() {
+        return ChunkGeneratorAbstract.a;
+    }
+    
+    @Override // getColumn
+    public BlockColumn a(int x, int z, LevelHeightAccessor height) {
+        IBlockData[] array = new IBlockData[height.v_()];
+        WorldProperties properties = new NMSWorldProperties(seed, height);
+        BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties);
+        for(int y = properties.getMaxHeight() - 1; y >= properties.getMinHeight(); y--) {
+            array[y - properties.getMinHeight()] = ((CraftBlockData) delegate.getBlock(properties, x, y, z, biomeProvider)
+                                                                             .getHandle()).getState();
+        }
+        return new BlockColumn(getMinimumY(), array);
+    }
+    
+    @Override // withSeed
+    public ChunkGenerator a(long seed) {
+        return new NMSChunkGeneratorDelegate(vanilla, pack, biomeSource, seed);
+    }
+    
+    //spawnOriginalMobs
+    public void a(RegionLimitedWorldAccess regionlimitedworldaccess) {
+        vanilla.a(regionlimitedworldaccess);
+    }
+    
+    // getGenDepth
+    public int f() {
+        return vanilla.f();
+    }
+    
+    // climateSampler
+    public Sampler d() {
+        return Climate.a();
+    }
+    
+    //getMinY
+    @Override
+    public int h() {
+        return vanilla.h();
+    }
+    
+    @Override // getBaseHeight
+    public int a(int x, int z, HeightMap.Type heightmap, LevelHeightAccessor height) {
+        WorldProperties properties = new NMSWorldProperties(seed, height);
+        int y = properties.getMaxHeight();
+        BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties);
+        while(y >= getMinimumY() && !heightmap.e().test(
+                ((CraftBlockData) delegate.getBlock(properties, x, y - 1, z, biomeProvider).getHandle()).getState())) {
+            y--;
+        }
+        return y;
+    }
+    
+    @Override
+    public void a(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess,
+                  DefinedStructureManager definedstructuremanager, long i) {
+        super.a(iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i);
+    }
+    
+    @Nullable
+    @Override
+    public List<ChunkCoordIntPair> a(ConcentricRingsStructurePlacement concentricringsstructureplacement) {
+        this.i();
+        return this.h.get(concentricringsstructureplacement).value();
+    }
+    
+    private volatile boolean rings = false;
+    
+    @Override
+    public synchronized void i() {
+        if(!this.rings) {
+            super.i();
+            this.populateStrongholdData();
+            this.rings = true;
+        }
+    }
+    
+    private void populateStrongholdData() {
+        LOGGER.info("Generating safe stronghold data. This may take up to a minute.");
+        Set<Holder<BiomeBase>> set = this.d.b();
+        a().map(h -> h.a()).forEach((holder) -> { // we dont need the spigot crap because it doesnt touch concentric.
+            StructurePlacement structureplacement = holder.b();
+            if(structureplacement instanceof ConcentricRingsStructurePlacement concentricringsstructureplacement) {
+                if(holder.a().stream().anyMatch((structureset_a1) -> structureset_a1.a(set::contains))) {
+                    this.h.put(concentricringsstructureplacement,
+                               Lazy.lazy(() -> this.generateRingPositions(holder, concentricringsstructureplacement)));
+                }
+            }
+        });
+    }
+    
+    private List<ChunkCoordIntPair> generateRingPositions(StructureSet holder,
+                                                          ConcentricRingsStructurePlacement concentricringsstructureplacement) {
+        if(concentricringsstructureplacement.d() == 0) {
+            return List.of();
+        }
+        List<ChunkCoordIntPair> list = new ArrayList<>();
+        Set<Holder<BiomeBase>> set = holder.a().stream().flatMap((structureset_a) -> (structureset_a.a().a()).a().a()).collect(
+                Collectors.toSet());
+        int i = concentricringsstructureplacement.b();
+        int j = concentricringsstructureplacement.d();
+        int k = concentricringsstructureplacement.c();
+        Random random = new Random();
+        random.setSeed(this.j);
+        double d0 = random.nextDouble() * Math.PI * 2.0;
+        int l = 0;
+        int i1 = 0;
+        
+        for(int j1 = 0; j1 < j; ++j1) {
+            double d1 = (double) (4 * i + i * i1 * 6) + (random.nextDouble() - 0.5) * (double) i * 2.5;
+            int k1 = (int) Math.round(Math.cos(d0) * d1);
+            int l1 = (int) Math.round(Math.sin(d0) * d1);
+            int i2 = SectionPosition.a(k1, 8);
+            int j2 = SectionPosition.a(l1, 8);
+            Objects.requireNonNull(set);
+            Pair<BlockPosition, Holder<BiomeBase>> pair = this.c.a(i2, 0, j2, 112, set::contains, random, this.d());
+            if(pair != null) {
+                BlockPosition blockposition = pair.getFirst();
+                k1 = SectionPosition.a(blockposition.u());
+                l1 = SectionPosition.a(blockposition.w());
+            }
+            
+            list.add(new ChunkCoordIntPair(k1, l1));
+            d0 += 6.283185307179586 / (double) k;
+            ++l;
+            if(l == k) {
+                ++i1;
+                l = 0;
+                k += 2 * k / (i1 + 1);
+                k = Math.min(k, j - j1);
+                d0 += random.nextDouble() * Math.PI * 2.0;
+            }
+        }
+        return list;
+        
+    }
+    
+    public int getMinimumY() {
+        return h();
+    }
+    
+    @Override //addDebugScreenInfo
+    public void a(List<String> arg0, BlockPosition arg1) {
+    
+    }
+}

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSInitializer.java

@@ -0,0 +1,15 @@
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
+
+import org.bukkit.Bukkit;
+
+import com.dfsek.terra.bukkit.PlatformImpl;
+import com.dfsek.terra.bukkit.nms.Initializer;
+
+
+public class NMSInitializer implements Initializer {
+    @Override
+    public void initialize(PlatformImpl platform) {
+        NMSBiomeInjector.registerBiomes(platform.getRawConfigRegistry());
+        Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), platform.getPlugin());
+    }
+}

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSInjectListener.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms;
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
 
 import net.minecraft.server.level.WorldServer;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -36,13 +36,16 @@ public class NMSInjectListener implements Listener {
     
             ChunkGenerator vanilla = serverWorld.k().g();
             NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), vanilla.e(), craftWorld.getSeed());
-            NMSChunkGeneratorDelegate custom = new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld);
+            NMSChunkGeneratorDelegate custom = new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed());
             
             custom.conf = vanilla.conf; // world config from Spigot
             
             serverWorld.k().a.u = custom;
-
+            
             LOGGER.info("Successfully injected into world.");
+            
+            serverWorld.k().a.u.i(); // generate stronghold data now
+            
             INJECT_LOCK.unlock();
         }
     }

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSWorldProperties.java

@@ -0,0 +1,36 @@
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
+
+import net.minecraft.world.level.LevelHeightAccessor;
+
+import com.dfsek.terra.api.world.info.WorldProperties;
+
+
+public class NMSWorldProperties implements WorldProperties {
+    private final long seed;
+    private final LevelHeightAccessor height;
+    
+    public NMSWorldProperties(long seed, LevelHeightAccessor height) {
+        this.seed = seed;
+        this.height = height;
+    }
+    
+    @Override
+    public Object getHandle() {
+        return height;
+    }
+    
+    @Override
+    public long getSeed() {
+        return seed;
+    }
+    
+    @Override
+    public int getMaxHeight() {
+        return height.ag();
+    }
+    
+    @Override
+    public int getMinHeight() {
+        return height.u_();
+    }
+}

platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/Registries.java

@@ -0,0 +1,30 @@
+package com.dfsek.terra.bukkit.nms.v1_18_R2;
+
+import net.minecraft.core.IRegistry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.world.level.biome.BiomeBase;
+import net.minecraft.world.level.levelgen.structure.StructureSet;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+
+
+public class Registries {
+    private static <T> IRegistry<T> getRegistry(ResourceKey<IRegistry<T>> key) {
+        CraftServer craftserver = (CraftServer) Bukkit.getServer();
+        DedicatedServer dedicatedserver = craftserver.getServer();
+        return dedicatedserver
+                .aU() // getRegistryManager
+                .b( // getRegistry
+                    key
+                  );
+    }
+    
+    public static IRegistry<BiomeBase> biomeRegistry() {
+        return getRegistry(IRegistry.aP);
+    }
+    
+    public static IRegistry<StructureSet> structureSet() {
+        return getRegistry(IRegistry.aM);
+    }
+}

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java

@@ -1,149 +0,0 @@
-package com.dfsek.terra.bukkit.nms;
-
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.info.WorldProperties;
-import com.dfsek.terra.bukkit.generator.BukkitProtoChunk;
-import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.bukkit.world.BukkitServerWorld;
-
-import com.mojang.serialization.Codec;
-import net.minecraft.core.BlockPosition;
-import net.minecraft.server.level.RegionLimitedWorldAccess;
-import net.minecraft.world.level.BlockColumn;
-import net.minecraft.world.level.GeneratorAccessSeed;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.StructureManager;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.biome.Climate;
-import net.minecraft.world.level.biome.Climate.Sampler;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.IChunkAccess;
-import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract;
-import net.minecraft.world.level.levelgen.HeightMap;
-import net.minecraft.world.level.levelgen.WorldGenStage;
-import net.minecraft.world.level.levelgen.blending.Blender;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_18_R2.generator.CraftChunkData;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
-
-public class NMSChunkGeneratorDelegate extends ChunkGenerator {
-    
-    private final NMSBiomeProvider biomeSource;
-    private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate;
-    
-    private final ChunkGenerator vanilla;
-    private final ConfigPack pack;
-    private final CraftWorld world;
-    
-    
-    public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, CraftWorld world) {
-        super(vanilla.b, vanilla.e, biomeProvider);
-        this.delegate = pack.getGeneratorProvider().newInstance(pack);
-        this.vanilla = vanilla;
-        this.biomeSource = biomeProvider;
-        this.pack = pack;
-        this.world = world;
-    }
-    
-    @Override //applyCarvers
-    public void a(RegionLimitedWorldAccess regionlimitedworldaccess, long var2, BiomeManager var4, StructureManager var5,
-                  IChunkAccess ichunkaccess, WorldGenStage.Features var7) {
-        // no-op
-    }
-    
-    @Override // getSeaLevel
-    public int g() {
-        return vanilla.g();
-    }
-    
-    @Override //fillFromNoise
-    public CompletableFuture<IChunkAccess> a(Executor executor, Blender blender, StructureManager structuremanager,
-                                             IChunkAccess ichunkaccess) {
-        return vanilla.a(executor, blender, structuremanager, ichunkaccess);
-    }
-    
-    
-    @Override //buildSurface. Used to be buildBase
-    public void a(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager, IChunkAccess ichunkaccess) {
-    
-    }
-    
-    @Override
-    public void a(GeneratorAccessSeed gas, StructureManager manager, IChunkAccess ica) {
-        vanilla.a(gas, manager, ica);
-    }
-    
-    @Override
-    protected Codec<? extends ChunkGenerator> b() {
-        return ChunkGeneratorAbstract.a;
-    }
-    
-    @Override // getColumn
-    public BlockColumn a(int var0, int var1, LevelHeightAccessor var2) {
-        return vanilla.a(var0, var1, var2);
-    }
-    
-    @Override // withSeed
-    public ChunkGenerator a(long seed) {
-        return new NMSChunkGeneratorDelegate(vanilla, pack, biomeSource, world);
-    }
-    
-    //spawnOriginalMobs
-    public void a(RegionLimitedWorldAccess regionlimitedworldaccess) {
-        vanilla.a(regionlimitedworldaccess);
-    }
-    
-    // getGenDepth
-    public int f() {
-        return vanilla.f();
-    }
-    
-    // climateSampler
-    public Sampler d() {
-        return Climate.a();
-    }
-    
-    //getMinY
-    @Override
-    public int h() {
-        return vanilla.h();
-    }
-    
-    @Override //getFirstFreeHeight
-    public int b(int i, int j, HeightMap.Type heightmap_type, LevelHeightAccessor levelheightaccessor) {
-        return this.a(i, j, heightmap_type, levelheightaccessor);
-    }
-    
-    
-    @Override //getFirstOccupiedHeight
-    public int c(int i, int j, HeightMap.Type heightmap_type, LevelHeightAccessor levelheightaccessor) {
-        return this.a(i, j, heightmap_type, levelheightaccessor) - 1;
-    }
-    
-    @Override // getBaseHeight
-    public int a(int x, int z, HeightMap.Type heightmap, LevelHeightAccessor height) {
-        int y = world.getMaxHeight();
-        WorldProperties properties = BukkitAdapter.adapt(world);
-        BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties);
-        while(y >= getMinimumY() && !heightmap.e().test(
-                ((CraftBlockData) delegate.getBlock(properties, x, y - 1, z, biomeProvider).getHandle()).getState())) {
-            y--;
-        }
-        return y;
-    }
-    
-    public int getMinimumY() {
-        return h();
-    }
-    
-    @Override //addDebugScreenInfo
-    public void a(List<String> arg0, BlockPosition arg1) {
-    
-    }
-}

platforms/fabric/build.gradle.kts

@@ -48,6 +48,7 @@ tasks.getByName<ShadowJar>("shadowJar") {
 }
 
 val remapped = tasks.register<RemapJarTask>("remapShadedJar") {
+    dependsOn("installAddons")
     group = "fabric"
     val shadowJar = tasks.getByName<ShadowJar>("shadowJar")
     dependsOn(shadowJar)

settings.gradle.kts

@@ -18,6 +18,10 @@ includeImmediateChildren(file("common/addons"), "addon")
 
 includeImmediateChildren(file("platforms"), "platform")
 
+includeImmediateChildren(file("platforms/bukkit/nms"), "Bukkit NMS")
+
+include(":platforms:bukkit:common")
+
 pluginManagement {
     repositories {
         maven(url = "https://maven.fabricmc.net") {