use ConfigHandler to work with server-side config

GTNewHorizons · Jan 12, 2024 · c6b42ef · c6b42ef
1 parent b8f148b
commit c6b42ef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/betterquesting/api/storage/BQ_Settings.java b/src/main/java/betterquesting/api/storage/BQ_Settings.java
@@ -38,4 +38,6 @@ public class BQ_Settings
 	public static boolean alwaysDrawImplicit = false;
 	public static boolean urlDebug = false;
 	public static boolean loadDefaultsOnStartup = true;
+
+	public static boolean unrestrictAdminCommands = false;
 }
diff --git a/src/main/java/betterquesting/commands/BQ_CommandAdmin.java b/src/main/java/betterquesting/commands/BQ_CommandAdmin.java
@@ -11,12 +11,13 @@
 import betterquesting.commands.admin.QuestCommandPurge;
 import betterquesting.commands.admin.QuestCommandReportAllProgress;
 import betterquesting.commands.admin.QuestCommandReset;
-import drethic.questbook.config.QBConfig;
 
+import betterquesting.handlers.ConfigHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.command.WrongUsageException;
+import net.minecraftforge.common.config.Configuration;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -109,7 +110,7 @@ public int getRequiredPermissionLevel()
 	@Override
 	public boolean canCommandSenderUseCommand(ICommandSender sender)
 	{
-		if(QBConfig.unrestrictAdminCommands) return true;
+		if(ConfigHandler.config.get(Configuration.CATEGORY_GENERAL,"Unrestrict Admin Commands", false).getBoolean(false)) return true;
 		else return super.canCommandSenderUseCommand(sender);
 	}
 

diff --git a/src/main/java/betterquesting/handlers/ConfigHandler.java b/src/main/java/betterquesting/handlers/ConfigHandler.java
@@ -47,6 +47,7 @@ public static void initConfigs()
 		BQ_Settings.alwaysDrawImplicit = config.getBoolean("Always draw implicit dependency", Configuration.CATEGORY_GENERAL, false, "If true, always draw implicit dependency. This property can be changed by the GUI");
 		BQ_Settings.urlDebug = config.getBoolean("Highlight detected clickable url hotzone.", Configuration.CATEGORY_GENERAL, false, "If true, render each hotzone using alternating color.");
 		BQ_Settings.loadDefaultsOnStartup = config.getBoolean("Load the default quest DB on world startup.", Configuration.CATEGORY_GENERAL, true, "Does an equivalent of '/bq_admin default load' on every world load");
+		BQ_Settings.unrestrictAdminCommands = config.getBoolean("Unrestrict Admin Commands", Configuration.CATEGORY_GENERAL, false, "If true, all users can use /bq_admin commands regardless of op-status. Useful for single-player without cheats.");
 
 		config.save();
 	}

diff --git a/src/main/java/drethic/questbook/config/QBConfig.java b/src/main/java/drethic/questbook/config/QBConfig.java
@@ -14,7 +14,6 @@ public class QBConfig {
     public static boolean spawnWithBook;
     public static boolean disablePartyNotifications;
     public static boolean disableQuestNotifications;
-    public static boolean unrestrictAdminCommands;
 
     public static final void init(FMLPreInitializationEvent e) {
         QBLogger.logger.info("Loading config file.");
@@ -30,8 +29,6 @@ public static final void init(FMLPreInitializationEvent e) {
                 "[NYI]Disable party notifications.  Default: false");
         disableQuestNotifications = configBoolOption(Configuration.CATEGORY_GENERAL, "disableQuestNotifications", false,
                 "[NYI]Disable quest notifications.  Default: false");
-        unrestrictAdminCommands = configBoolOption(Configuration.CATEGORY_GENERAL, "unrestrictAdminCommands", false,
-                "Enable this option to let non-op players use /bq_admin commands. Useful for single-player without cheats enabled.  Default: false");
         qbconfig.save();
     }