diff --git a/loader-common/src/main/java/org/cyclops/flopper/GeneralConfig.java b/loader-common/src/main/java/org/cyclops/flopper/GeneralConfig.java new file mode 100644 index 0000000..26168e8 --- /dev/null +++ b/loader-common/src/main/java/org/cyclops/flopper/GeneralConfig.java @@ -0,0 +1,24 @@ +package org.cyclops.flopper; + +import org.cyclops.cyclopscore.config.ConfigurablePropertyCommon; +import org.cyclops.cyclopscore.config.extendedconfig.DummyConfigCommon; +import org.cyclops.cyclopscore.helper.ModBaseCommon; + +/** + * A config with general options for this mod. + * @author rubensworks + * + */ +public class GeneralConfig extends DummyConfigCommon> { + + @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 = "If the version checker should be enabled.") + public static boolean versionChecker = true; + + public GeneralConfig(ModBaseCommon mod) { + super(mod, "general"); + } + +} diff --git a/loader-fabric/src/main/java/org/cyclops/flopper/FlopperFabric.java b/loader-fabric/src/main/java/org/cyclops/flopper/FlopperFabric.java index 43317ef..5b49a7f 100644 --- a/loader-fabric/src/main/java/org/cyclops/flopper/FlopperFabric.java +++ b/loader-fabric/src/main/java/org/cyclops/flopper/FlopperFabric.java @@ -52,6 +52,8 @@ protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTa protected void onConfigsRegister(ConfigHandler configHandler) { super.onConfigsRegister(configHandler); + configHandler.addConfigurable(new GeneralConfig(this)); + configHandler.addConfigurable(new BlockFlopperConfigFabric()); configHandler.addConfigurable(new BlockEntityFlopperConfigFabric()); } diff --git a/loader-forge/src/main/java/org/cyclops/flopper/FlopperForge.java b/loader-forge/src/main/java/org/cyclops/flopper/FlopperForge.java index fe17134..bdeb488 100644 --- a/loader-forge/src/main/java/org/cyclops/flopper/FlopperForge.java +++ b/loader-forge/src/main/java/org/cyclops/flopper/FlopperForge.java @@ -54,6 +54,8 @@ protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTa protected void onConfigsRegister(ConfigHandler configHandler) { super.onConfigsRegister(configHandler); + configHandler.addConfigurable(new GeneralConfig(this)); + configHandler.addConfigurable(new BlockFlopperConfigForge()); configHandler.addConfigurable(new BlockEntityFlopperConfigForge()); } diff --git a/loader-neoforge/src/main/java/org/cyclops/flopper/FlopperNeoForge.java b/loader-neoforge/src/main/java/org/cyclops/flopper/FlopperNeoForge.java index 21b50cb..8d57f81 100644 --- a/loader-neoforge/src/main/java/org/cyclops/flopper/FlopperNeoForge.java +++ b/loader-neoforge/src/main/java/org/cyclops/flopper/FlopperNeoForge.java @@ -56,7 +56,7 @@ protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTa protected void onConfigsRegister(ConfigHandler configHandler) { super.onConfigsRegister(configHandler); - configHandler.addConfigurable(new GeneralConfig()); + configHandler.addConfigurable(new GeneralConfigNeoForge()); configHandler.addConfigurable(new BlockFlopperConfigNeoForge()); configHandler.addConfigurable(new BlockEntityFlopperConfigNeoForge()); diff --git a/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfig.java b/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfig.java deleted file mode 100644 index a3875bc..0000000 --- a/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.cyclops.flopper; - -import org.cyclops.cyclopscore.config.ConfigurableProperty; -import org.cyclops.cyclopscore.config.extendedconfig.DummyConfig; -import org.cyclops.cyclopscore.init.ModBase; -import org.cyclops.cyclopscore.tracking.Analytics; -import org.cyclops.cyclopscore.tracking.Versions; - -/** - * A config with general options for this mod. - * @author rubensworks - * - */ -public class GeneralConfig extends DummyConfig { - - @ConfigurableProperty(category = "core", comment = "Set 'true' to enable development debug mode. This will result in a lower performance!", requiresMcRestart = true) - public static boolean debug = false; - - @ConfigurableProperty(category = "core", comment = "If the recipe loader should crash when finding invalid recipes.", requiresMcRestart = true) - public static boolean crashOnInvalidRecipe = false; - - @ConfigurableProperty(category = "core", comment = "If mod compatibility loader should crash hard if errors occur in that process.", requiresMcRestart = true) - public static boolean crashOnModCompatCrash = false; - - @ConfigurableProperty(category = "core", comment = "If an anonymous mod startup analytics request may be sent to our analytics service.") - public static boolean analytics = true; - - @ConfigurableProperty(category = "core", comment = "If the version checker should be enabled.") - public static boolean versionChecker = true; - - public GeneralConfig() { - super(FlopperNeoForge._instance, "general"); - } - - @Override - public void onRegistered() { - getMod().putGenericReference(ModBase.REFKEY_CRASH_ON_INVALID_RECIPE, GeneralConfig.crashOnInvalidRecipe); - getMod().putGenericReference(ModBase.REFKEY_CRASH_ON_MODCOMPAT_CRASH, GeneralConfig.crashOnModCompatCrash); - - if(analytics) { - Analytics.registerMod(getMod(), Reference.GA_TRACKING_ID); - } - if(versionChecker) { - Versions.registerMod(getMod(), FlopperNeoForge._instance, "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + getMod().getModHelpers().getMinecraftHelpers().getMinecraftVersionMajorMinor() + "/Flopper.txt"); - } - } - -} diff --git a/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfigNeoForge.java b/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfigNeoForge.java new file mode 100644 index 0000000..54eca33 --- /dev/null +++ b/loader-neoforge/src/main/java/org/cyclops/flopper/GeneralConfigNeoForge.java @@ -0,0 +1,24 @@ +package org.cyclops.flopper; + +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(FlopperNeoForge._instance); + } + + @Override + public void onRegistered() { + if(analytics) { + Analytics.registerMod((ModBase) getMod(), Reference.GA_TRACKING_ID); + } + if(versionChecker) { + Versions.registerMod((ModBase) getMod(), FlopperNeoForge._instance, "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + getMod().getModHelpers().getMinecraftHelpers().getMinecraftVersionMajorMinor() + "/Flopper.txt"); + } + } +}