From 19036ae0bc90e56ec4098f240aa5f8b7d3cafd21 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 19 Jul 2025 19:17:21 +0200 Subject: [PATCH] Move FeatureFlags to new config module --- .../config/featureflags}/FeatureFlag.java | 14 +++++++------- .../config/featureflags}/FeatureFlagConfig.java | 2 +- .../fancydialogs/config/FDFeatureFlags.java | 4 ++-- .../de/oliver/fancyholograms/FHFeatureFlags.java | 4 ++-- .../fancyholograms/config/FHFeatureFlags.java | 4 ++-- .../main/java/de/oliver/fancynpcs/FancyNpcs.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) rename libraries/config/src/main/java/{de/oliver/fancylib/featureFlags => com/fancyinnovations/config/featureflags}/FeatureFlag.java (89%) rename libraries/config/src/main/java/{de/oliver/fancylib/featureFlags => com/fancyinnovations/config/featureflags}/FeatureFlagConfig.java (97%) diff --git a/libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlag.java b/libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlag.java similarity index 89% rename from libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlag.java rename to libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlag.java index 6c80b119..b24152fd 100644 --- a/libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlag.java +++ b/libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlag.java @@ -1,11 +1,11 @@ -package de.oliver.fancylib.featureFlags; +package com.fancyinnovations.config.featureflags; public class FeatureFlag { private final String name; private final String description; - private boolean enabled; private final boolean forceDisabled; + private boolean enabled; public FeatureFlag(String name, String description, boolean forceDisabled) { this.name = name; @@ -15,11 +15,15 @@ public class FeatureFlag { } public boolean isEnabled() { - if(forceDisabled) return false; + if (forceDisabled) return false; return enabled; } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public String getName() { return name; } @@ -28,10 +32,6 @@ public class FeatureFlag { return description; } - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - public boolean isForceDisabled() { return forceDisabled; } diff --git a/libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlagConfig.java b/libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlagConfig.java similarity index 97% rename from libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlagConfig.java rename to libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlagConfig.java index e178b097..6bf58eae 100644 --- a/libraries/config/src/main/java/de/oliver/fancylib/featureFlags/FeatureFlagConfig.java +++ b/libraries/config/src/main/java/com/fancyinnovations/config/featureflags/FeatureFlagConfig.java @@ -1,4 +1,4 @@ -package de.oliver.fancylib.featureFlags; +package com.fancyinnovations.config.featureflags; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/config/FDFeatureFlags.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/config/FDFeatureFlags.java index 22609b6c..2345fd40 100644 --- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/config/FDFeatureFlags.java +++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/config/FDFeatureFlags.java @@ -1,8 +1,8 @@ package com.fancyinnovations.fancydialogs.config; +import com.fancyinnovations.config.featureflags.FeatureFlag; +import com.fancyinnovations.config.featureflags.FeatureFlagConfig; import com.fancyinnovations.fancydialogs.FancyDialogsPlugin; -import de.oliver.fancylib.featureFlags.FeatureFlag; -import de.oliver.fancylib.featureFlags.FeatureFlagConfig; public class FDFeatureFlags { diff --git a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FHFeatureFlags.java b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FHFeatureFlags.java index e5b4a05b..12309f6d 100644 --- a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FHFeatureFlags.java +++ b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/FHFeatureFlags.java @@ -1,7 +1,7 @@ package de.oliver.fancyholograms; -import de.oliver.fancylib.featureFlags.FeatureFlag; -import de.oliver.fancylib.featureFlags.FeatureFlagConfig; +import com.fancyinnovations.config.featureflags.FeatureFlag; +import com.fancyinnovations.config.featureflags.FeatureFlagConfig; public class FHFeatureFlags { diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java index f3fdd363..059bd186 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java @@ -1,8 +1,8 @@ package de.oliver.fancyholograms.config; +import com.fancyinnovations.config.featureflags.FeatureFlag; +import com.fancyinnovations.config.featureflags.FeatureFlagConfig; import de.oliver.fancyholograms.main.FancyHologramsPlugin; -import de.oliver.fancylib.featureFlags.FeatureFlag; -import de.oliver.fancylib.featureFlags.FeatureFlagConfig; public class FHFeatureFlags { diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java index 6a6c109f..2e209312 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -1,5 +1,7 @@ package de.oliver.fancynpcs; +import com.fancyinnovations.config.featureflags.FeatureFlag; +import com.fancyinnovations.config.featureflags.FeatureFlagConfig; import com.google.common.util.concurrent.ThreadFactoryBuilder; import de.oliver.fancyanalytics.api.FancyAnalyticsAPI; import de.oliver.fancyanalytics.api.metrics.MetricSupplier; @@ -12,8 +14,6 @@ import de.oliver.fancyanalytics.sdk.events.Event; import de.oliver.fancylib.FancyLib; import de.oliver.fancylib.Metrics; import de.oliver.fancylib.VersionConfig; -import de.oliver.fancylib.featureFlags.FeatureFlag; -import de.oliver.fancylib.featureFlags.FeatureFlagConfig; import de.oliver.fancylib.serverSoftware.ServerSoftware; import de.oliver.fancylib.serverSoftware.schedulers.BukkitScheduler; import de.oliver.fancylib.serverSoftware.schedulers.FancyScheduler;