Port to MC 1.20.2

Author: Darkhax

.gitignore

@@ -1,19 +1,24 @@
-# Gradle
-.gradle/
-bin/
-build/
-
-#Eclipse
-*.classpath
-*.project
-*.prefs
+# eclipse
+bin
 *.launch
-.idea/
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
 
-# General
-run/
+# gradle
+build
+.gradle
 
-# Annotation Processing
-/.apt_generated_tests/
-/Users/
-.factorypath
+# other
+eclipse
+run
+runs
+.DS_Store

gradle.properties

@@ -1,5 +1,5 @@
 group=net.darkhax.gamestages
-version=15.0
+version=16.0
 
 mod_name=GameStages
 mod_author=Darkhax
@@ -10,12 +10,12 @@ mod_issues=https://github.com/Darkhax-Minecraft/Game-Stages/issues
 mod_description=A framework for creating custom progression systems.
 
 # Minecraft Forge properties (gradle/forge.gradle)
-minecraft_version=1.20.1
-forge_version=47.1.28
+minecraft_version=1.20.2
+forge_version=48.1.0
 
 # Dependencies (gradle/dependencies.gradle)
-bookshelf_version=20.0.1
-crafttweaker_version=14.0.9
+bookshelf_version=21.0.14
+crafttweaker_version=15.0.6
 
 # CurseForge properties (gradle/curseforge.gradle)
 curse_project=268655

src/main/java/net/darkhax/gamestages/GameStageHelper.java

@@ -7,7 +7,6 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.fml.util.thread.EffectiveSide;
 
 import javax.annotation.Nullable;
