Skip to content

Update to 1.21.5 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update to 1.21.5 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/worldseed/gestures/ModelBoneEmote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()
);
});
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/worldseed/multipart/ModelEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down