1.21.1 update

SamB440 · Aug 30, 2024 · 8a50ff0 · 8a50ff0
1 parent b828519
commit 8a50ff0
Show file tree

Hide file tree

Showing 183 changed files with 1,312 additions and 1,252 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,9 @@
 plugins {
     id 'groovy'
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_17
-java.targetCompatibility = JavaVersion.VERSION_17
-
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
@@ -121,7 +118,7 @@ tasks {
         duplicatesStrategy = DuplicatesStrategy.WARN
         from file('src/main/generated')
         from("LICENSE") {
-            rename { "${it}_${project.archivesBaseName}"}
+            rename { "${it}_${project.base.archivesName.get()}"}
         }
         dependsOn 'runDatagen'
     }
@@ -146,28 +143,33 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:all'
     options.deprecation = true
 
-    // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-    it.options.release = 17
+    it.options.release = 21
 }
 
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 // configure the maven publication
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        create("mavenJava", MavenPublication) {
+            artifactId = project.archives_base_name
             from components.java
         }
     }
 
-    // select the repositories you want to publish to
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
     }
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,12 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.11
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+loader_version=0.16.3
 
 # Fabric API
-fabric_version=0.97.1+1.20.4
+fabric_version=0.103.0+1.21.1
 
 # Mod Properties
 mod_version = 1.0.6
@@ -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 = 9.0.0
-cloth_version = 13.0.121
+modmenu_version = 11.0.2
+cloth_version = 15.0.130
 toml4j_version = 0.7.2
-owo_version = 0.12.5+1.20.3
+owo_version = 0.12.11+1.21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/src/client/java/com/convallyria/taleofkingdoms/client/TaleOfKingdomsClient.java b/src/client/java/com/convallyria/taleofkingdoms/client/TaleOfKingdomsClient.java
@@ -6,7 +6,7 @@
 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.listener.StartWorldListener;
 import com.convallyria.taleofkingdoms.client.packet.both.BothSignContractPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.incoming.IncomingInstanceSyncPacketHandler;
 import com.convallyria.taleofkingdoms.client.packet.incoming.IncomingOpenScreenPacketHandler;
@@ -20,7 +20,7 @@
 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.client.listener.StartWorldListener;
+import com.convallyria.taleofkingdoms.common.packet.PacketHandler;
 import com.convallyria.taleofkingdoms.common.world.ConquestInstance;
 import com.convallyria.taleofkingdoms.server.packet.outgoing.OutgoingOpenScreenPacketHandler;
 import net.fabricmc.api.ClientModInitializer;
@@ -96,11 +96,11 @@ private void registerPacketHandlers() {
         registerHandler(new IncomingInstanceSyncPacketHandler());
         registerHandler(new IncomingOpenScreenPacketHandler());
 
-        api.registerIntegratedHandler(new OutgoingOpenScreenPacketHandler());
+        api.registerPacketHandler(EnvType.SERVER, new OutgoingOpenScreenPacketHandler());
     }
 
