Update to 1.20.2

Author: henkelmax

build.gradle

@@ -28,7 +28,18 @@ dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.officialMojangMappings()
     modImplementation "net.fabricmc:fabric-loader:${loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+
+    Set<String> apiModules = [
+            'fabric-api-base',
+            'fabric-lifecycle-events-v1',
+            'fabric-networking-api-v1',
+            'fabric-resource-loader-v0',
+            'fabric-key-binding-api-v1'
+    ]
+
+    apiModules.forEach {
+        include(modImplementation(fabricApi.module(it, fabric_version)))
+    }
 
     implementation "de.maxhenkel.configbuilder:configbuilder:${configbuilder_version}"
     shadow "de.maxhenkel.configbuilder:configbuilder:${configbuilder_version}"
@@ -41,7 +52,7 @@ processResources {
         expand 'version': version,
                 'minecraft_dependency': minecraft_dependency,
                 'loader_version': loader_version,
-                'fabric_version': fabric_version,
+                'min_fabric_version': fabric_version,
                 'compatibility_version': mod_compatibility_version
     }
 }

changelog.md

@@ -1 +1 @@
-- Added Japanese translation
+- Updated to 1.20.2

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx2G
-minecraft_version=1.20.1
-minecraft_dependency=1.20.x
+minecraft_version=1.20.2
+minecraft_dependency=1.20.2
 
 configbuilder_version=1.1.2
 
-curseforge_minecraft_version=1.20.1
-loader_version=0.14.21
-fabric_version=0.83.0+1.20.1
-mod_version=1.20.1-1.0.4
+curseforge_minecraft_version=1.20.2
+loader_version=0.14.22
+fabric_version=0.88.4+1.20.2
+mod_version=1.20.2-1.0.4
 mod_compatibility_version=1
 maven_group=de.maxhenkel.status
 archives_base_name=status

src/main/java/de/maxhenkel/status/gui/StatusScreen.java

@@ -69,11 +69,16 @@ protected void init() {
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void renderBackground(GuiGraphics guiGraphics, int i, int j, float f) {
+        super.renderBackground(guiGraphics, i, j, f);
+
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
         guiGraphics.blit(TEXTURE, guiLeft, guiTop, 0, 0, xSize, ySize);
+    }
 
+    @Override
+    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
         super.render(guiGraphics, mouseX, mouseY, partialTicks);
 
         int x = guiLeft + 10;

src/main/java/de/maxhenkel/status/mixin/MinecraftMixin.java

@@ -16,7 +16,7 @@ public class MinecraftMixin {
     @Shadow
     public ClientLevel level;
 
-    @Inject(at = @At("HEAD"), method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V")
+    @Inject(method = "clearClientLevel", at = @At("HEAD"))
     private void disconnect(Screen screen, CallbackInfo info) {
         if (level != null) {
             ClientWorldEvents.DISCONNECT.invoker().run();

src/main/java/de/maxhenkel/status/mixin/PlayerManagerMixin.java

@@ -3,6 +3,7 @@
 import de.maxhenkel.status.events.PlayerEvents;
 import net.minecraft.network.Connection;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.players.PlayerList;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -12,10 +13,9 @@
 @Mixin(PlayerList.class)
 public class PlayerManagerMixin {
 
-
     @Inject(at = @At("RETURN"), method = "placeNewPlayer")
-    private void onPlayerConnect(Connection connection, ServerPlayer player, CallbackInfo info) {
-        PlayerEvents.PLAYER_LOGGED_IN.invoker().accept(player);
+    private void onPlayerConnect(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) {
+        PlayerEvents.PLAYER_LOGGED_IN.invoker().accept(serverPlayer);
     }
 
     @Inject(at = @At("HEAD"), method = "remove")

src/main/java/de/maxhenkel/status/playerstate/ClientPlayerStateManager.java

@@ -75,9 +75,9 @@ public void setNoSleep(boolean noSleep) {
 
     private PlayerState getDefaultState() {
         if (StatusClient.CLIENT_CONFIG.persistState.get()) {
-            return new PlayerState(Minecraft.getInstance().getUser().getGameProfile().getId(), StatusClient.CLIENT_CONFIG.availability.get(), StatusClient.CLIENT_CONFIG.status.get(), StatusClient.CLIENT_CONFIG.noSleep.get());
+            return new PlayerState(Minecraft.getInstance().getUser().getProfileId(), StatusClient.CLIENT_CONFIG.availability.get(), StatusClient.CLIENT_CONFIG.status.get(), StatusClient.CLIENT_CONFIG.noSleep.get());
         } else {
-            return new PlayerState(Minecraft.getInstance().getUser().getGameProfile().getId());
+            return new PlayerState(Minecraft.getInstance().getUser().getProfileId());
         }
     }
 

src/main/resources/fabric.mod.json

@@ -25,10 +25,12 @@
   ],
   "depends": {
     "fabricloader": ">=${loader_version}",
-    "fabric": ">=${fabric_version}",
     "minecraft": "${minecraft_dependency}",
     "java": ">=17"
   },
+  "breaks": {
+    "fabric-api": "<${min_fabric_version}"
+  },
   "custom": {
     "status": {
       "compatibilityVersion": "${compatibility_version}"