Move GeneralConfig to common

loader-common/src/main/java/org/cyclops/cyclopscore/GeneralConfig.java

@@ -0,0 +1,39 @@
+package org.cyclops.cyclopscore;
+
+import org.cyclops.cyclopscore.config.ConfigurablePropertyCommon;
+import org.cyclops.cyclopscore.config.ModConfigLocation;
+import org.cyclops.cyclopscore.config.extendedconfig.DummyConfigCommon;
+import org.cyclops.cyclopscore.helper.ModBaseCommon;
+
+import java.util.UUID;
+
+/**
+ * A config with general options for this mod.
+ * @author rubensworks
+ *
+ */
+public class GeneralConfig extends DummyConfigCommon<ModBaseCommon<?>> {
+
+    @ConfigurablePropertyCommon(category = "core", comment = "If an anonymous mod startup analytics request may be sent to our analytics service.")
+    public static boolean analytics = true;
+
+    @ConfigurablePropertyCommon(category = "core", comment = "The anonymous id used by the analytics service.")
+    public static String anonymousAnalyticsID = UUID.randomUUID().toString();
+
+    @ConfigurablePropertyCommon(category = "core", comment = "If the version checker should be enabled.")
+    public static boolean versionChecker = true;
+
+    @ConfigurablePropertyCommon(category = "general", comment = "When in a dev environment, if a button should be added to the main menu to open a dev world (shift-click creates a new world).", configLocation = ModConfigLocation.CLIENT)
+    public static boolean devWorldButton = true;
+
+    @ConfigurablePropertyCommon(category = "general", comment = "When in a dev environment, if music should be disabled at startup.", configLocation = ModConfigLocation.CLIENT)
+    public static boolean devDisableMusic = true;
+
+    /**
+     * Create a new instance.
+     */
+    public GeneralConfig(ModBaseCommon<?> mod) {
+        super(mod, "general");
+    }
+
+}

loader-fabric/src/main/java/org/cyclops/cyclopscore/CyclopsCoreMainFabric.java → loader-fabric/src/main/java/org/cyclops/cyclopscore/CyclopsCoreFabric.java

@@ -1,6 +1,7 @@
 package org.cyclops.cyclopscore;
 
 import net.fabricmc.api.ModInitializer;
+import org.cyclops.cyclopscore.config.ConfigHandler;
 import org.cyclops.cyclopscore.helper.CyclopsCoreInstance;
 import org.cyclops.cyclopscore.init.ModBaseFabric;
 import org.cyclops.cyclopscore.proxy.ClientProxyFabric;
@@ -12,14 +13,14 @@
  * The main mod class of CyclopsCore.
  * @author rubensworks
  */
