Update to 1.20 and fix some world join issues on singleplayer if usin…

…g another account

gradle.properties

@@ -7,12 +7,12 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
 loader_version=0.14.21
 
 #Fabric api
-fabric_version=0.82.0+1.19.4
+fabric_version=0.83.0+1.20
 
 # Mod Properties
 mod_version = 1.0.5
@@ -22,7 +22,7 @@ modid = taleofkingdoms
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-modmenu_version = 6.2.2
-cloth_version = 10.0.96
+modmenu_version = 7.0.1
+cloth_version = 11.0.99
 toml4j_version = 0.7.2
-owo_version = 0.10.5+1.19.4
+owo_version = 0.11.0+1.20

src/main/java/com/convallyria/taleofkingdoms/client/TaleOfKingdomsClient.java

@@ -6,6 +6,7 @@
 import com.convallyria.taleofkingdoms.client.gui.RenderListener;
 import com.convallyria.taleofkingdoms.client.gui.generic.ScreenStartConquest;
 import com.convallyria.taleofkingdoms.client.gui.shop.ScreenSellItem;
+import com.convallyria.taleofkingdoms.client.listener.ClientGameInstanceListener;
 import com.convallyria.taleofkingdoms.client.packet.ClientPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.both.BothSignContractPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.incoming.IncomingInstanceSyncPacketHandler;
@@ -19,7 +20,6 @@
 import com.convallyria.taleofkingdoms.client.packet.outgoing.OutgoingHunterPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.outgoing.OutgoingInnkeeperPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.outgoing.OutgoingToggleSellGuiPacketHandler;
-import com.convallyria.taleofkingdoms.common.listener.GameInstanceListener;
 import com.convallyria.taleofkingdoms.common.listener.StartWorldListener;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
@@ -81,16 +81,13 @@ private void registerPacketHandlers() {
         registerHandler(new IncomingInstanceSyncPacketHandler());
     }
 
-    private void registerListeners() {
-        new GameInstanceListener();
-    }
-
     protected void registerHandler(ClientPacketHandler clientPacketHandler) {
         TaleOfKingdoms.getAPI().registerClientHandler(clientPacketHandler);
     }
 
     private void registerEvents() {
         TaleOfKingdoms.LOGGER.info("Registering client events...");
+        new ClientGameInstanceListener();
         new RenderListener();
         this.startWorldListener = new StartWorldListener();
     }

src/main/java/com/convallyria/taleofkingdoms/client/gui/RenderListener.java

