Update for MC 1.21.4

ShaneBeee · ShaneBeee · commit 2bfe426fcf51 · 2024-12-17T17:06:49.000-08:00
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 plugins {
     id 'java'
     id 'maven-publish'
-    id("io.papermc.paperweight.userdev") version "1.7.1" // the latest version can be found on the Gradle Plugin Portal
+    id("io.papermc.paperweight.userdev") version "1.7.7" // the latest version can be found on the Gradle Plugin Portal
 }
 
 // The Minecraft version we're currently building for
-def minecraftVersion = '1.21.1'
+def minecraftVersion = '1.21.4'
 // The Paper JavaDoc version to use
-def javaDocVersion = '1.21.1'
+def javaDocVersion = '1.21.4'
 // Where this builds on the server
-def serverLocation = '1-21-1'
+def serverLocation = '1-21-4'
 // Version of NMS-API
 def projectVersion = '1.7.2'
 
diff --git a/src/main/java/com/shanebeestudios/nms/api/util/McUtils.java b/src/main/java/com/shanebeestudios/nms/api/util/McUtils.java
@@ -58,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -207,7 +208,7 @@ public static LevelChunk getLevelChunk(Chunk chunk) {
      * @return Registry from key
      */
     public static <T> Registry<T> getRegistry(ResourceKey<? extends Registry<? extends T>> registry) {
-        return MinecraftServer.getServer().registryAccess().registryOrThrow(registry);
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(registry);
     }
 
     /**
@@ -240,7 +241,11 @@ public static Entity getNMSEntity(org.bukkit.entity.Entity bukkitEntity) {
     public static EntityType<?> getEntityType(org.bukkit.entity.EntityType bukkitType) {
         NamespacedKey key = bukkitType.getKey();
         ResourceLocation resourceLocation = McUtils.getResourceLocation(key);
-        return BuiltInRegistries.ENTITY_TYPE.get(resourceLocation);
+        Optional<Holder.Reference<EntityType<?>>> ref = BuiltInRegistries.ENTITY_TYPE.get(resourceLocation);
+        if (ref.isEmpty()) {
+            throw new IllegalArgumentException("Unknown entity type " + resourceLocation);
+        }
+        return ref.get().value();
     }
 
     /**
@@ -290,7 +295,7 @@ public static <T> Holder.Reference<T> getHolderReference(Registry<T> registry, N
         ResourceLocation resourceLocation = McUtils.getResourceLocation(key);
         ResourceKey<T> resourceKey = ResourceKey.create(registry.key(), resourceLocation);
         try {
-            return registry.getHolderOrThrow(resourceKey);
+            return registry.getOrThrow(resourceKey);
         } catch (IllegalStateException ignore) {
             return null;
         }
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/WorldApi.java b/src/main/java/com/shanebeestudios/nms/api/world/WorldApi.java
@@ -86,7 +86,7 @@ public static void setBiome(@NotNull Location location, @NotNull NamespacedKey b
 
         LevelChunk chunk = serverLevel.getChunkAt(new BlockPos(x, y, z));
         chunk.setBiome(x >> 2, y >> 2, z >> 2, biome);
-        chunk.setUnsaved(true);
+        chunk.markUnsaved();
     }
 
     /**
@@ -136,7 +136,7 @@ public static void fillBiome(@NotNull Location location, @NotNull Location locat
         for (ChunkAccess chunkAccess : chunkAccessList) {
             chunkAccess.fillBiomesFromNoise(McUtils.getBiomeResolver(new MutableInt(0), chunkAccess, box, biome,
                     biomeHolder -> replaceBiome == null || biomeHolder.is(replaceBiome)), level.getChunkSource().randomState().sampler());
-            chunkAccess.setUnsaved(true);
+            chunkAccess.markUnsaved();
         }
         level.getChunkSource().chunkMap.resendBiomesForChunks(chunkAccessList);
     }
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/biome/BiomeDefinition.java b/src/main/java/com/shanebeestudios/nms/api/world/biome/BiomeDefinition.java
@@ -4,17 +4,14 @@
 import com.shanebeestudios.nms.api.util.ReflectionUtils;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.biome.BiomeSpecialEffects;
 import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
 import net.minecraft.world.level.biome.MobSpawnSettings;
-import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.NamespacedKey;
 
@@ -120,19 +117,17 @@ public Biome registerAndReturn() {
         this.biomeBuilder.generationSettings((new BiomeGenerationSettings.PlainBuilder()).build());
         this.biomeBuilder.mobSpawnSettings((new MobSpawnSettings.Builder()).build());
         Biome biome = this.biomeBuilder.build();
-        DedicatedServer minecraftServer = McUtils.getMinecraftServer(Bukkit.getServer());
-        RegistryAccess.Frozen registryAccess = minecraftServer.registryAccess();
-        Registry<Biome> biomeRegistry = registryAccess.registry(Registries.BIOME).orElseThrow();
+        Registry<Biome> biomeRegistry = McUtils.getRegistry(Registries.BIOME);
         ReflectionUtils.setField("frozen", biomeRegistry, false);
         ReflectionUtils.setField("unregisteredIntrusiveHolders", biomeRegistry, new IdentityHashMap<>());
         Holder.Reference<Biome> holder = biomeRegistry.createIntrusiveHolder(biome);
         ResourceKey<Biome> resourceKey = ResourceKey.create(Registries.BIOME, this.key);
-        Registry.register(biomeRegistry, resourceKey, (Biome)holder.value());
+        Registry.register(biomeRegistry, resourceKey, (Biome) holder.value());
         biomeRegistry.freeze();
         return biome;
     }
 
-    public static enum GrassModifier {
+    public enum GrassModifier {
         NONE(GrassColorModifier.NONE),
         DARK_FOREST(GrassColorModifier.DARK_FOREST),
         SWAMP(GrassColorModifier.SWAMP);
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/entity/FakePlayer.java b/src/main/java/com/shanebeestudios/nms/api/world/entity/FakePlayer.java
@@ -48,7 +48,7 @@ public class FakePlayer {
         if (attachedEntity != null) serverPlayer.setId(attachedEntity.getId());
         this.fakeServerPlayer = serverPlayer;
         this.fakePlayerEntry = new Entry(this.fakeServerPlayer.getUUID(), this.fakeServerPlayer.getGameProfile(), true, 0,
-            GameType.CREATIVE, this.fakeServerPlayer.getDisplayName(), null);
+            GameType.CREATIVE, this.fakeServerPlayer.getDisplayName(), true, /*Is 0 what we want?*/ 0,null);
         this.id = serverPlayer.getId();
         this.attachedEntity = attachedEntity;
     }
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/item/ItemApi.java b/src/main/java/com/shanebeestudios/nms/api/world/item/ItemApi.java
@@ -6,13 +6,11 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TieredItem;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Api methods pertaining to an {@link org.bukkit.inventory.ItemStack}
@@ -91,18 +89,6 @@ public static Item getItem(@NotNull Material bukkitMaterial) {
         return CraftMagicNumbers.getItem(bukkitMaterial);
     }
 
