Add a dev mode only config option to suppress the alpha warning

mekanism · Jul 12, 2024 · cba0bec · cba0bec
1 parent b163ad5
commit cba0bec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java
@@ -5,6 +5,7 @@
 import mekanism.common.block.BlockBounding;
 import mekanism.common.block.BlockCardboardBox;
 import mekanism.common.block.BlockMekanism;
+import mekanism.common.config.MekanismConfig;
 import mekanism.common.lib.radiation.RadiationManager;
 import mekanism.common.network.to_client.player_data.PacketPlayerData;
 import mekanism.common.network.to_client.player_data.PacketResetPlayerClient;
@@ -43,7 +44,9 @@ public CommonPlayerTracker() {
     public void onPlayerLoginEvent(PlayerLoggedInEvent event) {
         Player player = event.getEntity();
         if (!player.level().isClientSide) {
-            player.sendSystemMessage(ALPHA_WARNING);
+            if (MekanismConfig.general.enableAlphaWarning.getAsBoolean()) {
+                player.sendSystemMessage(ALPHA_WARNING);
+            }
             MekanismCriteriaTriggers.LOGGED_IN.value().trigger((ServerPlayer) player);
         }
     }

diff --git a/src/main/java/mekanism/common/config/GeneralConfig.java b/src/main/java/mekanism/common/config/GeneralConfig.java
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.BooleanSupplier;
+import mekanism.api.functions.ConstantPredicates;
 import mekanism.api.math.FloatingLong;
 import mekanism.common.config.value.CachedBooleanValue;
 import mekanism.common.config.value.CachedConfigValue;
@@ -19,6 +21,7 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.fml.config.ModConfig.Type;
+import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.common.ModConfigSpec;
 import net.neoforged.neoforge.fluids.FluidType;
 
@@ -43,6 +46,8 @@ public class GeneralConfig extends BaseMekanismConfig {
 
     private final ModConfigSpec configSpec;
 
+    public final BooleanSupplier enableAlphaWarning;
+
     public final CachedBooleanValue logPackets;
     public final CachedBooleanValue allowChunkloading;
     public final CachedBooleanValue easyMinerFilters;
@@ -135,6 +140,14 @@ public class GeneralConfig extends BaseMekanismConfig {
         ModConfigSpec.Builder builder = new ModConfigSpec.Builder();
         builder.comment("General Config. This config is synced from server to client.").push("general");
 
+        //Note: We only enable this config option in dev mode
+        if (FMLEnvironment.production) {
+            enableAlphaWarning = ConstantPredicates.ALWAYS_TRUE;
+        } else {
+            enableAlphaWarning = CachedBooleanValue.wrap(this, builder.comment("Display Mekanism's alpha warning when joining the game if Mekanism is currently in alpha. Dev mode only setting.")
+                  .define("alphaWarning", true));
+        }
+
         logPackets = CachedBooleanValue.wrap(this, builder.comment("Log Mekanism packet names. Debug setting.")
               .define("logPackets", false));
         allowChunkloading = CachedBooleanValue.wrap(this, builder.comment("Disable to make the anchor upgrade not do anything.")