Fix Wrong Version & Build Field Problems (#104)

* Fix Wrong Version Being Reported in Mod Container * Use Global Version, Get That instead of Using GetActiveContainer * Fix Another Edge Case where Build was not being applied
CleanroomMC · Mar 7, 2024 · 666c4c2 · 666c4c2
1 parent 9d177a4
commit 666c4c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java b/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java
@@ -6,6 +6,7 @@
 import betterquesting.api.utils.NBTConverter;
 import betterquesting.commands.QuestCommandBase;
 import betterquesting.core.BetterQuesting;
+import betterquesting.core.ModReference;
 import betterquesting.handlers.SaveLoadHandler;
 import betterquesting.legacy.ILegacyLoader;
 import betterquesting.legacy.LegacyLoaderRegistry;
@@ -77,6 +78,7 @@ public void runCommand(MinecraftServer server, CommandBase command, ICommandSend
  base.setTag("questDatabase", QuestDatabase.INSTANCE.writeToNBT(new NBTTagList(), null));
  base.setTag("questLines", QuestLineDatabase.INSTANCE.writeToNBT(new NBTTagList(), null));
  base.setString("format", BetterQuesting.FORMAT);
+ base.setString("build", ModReference.VERSION);
  JsonHelper.WriteToFile(qFile, NBTConverter.NBTtoJSON_Compound(base, new JsonObject(), true));
 
  if (args.length == 3 && !args[2].equalsIgnoreCase("DefaultQuests")) {

diff --git a/src/main/java/betterquesting/core/BetterQuesting.java b/src/main/java/betterquesting/core/BetterQuesting.java
@@ -47,7 +47,7 @@
 
 @Mod(modid = ModReference.MODID, version = BetterQuesting.VERSION, name = ModReference.NAME, guiFactory = "betterquesting.handlers.ConfigGuiFactory")
 public class BetterQuesting {
- public static final String VERSION = "@VERSION@";
+ public static final String VERSION = ModReference.VERSION;
  public static final String FORMAT = "2.0.0";
 
  // Used for some legacy compat

diff --git a/src/main/java/betterquesting/core/ModReference.java b/src/main/java/betterquesting/core/ModReference.java
@@ -5,4 +5,5 @@
 public class ModReference {
  public static final String MODID = Tags.ID;
  public static final String NAME = Tags.NAME;
+ public static final String VERSION = Tags.VERSION;
 }
diff --git a/src/main/java/betterquesting/handlers/SaveLoadHandler.java b/src/main/java/betterquesting/handlers/SaveLoadHandler.java
@@ -10,6 +10,7 @@
 import betterquesting.client.QuestNotification;
 import betterquesting.client.gui2.GuiHome;
 import betterquesting.core.BetterQuesting;
+import betterquesting.core.ModReference;
 import betterquesting.legacy.ILegacyLoader;
 import betterquesting.legacy.LegacyLoaderRegistry;
 import betterquesting.questing.QuestDatabase;
@@ -25,7 +26,6 @@
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.Loader;
 
 import java.io.File;
 import java.util.*;
@@ -197,7 +197,7 @@ private void loadConfig() {
 
  String formatVer = nbt.hasKey("format", 8) ? nbt.getString("format") : "0.0.0";
  String buildVer = nbt.getString("build");
- String currVer = Loader.instance().activeModContainer().getVersion();
+ String currVer = ModReference.VERSION;
 
  if (!currVer.equalsIgnoreCase(buildVer)) // RUN BACKUPS
  {
@@ -300,7 +300,7 @@ private Future<Void> saveConfig() {
  json.setTag("questLines", QuestLineDatabase.INSTANCE.writeToNBT(new NBTTagList(), null));
 
  json.setString("format", BetterQuesting.FORMAT);
- json.setString("build", Loader.instance().activeModContainer().getVersion());
+ json.setString("build", ModReference.VERSION);
 
  return JsonHelper.WriteToFile(fileDatabase, NBTConverter.NBTtoJSON_Compound(json, new JsonObject(), true));
  }