mirror of
https://github.com/Suiranoil/SkinRestorer.git
synced 2026-01-16 04:42:12 +00:00
implement skinshuffle support (closes #34)
This commit is contained in:
@@ -2,7 +2,7 @@ package net.lionarius.skinrestorer.forge;
|
||||
|
||||
import net.lionarius.skinrestorer.SkinRestorer;
|
||||
import net.lionarius.skinrestorer.command.SkinCommand;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
|
||||
import net.minecraftforge.event.RegisterCommandsEvent;
|
||||
import net.minecraftforge.event.server.ServerStartedEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
@@ -13,9 +13,10 @@ import net.minecraftforge.fml.common.Mod;
|
||||
public final class SkinRestorerForge {
|
||||
|
||||
public SkinRestorerForge() {
|
||||
MinecraftForge.EVENT_BUS.register(SkinRestorerForge.class);
|
||||
|
||||
SkinRestorer.onInitialize();
|
||||
|
||||
if (SkinShuffleCompatibility.shouldApply())
|
||||
net.lionarius.skinrestorer.forge.compat.skinshuffle.SkinShuffleCompatibility.initialize();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package net.lionarius.skinrestorer.forge.compat.skinshuffle;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
public final class SkinShuffleCompatibility {
|
||||
|
||||
private SkinShuffleCompatibility() {}
|
||||
|
||||
public static void initialize() {
|
||||
MinecraftForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
|
||||
|
||||
SkinShufflePacketHandler.initialize();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package net.lionarius.skinrestorer.forge.compat.skinshuffle;
|
||||
|
||||
import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
|
||||
public final class SkinShuffleGameEventHandler {
|
||||
|
||||
private SkinShuffleGameEventHandler() {}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
|
||||
SkinShuffleCompatibility.onPlayerJoin((ServerPlayer) event.getEntity());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package net.lionarius.skinrestorer.forge.compat.skinshuffle;
|
||||
|
||||
import net.lionarius.skinrestorer.SkinRestorer;
|
||||
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.minecraftforge.event.network.CustomPayloadEvent;
|
||||
import net.minecraftforge.network.Channel;
|
||||
import net.minecraftforge.network.ChannelBuilder;
|
||||
|
||||
public class SkinShufflePacketHandler {
|
||||
private SkinShufflePacketHandler() {
|
||||
}
|
||||
|
||||
private static final Channel<CustomPacketPayload> INSTANCE = ChannelBuilder
|
||||
.named(SkinRestorer.resourceLocation("skin_shuffle_compat"))
|
||||
.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();
|
||||
|
||||
protected static void initialize() {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public static void sendHandshake(Connection connection) {
|
||||
INSTANCE.send(SkinShuffleHandshakePayload.INSTANCE, connection);
|
||||
}
|
||||
|
||||
private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
|
||||
var sender = context.getSender();
|
||||
|
||||
if (!context.isServerSide() || sender == null)
|
||||
return;
|
||||
|
||||
SkinShuffleCompatibility.handleSkinRefresh(sender.getServer(), sender, payload);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package net.lionarius.skinrestorer.forge.platform;
|
||||
|
||||
import net.lionarius.skinrestorer.forge.compat.skinshuffle.SkinShufflePacketHandler;
|
||||
import net.lionarius.skinrestorer.platform.services.CompatibilityHelper;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
|
||||
public final class ForgeCompatibilityHelper implements CompatibilityHelper {
|
||||
|
||||
@Override
|
||||
public void skinShuffle_sendHandshake(ServerPlayer player) {
|
||||
SkinShufflePacketHandler.sendHandshake(player.connection.getConnection());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
net.lionarius.skinrestorer.forge.platform.ForgeCompatibilityHelper
|
||||
Reference in New Issue
Block a user