-    protected void registerHandler(ClientPacketHandler clientPacketHandler) {
-        api.registerClientHandler(clientPacketHandler);
+    protected void registerHandler(PacketHandler<?> clientPacketHandler) {
+        api.registerPacketHandler(EnvType.CLIENT, clientPacketHandler);
     }
 
     private void registerEvents() {

diff --git a/src/client/java/com/convallyria/taleofkingdoms/client/TaleOfKingdomsClientAPI.java b/src/client/java/com/convallyria/taleofkingdoms/client/TaleOfKingdomsClientAPI.java
@@ -2,25 +2,16 @@
 
 import com.convallyria.taleofkingdoms.TaleOfKingdoms;
 import com.convallyria.taleofkingdoms.TaleOfKingdomsAPI;
-import com.convallyria.taleofkingdoms.client.packet.ClientPacketHandler;
-import com.convallyria.taleofkingdoms.common.packet.PacketHandler;
-import com.convallyria.taleofkingdoms.server.packet.ServerPacketHandler;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.Identifier;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 @Environment(EnvType.CLIENT)
 public class TaleOfKingdomsClientAPI extends TaleOfKingdomsAPI {
 
-    private final Map<Identifier, ClientPacketHandler> clientPacketHandlers = new ConcurrentHashMap<>();
-    private final Map<Identifier, ServerPacketHandler> integratedPacketHandlers = new ConcurrentHashMap<>();
-
     public TaleOfKingdomsClientAPI(TaleOfKingdoms mod) {
         super(mod);
     }
@@ -35,16 +26,6 @@ public void executeOnMain(Runnable runnable) {
         MinecraftClient.getInstance().execute(runnable);
     }
 
-    @Override
-    public PacketHandler getPacketHandler(Identifier packet) {
-        // Integrated takes precedence over client
-        final ServerPacketHandler possible = getIntegratedPacketHandler(packet);
-        if (possible == null) {
-            return getClientPacketHandler(packet);
-        }
-        return possible;
-    }
-
     public void executeOnServer(Runnable runnable) {
         MinecraftServer server = MinecraftClient.getInstance().getServer();
         if (server != null) {
@@ -53,21 +34,4 @@ public void executeOnServer(Runnable runnable) {
             TaleOfKingdoms.LOGGER.warn("Cannot execute task because MinecraftServer is null");
         }
     }
-
-    public ClientPacketHandler getClientPacketHandler(Identifier identifier) {
-        return clientPacketHandlers.get(identifier);
-    }
-
-    public ServerPacketHandler getIntegratedPacketHandler(Identifier identifier) {
-        return integratedPacketHandlers.get(identifier);
-    }
-
-    public void registerClientHandler(ClientPacketHandler clientPacketHandler) {
-        clientPacketHandlers.put(clientPacketHandler.getPacket(), clientPacketHandler);
-    }
-
-    // Ugh... Why are integrated servers so complex? Why can't we just unify dedicated servers to integrated ones so that everything runs as expected?
-    public void registerIntegratedHandler(ServerPacketHandler serverPacketHandler) {
-        integratedPacketHandlers.put(serverPacketHandler.getPacket(), serverPacketHandler);
-    }
 }
diff --git a/.../java/com/convallyria/taleofkingdoms/client/entity/render/ReficuleMageEntityRenderer.java b/.../java/com/convallyria/taleofkingdoms/client/entity/render/ReficuleMageEntityRenderer.java
@@ -18,7 +18,7 @@
 @Environment(EnvType.CLIENT)
 public class ReficuleMageEntityRenderer<T extends ReficuleMageEntity> extends MobEntityRenderer<T, PlayerEntityModel<T>> {
 
-    private static final Identifier TEXTURE = new Identifier(TaleOfKingdoms.MODID, "textures/entity/updated_textures/reficulemage.png");
+    private static final Identifier TEXTURE = Identifier.of(TaleOfKingdoms.MODID, "textures/entity/updated_textures/reficulemage.png");
 
     public ReficuleMageEntityRenderer(EntityRendererFactory.Context context, PlayerEntityModel<T> modelBipedIn) {
         super(context, modelBipedIn, 0.5f);

diff --git a/src/client/java/com/convallyria/taleofkingdoms/client/entity/render/RenderSetup.java b/src/client/java/com/convallyria/taleofkingdoms/client/entity/render/RenderSetup.java
@@ -75,6 +75,6 @@ private <T extends MobEntity & MultiSkinned> void  registerDefault(EntityType<T>
     }
 
     public static Identifier identifier(String path) {
-        return new Identifier(TaleOfKingdoms.MODID, path);
+        return Identifier.of(TaleOfKingdoms.MODID, path);
     }
 }
diff --git a/src/client/java/com/convallyria/taleofkingdoms/client/gui/entity/BankerScreen.java b/src/client/java/com/convallyria/taleofkingdoms/client/gui/entity/BankerScreen.java
@@ -2,6 +2,7 @@
 
 import com.convallyria.taleofkingdoms.TaleOfKingdoms;
 import com.convallyria.taleofkingdoms.client.TaleOfKingdomsClient;
+import com.convallyria.taleofkingdoms.common.packet.c2s.BankerInteractPacket;
 import com.convallyria.taleofkingdoms.common.translation.Translations;
 import com.convallyria.taleofkingdoms.common.entity.guild.BankerEntity;
 import com.convallyria.taleofkingdoms.common.entity.guild.banker.BankerMethod;
@@ -29,7 +30,7 @@ public class BankerScreen extends BaseUIModelScreen<FlowLayout> {
     private LabelComponent totalMoney, totalMoneyBank;
 
     public BankerScreen(PlayerEntity player, BankerEntity entity, ConquestInstance instance) {
-        super(FlowLayout.class, BaseUIModelScreen.DataSource.asset(new Identifier(TaleOfKingdoms.MODID, "banker_ui_model")));
+        super(FlowLayout.class, BaseUIModelScreen.DataSource.asset(Identifier.of(TaleOfKingdoms.MODID, "banker_ui_model")));
         this.player = player;
         this.entity = entity;
         this.instance = instance;
@@ -58,8 +59,8 @@ protected void build(FlowLayout rootComponent) {
                 if (guildPlayer.getCoins() >= coins) {
                     this.close();
                     if (MinecraftClient.getInstance().getServer() == null) {
-                        TaleOfKingdomsClient.getAPI().getClientPacketHandler(Packets.BANKER_INTERACT)
-                                .handleOutgoingPacket(player, BankerMethod.DEPOSIT, coins);
+                        TaleOfKingdomsClient.getAPI().getClientPacket(Packets.BANKER_INTERACT)
+                                .sendPacket(player, new BankerInteractPacket(BankerMethod.DEPOSIT, coins));
                         return;
                     }
                     guildPlayer.setCoins(guildPlayer.getCoins() - coins);
@@ -82,8 +83,8 @@ protected void build(FlowLayout rootComponent) {
                 if (guildPlayer.getBankerCoins() >= coins) {
                     this.close();
                     if (MinecraftClient.getInstance().getServer() == null) {
-                        TaleOfKingdomsClient.getAPI().getClientPacketHandler(Packets.BANKER_INTERACT)
-                                .handleOutgoingPacket(player, BankerMethod.WITHDRAW, coins);
+                        TaleOfKingdomsClient.getAPI().getClientPacket(Packets.BANKER_INTERACT)
+                                .sendPacket(player, new BankerInteractPacket(BankerMethod.WITHDRAW, coins));
                         return;
                     }
                     guildPlayer.setBankerCoins(guildPlayer.getBankerCoins() - coins);

diff --git a/src/client/java/com/convallyria/taleofkingdoms/client/gui/entity/GuildMasterScreen.java b/src/client/java/com/convallyria/taleofkingdoms/client/gui/entity/GuildMasterScreen.java
@@ -7,6 +7,9 @@
 import com.convallyria.taleofkingdoms.client.gui.ScreenTOK;
 import com.convallyria.taleofkingdoms.client.gui.generic.bar.BarColour;
 import com.convallyria.taleofkingdoms.client.gui.generic.bar.ScreenBar;
+import com.convallyria.taleofkingdoms.common.packet.both.SignContractPacket;
+import com.convallyria.taleofkingdoms.common.packet.c2s.FixGuildPacket;
+import com.convallyria.taleofkingdoms.common.packet.c2s.HireHunterPacket;
 import com.convallyria.taleofkingdoms.common.translation.Translations;
 import com.convallyria.taleofkingdoms.common.entity.EntityTypes;
 import com.convallyria.taleofkingdoms.common.entity.generic.HunterEntity;
@@ -78,8 +81,8 @@ public void init() {
                 if (!guildPlayer.getHunters().isEmpty()) {
                     Translations.HUNTER_THANK.send(player);
                     if (MinecraftClient.getInstance().getServer() == null) {
-                        TaleOfKingdomsClient.getAPI().getClientPacketHandler(Packets.HIRE_HUNTER)
-                                .handleOutgoingPacket(player, true);
+                        TaleOfKingdomsClient.getAPI().getClientPacket(Packets.HIRE_HUNTER)
+                                .sendPacket(player, new HireHunterPacket(true));
                         this.close();
                         return;
                     }
@@ -117,8 +120,8 @@ public void init() {
                 if (instance.isUnderAttack() || guildPlayer.getCoins() < 3000) return;
                 if (stack == null) return;
                 if (MinecraftClient.getInstance().getServer() == null) {
-                    ((TaleOfKingdomsClientAPI) api).getClientPacketHandler(Packets.FIX_GUILD)
-                            .handleOutgoingPacket(player);
+                    ((TaleOfKingdomsClientAPI) api).getClientPacket(Packets.FIX_GUILD)
+                            .sendPacket(player, new FixGuildPacket());
                     return;
                 }
 
@@ -182,8 +185,8 @@ private void makeContractSignButton() {
                 guildPlayer.setSignedContract(true);
                 Translations.GUILDMASTER_CONTRACT_SIGN.send(player);
             } else {
-                TaleOfKingdomsClient.getAPI().getClientPacketHandler(Packets.SIGN_CONTRACT)
-                        .handleOutgoingPacket(player, true);
+                TaleOfKingdomsClient.getAPI().getClientPacket(Packets.SIGN_CONTRACT)
+                        .sendPacket(player, new SignContractPacket(true));
             }
             widget.visible = false;
             widget.active = false;
@@ -203,8 +206,8 @@ private void makeCancelContractButton() {
                 guildPlayer.setSignedContract(false);
                 Translations.GUILDMASTER_CONTRACT_CANCEL_AWAIT.send(player);
             } else {
-                TaleOfKingdomsClient.getAPI().getClientPacketHandler(Packets.SIGN_CONTRACT)
-                        .handleOutgoingPacket(player, false);
+                TaleOfKingdomsClient.getAPI().getClientPacket(Packets.SIGN_CONTRACT)
+                        .sendPacket(player, new SignContractPacket(false));
             }
             widget.visible = false;
             widget.active = false;
@@ -213,7 +216,7 @@ private void makeCancelContractButton() {
     }
 
     private void makeHireHuntersButton() {
-        MutableText hunterText = Text.translatable("menu.taleofkingdoms.guild_master.hire_hunter", guildPlayer.getCoins() >= 1500 ? Formatting.GREEN : Formatting.RED);
+        MutableText hunterText = Text.translatable("menu.taleofkingdoms.guild_master.hire_hunter").formatted(guildPlayer.getCoins() >= 1500 ? Formatting.GREEN : Formatting.RED);
         if (this.hireHuntersButton != null) {
             this.hireHuntersButton.setMessage(hunterText);
             return;
@@ -224,8 +227,8 @@ private void makeHireHuntersButton() {
                 final TaleOfKingdomsAPI api = TaleOfKingdoms.getAPI();
                 Translations.SERVE.send(player);
                 if (MinecraftClient.getInstance().getServer() == null) {
-                    ((TaleOfKingdomsClientAPI) api).getClientPacketHandler(Packets.HIRE_HUNTER)
-                            .handleOutgoingPacket(player, false);
+                    api.getClientPacket(Packets.HIRE_HUNTER)
+                            .sendPacket(player, new HireHunterPacket(false));
                     return;
                 }