Skip to content

Latest Minestom Support #2

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

Open
BitByLogics wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Latest Minestom Support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e886a
Update Gradle wrapper to 9.2.1, Minestom to 1.21.11, and Java toolcha…
BitByLogics Dec 27, 2025
f84c147
Add FastUtil as a compile-only dependency
BitByLogics Dec 27, 2025
dc8e9ea
Replace TagStringIOExt with MinestomAdventure.tagStringIO usage
BitByLogics Dec 27, 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
5 changes: 3 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ repositories {
dependencies {
api("org.jetbrains:annotations:24.0.1")

val minestom = "net.minestom:minestom:2025.07.04-1.21.5"
val minestom = "net.minestom:minestom:2025.12.20-1.21.11"

compileOnly(minestom)
compileOnly("it.unimi.dsi:fastutil:8.5.18")

testImplementation(minestom)

Expand All @@ -33,7 +34,7 @@ tasks.test {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(25))
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Aug 17 23:49:03 CDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 8 additions & 3 deletions src/main/java/net/goldenstack/loot/LootFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@
import net.goldenstack.loot.util.nbt.NBTUtils;
import net.goldenstack.loot.util.predicate.ItemPredicate;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.nbt.*;
import net.kyori.adventure.nbt.BinaryTag;
import net.kyori.adventure.nbt.CompoundBinaryTag;
import net.kyori.adventure.nbt.ListBinaryTag;
import net.kyori.adventure.nbt.TagStringIO;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.util.RGBLike;
import net.minestom.server.MinecraftServer;
import net.minestom.server.ServerFlag;
import net.minestom.server.adventure.MinestomAdventure;
import net.minestom.server.codec.Codec;
import net.minestom.server.codec.Result;
import net.minestom.server.codec.StructCodec;
Expand All @@ -30,6 +34,7 @@
import net.minestom.server.item.component.*;
import net.minestom.server.item.enchant.Enchantment;
import net.minestom.server.item.instrument.Instrument;
import net.minestom.server.network.player.ResolvableProfile;
import net.minestom.server.potion.PotionEffect;
import net.minestom.server.potion.PotionType;
import net.minestom.server.registry.DynamicRegistry;
Expand Down Expand Up @@ -614,7 +619,7 @@ record FillPlayerHead(@NotNull List<LootPredicate> predicates, @NotNull Relevant
PlayerSkin skin = player.getSkin();
if (skin == null) return input;

return input.with(DataComponents.PROFILE, new HeadProfile(skin));
return input.with(DataComponents.PROFILE, new ResolvableProfile(skin));
}

@Override
Expand Down Expand Up @@ -957,7 +962,7 @@ record SetCustomData(@NotNull List<LootPredicate> predicates, @NotNull CompoundB
} catch (IOException e) {
throw new RuntimeException(e);
}
}, TagStringIOExt::writeTag), SetCustomData::tag,
}, MinestomAdventure.tagStringIO()::asString), SetCustomData::tag,
SetCustomData::new
);

Expand Down
13 changes: 11 additions & 2 deletions src/main/java/net/goldenstack/loot/util/nbt/NBTPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package net.goldenstack.loot.util.nbt;

import it.unimi.dsi.fastutil.ints.IntSet;
import net.kyori.adventure.nbt.*;
import net.kyori.adventure.nbt.BinaryTag;
import net.kyori.adventure.nbt.CompoundBinaryTag;
import net.kyori.adventure.nbt.ListBinaryTag;
import net.kyori.adventure.nbt.TagStringIO;
import net.minestom.server.adventure.MinestomAdventure;
import net.minestom.server.codec.Codec;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -469,7 +473,12 @@ private static BinaryTag readTag(@NotNull StringReader reader) throws IOExceptio

String dump = builder.toString();

Map.Entry<BinaryTag, String> entry = TagStringIOExt.readTagEmbedded(dump);
Map.Entry<BinaryTag, String> entry;

StringBuilder remainder = new StringBuilder();
BinaryTag tag = MinestomAdventure.tagStringIO().asTag(dump, remainder);

entry = Map.entry(tag, remainder.toString());

reader.skip(-count + entry.getValue().length());
return entry.getKey();
Expand Down