Changelog.md

@@ -1,17 +1,5 @@
 # Upcoming changes
 
-# Version NeoForge-1.26.3
-
-Port to NeoForge 21.3.2-beta (MC 1.21.3).
-
-Note that MC 1.21.1 (NeoForge 21.1.72) will still be supported in a separate
-branch (neoforge\_mc1.21.1) until MC version 1.22 is released.
-
-# Version NeoForge-1.26.3-MC-1.21.1
-
-Tweak to "Ping" packet to not create client-local Battle instance if it does
-not exist.
-
 # Version Forge-1.26.2
 
 Show battling Entities next to their attack button in the BattleGUI.

README.md

@@ -74,7 +74,7 @@ configured for them.)
 
 Simply invoke `./gradlew build` in the mod directory and after some time the
 finished jar will be saved at
-`build/libs/TurnBasedMinecraft-NeoForge-1.26.3-MC-1.21.1-all.jar`
+`build/libs/TurnBasedMinecraft-NeoForge-1.26.2-all.jar`
 
 # Reproducibility
 

gradle.properties

@@ -37,7 +37,7 @@ mod_name=TurnBasedMinecraftMod
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.26.3-MC-1.21.1
+mod_version=1.26.2
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java

@@ -41,7 +41,7 @@ import org.apache.logging.log4j.Logger;
 public class TurnBasedMinecraftMod {
     public static final String MODID = "com_burnedkirby_turnbasedminecraft";
     public static final String NAME = "Turn Based Minecraft Mod";
-    public static final String VERSION = "1.26.3-MC-1.21.1";
+    public static final String VERSION = "1.26.2";
     public static final String CONFIG_FILENAME = "TBM_Config.toml";
     public static final String DEFAULT_CONFIG_FILENAME = "TBM_Config_DEFAULT.toml";
     public static final String CONFIG_DIRECTORY = "config/TurnBasedMinecraft/";

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java

@@ -31,12 +31,13 @@ public record PacketBattlePing(int battleID, int remainingSeconds) implements Cu
         @Override
         public void handle(final @NotNull PacketBattlePing pkt, IPayloadContext ctx) {
             ctx.enqueueWork(() -> {
-                if (TurnBasedMinecraftMod.proxy.getLocalBattle() != null) {
+                if (TurnBasedMinecraftMod.proxy.getLocalBattle() == null) {
-                    TurnBasedMinecraftMod.proxy.setBattleGuiAsGui();
+                    TurnBasedMinecraftMod.proxy.createLocalBattle(pkt.battleID);
-                    TurnBasedMinecraftMod.proxy.setBattleGuiBattleChanged();
-                    TurnBasedMinecraftMod.proxy.setBattleGuiTime(pkt.remainingSeconds);
-                    TurnBasedMinecraftMod.proxy.pauseMCMusic();
                 }
+                TurnBasedMinecraftMod.proxy.setBattleGuiAsGui();
+                TurnBasedMinecraftMod.proxy.setBattleGuiBattleChanged();
+                TurnBasedMinecraftMod.proxy.setBattleGuiTime(pkt.remainingSeconds);
+                TurnBasedMinecraftMod.proxy.pauseMCMusic();
             }).exceptionally(e -> {
                 ctx.disconnect(Component.literal("Exception handling PacketBattlePing! " + e.getMessage()));
                 return null;