@@ -273,7 +272,7 @@ public static IStageData getPlayerData (Player player) {
 
             if (player instanceof ServerPlayer) {
 
-                if (player instanceof FakePlayer) {
+                if (player.getClass() != ServerPlayer.class) {
 
                     return GameStageSaveHandler.getFakeData(player.getName().getString());
                 }

src/main/java/net/darkhax/gamestages/GameStages.java

@@ -6,6 +6,7 @@
 import net.darkhax.gamestages.packet.GameStagesPacketHandler;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.controls.KeyBindsScreen;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.CustomizeGuiOverlayEvent;
@@ -46,8 +47,8 @@ private void registerReloadListeners(AddReloadListenerEvent event) {
     private void onF3Text (CustomizeGuiOverlayEvent.DebugText event) {
 
         final Minecraft mc = Minecraft.getInstance();
-        
-        if (mc.options.renderDebug) {
+
+        if (mc.gui != null && mc.gui.getDebugOverlay() != null && mc.gui.getDebugOverlay().showDebugScreen()) {
 
             if (mc.player.isShiftKeyDown()) {
 

src/main/java/net/darkhax/gamestages/addons/crt/StageHelper.java

@@ -259,11 +259,11 @@ public static void grantStageOnAdvancement(Predicate<ResourceLocation> predicate
 
         ZenEventManager.EVENTS.register(AdvancementEvent.AdvancementEarnEvent.class, event -> {
 
-            if (event.getEntity() instanceof ServerPlayer player && predicate.test(event.getAdvancement().getId())) {
+            if (event.getEntity() instanceof ServerPlayer player && predicate.test(event.getAdvancement().id())) {
 
                 if (grantStages(player, stages) && hook != null) {
 
-                    hook.accept(player, event.getAdvancement().getId());
+                    hook.accept(player, event.getAdvancement().id());
                 }
             }
         });

src/main/java/net/darkhax/gamestages/command/StageArgumentType.java

@@ -1,13 +1,14 @@
 package net.darkhax.gamestages.command;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.darkhax.bookshelf.api.serialization.Serializers;
+import net.darkhax.bookshelf.api.data.bytebuf.BookshelfByteBufs;
 import net.darkhax.gamestages.GameStageHelper;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.SharedSuggestionProvider;
@@ -113,19 +114,22 @@ static class Serializer implements ArgumentTypeInfo<StageArgumentType, Template>
         @Override
         public void serializeToNetwork(StageArgumentType.Template template, FriendlyByteBuf buffer) {
 
-            Serializers.STRING.toByteBufList(buffer, new ArrayList<>(template.knownStages));
+            BookshelfByteBufs.STRING.writeSet(buffer, template.knownStages);
         }
 
         @Override
         public StageArgumentType.Template deserializeFromNetwork(FriendlyByteBuf buffer) {
 
-            return new StageArgumentType.Template(new HashSet<>(Serializers.STRING.fromByteBufList(buffer)));
+            final Set<String> readStages = BookshelfByteBufs.STRING.readSet(buffer);
+            return new StageArgumentType.Template(readStages);
         }
 
         @Override
         public void serializeToJson(StageArgumentType.Template template, JsonObject json) {
 
-            json.add("known_stages", Serializers.STRING.toJSONSet(template.knownStages));
+            final JsonArray stagesArray = new JsonArray();
+            template.knownStages.forEach(stagesArray::add);
+            json.add("known_stages", stagesArray);
         }
 
         @Override

src/main/java/net/darkhax/gamestages/packet/GameStagesPacketHandler.java

@@ -1,6 +1,6 @@
 package net.darkhax.gamestages.packet;
 
-import net.darkhax.bookshelf.api.serialization.Serializers;
+import net.darkhax.bookshelf.api.data.bytebuf.BookshelfByteBufs;
 import net.darkhax.gamestages.GameStages;
 import net.darkhax.gamestages.data.GameStageSaveHandler;
 import net.darkhax.gamestages.data.IStageData;
@@ -10,34 +10,45 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.network.NetworkEvent;
-import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.event.network.CustomPayloadEvent;
+import net.minecraftforge.network.ChannelBuilder;
+import net.minecraftforge.network.NetworkDirection;
 import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.network.SimpleChannel;
 
-import java.util.function.Supplier;
+import java.util.List;
 
 public class GameStagesPacketHandler {
 
-    private final String PROTOCOL = "9";
-    private final SimpleChannel channel = NetworkRegistry.newSimpleChannel(new ResourceLocation(GameStages.MOD_ID, "main"), () -> PROTOCOL, PROTOCOL::equals, PROTOCOL::equals);
+    private final int PROTOCOL = 9;
+    private final ResourceLocation CHANNEL_ID = new ResourceLocation(GameStages.MOD_ID, "main");
+    private final SimpleChannel channel = ChannelBuilder.named(CHANNEL_ID).networkProtocolVersion(PROTOCOL).clientAcceptedVersions((status, version) -> true).serverAcceptedVersions((status, version) -> true).simpleChannel();
 
     public GameStagesPacketHandler() {
 
-        channel.registerMessage(0, MessageStages.class, this::encodeStageMessage, this::decodeStageMessage, this::processSyncStagesMessage);
+        channel.messageBuilder(MessageStages.class, 0, NetworkDirection.PLAY_TO_CLIENT).encoder(this::encodeStageMessage).decoder(this::decodeStageMessage).consumerMainThread(this::processSyncStagesMessage).add();
     }
 
     public void syncPlayerStages(ServerPlayer player, MessageStages msg) {
 
-        channel.send(PacketDistributor.PLAYER.with(() -> player), msg);
+        if (msg != null) {
+
+            channel.send(msg, PacketDistributor.PLAYER.with(player));
+        }
+    }
+
+    private void encodeStageMessage(MessageStages packet, FriendlyByteBuf buffer) {
+
+        BookshelfByteBufs.STRING.writeList(buffer, packet.getStages());
     }
 
     private MessageStages decodeStageMessage(FriendlyByteBuf buffer) {
 
-        return new MessageStages(Serializers.STRING.fromByteBufList(buffer));
+        final List<String> stages = BookshelfByteBufs.STRING.readList(buffer);
+        return new MessageStages(stages);
     }
 
-    private void processSyncStagesMessage(MessageStages message, Supplier<NetworkEvent.Context> ctx) {
+    private void processSyncStagesMessage(MessageStages message, CustomPayloadEvent.Context ctx) {
 
         // Reset the client data to a new object.
         final IStageData clientData = new StageData();
@@ -52,11 +63,6 @@ private void processSyncStagesMessage(MessageStages message, Supplier<NetworkEve
 
         // Alert all the listeners.
         MinecraftForge.EVENT_BUS.post(new StagesSyncedEvent(clientData));
-        ctx.get().setPacketHandled(true);
-    }
-
-    private void encodeStageMessage (MessageStages packet, FriendlyByteBuf buffer) {
-
-        Serializers.STRING.toByteBufList(buffer, packet.getStages());
+        ctx.setPacketHandled(true);
     }
 }

src/main/resources/META-INF/mods.toml

@@ -1,13 +1,13 @@
 modLoader="javafml"
-loaderVersion="[47,]"
+loaderVersion="[48,]"
 issueTrackerURL="https://github.com/Darkhax-Minecraft/Game-Stages"
 license="LGPL v2.1"
 logoFile="mod_logo.png"
 logoBlur=false
 
 [[mods]]
 modId="gamestages"
-updateJSONURL="https://updates.blamejared.com/get?n=gamestages&gv=1.20.1"
+updateJSONURL="https://updates.blamejared.com/get?n=gamestages&gv=1.20.2"
 version="${file.jarVersion}"
 displayName="${modName}"
 displayURL="${modHomepage}"
@@ -21,20 +21,20 @@ itemIcon="minecraft:name_tag"
 [[dependencies.gamestages]]
     modId="forge"
     mandatory=true
-    versionRange="[47,]"
+    versionRange="[48,]"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.gamestages]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.20.1]"
+    versionRange="[1.20.2]"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.gamestages]]
     modId="bookshelf"
     mandatory=true
-    versionRange="[20,)"
+    versionRange="[21,)"
     ordering="NONE"
     side="BOTH"