Migrate to official mappings

dima-dencep · Apr 8, 2024 · 94357ef · 94357ef
1 parent 120289e
commit 94357ef
Show file tree

Hide file tree

Showing 13 changed files with 175 additions and 175 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+        mappings loom.officialMojangMappings()
     }
 
     machete {

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/duck/OverlayExtender.java b/common/src/main/java/com/github/dimadencep/mods/rrls/duck/OverlayExtender.java
@@ -11,14 +11,14 @@
 package com.github.dimadencep.mods.rrls.duck;
 
 import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.GuiGraphics;
 
 @SuppressWarnings("unused")
 public interface OverlayExtender {
     OverlayHelper.State rrls$getState();
     void rrls$setState(OverlayHelper.State state);
 
-    default void rrls$miniRender(DrawContext context) {
+    default void rrls$miniRender(GuiGraphics context) {
         throw new UnsupportedOperationException("The '" + getClass().getCanonicalName() + "' overlay doesn't have a mini-render!");
     }
 }
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/MinecraftClientMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/MinecraftClientMixin.java
@@ -18,10 +18,6 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.RunArgs;
-import net.minecraft.client.gui.screen.Overlay;
-import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -31,23 +27,27 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Overlay;
+import net.minecraft.client.main.GameConfig;
+import net.minecraft.network.chat.Component;
 
-@Mixin(MinecraftClient.class)
+@Mixin(Minecraft.class)
 public abstract class MinecraftClientMixin {
     @Shadow
-    protected abstract void showResourceReloadFailureToast(@Nullable Text description);
+    protected abstract void showResourceReloadFailureToast(@Nullable Component description);
     @Shadow
-    protected abstract CompletableFuture<Void> reloadResources(boolean force, @Nullable MinecraftClient.LoadingContext loadingContext);
+    protected abstract CompletableFuture<Void> reloadResources(boolean force, @Nullable Minecraft.GameLoadCookie loadingContext);
     @Shadow
-    protected abstract void onFinishedLoading(@Nullable MinecraftClient.LoadingContext loadingContext);
+    protected abstract void onFinishedLoading(@Nullable Minecraft.GameLoadCookie loadingContext);
 
     @Inject(
             method = "<init>",
             at = @At(
                     value = "RETURN"
             )
     )
-    public void rrls$init(RunArgs args, CallbackInfo ci, @Local(ordinal = 0) MinecraftClient.LoadingContext loadingContext) {
+    public void rrls$init(GameConfig args, CallbackInfo ci, @Local(ordinal = 0) Minecraft.GameLoadCookie loadingContext) {
         if (ConfigExpectPlatform.forceClose())
             onFinishedLoading(loadingContext);
     }
@@ -59,7 +59,7 @@ public abstract class MinecraftClientMixin {
             ),
             cancellable = true
     ) // TODO refactor when @WrapMethod
-    public void rrls$onResourceReloadFailure(Throwable exception, Text resourceName, MinecraftClient.LoadingContext loadingContext, CallbackInfo ci) {
+    public void rrls$onResourceReloadFailure(Throwable exception, Component resourceName, Minecraft.GameLoadCookie loadingContext, CallbackInfo ci) {
         if (!ConfigExpectPlatform.resetResources()) {
             Rrls.LOGGER.error("Caught error loading resourcepacks!", exception);
 
@@ -80,7 +80,7 @@ public abstract class MinecraftClientMixin {
             ),
             cancellable = true
     )
-    public void rrls$doubleLoad(Throwable exception, Text resourceName, MinecraftClient.LoadingContext loadingContext, CallbackInfo ci) {
+    public void rrls$doubleLoad(Throwable exception, Component resourceName, Minecraft.GameLoadCookie loadingContext, CallbackInfo ci) {
         if (!ConfigExpectPlatform.doubleLoad().isLoad())
             ci.cancel();
     }
@@ -108,7 +108,7 @@ public abstract class MinecraftClientMixin {
                     target = "Lnet/minecraft/client/MinecraftClient;overlay:Lnet/minecraft/client/gui/screen/Overlay;"
             )
     )
-    public Overlay rrls$miniRender(MinecraftClient instance, Operation<Overlay> original) {
+    public Overlay rrls$miniRender(Minecraft instance, Operation<Overlay> original) {
         Overlay overlay = original.call(instance);
 
         if (OverlayHelper.isRenderingState(overlay))

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java
@@ -16,12 +16,6 @@
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Overlay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.SplashOverlay;
-import net.minecraft.resource.ResourceReload;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -35,17 +29,23 @@
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Consumer;
-
-@Mixin(SplashOverlay.class)
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.LoadingOverlay;
+import net.minecraft.client.gui.screens.Overlay;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.server.packs.resources.ReloadInstance;
+
+@Mixin(LoadingOverlay.class)
 public abstract class SplashOverlayMixin extends Overlay {
     @Shadow
     public float progress;
     @Shadow
     @Final
-    private MinecraftClient client;
+    private Minecraft client;
 
     @Shadow
-    protected abstract void renderProgressBar(DrawContext drawContext, int minX, int minY, int maxX, int maxY, float opacity);
+    protected abstract void renderProgressBar(GuiGraphics drawContext, int minX, int minY, int maxX, int maxY, float opacity);
     @Shadow
     private static int withAlpha(int color, int alpha) {
         return 0;
@@ -57,14 +57,14 @@ private static int withAlpha(int color, int alpha) {
                     value = "TAIL"
             )
     )
-    private void rrls$init(MinecraftClient client, ResourceReload monitor, Consumer<Optional<Throwable>> exceptionHandler, boolean reloading, CallbackInfo ci) {
-        rrls$setState(OverlayHelper.lookupState(client.currentScreen, reloading));
+    private void rrls$init(Minecraft client, ReloadInstance monitor, Consumer<Optional<Throwable>> exceptionHandler, boolean reloading, CallbackInfo ci) {
+        rrls$setState(OverlayHelper.lookupState(client.screen, reloading));
     }
 
     @Override
-    public void rrls$miniRender(DrawContext context) {
-        int i = context.getScaledWindowWidth();
-        int j = context.getScaledWindowHeight();
+    public void rrls$miniRender(GuiGraphics context) {
+        int i = context.guiWidth();
+        int j = context.guiHeight();
 
         switch (ConfigExpectPlatform.type()) {
             case PROGRESS -> {
@@ -74,8 +74,8 @@ private static int withAlpha(int color, int alpha) {
                 this.renderProgressBar(context, i / 2 - r, s - 5, i / 2 + r, s + 5, 0.8F);
             }
 
-            case TEXT -> context.drawCenteredTextWithShadow(
-                    client.textRenderer, ConfigExpectPlatform.reloadText(), i / 2, 70,
+            case TEXT -> context.drawCenteredString(
+                    client.font, ConfigExpectPlatform.reloadText(), i / 2, 70,
                     ConfigExpectPlatform.rgbProgress() ? ThreadLocalRandom.current().nextInt(0, 0xFFFFFF) : -1
             );
         }
@@ -87,9 +87,9 @@ private static int withAlpha(int color, int alpha) {
                     value = "HEAD"
             )
     )
-    public void rrls$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    public void rrls$render(GuiGraphics context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (rrls$getState() != OverlayHelper.State.DEFAULT) // Update attach (Optifine ❤️)
-            rrls$setState(OverlayHelper.lookupState(client.currentScreen, rrls$getState() != OverlayHelper.State.WAIT));
+            rrls$setState(OverlayHelper.lookupState(client.screen, rrls$getState() != OverlayHelper.State.WAIT));
     }
 
     @WrapWithCondition(
@@ -99,7 +99,7 @@ private static int withAlpha(int color, int alpha) {
                     target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/gui/DrawContext;IIF)V"
             )
     )
-    public boolean rrls$screenrender(Screen instance, DrawContext context, int mouseX, int mouseY, float delta) {
+    public boolean rrls$screenrender(Screen instance, GuiGraphics context, int mouseX, int mouseY, float delta) {
         return !(context instanceof DummyDrawContext);
     }
 
@@ -110,7 +110,7 @@ private static int withAlpha(int color, int alpha) {
                     target = "Lnet/minecraft/client/MinecraftClient;setOverlay(Lnet/minecraft/client/gui/screen/Overlay;)V"
             )
     )
-    public boolean rrls$infinityLoading(MinecraftClient instance, Overlay overlay) {
+    public boolean rrls$infinityLoading(Minecraft instance, Overlay overlay) {
         return ConfigExpectPlatform.removeOverlayAtEnd();
     }
 
@@ -157,18 +157,18 @@ private static int withAlpha(int color, int alpha) {
                     value = "HEAD"
             )
     )
-    public void rrls$dvdStart(DrawContext drawContext, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+    public void rrls$dvdStart(GuiGraphics drawContext, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
         if (!ConfigExpectPlatform.aprilFool().canUes())
             return;
 
-        int sx = (drawContext.getScaledWindowWidth() * 2) - (maxX - minX) * 2;
+        int sx = (drawContext.guiWidth() * 2) - (maxX - minX) * 2;
         float mul = 1f / sx;
 
-        int sy = (drawContext.getScaledWindowHeight() * 2) - (maxY - minY) * 2;
+        int sy = (drawContext.guiHeight() * 2) - (maxY - minY) * 2;
         float ymul = 1f / sy;
 
-        drawContext.getMatrices().push();
-        drawContext.getMatrices().translate(rrls$dvd$x * sx - minX, rrls$dvd$y * sy - minY, 0.0F);
+        drawContext.pose().pushPose();
+        drawContext.pose().translate(rrls$dvd$x * sx - minX, rrls$dvd$y * sy - minY, 0.0F);
 
         rrls$dvd$x += mul * (progress * 5) * rrls$dvd$xdir;
         rrls$dvd$y += ymul * (progress * 5) * rrls$dvd$ydir;
@@ -188,9 +188,9 @@ private static int withAlpha(int color, int alpha) {
                     value = "RETURN"
             )
     )
-    public void rrls$dvdStop(DrawContext drawContext, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+    public void rrls$dvdStop(GuiGraphics drawContext, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
         if (ConfigExpectPlatform.aprilFool().canUes())
-            drawContext.getMatrices().pop();
+            drawContext.pose().popPose();
     }
 
     @WrapOperation(
@@ -225,7 +225,7 @@ private static int withAlpha(int color, int alpha) {
     }
 
     @Override // YAY Conflicts!!!
-    public boolean pausesGame() {
-        return super.pausesGame();
+    public boolean isPauseScreen() {
+        return super.isPauseScreen();
     }
 }
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/TitleScreenMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/TitleScreenMixin.java
@@ -11,7 +11,7 @@
 package com.github.dimadencep.mods.rrls.mixins;
 
 import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
-import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.client.gui.screens.TitleScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/GameRendererMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/GameRendererMixin.java
@@ -15,10 +15,10 @@
 import com.github.dimadencep.mods.rrls.utils.DummyDrawContext;
 import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Overlay;
-import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Overlay;
+import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,7 +30,7 @@
 public class GameRendererMixin {
     @Shadow
     @Final
-    MinecraftClient client;
+    Minecraft client;
 
     @Inject(
             method = "render",
@@ -39,12 +39,12 @@ public class GameRendererMixin {
                     target = "Lnet/minecraft/client/gui/DrawContext;draw()V"
             )
     )
-    public void rrls$miniRender(float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local(ordinal = 0) DrawContext drawContext) {
+    public void rrls$miniRender(float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local(ordinal = 0) GuiGraphics drawContext) {
         try {
             Overlay overlay = this.client.overlay;
 
             if (OverlayHelper.isRenderingState(overlay)) {
-                overlay.render(DummyDrawContext.INSTANCE, 0, 0, client.getLastFrameDuration());
+                overlay.render(DummyDrawContext.INSTANCE, 0, 0, client.getDeltaFrameTime());
 
                 if (ConfigExpectPlatform.miniRender())
                     overlay.rrls$miniRender(drawContext);

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/OverlayMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/OverlayMixin.java
@@ -13,7 +13,7 @@
 import com.github.dimadencep.mods.rrls.duck.OverlayExtender;
 import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import net.minecraft.client.gui.screen.Overlay;
+import net.minecraft.client.gui.screens.Overlay;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/...c/main/java/com/github/dimadencep/mods/rrls/mixins/compat/RendererKeyboardMouseMixin.java b/...c/main/java/com/github/dimadencep/mods/rrls/mixins/compat/RendererKeyboardMouseMixin.java
@@ -13,18 +13,18 @@
 import com.github.dimadencep.mods.rrls.utils.OverlayHelper;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.client.Keyboard;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.Mouse;
-import net.minecraft.client.gui.screen.Overlay;
-import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.KeyboardHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.MouseHandler;
+import net.minecraft.client.gui.screens.Overlay;
+import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(value = {
         GameRenderer.class,
-        Keyboard.class,
-        Mouse.class
+        KeyboardHandler.class,
+        MouseHandler.class
 })
 public class RendererKeyboardMouseMixin {
     @WrapOperation(
@@ -34,7 +34,7 @@ public class RendererKeyboardMouseMixin {
                     target = "Lnet/minecraft/client/MinecraftClient;getOverlay()Lnet/minecraft/client/gui/screen/Overlay;"
             )
     )
-    public Overlay rrls$miniRender(MinecraftClient instance, Operation<Overlay> original) {
+    public Overlay rrls$miniRender(Minecraft instance, Operation<Overlay> original) {
         Overlay overlay = original.call(instance);
 
         if (OverlayHelper.isRenderingState(overlay))

diff --git a/...in/java/com/github/dimadencep/mods/rrls/mixins/compat/ServerResourcePackManagerMixin.java b/...in/java/com/github/dimadencep/mods/rrls/mixins/compat/ServerResourcePackManagerMixin.java
@@ -11,18 +11,18 @@
 package com.github.dimadencep.mods.rrls.mixins.compat;
 
 import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.resource.server.ServerResourcePackManager;
-import net.minecraft.network.packet.c2s.common.ResourcePackStatusC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.UUID;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.resources.server.ServerPackManager;
+import net.minecraft.network.protocol.common.ServerboundResourcePackPacket;
 
-@Mixin(ServerResourcePackManager.class)
+@Mixin(ServerPackManager.class)
 public class ServerResourcePackManagerMixin {
     @Inject(
             method = "onAdd",
@@ -31,12 +31,12 @@ public class ServerResourcePackManagerMixin {
                     target = "Lnet/minecraft/client/resource/server/ServerResourcePackManager;onPackChanged()V"
             )
     )
-    public void earlyResourcePackStatusSend(UUID id, ServerResourcePackManager.PackEntry pack, CallbackInfo ci) {
+    public void earlyResourcePackStatusSend(UUID id, ServerPackManager.ServerPackData pack, CallbackInfo ci) {
         if (ConfigExpectPlatform.earlyPackStatusSend()) {
-            ClientPlayNetworkHandler handler = MinecraftClient.getInstance().getNetworkHandler();
+            ClientPacketListener handler = Minecraft.getInstance().getConnection();
 
-            if (handler != null && handler.getConnection() != null && handler.getConnection().isOpen()) {
-                handler.getConnection().send(new ResourcePackStatusC2SPacket(id, ResourcePackStatusC2SPacket.Status.SUCCESSFULLY_LOADED));
+            if (handler != null && handler.getConnection() != null && handler.getConnection().isConnected()) {
+                handler.getConnection().send(new ServerboundResourcePackPacket(id, ServerboundResourcePackPacket.Action.SUCCESSFULLY_LOADED));
             }
         }
     }