lionarius/SkinRestorer
1
0
Fork 0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Code Wiki Activity

backport to 1.20.5

Browse Source
This commit is contained in:
Lionarius
2024-11-29 11:53:03 +03:00
parent b0d95a4d4f
commit dda9a9632a
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
View File

@@ -61,7 +61,7 @@ public final class SkinRestorer {
}
public static ResourceLocation resourceLocation(String name) {
return ResourceLocation.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
return new ResourceLocation(SkinRestorer.MOD_ID, name);
}
public static String assetPath(String name) {

2
common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
View File

@@ -24,7 +24,7 @@ public class SkinShuffleCompatibility {
}
public static ResourceLocation resourceLocation(String name) {
return ResourceLocation.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
return new ResourceLocation(SkinShuffleCompatibility.MOD_ID, name);
}
public static void onPlayerJoin(ServerPlayer player) {

50
forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java
View File

@@ -1,39 +1,53 @@
package net.lionarius.skinrestorer.forge.compat.skinshuffle;
import net.lionarius.skinrestorer.SkinRestorer;
import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
import io.netty.buffer.Unpooled;
import net.lionarius.skinrestorer.compat.skinshuffle.*;
import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraftforge.event.network.CustomPayloadEvent;
import net.minecraftforge.network.Channel;
import net.minecraftforge.network.ChannelBuilder;
import net.minecraftforge.network.EventNetworkChannel;
public class SkinShufflePacketHandler {
private SkinShufflePacketHandler() {
}
private static final Channel<CustomPacketPayload> INSTANCE = ChannelBuilder
.named(SkinRestorer.resourceLocation("skin_shuffle_compat"))
private static final EventNetworkChannel HANDSHAKE_INSTANCE = ChannelBuilder
.named(SkinShuffleHandshakePayload.PACKET_ID.id())
.optional()
.payloadChannel()
.any()
.clientbound()
.add(SkinShuffleHandshakePayload.PACKET_ID, SkinShuffleHandshakePayload.PACKET_CODEC, (payload, context) -> {
})
.serverbound()
.add(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleSkinRefreshV1Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket)
.add(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket)
.build();
.eventNetworkChannel();
private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = ChannelBuilder
.named(SkinShuffleSkinRefreshV1Payload.PACKET_ID.id())
.optional()
.eventNetworkChannel()
.addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = ChannelBuilder
.named(SkinShuffleSkinRefreshV2Payload.PACKET_ID.id())
.optional()
.eventNetworkChannel()
.addListener(SkinShufflePacketHandler::skinRefreshV2Listener);
protected static void initialize() {
// NO-OP
}
public static void sendHandshake(Connection connection) {
INSTANCE.send(SkinShuffleHandshakePayload.INSTANCE, connection);
HANDSHAKE_INSTANCE.send(new FriendlyByteBuf(Unpooled.buffer(0, 0)), connection);
}
private static void skinRefreshV1Listener(CustomPayloadEvent event) {
var payload = SkinShuffleSkinRefreshV1Payload.PACKET_CODEC.decode(event.getPayload());
handleSkinRefreshPacket(payload, event.getSource());
}
private static void skinRefreshV2Listener(CustomPayloadEvent event) {
var payload = SkinShuffleSkinRefreshV2Payload.PACKET_CODEC.decode(event.getPayload());
handleSkinRefreshPacket(payload, event.getSource());
}
private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
var sender = context.getSender();