Changelog.md

@@ -1,41 +1,5 @@
 # Upcoming changes
 
-# Version Forge-1.26.5
-
-Update TBM\_Config.toml to have haste\_speed and slow\_speed for all mob
-entries.
-
-Update Config to merge in new changes. This means that the existing config will
-be overwritten much less frequently (if ever).
-
-Update to Forge 52.0.26 (MC 1.21.1).
-
-# Version NeoForge-1.26.5-MC-1.21.1
-
-Update TBM\_Config.toml to have haste\_speed and slow\_speed for all mob
-entries.
-
-Update ClientConfigGui to quit to mod-menu screen in NeoForge (before, it quit
-to the main screen or current game).
-
-Update Config to merge in new changes. This means that the existing config will
-be overwritten much less frequently (if ever).
-
-Update to NeoForge 21.1.74 (MC 1.21.1).
-
-# Version NeoForge-1.26.5
-
-Update TBM\_Config.toml to have haste\_speed and slow\_speed for all mob
-entries.
-
-Update ClientConfigGui to quit to mod-menu screen in NeoForge (before, it quit
-to the main screen or current game).
-
-Update Config to merge in new changes. This means that the existing config will
-be overwritten much less frequently (if ever).
-
-Update to NeoForge 21.3.11-beta (MC 1.21.3).
-
 # Version Forge-1.26.4
 
 [Add support for "per-player-stats" in Turn-Based-Battle.](https://stephen-seo.github.io/TurnBasedMinecraftMod/server_config/#per-player-settings)

README.md

@@ -78,7 +78,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.5-MC-1.21.1-all.jar`
+`build/libs/TurnBasedMinecraft-NeoForge-1.26.4-MC-1.21.1-all.jar`
 
 # Reproducibility
 

gradle.properties

@@ -21,7 +21,7 @@ minecraft_version=1.21.1
 minecraft_version_range=[1.21.1, 1.22)
 
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.1.74
+neo_version=21.1.73
 # The Neo version range can use any version of Neo as bounds
 neo_version_range=[21.1.0,)
 # The loader version range can only use the major version of FML as bounds
@@ -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.5-MC-1.21.1
+mod_version=1.26.4-MC-1.21.1
 # 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/client/ClientConfigGui.java

@@ -20,7 +20,6 @@ public class ClientConfigGui extends net.minecraft.client.gui.screens.Screen {
     private Checkbox affectedByMasterVolCheckbox = null;
     private Checkbox affectedByMusicVolCheckbox = null;
     private SliderPercentage volumeSlider = null;
-    private Screen parentScreen = null;
 
     public ClientConfigGui(ModContainer container, Screen parent) {
         super(Component.literal("TurnBasedMC Client Config"));
@@ -28,8 +27,6 @@ public class ClientConfigGui extends net.minecraft.client.gui.screens.Screen {
         dirtyFlag = true;
 
         accepted = false;
-
-        this.parentScreen = parent;
     }
 
     public void onDirty() {
@@ -178,7 +175,7 @@ public class ClientConfigGui extends net.minecraft.client.gui.screens.Screen {
         addRenderableWidget(volumeSlider);
 
         addRenderableWidget(Button.builder(Component.literal("Cancel"),
-                        (b) -> Minecraft.getInstance().setScreen(this.parentScreen))
+                        (b) -> Minecraft.getInstance().setScreen(null))
                 .bounds(this.width / 2 - widget_width + widget_x_offset,
                         this.height - widget_height, widget_width, widget_height).build());
         addRenderableWidget(Button.builder(Component.literal("Accept"), (b) -> {
@@ -228,7 +225,7 @@ public class ClientConfigGui extends net.minecraft.client.gui.screens.Screen {
     public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
         if (accepted) {
             doAccepted();
-            Minecraft.getInstance().setScreen(this.parentScreen);
+            Minecraft.getInstance().setScreen(null);
             return;
         }
         if (dirtyFlag) {

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.5-MC-1.21.1";
+    public static final String VERSION = "1.26.4-MC-1.21.1";
     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/";