@@ -6,23 +6,23 @@
 import com.convallyria.taleofkingdoms.common.world.guild.GuildPlayer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 
 import java.util.UUID;
 
 public class RenderListener extends Listener {
 
     public RenderListener() {
-        InventoryDrawCallback.EVENT.register((gui, matrices, textRenderer) -> {
+        InventoryDrawCallback.EVENT.register((gui, context, textRenderer) -> {
             TaleOfKingdoms.getAPI().getConquestInstanceStorage().mostRecentInstance().ifPresent(instance -> {
                 final UUID uuid = MinecraftClient.getInstance().player.getUuid();
                 final GuildPlayer guildPlayer = instance.getPlayer(uuid);
-                drawWithoutShadow(matrices, textRenderer, "Gold Coins: " + guildPlayer.getCoins(), gui.width / 2 - 50, gui.height / 2 - 100, 16763904);
+                drawWithoutShadow(context, textRenderer, "Gold Coins: " + guildPlayer.getCoins(), gui.width / 2 - 50, gui.height / 2 - 100, 16763904);
             });
         });
     }
 
-    private void drawWithoutShadow(MatrixStack matrices, TextRenderer textRenderer, String text, int centerX, int y, int color) {
-        textRenderer.draw(matrices, text, (float) (centerX - textRenderer.getWidth(text) / 2), (float) y, color);
+    private void drawWithoutShadow(DrawContext context, TextRenderer textRenderer, String text, int centerX, int y, int color) {
+        context.drawText(textRenderer, text, (centerX - textRenderer.getWidth(text) / 2), y, color, false);
     }
 }

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/BankerScreen.java

@@ -13,7 +13,7 @@
 import io.wispforest.owo.ui.component.TextBoxComponent;
 import io.wispforest.owo.ui.container.FlowLayout;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -104,8 +104,8 @@ public void close() {
     }
 
     @Override
-    public void render(MatrixStack stack, int mouseX, int mouseY, float delta) {
-        super.render(stack, mouseX, mouseY, delta);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
         this.totalMoney.text(Text.translatable(Translations.BANK_TOTAL_MONEY.getKey(), guildPlayer.getCoins()));
         this.totalMoneyBank.text(Text.translatable(Translations.BANK_TOTAL_MONEY_BANK.getKey(), guildPlayer.getBankerCoins()));
     }

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/GuildMasterScreen.java

@@ -16,8 +16,8 @@
 import com.convallyria.taleofkingdoms.common.world.ConquestInstance;
 import com.convallyria.taleofkingdoms.common.world.guild.GuildPlayer;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -148,14 +148,14 @@ public void init() {
     }
 
     @Override
-    public void render(MatrixStack stack, int par1, int par2, float par3) {
-        super.render(stack, par1, par2, par3);
+    public void render(DrawContext context, int par1, int par2, float par3) {
+        super.render(context, par1, par2, par3);
         String order = Translations.GUILDMASTER_GUILD_ORDER.getFormatted() + guildPlayer.getCoins() + " " + Translations.GOLD_COINS.getFormatted();
         String path = Translations.GUILDMASTER_PATH.getFormatted();
-        drawCenteredTextWithShadow(stack, this.textRenderer, order, this.width / 2, this.height / 4 - 25, 0xFFFFFF);
-        drawCenteredTextWithShadow(stack, this.textRenderer, path, this.width / 2 , this.height / 2 + 70, 0XFFFFFF);
-        drawCenteredTextWithShadow(stack, this.textRenderer, "Repairing the guild costs 64 logs and 3000 coins.", this.width / 2, this.height / 2 + 100, 0XFFFFFF);
-        this.worthness.drawBar(stack);
+        context.drawCenteredTextWithShadow(this.textRenderer, order, this.width / 2, this.height / 4 - 25, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(this.textRenderer, path, this.width / 2 , this.height / 2 + 70, 0XFFFFFF);
+        context.drawCenteredTextWithShadow(this.textRenderer, "Repairing the guild costs 64 logs and 3000 coins.", this.width / 2, this.height / 2 + 100, 0XFFFFFF);
+        this.worthness.drawBar(context);
     }
 
     @Override

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/InnkeeperScreen.java

@@ -10,8 +10,8 @@
 import com.convallyria.taleofkingdoms.common.world.ConquestInstance;
 import com.convallyria.taleofkingdoms.common.world.guild.GuildPlayer;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
@@ -99,10 +99,10 @@ public void init() {
     }
 
     @Override
-    public void render(MatrixStack stack, int par1, int par2, float par3) {
-        super.render(stack, par1, par2, par3);
-        drawCenteredTextWithShadow(stack, this.textRenderer, "Time flies when you rest...", this.width / 2, this.height / 4 - 25, 0xFFFFFF);
-        drawCenteredTextWithShadow(stack, this.textRenderer, "Waiting or resting costs 10 coins.", this.width / 2, this.height / 2 + 100, 0XFFFFFF);
+    public void render(DrawContext context, int par1, int par2, float par3) {
+        super.render(context, par1, par2, par3);
+        context.drawCenteredTextWithShadow(this.textRenderer, "Time flies when you rest...", this.width / 2, this.height / 4 - 25, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(this.textRenderer, "Waiting or resting costs 10 coins.", this.width / 2, this.height / 2 + 100, 0XFFFFFF);
     }
 
     @Override

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/citybuilder/CityBuilderTierOneGui.java

@@ -18,7 +18,7 @@
 import io.wispforest.owo.ui.core.Positioning;
 import io.wispforest.owo.ui.core.Sizing;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -211,8 +211,8 @@ protected void build(FlowLayout rootComponent) {
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        super.render(matrices, mouseX, mouseY, delta);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
         this.update();
     }
 }

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/citybuilder/confirm/ConfirmBuildKingdomGui.java

@@ -86,7 +86,7 @@ protected void build(FlowLayout rootComponent) {
 
                     // Make city builder stop following player and move to well POI
                     TaleOfKingdoms.getAPI().executeOnServer(() -> {
-                        final CityBuilderEntity cityBuilderServer = (CityBuilderEntity) serverPlayer.world.getEntityById(entity.getId());
+                        final CityBuilderEntity cityBuilderServer = (CityBuilderEntity) serverPlayer.getWorld().getEntityById(entity.getId());
                         cityBuilderServer.stopFollowingPlayer();
                         // Teleport to the player first, should avoid getting stuck in ground
                         cityBuilderServer.refreshPositionAfterTeleport(serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ());

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/kingdom/ForemanScreen.java

@@ -19,7 +19,7 @@
 import io.wispforest.owo.ui.core.Surface;
 import io.wispforest.owo.ui.core.VerticalAlignment;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
@@ -109,8 +109,8 @@ protected void build(FlowLayout rootComponent) {
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        super.render(matrices, mouseX, mouseY, delta);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
         update();
     }
 

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/shop/DefaultShopScreen.java

@@ -20,8 +20,8 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.Color;
 import io.wispforest.owo.ui.core.Positioning;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -160,8 +160,8 @@ protected int getMaxPerSide() {
     protected void changePage(int newPage) {}
 
     @Override
-    public void render(MatrixStack stack, int mouseX, int mouseY, float delta) {
-        super.render(stack, mouseX, mouseY, delta);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
         coinsLabel.text(Text.translatable("menu.taleofkingdoms.shop.total_money", instance.getPlayer(player).getCoins()));
         if (this.selectedItem != null) {
             MutableText text = Text.translatable("menu.taleofkingdoms.shop.select_item_cost", this.selectedItem.getName(), this.selectedItem.getCost());

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/shop/widget/PageTurnWidget.java

@@ -3,12 +3,12 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.BookScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.sound.SoundManager;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 
@@ -24,10 +24,9 @@ public PageTurnWidget(boolean isNextPageButton, PressAction action, boolean play
     }
 
     @Override
-    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+    public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) {
         RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, BookScreen.BOOK_TEXTURE);
         int i = 0;
         int j = 192;
         if (this.isHovered()) {
@@ -38,7 +37,7 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del
             j += 13;
         }
 
-        this.drawTexture(matrices, this.getX(), this.getY(), i, j, 23, 13);
+        context.drawTexture(BookScreen.BOOK_TEXTURE, this.getX(), this.getY(), i, j, 23, 13);
     }
 
     @Override

src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/shop/widget/ShopButtonWidget.java

@@ -4,9 +4,9 @@
 import com.convallyria.taleofkingdoms.common.shop.ShopItem;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
@@ -34,11 +34,10 @@ public ShopItem getShopItem() {
     }
 
     @Override
-    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+    public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) {
         Identifier identifier = new Identifier(TaleOfKingdoms.MODID,"textures/gui/gui.png");
         RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, identifier);
         boolean flag = isMouseOver(mouseX, mouseY);
         int k;
         if (shopScreen.getSelectedItem().equals(shopItem)) {
@@ -47,15 +46,15 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del
             k = 1;
         }
 
-        drawTexture(matrices, this.x(), this.y(), 0, 46 + k * 20, width / 2, height);
-        drawTexture(matrices, this.x() + width / 2, this.y(), 200 - width / 2, 46 + k * 20, width / 2, height);
+        context.drawTexture(identifier, this.x(), this.y(), 0, 46 + k * 20, width / 2, height);
+        context.drawTexture(identifier, this.x() + width / 2, this.y(), 200 - width / 2, 46 + k * 20, width / 2, height);
         super.mouseDragged(mouseX, mouseY, 0, delta, delta); // Don't know what deltaX and deltaY are.
         if (!enabled) {
-            drawCenteredTextWithShadow(matrices, textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0xffffcc00);
+            context.drawCenteredTextWithShadow(textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0xffffcc00);
         } else if (!flag) {
-            drawCenteredTextWithShadow(matrices, textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0xffffff);
+            context.drawCenteredTextWithShadow(textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0xffffff);
         } else {
-            drawCenteredTextWithShadow(matrices, textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0x00cc00);
+            context.drawCenteredTextWithShadow(textRenderer, shopItem.getName(), (this.x() + width / 2) - 20, this.y() + (height - 8) / 2, 0x00cc00);
         }
     }
 }

src/main/java/com/convallyria/taleofkingdoms/client/gui/generic/ScreenContinueConquest.java

@@ -3,8 +3,8 @@
 import com.convallyria.taleofkingdoms.client.gui.ScreenTOK;
 import com.convallyria.taleofkingdoms.common.world.ConquestInstance;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 public class ScreenContinueConquest extends ScreenTOK {
@@ -30,14 +30,14 @@ public void init() {
     }
 
     @Override
-    public void render(MatrixStack stack, int par1, int par2, float par3) {
-        this.renderBackground(stack);
-        drawCenteredTextWithShadow(stack, this.textRenderer, MinecraftClient.getInstance().player.getName().getString()
+    public void render(DrawContext context, int par1, int par2, float par3) {
+        this.renderBackground(context);
+        context.drawCenteredTextWithShadow(this.textRenderer, MinecraftClient.getInstance().player.getName().getString()
                 + ", your conquest, "
                 + instance.getName() + ", has come far.", this.width / 2, this.height / 2 + 40, 0xFFFFFF);
-        drawCenteredTextWithShadow(stack, this.textRenderer, "Now you seek to venture further, and continue your journey.", this.width / 2, this.height / 2 + 50, 0xFFFFFF);
-        drawCenteredTextWithShadow(stack, this.textRenderer, "Safe travels, and go forth!", this.width / 2, this.height / 2 + 60, 0xFFFFFF);
-        super.render(stack, par1, par2, par3);
+        context.drawCenteredTextWithShadow(this.textRenderer, "Now you seek to venture further, and continue your journey.", this.width / 2, this.height / 2 + 50, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(this.textRenderer, "Safe travels, and go forth!", this.width / 2, this.height / 2 + 60, 0xFFFFFF);
+        super.render(context, par1, par2, par3);
     }
 
     @Override