-    /**
-     * Get the {@link McTier Tier} from a Tiered Item
-     *
-     * @param item Tiered Item to get Tier from
-     * @return Tier of Item
-     */
-    @Nullable
-    public static McTier getTier(@NotNull Item item) {
-        if (item instanceof TieredItem tieredItem) return McTier.wrap(tieredItem);
-        return null;
-    }
-
     /**
      * Get a wrapped ItemStack for easy to use methods
      *
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/item/McItem.java b/src/main/java/com/shanebeestudios/nms/api/world/item/McItem.java
@@ -1,9 +1,9 @@
 package com.shanebeestudios.nms.api.world.item;
 
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.TieredItem;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.world.item.component.DamageResistant;
 
 /**
  * Wrapper for Minecraft Item
@@ -37,33 +37,28 @@ public Item getItem() {
         return this.item;
     }
 
-    /**
-     * Get the {@link McTier Tier} from a Tiered Item
-     *
-     * @return Tier of Item
-     */
-    @Nullable
-    public McTier getTier() {
-        if (this.item instanceof TieredItem tieredItem) return McTier.wrap(tieredItem);
-        return null;
-    }
-
     /**
      * Check if this item is fire-resistant
      *
      * @return True if fire-resistant else false
      */
     public boolean isFireResistant() {
-        return this.item.components().has(DataComponents.FIRE_RESISTANT);
+        if (this.item.components().has(DataComponents.DAMAGE_RESISTANT)) {
+            DamageResistant data = this.item.components().get(DataComponents.DAMAGE_RESISTANT);
+            return data != null && data.types() == DamageTypeTags.IS_FIRE;
+        }
+        return false;
     }
 
     /**
      * Check if Item is complex
      *
      * @return True if complex else false
+     * @deprecated No longer a thing in MC
      */
+    @Deprecated(since = "1.21.4")
     public boolean isComplex() {
-        return this.item.isComplex();
+        return false;
     }
 
 }
diff --git a/src/main/java/com/shanebeestudios/nms/api/world/item/McTier.java b/src/main/java/com/shanebeestudios/nms/api/world/item/McTier.java

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static void setBiome(@NotNull Location location, @NotNull NamespacedKey b`
`86`	`86`
`87`	`87`	`LevelChunk chunk = serverLevel.getChunkAt(new BlockPos(x, y, z));`
`88`	`88`	`chunk.setBiome(x >> 2, y >> 2, z >> 2, biome);`
`89`		`- chunk.setUnsaved(true);`
	`89`	`+ chunk.markUnsaved();`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/**`
`@@ -136,7 +136,7 @@ public static void fillBiome(@NotNull Location location, @NotNull Location locat`
`136`	`136`	`for (ChunkAccess chunkAccess : chunkAccessList) {`
`137`	`137`	`chunkAccess.fillBiomesFromNoise(McUtils.getBiomeResolver(new MutableInt(0), chunkAccess, box, biome,`
`138`	`138`	`biomeHolder -> replaceBiome == null \|\| biomeHolder.is(replaceBiome)), level.getChunkSource().randomState().sampler());`
`139`		`- chunkAccess.setUnsaved(true);`
	`139`	`+ chunkAccess.markUnsaved();`
`140`	`140`	`}`
`141`	`141`	`level.getChunkSource().chunkMap.resendBiomesForChunks(chunkAccessList);`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class FakePlayer {`
`48`	`48`	`if (attachedEntity != null) serverPlayer.setId(attachedEntity.getId());`
`49`	`49`	`this.fakeServerPlayer = serverPlayer;`
`50`	`50`	`this.fakePlayerEntry = new Entry(this.fakeServerPlayer.getUUID(), this.fakeServerPlayer.getGameProfile(), true, 0,`
`51`		`- GameType.CREATIVE, this.fakeServerPlayer.getDisplayName(), null);`
	`51`	`+ GameType.CREATIVE, this.fakeServerPlayer.getDisplayName(), true, /Is 0 what we want?/ 0,null);`
`52`	`52`	`this.id = serverPlayer.getId();`
`53`	`53`	`this.attachedEntity = attachedEntity;`
`54`	`54`	`}`