Dev/1.21.5 (#495)

* Bukkit Build Fix (#494)

* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash

* Initial Fabric 1.21.5

* Updated dependencies

* Updated SpawnerData with backwards compat

* Updated dependencies

* Updated setBlockState usage - needs verifying as flags are confusing

* Refactored Bukkit NMS packages

* Initial attempt at updating mixin-commons

* Continue fabric 1.21.5 WIP

* Some additional logging

* Update deps

* Build fixes and update allay

* Add oak to authors

---------

Co-authored-by: Mikal <Ifiht@users.noreply.github.com>
Co-authored-by: OakLoaf <oak@beaconstudios.org>

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

@@ -1,8 +1,10 @@
-apply(plugin = "io.papermc.paperweight.userdev")
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
 
 dependencies {
     api(project(":platforms:bukkit:common"))
-    paperDevBundle(Versions.Bukkit.paperDevBundle)
+    paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle)
     implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/AwfulBukkitHacks.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
-import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_5.config.VanillaBiomeProperties;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/NMSAddon.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.bukkit.BukkitAddon;
 import com.dfsek.terra.bukkit.PlatformImpl;
-import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_5.config.VanillaBiomeProperties;
 
 
 public class NMSAddon extends BukkitAddon {

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -12,7 +12,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_5.config.VanillaBiomeProperties;
 
 
 public class NMSBiomeInjector {

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.Holder;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.BlockPos;
@@ -116,10 +116,10 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
                     if(noise > threshold) {
                         chunk.setBlockState(new BlockPos(x, y, z), ((CraftBlockData) ((BukkitBlockState) delegate
                             .getPalette(x + xi, y, z + zi, world, biomeProvider)
-                            .get(depth, x + xi, y, z + zi, world.getSeed())).getHandle()).getState(), false);
+                            .get(depth, x + xi, y, z + zi, world.getSeed())).getHandle()).getState(), 0);
                         depth++;
                     } else if(noise < airThreshold) {
-                        chunk.setBlockState(new BlockPos(x, y, z), Blocks.AIR.defaultBlockState(), false);
+                        chunk.setBlockState(new BlockPos(x, y, z), Blocks.AIR.defaultBlockState(), 0);
                     } else {
                         depth = 0;
                     }

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import com.dfsek.terra.bukkit.BukkitAddon;
 

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.world.level.LevelHeightAccessor;
 

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/Reflection.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/RegistryFetcher.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3;
+package com.dfsek.terra.bukkit.nms.v1_21_5;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/BiomeAdditionsSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/BiomeMoodSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/BiomeParticleConfigTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/EntityTypeTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/MusicSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/SoundEventTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/SpawnCostConfig.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/SpawnEntryConfig.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -7,7 +7,7 @@ import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 
 
-public class SpawnEntryTemplate implements ObjectTemplate<SpawnerData> {
+public class SpawnEntryConfig implements ObjectTemplate<SpawnEntryConfig> {
     @Value("type")
     @Default
     private EntityType<?> type = null;
@@ -23,9 +23,17 @@ public class SpawnEntryTemplate implements ObjectTemplate<SpawnerData> {
     @Value("max-group-size")
     @Default
     private Integer maxGroupSize = null;
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public SpawnerData getSpawnerData() {
+        return new SpawnerData(type, minGroupSize, maxGroupSize);
+    }
     
     @Override
-    public SpawnerData get() {
-        return new SpawnerData(type, weight, minGroupSize, maxGroupSize);
+    public SpawnEntryConfig get() {
+        return this;
     }
 }

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/SpawnSettingsTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -6,7 +6,6 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.List;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.biome.MobSpawnSettings;
-import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,8 +32,8 @@ public class SpawnSettingsTemplate implements ObjectTemplate<MobSpawnSettings> {
         MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder();
         for(SpawnTypeConfig spawn : spawns) {
             MobCategory group = spawn.getGroup();
-            for(SpawnerData entry : spawn.getEntries()) {
-                builder.addSpawn(group, entry);
+            for(SpawnEntryConfig entry : spawn.getEntries()) {
+                builder.addSpawn(group, entry.getWeight(), entry.getSpawnerData());
             }
         }
         for(SpawnCostConfig cost : costs) {

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/SpawnTypeConfig.java

@@ -1,11 +1,10 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.List;
 import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
 
 
 public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
@@ -15,13 +14,13 @@ public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
 
     @Value("entries")
     @Default
-    private List<SpawnerData> entries = null;
+    private List<SpawnEntryConfig> entries = null;
 
     public MobCategory getGroup() {
         return group;
     }
 
-    public List<SpawnerData> getEntries() {
+    public List<SpawnEntryConfig> getEntries() {
         return entries;
     }
 

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/VanillaBiomeProperties.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;

platforms/bukkit/nms/v1_21_5/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_5/config/VillagerTypeTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_3.config;
+package com.dfsek.terra.bukkit.nms.v1_21_5.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;