Skip to content

Commit ec7a6f7

Browse files
committed
reformat
1 parent ab38587 commit ec7a6f7

File tree

5 files changed

+44
-24
lines changed

5 files changed

+44
-24
lines changed

common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.resources.ResourceLocation;
77
import org.jetbrains.annotations.NotNull;
88

9-
public record SkinShuffleSkinRefreshV1Payload(
10-
Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
9+
public record SkinShuffleSkinRefreshV1Payload(Property textureProperty)
10+
implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
1111

1212
public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("refresh");
1313

@@ -28,7 +28,7 @@ public static SkinShuffleSkinRefreshV1Payload decode(FriendlyByteBuf buf) {
2828
public void write(@NotNull FriendlyByteBuf buf) {
2929
encode(buf, this);
3030
}
31-
31+
3232
@Override
3333
public @NotNull ResourceLocation id() {
3434
return PACKET_ID;

common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.resources.ResourceLocation;
77
import org.jetbrains.annotations.NotNull;
88

9-
public record SkinShuffleSkinRefreshV2Payload(
10-
Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
9+
public record SkinShuffleSkinRefreshV2Payload(Property textureProperty)
10+
implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
1111

1212
public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("skin_refresh");
1313

@@ -35,7 +35,7 @@ public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) {
3535
public void write(@NotNull FriendlyByteBuf buf) {
3636
encode(buf, this);
3737
}
38-
38+
3939
@Override
4040
public @NotNull ResourceLocation id() {
4141
return PACKET_ID;

common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,24 @@
1414

1515
import java.util.Locale;
1616
import java.util.Optional;
17-
import java.util.UUID;
1817
import java.util.concurrent.CompletableFuture;
1918
import java.util.function.BooleanSupplier;
2019

2120
@Mixin(SkullBlockEntity.class)
2221
public abstract class SkullBlockEntityMixin {
2322

24-
@Inject(method = "loadProfile", at = @At("HEAD"),
25-
cancellable = true)
26-
private static void fetchProfileByName(String name, Services services, BooleanSupplier hasCache, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
23+
@Inject(method = "loadProfile", at = @At("HEAD"), cancellable = true)
24+
private static void fetchProfileByName(
25+
String name,
26+
Services services,
27+
BooleanSupplier hasCache,
28+
CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
2729
if (name == null) return;
2830

2931
var profileOpt = Optional.<GameProfile>empty();
30-
var gameProfileInfo = ((GameProfileCacheAccessor) services.profileCache()).getProfilesByName().get(name.toLowerCase(Locale.ROOT));
32+
var gameProfileInfo = ((GameProfileCacheAccessor) services.profileCache())
33+
.getProfilesByName()
34+
.get(name.toLowerCase(Locale.ROOT));
3135

3236
if (gameProfileInfo != null) profileOpt = Optional.of(gameProfileInfo.getProfile());
3337

fabric/src/main/java/net/lionarius/skinrestorer/fabric/compat/skinshuffle/SkinShuffleCompatibility.java

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,40 @@ public static void initialize() {
2323
return;
2424
}
2525

26-
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.onPlayerJoin(handler.getPlayer()));
26+
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) ->
27+
net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.onPlayerJoin(
28+
handler.getPlayer()));
2729

28-
ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV1Packet);
30+
ServerPlayNetworking.registerGlobalReceiver(
31+
SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV1Packet);
2932

30-
ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV2Packet);
33+
ServerPlayNetworking.registerGlobalReceiver(
34+
SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV2Packet);
3135
}
3236

33-
private static void handleSkinRefreshV1Packet(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl listener, FriendlyByteBuf buf, PacketSender sender) {
37+
private static void handleSkinRefreshV1Packet(
38+
MinecraftServer server,
39+
ServerPlayer player,
40+
ServerGamePacketListenerImpl listener,
41+
FriendlyByteBuf buf,
42+
PacketSender sender) {
3443
var payload = SkinShuffleSkinRefreshV1Payload.decode(buf);
3544
SkinShuffleCompatibility.handleSkinRefreshPacket(payload, server, player);
3645
}
3746

38-
private static void handleSkinRefreshV2Packet(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl listener, FriendlyByteBuf buf, PacketSender sender) {
47+
private static void handleSkinRefreshV2Packet(
48+
MinecraftServer server,
49+
ServerPlayer player,
50+
ServerGamePacketListenerImpl listener,
51+
FriendlyByteBuf buf,
52+
PacketSender sender) {
3953
var payload = SkinShuffleSkinRefreshV2Payload.decode(buf);
4054
SkinShuffleCompatibility.handleSkinRefreshPacket(payload, server, player);
4155
}
4256

43-
private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, MinecraftServer server, ServerPlayer player) {
44-
net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(server, player, payload);
57+
private static void handleSkinRefreshPacket(
58+
SkinShuffleSkinRefreshPayload payload, MinecraftServer server, ServerPlayer player) {
59+
net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(
60+
server, player, payload);
4561
}
4662
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111

1212
public class SkinShufflePacketHandler {
1313

14-
private static final EventNetworkChannel HANDSHAKE_INSTANCE = ChannelBuilder
15-
.named(SkinShuffleHandshakePayload.PACKET_ID)
14+
private static final EventNetworkChannel HANDSHAKE_INSTANCE = ChannelBuilder.named(
15+
SkinShuffleHandshakePayload.PACKET_ID)
1616
.optional()
1717
.eventNetworkChannel();
1818

19-
private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = ChannelBuilder
20-
.named(SkinShuffleSkinRefreshV1Payload.PACKET_ID)
19+
private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = ChannelBuilder.named(
20+
SkinShuffleSkinRefreshV1Payload.PACKET_ID)
2121
.optional()
2222
.eventNetworkChannel()
2323
.addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
2424

25-
private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = ChannelBuilder
26-
.named(SkinShuffleSkinRefreshV2Payload.PACKET_ID)
25+
private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = ChannelBuilder.named(
26+
SkinShuffleSkinRefreshV2Payload.PACKET_ID)
2727
.optional()
2828
.eventNetworkChannel()
2929
.addListener(SkinShufflePacketHandler::skinRefreshV2Listener);

0 commit comments

Comments
 (0)