Merge pull request #53 from AsoDesu/update/1.20

Update to 1.20/.1

build.gradle

@@ -27,10 +27,10 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modApi include("me.shedaniel.cloth:cloth-config-fabric:10.0.96") {
+    modApi include("me.shedaniel.cloth:cloth-config-fabric:11.0.99") {
         exclude(group: "net.fabricmc.fabric-api")
     }
-    modApi("com.terraformersmc:modmenu:6.1.0-rc.4")
+    modApi("com.terraformersmc:modmenu:7.0.1")
 
     implementation include('com.github.JnCrMx:discord-game-sdk4j:v0.5.5')
 }

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.17
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.2
+loader_version=0.14.21
 # Mod Properties
 mod_version=1.4.1
 maven_group=net.asodev
 archives_base_name=islandutils
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.75.3+1.19.4
+fabric_version=0.83.1+1.20.1

src/main/java/net/asodev/islandutils/mixins/MainScreenMixin.java

@@ -5,6 +5,7 @@
 import net.asodev.islandutils.mixins.resources.ProgressScreenAccessor;
 import net.asodev.islandutils.util.ChatUtils;
 import net.minecraft.Util;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.PlainTextButton;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
@@ -38,7 +39,7 @@ public void init(CallbackInfo ci) {
     }
 
     @Inject(method = "render", at = @At("TAIL"))
-    private void render(PoseStack poseStack, int i, int j, float f, CallbackInfo ci) {
+    private void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
         if (!packUpdater.getting) return;
 
         float progress = 0;
@@ -50,8 +51,8 @@ private void render(PoseStack poseStack, int i, int j, float f, CallbackInfo ci)
         int width = 150;
         int height = 10;
 
-        fill(poseStack, (this.width / 2) - width, 3, (this.width / 2) + width, 5+height, backgroundColor);
-        fill(poseStack, (this.width / 2) - width, 3, (int) ((this.width / 2) - width + (Math.min(100, progress) * (width * 2))), 3+height, foregroundColor);
-        drawCenteredString(poseStack, this.font, Component.literal((int)(progress * 100) + "%"), this.width / 2, 3 + 10 + 3, 0xFFFFFF);
+        guiGraphics.fill((this.width / 2) - width, 3, (this.width / 2) + width, 5+height, backgroundColor);
+        guiGraphics.fill((this.width / 2) - width, 3, (int) ((this.width / 2) - width + (Math.min(100, progress) * (width * 2))), 3+height, foregroundColor);
+        guiGraphics.drawCenteredString(this.font, Component.literal((int)(progress * 100) + "%"), this.width / 2, 3 + 10 + 3, 0xFFFFFF);
     }
 }

src/main/java/net/asodev/islandutils/mixins/PacketListenerMixin.java

@@ -20,6 +20,7 @@
 import net.asodev.islandutils.util.MusicUtil;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import net.minecraft.client.player.LocalPlayer;
