From 7b2adf0faaf6f930b44e537d2bf85617375420e7 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Wed, 28 May 2025 14:24:40 +0200 Subject: [PATCH] Update to 1.21.5 --- build.gradle.kts | 4 ++-- src/main/java/net/worldseed/gestures/ModelBoneEmote.java | 8 ++++---- src/main/java/net/worldseed/multipart/ModelEngine.java | 4 ++-- .../model_bones/display_entity/ModelBonePartDisplay.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f54975c..6fcd285 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,8 +42,8 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") - compileOnly("net.minestom:minestom-snapshots:1_21_4-44b34717ed") - testImplementation("net.minestom:minestom-snapshots:1_21_4-44b34717ed") + compileOnly("net.minestom:minestom-snapshots:1_21_5-69b9a5d844") + testImplementation("net.minestom:minestom-snapshots:1_21_5-69b9a5d844") implementation("commons-io:commons-io:2.11.0") implementation("org.zeroturnaround:zt-zip:1.8") diff --git a/src/main/java/net/worldseed/gestures/ModelBoneEmote.java b/src/main/java/net/worldseed/gestures/ModelBoneEmote.java index daddf46..5f96e14 100644 --- a/src/main/java/net/worldseed/gestures/ModelBoneEmote.java +++ b/src/main/java/net/worldseed/gestures/ModelBoneEmote.java @@ -1,6 +1,7 @@ package net.worldseed.gestures; import net.kyori.adventure.util.RGBLike; +import net.minestom.server.component.DataComponents; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; @@ -9,7 +10,6 @@ import net.minestom.server.entity.PlayerSkin; import net.minestom.server.entity.metadata.display.ItemDisplayMeta; import net.minestom.server.instance.Instance; -import net.minestom.server.item.ItemComponent; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; import net.minestom.server.item.component.CustomModelData; @@ -41,11 +41,11 @@ public ModelBoneEmote(Point pivot, String name, Point rotation, GenericModel mod meta.setTransformationInterpolationDuration(2); meta.setPosRotInterpolationDuration(2); meta.setTranslation(new Vec(0, translation, 0)); - meta.setDisplayContext(ItemDisplayMeta.DisplayContext.THIRD_PERSON_RIGHT_HAND); + meta.setDisplayContext(ItemDisplayMeta.DisplayContext.THIRDPERSON_RIGHT_HAND); meta.setItemStack(ItemStack.builder(Material.PLAYER_HEAD) - .set(ItemComponent.PROFILE, new HeadProfile(skin)) - .set(ItemComponent.CUSTOM_MODEL_DATA, new CustomModelData(List.of(customModelDataFromName(name)), List.of(), List.of(), List.of())) + .set(DataComponents.PROFILE, new HeadProfile(skin)) + .set(DataComponents.CUSTOM_MODEL_DATA, new CustomModelData(List.of(customModelDataFromName(name)), List.of(), List.of(), List.of())) .build() ); }); diff --git a/src/main/java/net/worldseed/multipart/ModelEngine.java b/src/main/java/net/worldseed/multipart/ModelEngine.java index 5ff216c..f192768 100644 --- a/src/main/java/net/worldseed/multipart/ModelEngine.java +++ b/src/main/java/net/worldseed/multipart/ModelEngine.java @@ -2,6 +2,7 @@ import com.google.gson.*; import net.minestom.server.MinecraftServer; +import net.minestom.server.component.DataComponents; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; @@ -11,7 +12,6 @@ import net.minestom.server.event.entity.EntityDamageEvent; import net.minestom.server.event.player.PlayerEntityInteractEvent; import net.minestom.server.event.player.PlayerPacketEvent; -import net.minestom.server.item.ItemComponent; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; import net.minestom.server.item.component.CustomModelData; @@ -98,7 +98,7 @@ public static void loadMappings(Reader mappingsData, Path modelPath) { } private static ItemStack generateBoneItem(float model_id) { - return ItemStack.builder(modelMaterial).set(ItemComponent.CUSTOM_MODEL_DATA, new CustomModelData( + return ItemStack.builder(modelMaterial).set(DataComponents.CUSTOM_MODEL_DATA, new CustomModelData( List.of(model_id), List.of(), List.of(), diff --git a/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java b/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java index 43952e6..6b1926f 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java +++ b/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java @@ -38,7 +38,7 @@ public ModelBonePartDisplay(Point pivot, String name, Point rotation, GenericMod var itemMeta = (ItemDisplayMeta) this.stand.getEntityMeta(); itemMeta.setScale(new Vec(scale, scale, scale)); - itemMeta.setDisplayContext(ItemDisplayMeta.DisplayContext.THIRD_PERSON_LEFT_HAND); + itemMeta.setDisplayContext(ItemDisplayMeta.DisplayContext.THIRDPERSON_LEFT_HAND); itemMeta.setTransformationInterpolationDuration(2); itemMeta.setPosRotInterpolationDuration(2); itemMeta.setViewRange(1000);