Add config option to change default per-player build mode enabled state

LoveTropics · Oct 31, 2023 · 7903605 · 7903605
1 parent 991c8c4
commit 7903605
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/lovetropics/gamemodebuild/GBConfigs.java b/src/main/java/com/lovetropics/gamemodebuild/GBConfigs.java
@@ -22,7 +22,6 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-import net.minecraftforge.fml.config.ModConfig;
 
 @EventBusSubscriber (modid = GamemodeBuild.MODID, bus = Bus.MOD)
 public class GBConfigs {
@@ -58,6 +57,7 @@ public static class Server {
 
 		final BooleanValue enabled;
 		final BooleanValue removeBreakSpeedDebuff;
+		final BooleanValue playerDefaultEnabled;
 
 		final Map<String, ItemFilter> filters = new HashMap<>();;
 
@@ -77,6 +77,7 @@ public static class Server {
 
 			enabled = builder.comment("Enable SurvivalPlus for all players").define("enabled", true);
 			removeBreakSpeedDebuff = builder.comment("If true, players will break blocks in build mode as fast as if they were not flying").define("removeBreakSpeedDebuff", true);
+			playerDefaultEnabled = builder.comment("Enable for all players by default. If false, you will need to use /build enable @s to enable for a player.").define("playerDefaultEnabled", true);
 		}
 
 		void loadLists() {
@@ -182,6 +183,10 @@ public boolean enabled() {
 			return enabled.get();
 		}
 
+		public boolean playerDefaultEnabled() {
+			return playerDefaultEnabled.get();
+		}
+
 		public boolean removeBreakSpeedDebuff() {
 			return removeBreakSpeedDebuff.get();
 		}

diff --git a/src/main/java/com/lovetropics/gamemodebuild/state/GBPlayerStore.java b/src/main/java/com/lovetropics/gamemodebuild/state/GBPlayerStore.java
@@ -1,5 +1,6 @@
 package com.lovetropics.gamemodebuild.state;
 
+import com.lovetropics.gamemodebuild.GBConfigs;
 import com.lovetropics.gamemodebuild.GamemodeBuild;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -25,6 +26,9 @@ public static void setEnabled(Player player, boolean enabled) {
 
 	public static boolean isEnabled(Player player) {
 		CompoundTag survivalPlus = getOrCreatePersistent(player, GamemodeBuild.MODID);
+		if (!survivalPlus.contains(KEY_ENABLED)) {
+			return GBConfigs.SERVER.playerDefaultEnabled();
+		}
 		return !survivalPlus.contains(KEY_ENABLED) || survivalPlus.getBoolean(KEY_ENABLED);
 	}