Skip to content

Adaptation to 1.21.5 #49

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

Merged
iam4722202468 merged 2 commits into from
Jun 9, 2025
Merged

Adaptation to 1.21.5 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93bb982
Update to 1.21.5
Jun 7, 2025
841dc55
Revert version back by 0.0.1
Jun 7, 2025
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-6d70a6ca77")
testImplementation("net.minestom:minestom-snapshots:1_21_5-6d70a6ca77")

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
5 changes: 3 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,8 @@

import com.google.gson.*;
import net.minestom.server.MinecraftServer;
import net.minestom.server.component.DataComponent;
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 +13,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 @@ -96,7 +97,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
3 changes: 0 additions & 3 deletions src/test/java/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.minestom.server.event.player.PlayerSpawnEvent;
import net.minestom.server.event.server.ServerTickMonitorEvent;
import net.minestom.server.extras.lan.OpenToLAN;
import net.minestom.server.instance.InstanceContainer;
import net.minestom.server.instance.InstanceManager;
import net.minestom.server.instance.LightingChunk;
Expand Down Expand Up @@ -154,8 +153,6 @@ public static void main(String[] args) throws Exception {
}, TaskSchedule.tick(10), TaskSchedule.tick(10));
}

OpenToLAN.open();

minecraftServer.start("0.0.0.0", 25565);
System.out.println("Server startup done!");
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/demo_models/bulbasaur/BulbasaurMob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ public void remove() {

ParticlePacket packet = new ParticlePacket(
Particle.POOF,
false,
this.position.x(),
this.position.y() + 1,
this.position.z(),
Expand All @@ -127,7 +126,6 @@ public void remove() {
50
);
viewers.forEach(v -> v.sendPacket(packet));

super.remove();
});
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/demo_models/gem_golem/GemGolemAttackGoal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ private void attackNear() {
if (p != null) {
ParticlePacket packet = new ParticlePacket(
Particle.FLAME,
false,
p.x(),
p.y() + 1,
p.z(),
Expand All @@ -97,7 +96,6 @@ private void attackNear() {
if (p != null) {
ParticlePacket packet = new ParticlePacket(
Particle.EXPLOSION,
false,
p.x(),
p.y() + 1,
p.z(),
Expand Down
16 changes: 6 additions & 10 deletions src/test/java/demo_models/gem_golem/GemGolemMob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import net.minestom.server.MinecraftServer;
import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.entity.*;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EntityCreature;
import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.attribute.Attribute;
import net.minestom.server.entity.damage.DamageType;
import net.minestom.server.entity.damage.EntityDamage;
Expand Down Expand Up @@ -96,14 +99,9 @@ public GemGolemMob(Instance instance, Pos pos) {
this.getAttribute(Attribute.MOVEMENT_SPEED).setBaseValue(0.3f);

// Add the shadow for the entity
int size = 15;
var pfMeta = new PufferfishMeta(this, metadata) {
@Override
public void setState(State state) {
super.metadata.setIndex(OFFSET, Metadata.VarInt(size));
}
};
var pfMeta = new PufferfishMeta(this, metadata);

// TODO: Update to 1.21.5(Add shadow)
pfMeta.setState(PufferfishMeta.State.UNPUFFED);
this.entityMeta = pfMeta;

Expand Down Expand Up @@ -151,7 +149,6 @@ public void remove() {
this.animationHandler.destroy();
ParticlePacket packet = new ParticlePacket(
Particle.POOF,
false,
this.position.x(),
this.position.y() + 1,
this.position.z(),
Expand All @@ -162,7 +159,6 @@ public void remove() {
50
);
viewers.forEach(v -> v.sendPacket(packet));

super.remove();
});
}
Expand Down
1 change: 0 additions & 1 deletion src/test/java/demo_models/tuff_golem/TuffGolemMob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public void remove() {
this.animationHandler.destroy();
ParticlePacket packet = new ParticlePacket(
Particle.POOF,
false,
this.position.x(),
this.position.y() + 1,
this.position.z(),
Expand Down