*: update to 1.21.4

Author: yusshu

api/src/main/java/team/unnamed/hephaestus/writer/ResourceModelWriter.java

@@ -30,6 +30,8 @@
 import team.unnamed.creative.atlas.Atlas;
 import team.unnamed.creative.atlas.AtlasSource;
 import team.unnamed.creative.base.Vector3Float;
+import team.unnamed.creative.item.Item;
+import team.unnamed.creative.item.ItemModel;
 import team.unnamed.creative.model.Element;
 import team.unnamed.creative.model.ItemOverride;
 import team.unnamed.creative.model.ItemPredicate;
@@ -60,7 +62,7 @@
  * @since 1.0.0
  */
 final class ResourceModelWriter implements ModelWriter<ResourcePack> {
-
+    private static final Key LEATHER_HORSE_ARMOR_ITEM_MODEL_KEY = Key.key("leather_horse_armor");
     private static final Key LEATHER_HORSE_ARMOR_KEY = Key.key("item/leather_horse_armor");
 
     @Subst(Hephaestus.NAMESPACE)
@@ -124,6 +126,13 @@ public void write(ResourcePack resourcePack, Collection<Model> models) {
                 .build()
         );
 
+        resourcePack.item(Item.item(LEATHER_HORSE_ARMOR_ITEM_MODEL_KEY, ItemModel.composite(
+                ItemOverride.toItemModels(
+                        ItemModel.reference(LEATHER_HORSE_ARMOR_KEY),
+                        overrides
+                )
+        )));
+
         resourcePack.atlas(Atlas.atlas()
                 .key(Atlas.BLOCKS)
                 .sources(sources)

buildSrc/src/main/kotlin/hephaestus.common-conventions.gradle.kts

@@ -18,7 +18,7 @@ java {
     withSourcesJar()
     withJavadocJar()
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 

buildSrc/src/main/kotlin/hephaestus.runtime-bukkit-conventions.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 
 repositories {
     maven("https://repo.codemc.io/repository/nms/")
-    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.papermc.io/repository/maven-public/")
 }

runtime-bukkit/adapt-v1_21_4/src/main/java/team/unnamed/hephaestus/bukkit/v1_21_4/BoneEntity.java

@@ -24,8 +24,11 @@
 package team.unnamed.hephaestus.bukkit.v1_21_4;
 
 import com.mojang.math.Transformation;
+import io.papermc.paper.datacomponent.DataComponentTypes;
 import net.kyori.adventure.nbt.BinaryTagTypes;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtAccounter;
@@ -37,8 +40,11 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Display;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.CustomModelData;
+import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Color;
 import org.jetbrains.annotations.NotNull;
@@ -196,27 +202,17 @@ public void updateTransformation() {
     @Override
     public void updateItem() {
         final var itemKey = modifiers.modifyItem(Hephaestus.BONE_ITEM_KEY);
-        final var tag = modifiers.modifyItemTag(CompoundBinaryTag.builder()
-                .put(Minecraft.DISPLAY_TAG, CompoundBinaryTag.builder()
-                        .putInt(Minecraft.COLOR_TAG, color)
-                        .build())
-                .putInt(Minecraft.CUSTOM_MODEL_DATA_TAG, bone.customModelData())
-                .build());
-
-        final var item = BuiltInRegistries.ITEM.get(ResourceLocation.fromNamespaceAndPath(itemKey.namespace(), itemKey.value()));
-        final var itemStack = new ItemStack(item, 1);
 
-        try {
-            final var bytes = new ByteArrayOutputStream();
-            final var output = new DataOutputStream(bytes);
-            BinaryTagTypes.COMPOUND.write(tag, output);
-            output.flush();
+        final var item = BuiltInRegistries.ITEM.get(ResourceLocation.fromNamespaceAndPath(itemKey.namespace(), itemKey.value())).orElseThrow();
+        final var itemStack = new ItemStack(item, 1);
 
-            final var nmsTag = CompoundTag.TYPE.load(new DataInputStream(new ByteArrayInputStream(bytes.toByteArray())), NbtAccounter.unlimitedHeap());
-            itemStack.setTag(nmsTag);
-        } catch (final IOException e) {
-            throw new RuntimeException("Failed to write item tag", e);
-        }
+        itemStack.set(DataComponents.DYED_COLOR, new DyedItemColor(color, true));
+        itemStack.set(DataComponents.CUSTOM_MODEL_DATA, new CustomModelData(
+                List.of((float) bone.customModelData()),
+                List.of(),
+                List.of(),
+                List.of()
+        ));
 
         setItemStack(itemStack);
     }

runtime-bukkit/adapt-v1_21_4/src/main/java/team/unnamed/hephaestus/bukkit/v1_21_4/BukkitModelViewTrackerImpl.java

@@ -87,7 +87,6 @@ public boolean stopTracking(final @NotNull AbstractModelView<Player> abstractVie
 
             final var old = replacementTracker.replaced();
             chunkMap.entityMap.put(base.getEntityId(), old);
-            baseHandle.tracker = old;
             tracker = old;
         }
 
@@ -159,7 +158,6 @@ public boolean startTrackingOn(final @NotNull AbstractModelView<Player> abstract
                     baseHandle.getType().trackDeltas()
             );
             chunkMap.entityMap.put(base.getEntityId(), entityTracker);
-            baseHandle.tracker = entityTracker;
             broadcastChangesFunction = packet -> {
                 ((ServerPlayer) baseHandle).connection.send(packet);
                 entityTracker.broadcast(packet);

runtime-bukkit/api/build.gradle.kts

@@ -5,5 +5,5 @@ plugins {
 
 dependencies {
     api(project(":hephaestus-api"))
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 }

runtime-bukkit/test-plugin/build.gradle.kts

@@ -12,7 +12,7 @@ java {
 
 dependencies {
     // server api
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
     // resource-pack plugin api
     compileOnly("team.unnamed:creative-central-api:1.4.0")
@@ -27,10 +27,10 @@ dependencies {
 tasks {
     runServer {
         downloadPlugins {
-            modrinth("central", "1.4.0") // creative-central
+            //modrinth("central", "1.3.0") // creative-central
         }
 
-        minecraftVersion("1.21")
+        minecraftVersion("1.21.4")
     }
     shadowJar {
         dependencies {