Skip to content

Commit c268bb2

Browse files
committed
update to 1.21.9; update other dependencies & gradle
1 parent 66bd838 commit c268bb2

File tree

8 files changed

+32
-27
lines changed

8 files changed

+32
-27
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
- name: Setup java
2323
uses: actions/setup-java@v4
2424
with:
25-
java-version: 21
25+
java-version: 25
2626
check-latest: true
2727
distribution: 'zulu'
2828

2929
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@v4
30+
uses: gradle/actions/setup-gradle@v5
3131
with:
3232
add-job-summary: always
3333
cache-cleanup: on-success

fabric/src/main/java/com/github/juliarn/npclib/fabric/protocol/FabricProtocolAdapter.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.github.juliarn.npclib.api.Platform;
2828
import com.github.juliarn.npclib.api.event.InteractNpcEvent;
29+
import com.github.juliarn.npclib.api.profile.ProfileProperty;
2930
import com.github.juliarn.npclib.api.protocol.OutboundPacket;
3031
import com.github.juliarn.npclib.api.protocol.PlatformPacketAdapter;
3132
import com.github.juliarn.npclib.api.protocol.enums.EntityAnimation;
@@ -37,9 +38,12 @@
3738
import com.github.juliarn.npclib.common.event.DefaultInteractNpcEvent;
3839
import com.github.juliarn.npclib.fabric.controller.FabricActionControllerEvents;
3940
import com.github.juliarn.npclib.fabric.util.FabricUtil;
41+
import com.google.common.collect.HashMultimap;
42+
import com.google.common.collect.Multimaps;
4043
import com.google.gson.JsonParser;
4144
import com.mojang.authlib.GameProfile;
4245
import com.mojang.authlib.properties.Property;
46+
import com.mojang.authlib.properties.PropertyMap;
4347
import com.mojang.datafixers.util.Pair;
4448
import com.mojang.serialization.JsonOps;
4549
import io.leangen.geantyref.TypeFactory;
@@ -53,6 +57,7 @@
5357
import java.util.Objects;
5458
import java.util.Optional;
5559
import java.util.function.UnaryOperator;
60+
import java.util.stream.Collectors;
5661
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
5762
import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
5863
import net.minecraft.network.chat.Component;
@@ -266,11 +271,13 @@ private FabricProtocolAdapter() {
266271
case REMOVE_PLAYER -> new ClientboundPlayerInfoRemovePacket(List.of(npc.profile().uniqueId()));
267272
case ADD_PLAYER -> {
268273
var profile = npc.profile();
269-
var gameProfile = new GameProfile(profile.uniqueId(), profile.name());
270-
for (var property : profile.properties()) {
271-
var prop = new Property(property.name(), property.value(), property.signature());
272-
gameProfile.getProperties().put(property.name(), prop);
273-
}
274+
var gameProfileProperties = profile.properties().stream().collect(Collectors.collectingAndThen(
275+
Multimaps.toMultimap(
276+
ProfileProperty::name,
277+
pp -> new Property(pp.name(), pp.value(), pp.signature()),
278+
HashMultimap::create),
279+
PropertyMap::new));
280+
var gameProfile = new GameProfile(profile.uniqueId(), profile.name(), gameProfileProperties);
274281

275282
var updatePacket = new ClientboundPlayerInfoUpdatePacket(ADD_ACTIONS, List.of());
276283
updatePacket.entries = List.of(new ClientboundPlayerInfoUpdatePacket.Entry(

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
org.gradle.caching=true
2626
org.gradle.parallel=true
2727
org.gradle.warning.mode=all
28-
org.gradle.logging.level=warn
28+
org.gradle.logging.stacktrace=all
2929
org.gradle.configureondemand=true
3030
org.gradle.configuration-cache=true
3131
org.gradle.configuration-cache.problems=fail

gradle/libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
[versions]
22

33
# plugins
4-
shadow = "9.0.1"
5-
spotless = "7.2.1"
4+
shadow = "9.2.2"
5+
spotless = "8.0.0"
66
nexusPublish = "2.0.0"
7-
checkstyleTools = "11.0.0"
7+
checkstyleTools = "11.1.0"
88

99
# general
10-
gson = "2.13.1"
10+
gson = "2.13.2"
1111
geantyref = "1.3.16"
12-
annotations = "26.0.2"
12+
annotations = "26.0.2-1"
1313
netty = "4.1.117.Final"
1414

1515
# platform api versions
1616
sponge = "10.0.0"
17-
minestom = "2025.08.11-1.21.8"
18-
paper = "1.21.8-R0.1-SNAPSHOT"
17+
minestom = "2025.09.13-1.21.8"
18+
paper = "1.21.9-R0.1-SNAPSHOT"
1919

2020
# fabric
21-
minecraft = "1.21.6"
22-
fabricLoom = "1.11.6"
23-
fabricLoader = "0.16.14"
24-
fabricApi = "0.127.1+1.21.6"
21+
minecraft = "1.21.9"
22+
fabricLoom = "1.11.8"
23+
fabricLoader = "0.17.2"
24+
fabricApi = "0.133.14+1.21.9"
2525

2626
# platform extensions
2727
paperLib = "1.0.8"
28-
packetEvents = "2.9.4"
28+
packetEvents = "2.9.5"
2929
protocolLib = "9417eee444"
3030

3131

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Inst
9898

9999
private static final EnumSet<PlayerInfoUpdatePacket.Action> ADD_ACTIONS = EnumSet.of(
100100
PlayerInfoUpdatePacket.Action.ADD_PLAYER,
101+
PlayerInfoUpdatePacket.Action.UPDATE_HAT,
101102
PlayerInfoUpdatePacket.Action.UPDATE_LISTED,
102103
PlayerInfoUpdatePacket.Action.UPDATE_LATENCY,
103104
PlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE,
@@ -277,7 +278,8 @@ private MinestomProtocolAdapter() {
277278
GameMode.CREATIVE,
278279
null,
279280
null,
280-
0
281+
0,
282+
true
281283
)));
282284
player.sendPacket(updatePacket);
283285
});

0 commit comments

Comments
 (0)