-public class CyclopsCoreMainFabric extends ModBaseFabric<CyclopsCoreMainFabric> implements ModInitializer {
+public class CyclopsCoreFabric extends ModBaseFabric<CyclopsCoreFabric> implements ModInitializer {
 
     /**
      * The unique instance of this mod.
      */
-    public static CyclopsCoreMainFabric _instance;
+    public static CyclopsCoreFabric _instance;
 
-    public CyclopsCoreMainFabric() {
+    public CyclopsCoreFabric() {
         super(Reference.MOD_ID, (instance) -> {
             _instance = instance;
             CyclopsCoreInstance.MOD = instance;
@@ -35,4 +36,11 @@ protected IClientProxyCommon constructClientProxy() {
     protected ICommonProxyCommon constructCommonProxy() {
         return new CommonProxyFabric();
     }
+
+    @Override
+    protected void onConfigsRegister(ConfigHandler configHandler) {
+        super.onConfigsRegister(configHandler);
+
+        configHandler.addConfigurable(new GeneralConfig(this));
+    }
 }

loader-fabric/src/main/java/org/cyclops/cyclopscore/client/gui/GuiMainMenuExtensionDevWorldFabricRegistrar.java

@@ -4,16 +4,21 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.sounds.SoundSource;
-import org.cyclops.cyclopscore.CyclopsCoreMainFabric;
+import org.cyclops.cyclopscore.GeneralConfig;
+import org.cyclops.cyclopscore.helper.IModHelpers;
 
 /**
  * @author rubensworks
  */
 public class GuiMainMenuExtensionDevWorldFabricRegistrar {
     public static void afterInit(Minecraft minecraft, Screen screen, int scaledWidth, int scaledHeight) {
         // Add a button to the main menu and disable music if we're in a dev environment
-        if (CyclopsCoreMainFabric._instance.getModHelpers().getMinecraftHelpers().isDevEnvironment()) {
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devWorldButton) {
             GuiMainMenuExtensionDevWorld.onMainMenuInit(minecraft, screen);
+        }
+
+        // And disable music
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devDisableMusic) {
             if (screen instanceof TitleScreen) {
                 Minecraft.getInstance().options.getSoundSourceOptionInstance(SoundSource.MUSIC).set(0.0);
             }

loader-fabric/src/main/java/org/cyclops/cyclopscore/helper/MinecraftHelpersFabric.java

@@ -4,7 +4,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.impl.FabricLoaderImpl;
 import net.minecraft.client.Minecraft;
-import org.cyclops.cyclopscore.CyclopsCoreMainFabric;
+import org.cyclops.cyclopscore.CyclopsCoreFabric;
 import org.cyclops.cyclopscore.Reference;
 
 /**
@@ -20,7 +20,7 @@ public boolean isDevEnvironment() {
 
     @Override
     public boolean isMinecraftInitialized() {
-        return CyclopsCoreMainFabric._instance.isLoaded();
+        return CyclopsCoreFabric._instance.isLoaded();
     }
 
     @Override

loader-fabric/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProviderFabric.java

@@ -4,7 +4,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import org.cyclops.cyclopscore.CyclopsCoreMainFabric;
+import org.cyclops.cyclopscore.CyclopsCoreFabric;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@
 public class ItemInformationProviderFabric extends ItemInformationProviderCommon {
     public static void onTooltip(ItemStack itemStack, Item.TooltipContext tooltipContext, TooltipFlag tooltipFlag, List<Component> lines) {
         if (ITEMS_INFO.contains(itemStack.getItem())) {
-            CyclopsCoreMainFabric._instance.getModHelpers().getL10NHelpers().addOptionalInfo(lines, itemStack.getDescriptionId());
+            CyclopsCoreFabric._instance.getModHelpers().getL10NHelpers().addOptionalInfo(lines, itemStack.getDescriptionId());
         }
     }
 }

loader-fabric/src/main/java/org/cyclops/cyclopscore/proxy/ClientProxyFabric.java

@@ -2,7 +2,7 @@
 
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
-import org.cyclops.cyclopscore.CyclopsCoreMainFabric;
+import org.cyclops.cyclopscore.CyclopsCoreFabric;
 import org.cyclops.cyclopscore.client.gui.GuiMainMenuExtensionDevWorldFabricRegistrar;
 import org.cyclops.cyclopscore.init.ModBaseFabric;
 import org.cyclops.cyclopscore.item.ItemInformationProviderFabric;
@@ -21,7 +21,7 @@ public ClientProxyFabric() {
 
     @Override
     public ModBaseFabric<?> getMod() {
-        return CyclopsCoreMainFabric._instance;
+        return CyclopsCoreFabric._instance;
     }
 
     @Override

loader-fabric/src/main/java/org/cyclops/cyclopscore/proxy/CommonProxyFabric.java

@@ -1,6 +1,6 @@
 package org.cyclops.cyclopscore.proxy;
 
-import org.cyclops.cyclopscore.CyclopsCoreMainFabric;
+import org.cyclops.cyclopscore.CyclopsCoreFabric;
 import org.cyclops.cyclopscore.init.ModBaseFabric;
 
 /**
@@ -12,7 +12,7 @@ public class CommonProxyFabric extends CommonProxyComponentFabric {
 
     @Override
     public ModBaseFabric<?> getMod() {
-        return CyclopsCoreMainFabric._instance;
+        return CyclopsCoreFabric._instance;
     }
 
 }

loader-fabric/src/main/resources/fabric.mod.json

@@ -19,7 +19,7 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "org.cyclops.cyclopscore.CyclopsCoreMainFabric"
+      "org.cyclops.cyclopscore.CyclopsCoreFabric"
     ],
     "client": [
       "org.cyclops.cyclopscore.CyclopsCoreClientFabric"

loader-forge/src/main/java/org/cyclops/cyclopscore/CyclopsCoreForge.java

@@ -1,6 +1,7 @@
 package org.cyclops.cyclopscore;
 
 import net.minecraftforge.fml.common.Mod;
+import org.cyclops.cyclopscore.config.ConfigHandler;
 import org.cyclops.cyclopscore.helper.CyclopsCoreInstance;
 import org.cyclops.cyclopscore.init.ModBaseForge;
 import org.cyclops.cyclopscore.proxy.ClientProxyForge;
@@ -37,4 +38,11 @@ protected IClientProxyCommon constructClientProxy() {
     protected ICommonProxyCommon constructCommonProxy() {
         return new CommonProxyForge();
     }
+
+    @Override
+    protected void onConfigsRegister(ConfigHandler configHandler) {
+        super.onConfigsRegister(configHandler);
+
+        configHandler.addConfigurable(new GeneralConfig(this));
+    }
 }

loader-forge/src/main/java/org/cyclops/cyclopscore/client/gui/GuiMainMenuExtensionDevWorldForgeRegistrar.java

@@ -7,16 +7,21 @@
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import org.cyclops.cyclopscore.CyclopsCoreForge;
+import org.cyclops.cyclopscore.GeneralConfig;
+import org.cyclops.cyclopscore.helper.IModHelpers;
 
 @Mod.EventBusSubscriber(Dist.CLIENT)
 public class GuiMainMenuExtensionDevWorldForgeRegistrar {
 
     @SubscribeEvent
     public static void onMainMenuInit(ScreenEvent.Init.Pre event) {
         // Add a button to the main menu and disable music if we're in a dev environment
-        if (CyclopsCoreForge._instance.getModHelpers().getMinecraftHelpers().isDevEnvironment()) {
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devWorldButton) {
             GuiMainMenuExtensionDevWorld.onMainMenuInit(event.getScreen().getMinecraft(), event.getScreen());
+        }
+
+        // And disable music
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devDisableMusic) {
             if (event.getScreen() instanceof TitleScreen) {
                 Minecraft.getInstance().options.getSoundSourceOptionInstance(SoundSource.MUSIC).set(0.0);
             }

loader-neoforge/src/main/java/org/cyclops/cyclopscore/CyclopsCore.java

@@ -149,7 +149,9 @@ protected boolean hasDefaultCreativeModeTab() {
 
     @Override
     public void onConfigsRegister(ConfigHandler configHandler) {
-        configHandler.addConfigurable(new GeneralConfig());
+        super.onConfigsRegister(configHandler);
+
+        configHandler.addConfigurable(new GeneralConfig(this));
 
         // Capabilities
         configHandler.addConfigurable(new FluidHandlerItemCapacityConfig());

loader-neoforge/src/main/java/org/cyclops/cyclopscore/GeneralConfigNeoForge.java

@@ -0,0 +1,24 @@
+package org.cyclops.cyclopscore;
+
+import org.cyclops.cyclopscore.init.ModBase;
+import org.cyclops.cyclopscore.tracking.Analytics;
+import org.cyclops.cyclopscore.tracking.Versions;
+
+/**
+ * @author rubensworks
+ */
+public class GeneralConfigNeoForge extends GeneralConfig {
+    public GeneralConfigNeoForge() {
+        super(CyclopsCore._instance);
+    }
+
+    @Override
+    public void onRegistered() {
+        if(analytics) {
+            Analytics.registerMod((ModBase) getMod(), Reference.GA_TRACKING_ID);
+        }
+        if(versionChecker) {
+            Versions.registerMod((ModBase) getMod(), CyclopsCore._instance, "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + getMod().getModHelpers().getMinecraftHelpers().getMinecraftVersionMajorMinor() + "/CyclopsCore.txt");
+        }
+    }
+}

loader-neoforge/src/main/java/org/cyclops/cyclopscore/client/gui/GuiMainMenuExtensionDevWorldNeoForgeRegistrar.java

@@ -8,19 +8,20 @@
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.ScreenEvent;
 import org.cyclops.cyclopscore.GeneralConfig;
+import org.cyclops.cyclopscore.helper.IModHelpers;
 
 @EventBusSubscriber(Dist.CLIENT)
 public class GuiMainMenuExtensionDevWorldNeoForgeRegistrar {
 
     @SubscribeEvent
     public static void onMainMenuInit(ScreenEvent.Init.Pre event) {
         // Add a button to the main menu if we're in a dev environment
-        if (GeneralConfig.devWorldButton) {
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devWorldButton) {
             GuiMainMenuExtensionDevWorld.onMainMenuInit(event.getScreen().getMinecraft(), event.getScreen());
         }
 
         // And disable music
-        if (GeneralConfig.devDisableMusic) {
+        if (IModHelpers.get().getMinecraftHelpers().isDevEnvironment() && GeneralConfig.devDisableMusic) {
             if (event.getScreen() instanceof TitleScreen) {
                 Minecraft.getInstance().options.getSoundSourceOptionInstance(SoundSource.MUSIC).set(0.0);
             }