Refractor bukkit to v1_21_3

PolyhedralDev · Oct 29, 2024 · 710bbc3 · 710bbc3
1 parent 1929239
commit 710bbc3
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 36 deletions.
diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_21", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_21_3", configuration = "reobf"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 

diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -194,7 +194,7 @@ private boolean doVersionCheck() {
     @Override
     public @Nullable
     ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
-        if(id == null || id.trim().equals("")) { return null; }
+        if(id == null || id.trim().isEmpty()) { return null; }
         return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
             ConfigPack pack = platform.getConfigRegistry().getByID(id).orElseThrow(
                 () -> new IllegalArgumentException("No such config pack \"" + id + "\""));

diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java
@@ -54,9 +54,6 @@ static BukkitAddon nmsAddon(PlatformImpl platform) {
     private static Initializer constructInitializer() {
         try {
             String packageVersion = NMS;
-            if(NMS.equals("v1_21_3")) {
-                packageVersion = "v1_21"; // TODO: Refactor nms package to v1_21_3
-            }
 
             Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer");
             try {

diff --git a/platforms/bukkit/nms/v1_21/build.gradle.kts → ...forms/bukkit/nms/v1_21_3/build.gradle.kts b/platforms/bukkit/nms/v1_21/build.gradle.kts → ...forms/bukkit/nms/v1_21_3/build.gradle.kts
diff --git a/...ra/bukkit/nms/v1_21/AwfulBukkitHacks.java → .../bukkit/nms/v1_21_3/AwfulBukkitHacks.java b/...ra/bukkit/nms/v1_21/AwfulBukkitHacks.java → .../bukkit/nms/v1_21_3/AwfulBukkitHacks.java
@@ -1,6 +1,6 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
-import com.dfsek.terra.bukkit.nms.v1_21.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
 
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.core.Holder;

diff --git a/...fsek/terra/bukkit/nms/v1_21/NMSAddon.java → ...ek/terra/bukkit/nms/v1_21_3/NMSAddon.java b/...fsek/terra/bukkit/nms/v1_21/NMSAddon.java → ...ek/terra/bukkit/nms/v1_21_3/NMSAddon.java
@@ -1,11 +1,11 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 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.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
 
 
 public class NMSAddon extends BukkitAddon {

diff --git a/.../terra/bukkit/nms/v1_21/NMSBiomeInfo.java → ...erra/bukkit/nms/v1_21_3/NMSBiomeInfo.java b/.../terra/bukkit/nms/v1_21/NMSBiomeInfo.java → ...erra/bukkit/nms/v1_21_3/NMSBiomeInfo.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;

diff --git a/...ra/bukkit/nms/v1_21/NMSBiomeInjector.java → .../bukkit/nms/v1_21_3/NMSBiomeInjector.java b/...ra/bukkit/nms/v1_21/NMSBiomeInjector.java → .../bukkit/nms/v1_21_3/NMSBiomeInjector.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -11,7 +11,7 @@
 import java.util.Optional;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.bukkit.nms.v1_21.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_3.config.VanillaBiomeProperties;
 
 
 public class NMSBiomeInjector {

diff --git a/...ra/bukkit/nms/v1_21/NMSBiomeProvider.java → .../bukkit/nms/v1_21_3/NMSBiomeProvider.java b/...ra/bukkit/nms/v1_21/NMSBiomeProvider.java → .../bukkit/nms/v1_21_3/NMSBiomeProvider.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.Holder;

diff --git a/.../nms/v1_21/NMSChunkGeneratorDelegate.java → ...ms/v1_21_3/NMSChunkGeneratorDelegate.java b/.../nms/v1_21/NMSChunkGeneratorDelegate.java → ...ms/v1_21_3/NMSChunkGeneratorDelegate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.BlockPos;

diff --git a/...erra/bukkit/nms/v1_21/NMSInitializer.java → ...ra/bukkit/nms/v1_21_3/NMSInitializer.java b/...erra/bukkit/nms/v1_21/NMSInitializer.java → ...ra/bukkit/nms/v1_21_3/NMSInitializer.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import com.dfsek.terra.bukkit.BukkitAddon;
 

diff --git a/...a/bukkit/nms/v1_21/NMSInjectListener.java → ...bukkit/nms/v1_21_3/NMSInjectListener.java b/...a/bukkit/nms/v1_21/NMSInjectListener.java → ...bukkit/nms/v1_21_3/NMSInjectListener.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
@@ -17,7 +17,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.util.reflection.ReflectionUtil;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 
 

diff --git a/.../bukkit/nms/v1_21/NMSWorldProperties.java → ...ukkit/nms/v1_21_3/NMSWorldProperties.java b/.../bukkit/nms/v1_21/NMSWorldProperties.java → ...ukkit/nms/v1_21_3/NMSWorldProperties.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.world.level.LevelHeightAccessor;
 

diff --git a/...ek/terra/bukkit/nms/v1_21/Reflection.java → .../terra/bukkit/nms/v1_21_3/Reflection.java b/...ek/terra/bukkit/nms/v1_21/Reflection.java → .../terra/bukkit/nms/v1_21_3/Reflection.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;

diff --git a/...rra/bukkit/nms/v1_21/RegistryFetcher.java → ...a/bukkit/nms/v1_21_3/RegistryFetcher.java b/...rra/bukkit/nms/v1_21/RegistryFetcher.java → ...a/bukkit/nms/v1_21_3/RegistryFetcher.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_21_3;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;

diff --git a/...1/config/BiomeAdditionsSoundTemplate.java → ...3/config/BiomeAdditionsSoundTemplate.java b/...1/config/BiomeAdditionsSoundTemplate.java → ...3/config/BiomeAdditionsSoundTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/.../v1_21/config/BiomeMoodSoundTemplate.java → ...1_21_3/config/BiomeMoodSoundTemplate.java b/.../v1_21/config/BiomeMoodSoundTemplate.java → ...1_21_3/config/BiomeMoodSoundTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/...1/config/BiomeParticleConfigTemplate.java → ...3/config/BiomeParticleConfigTemplate.java b/...1/config/BiomeParticleConfigTemplate.java → ...3/config/BiomeParticleConfigTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/.../nms/v1_21/config/EntityTypeTemplate.java → ...ms/v1_21_3/config/EntityTypeTemplate.java b/.../nms/v1_21/config/EntityTypeTemplate.java → ...ms/v1_21_3/config/EntityTypeTemplate.java
@@ -1,9 +1,8 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.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 net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;

diff --git a/.../nms/v1_21/config/MusicSoundTemplate.java → ...ms/v1_21_3/config/MusicSoundTemplate.java b/.../nms/v1_21/config/MusicSoundTemplate.java → ...ms/v1_21_3/config/MusicSoundTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/.../nms/v1_21/config/SoundEventTemplate.java → ...ms/v1_21_3/config/SoundEventTemplate.java b/.../nms/v1_21/config/SoundEventTemplate.java → ...ms/v1_21_3/config/SoundEventTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/...kit/nms/v1_21/config/SpawnCostConfig.java → ...t/nms/v1_21_3/config/SpawnCostConfig.java b/...kit/nms/v1_21/config/SpawnCostConfig.java → ...t/nms/v1_21_3/config/SpawnCostConfig.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/.../nms/v1_21/config/SpawnEntryTemplate.java → ...ms/v1_21_3/config/SpawnEntryTemplate.java b/.../nms/v1_21/config/SpawnEntryTemplate.java → ...ms/v1_21_3/config/SpawnEntryTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/...s/v1_21/config/SpawnSettingsTemplate.java → ...v1_21_3/config/SpawnSettingsTemplate.java b/...s/v1_21/config/SpawnSettingsTemplate.java → ...v1_21_3/config/SpawnSettingsTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/...kit/nms/v1_21/config/SpawnTypeConfig.java → ...t/nms/v1_21_3/config/SpawnTypeConfig.java b/...kit/nms/v1_21/config/SpawnTypeConfig.java → ...t/nms/v1_21_3/config/SpawnTypeConfig.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

diff --git a/.../v1_21/config/VanillaBiomeProperties.java → ...1_21_3/config/VanillaBiomeProperties.java b/.../v1_21/config/VanillaBiomeProperties.java → ...1_21_3/config/VanillaBiomeProperties.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.config;
 
 import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;

diff --git a/...ms/v1_21/config/VillagerTypeTemplate.java → .../v1_21_3/config/VillagerTypeTemplate.java b/...ms/v1_21/config/VillagerTypeTemplate.java → .../v1_21_3/config/VillagerTypeTemplate.java
@@ -1,12 +1,9 @@
-package com.dfsek.terra.bukkit.nms.v1_21.config;
+package com.dfsek.terra.bukkit.nms.v1_21_3.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 net.minecraft.core.Registry;
-import net.minecraft.core.RegistryCodecs;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.npc.VillagerType;