@@ -230,11 +231,11 @@ private void containerContent(ClientboundContainerSetContentPacket clientboundCo
 
     @Inject(method = "handleRespawn", at = @At("HEAD")) // Whenever we change worlds
     private void handleRespawn(ClientboundRespawnPacket clientboundRespawnPacket, CallbackInfo ci) {
-        LocalPlayer localPlayer = this.minecraft.player; // Get our player
-        if (localPlayer == null) return; // minecraft is a good game.
+        ClientLevel clientLevel = this.minecraft.level; // Get our player
+        if (clientLevel == null) return; // minecraft is a good game.
 
         ResourceKey<Level> resourceKey = clientboundRespawnPacket.getDimension(); // Get the key of this world
-        if (resourceKey != localPlayer.level.dimension()) { // If we have changed worlds...
+        if (resourceKey != clientLevel.dimension()) { // If we have changed worlds...
             MusicUtil.stopMusic(); // ...stop the music
         }
     }

src/main/java/net/asodev/islandutils/mixins/cosmetics/ChestScreenMixin.java

@@ -11,6 +11,7 @@
 import net.asodev.islandutils.state.cosmetics.CosmeticSlot;
 import net.asodev.islandutils.state.cosmetics.CosmeticState;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.nbt.CompoundTag;
@@ -40,7 +41,7 @@ protected ChestScreenMixin(Component component) {
     }
 
     @Inject(method = "renderSlot", at = @At("TAIL"))
-    private void renderSlot(PoseStack poseStack, Slot slot, CallbackInfo ci) {
+    private void renderSlot(GuiGraphics guiGraphics, Slot slot, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
 
         ItemStack slotItem = slot.getItem();
@@ -53,16 +54,16 @@ private void renderSlot(PoseStack poseStack, Slot slot, CallbackInfo ci) {
         if (CosmeticState.hatSlot.preview != null && CosmeticState.hatSlot.preview.matchesSlot(slot)) shouldRender = true;
         else if (CosmeticState.accessorySlot.preview != null && CosmeticState.accessorySlot.preview.matchesSlot(slot)) shouldRender = true;
 
+        guiGraphics.pose().pushPose();
         if (shouldRender) {
-            poseStack.pushPose();
-            poseStack.translate(0.0F, 0.0F, 105.0F);
-            RenderSystem.setShaderTexture(0, PREVIEW);
-            blit(poseStack, slot.x-3, slot.y-4, 0, 0, 0, 22, 24, 22, 24);
+            guiGraphics.pose().translate(0.0f, 0.0f, 105f);
+            guiGraphics.blit(PREVIEW, slot.x-3, slot.y-4, 105, 0, 0, 22, 24, 22, 24);
         }
+        guiGraphics.pose().popPose();
     }
 
     @Inject(method = "render", at = @At("TAIL"))
-    private void render(PoseStack poseStack, int i, int j, float f, CallbackInfo ci) {
+    private void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
         if (IslandOptions.getOptions().isShowOnHover() && hoveredSlot != null && hoveredSlot.hasItem() && CosmeticState.isColoredItem(hoveredSlot.getItem())) {
             Integer color = CosmeticState.getColor(hoveredSlot.getItem());
             if (color != null) {

src/main/java/net/asodev/islandutils/mixins/cosmetics/FontLoaderMixin.java

@@ -17,20 +17,20 @@
 import static net.asodev.islandutils.state.cosmetics.CosmeticState.MCC_ICONS;
 import static net.asodev.islandutils.state.faction.FactionComponents.MCC_ICONS_19;
 
-@Mixin(BitmapProvider.Builder.class)
+@Mixin(BitmapProvider.Definition.class)
 public class FontLoaderMixin {
 
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void init(ResourceLocation resourceLocation, int i, int j, List<int[]> list, CallbackInfo ci) {
-        if (list.size() == 1) {
-            int[] c = list.get(0);
+    private void init(ResourceLocation file, int i, int j, int[][] chars, CallbackInfo ci) {
+        if (chars.length == 1) {
+            int[] c = chars[0];
 
             StringBuilder builder = new StringBuilder();
             for (int point : c) { builder.appendCodePoint(point); }
 
             Component comp = Component.literal(builder.toString()).setStyle(Style.EMPTY.withFont(MCC_ICONS));
             Component factionComp = Component.literal(builder.toString()).setStyle(Style.EMPTY.withFont(MCC_ICONS_19));
-            switch (resourceLocation.getPath()) {
+            switch (file.getPath()) {
                 case "_fonts/tooltips/hat.png" -> CosmeticState.HAT_COMP = comp;
                 case "_fonts/tooltips/accessory.png" -> CosmeticState.ACCESSORY_COMP = comp;
                 case "_fonts/tooltips/hair.png" -> CosmeticState.HAIR_COMP = comp;

src/main/java/net/asodev/islandutils/mixins/cosmetics/UIMixin.java

@@ -8,6 +8,7 @@
 import net.asodev.islandutils.state.MccIslandState;
 import net.asodev.islandutils.state.cosmetics.CosmeticState;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.ContainerScreen;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -38,7 +39,7 @@ public UIMixin(ChestMenu abstractContainerMenu, Inventory inventory, Component c
     }
 
     @Inject(method = "renderBg", at = @At("TAIL"))
-    public void renderBg(PoseStack poseStack, float f, int i, int j, CallbackInfo ci) {
+    public void renderBg(GuiGraphics guiGraphics, float f, int i, int j, CallbackInfo ci) {
         if (!MccIslandState.isOnline()) return;
 
         IslandOptions options = IslandOptions.getOptions();
@@ -101,14 +102,14 @@ public void renderBg(PoseStack poseStack, float f, int i, int j, CallbackInfo ci
 
         y += 8;
         int backgroundColor = 0x60000000;
-        fill(poseStack, x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
-        drawString(poseStack, this.font, CosmeticState.HAT_COMP, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
-        this.itemRenderer.renderAndDecorateItem(poseStack, this.minecraft.player, hatSlot, itemPos, y+2, x + y * this.imageWidth);
+        guiGraphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
+        guiGraphics.drawString(this.font, CosmeticState.HAT_COMP, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
+        guiGraphics.renderItem(this.minecraft.player, hatSlot, itemPos, y+2, x + y * this.imageWidth);
 
         y += 19 + 4;
-        fill(poseStack, x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
-        drawString(poseStack, this.font, CosmeticState.ACCESSORY_COMP, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
-        this.itemRenderer.renderAndDecorateItem(poseStack, this.minecraft.player, accSlot, itemPos, y+2, x + y * this.imageWidth);
+        guiGraphics.fill(x-(size / 2) - 2, y, x+(size / 2)+2, y + 19, backgroundColor);
+        guiGraphics.drawString(this.font, CosmeticState.ACCESSORY_COMP, x-(size / 2) + 4, y + 6, 16777215 | 255 << 24);
+        guiGraphics.renderItem(this.minecraft.player, accSlot, itemPos, y+2, x + y * this.imageWidth);
 
         if (this.hoveredSlot != null) {
             ItemStack currHover = this.hoveredSlot.getItem();

src/main/java/net/asodev/islandutils/mixins/resources/MultiplayerJoinMixin.java

@@ -38,7 +38,7 @@ private void join(ServerData serverData, CallbackInfo ci) {
     void confirm(boolean bool, ServerData serverData) {
         if (bool) {
             IslandUtils.packUpdater.accepted = true;
-            ConnectScreen.startConnecting(this, this.minecraft, ServerAddress.parseString(serverData.ip), serverData);
+            ConnectScreen.startConnecting(this, this.minecraft, ServerAddress.parseString(serverData.ip), serverData, false);
         }
         else this.minecraft.setScreen(this);
     }

src/main/java/net/asodev/islandutils/mixins/ui/ChatScreenMixin.java

@@ -7,6 +7,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.CommandSuggestions;
 import net.minecraft.client.gui.components.PlainTextButton;
 import net.minecraft.client.gui.screens.ChatScreen;
@@ -73,10 +74,10 @@ private void init(CallbackInfo ci) {
     }
 
     @Inject(method = "render", at = @At("TAIL"))
-    private void render(PoseStack poseStack, int i, int j, float f, CallbackInfo ci) {
+    private void render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
         CommandSuggestionsAccessor suggestionsAccessor = ((CommandSuggestionsAccessor)commandSuggestions);
         if (suggestionsAccessor.suggestions() == null && suggestionsAccessor.commandUsage().size() == 0) {
-            buttons.forEach(btn -> btn.render(poseStack, i, j, f));
+            buttons.forEach(btn -> btn.render(guiGraphics, i, j, f));
         }
     }
 

src/main/java/net/asodev/islandutils/util/PlainTextButtonNoShadow.java

@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.PlainTextButton;
 import net.minecraft.network.chat.Component;
@@ -22,8 +23,8 @@ public PlainTextButtonNoShadow(int i, int j, int k, int l, Component component,
     }
 
     @Override
-    public void renderWidget(PoseStack poseStack, int i, int j, float f) {
+    public void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) {
         Component component = this.isHoveredOrFocused() ? this.underlinedMessage : this.message;
-        this.font.draw(poseStack, component, getX(), getY(), 0xFFFFFF | Mth.ceil(this.alpha * 255.0f) << 24);
+        guiGraphics.drawString(this.font, component, getX(), getY(), 0xFFFFFF | Mth.ceil(this.alpha * 255.0f) << 24);
     }
 }

src/main/resources/fabric.mod.json

@@ -32,6 +32,6 @@
   "depends": {
     "fabricloader": ">=0.14.8",
     "fabric": "*",
-    "minecraft": "1.19.4"
+    "minecraft": "1.20.x"
   }
 }