move the QuestRegistry and processors into sub-packages

BetonQuest · May 26, 2024 · 34602a8 · 34602a8
1 parent 37bd493
commit 34602a8
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 20 deletions.
diff --git a/src/main/java/org/betonquest/betonquest/BetonQuest.java b/src/main/java/org/betonquest/betonquest/BetonQuest.java
@@ -105,13 +105,13 @@
 import org.betonquest.betonquest.notify.SuppressNotifyIO;
 import org.betonquest.betonquest.notify.TitleNotifyIO;
 import org.betonquest.betonquest.notify.TotemNotifyIO;
-import org.betonquest.betonquest.quest.QuestRegistry;
-import org.betonquest.betonquest.quest.VariableProcessor;
 import org.betonquest.betonquest.quest.event.NullStaticEventFactory;
 import org.betonquest.betonquest.quest.event.legacy.FromClassQuestEventFactory;
 import org.betonquest.betonquest.quest.event.legacy.QuestEventFactory;
 import org.betonquest.betonquest.quest.event.legacy.QuestEventFactoryAdapter;
 import org.betonquest.betonquest.quest.registry.CoreQuestTypes;
+import org.betonquest.betonquest.quest.registry.QuestRegistry;
+import org.betonquest.betonquest.quest.registry.processor.VariableProcessor;
 import org.betonquest.betonquest.utils.PlayerConverter;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;

diff --git a/...quest/betonquest/quest/QuestRegistry.java → ...onquest/quest/registry/QuestRegistry.java b/...quest/betonquest/quest/QuestRegistry.java → ...onquest/quest/registry/QuestRegistry.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry;
 
 import org.betonquest.betonquest.BetonQuest;
 import org.betonquest.betonquest.api.Condition;
@@ -11,6 +11,12 @@
 import org.betonquest.betonquest.id.ID;
 import org.betonquest.betonquest.modules.schedule.EventScheduling;
 import org.betonquest.betonquest.quest.event.legacy.QuestEventFactory;
+import org.betonquest.betonquest.quest.registry.processor.CancellerProcessor;
+import org.betonquest.betonquest.quest.registry.processor.ConditionProcessor;
+import org.betonquest.betonquest.quest.registry.processor.ConversationProcessor;
+import org.betonquest.betonquest.quest.registry.processor.EventProcessor;
+import org.betonquest.betonquest.quest.registry.processor.ObjectiveProcessor;
+import org.betonquest.betonquest.quest.registry.processor.VariableProcessor;
 
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/.../betonquest/quest/CancellerProcessor.java → ...egistry/processor/CancellerProcessor.java b/.../betonquest/quest/CancellerProcessor.java → ...egistry/processor/CancellerProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.api.config.quest.QuestPackage;
 import org.betonquest.betonquest.api.logger.BetonQuestLogger;

diff --git a/.../betonquest/quest/ConditionProcessor.java → ...egistry/processor/ConditionProcessor.java b/.../betonquest/quest/ConditionProcessor.java → ...egistry/processor/ConditionProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import io.papermc.lib.PaperLib;
 import org.betonquest.betonquest.Instruction;
@@ -25,7 +25,7 @@
 /**
  * Does the logic around Conditions.
  */
-public class ConditionProcessor extends QuestProcessor<Condition, ConditionID> {
+public class ConditionProcessor extends QuestProcessor<Condition, ConditionID> implements MetricSupplying {
     /**
      * Available Condition types.
      */
@@ -40,7 +40,8 @@ public ConditionProcessor(final BetonQuestLogger log, final Map<String, Class<?
         this.conditionTypes = conditionTypes;
     }
 
-    /* default */ CompositeInstructionMetricsSupplier<ConditionID> metricsSupplier() {
+    @Override
+    public CompositeInstructionMetricsSupplier<ConditionID> metricsSupplier() {
         return new CompositeInstructionMetricsSupplier<>(values::keySet, conditionTypes::keySet);
     }
 

diff --git a/...tonquest/quest/ConversationProcessor.java → ...stry/processor/ConversationProcessor.java b/...tonquest/quest/ConversationProcessor.java → ...stry/processor/ConversationProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.BetonQuest;
 import org.betonquest.betonquest.api.config.quest.QuestPackage;

diff --git a/...uest/betonquest/quest/EventProcessor.java → ...st/registry/processor/EventProcessor.java b/...uest/betonquest/quest/EventProcessor.java → ...st/registry/processor/EventProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.api.QuestEvent;
 import org.betonquest.betonquest.api.config.quest.QuestPackage;
@@ -18,7 +18,7 @@
 /**
  * Stores Events and execute them.
  */
-public class EventProcessor extends QuestProcessor<QuestEvent, EventID> {
+public class EventProcessor extends QuestProcessor<QuestEvent, EventID> implements MetricSupplying {
     /**
      * Available Event types.
      */
@@ -35,7 +35,8 @@ public EventProcessor(final BetonQuestLogger log, final Map<String, QuestEventFa
         this.eventTypes = eventTypes;
     }
 
-    /* default */ CompositeInstructionMetricsSupplier<EventID> metricsSupplier() {
+    @Override
+    public CompositeInstructionMetricsSupplier<EventID> metricsSupplier() {
         return new CompositeInstructionMetricsSupplier<>(values::keySet, eventTypes::keySet);
     }
 

diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/MetricSupplying.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/MetricSupplying.java
@@ -0,0 +1,16 @@
+package org.betonquest.betonquest.quest.registry.processor;
+
+import org.betonquest.betonquest.bstats.CompositeInstructionMetricsSupplier;
+
+/**
+ * A Processor supplying BStats Metrics.
+ */
+@FunctionalInterface
+public interface MetricSupplying {
+    /**
+     * Gets the bstats metric supplier for registered and active types.
+     *
+     * @return the metric
+     */
+    CompositeInstructionMetricsSupplier<?> metricsSupplier();
+}
diff --git a/.../betonquest/quest/ObjectiveProcessor.java → ...egistry/processor/ObjectiveProcessor.java b/.../betonquest/quest/ObjectiveProcessor.java → ...egistry/processor/ObjectiveProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.Instruction;
 import org.betonquest.betonquest.api.Objective;
@@ -20,7 +20,7 @@
 /**
  * Stores Objectives and starts/stops/resumes them.
  */
-public class ObjectiveProcessor extends QuestProcessor<Objective, ObjectiveID> {
+public class ObjectiveProcessor extends QuestProcessor<Objective, ObjectiveID> implements MetricSupplying {
     /**
      * Available Objective types
      */
@@ -38,15 +38,16 @@ public ObjectiveProcessor(final BetonQuestLogger log, final Map<String, Class<?
     }
 
     @Override
-        /* default */ void clear() {
+    public void clear() {
         // save data of all objectives to the players
         for (final Objective objective : values.values()) {
             objective.close();
         }
         super.clear();
     }
 
-    /* default */ CompositeInstructionMetricsSupplier<ObjectiveID> metricsSupplier() {
+    @Override
+    public CompositeInstructionMetricsSupplier<ObjectiveID> metricsSupplier() {
         return new CompositeInstructionMetricsSupplier<>(values::keySet, objectiveTypes::keySet);
     }
 

diff --git a/...uest/betonquest/quest/QuestProcessor.java → ...st/registry/processor/QuestProcessor.java b/...uest/betonquest/quest/QuestProcessor.java → ...st/registry/processor/QuestProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.api.config.quest.QuestPackage;
 import org.betonquest.betonquest.api.logger.BetonQuestLogger;
@@ -37,7 +37,7 @@ public QuestProcessor(final BetonQuestLogger log) {
     /**
      * Clears the values. Used before reloading all QuestPackages.
      */
-    /* default */ void clear() {
+    public void clear() {
         values.clear();
     }
 

diff --git a/...t/betonquest/quest/VariableProcessor.java → ...registry/processor/VariableProcessor.java b/...t/betonquest/quest/VariableProcessor.java → ...registry/processor/VariableProcessor.java
@@ -1,4 +1,4 @@
-package org.betonquest.betonquest.quest;
+package org.betonquest.betonquest.quest.registry.processor;
 
 import org.betonquest.betonquest.Instruction;
 import org.betonquest.betonquest.api.Variable;
@@ -23,7 +23,7 @@
 /**
  * Stores Variables and resolve them.
  */
-public class VariableProcessor extends QuestProcessor<Variable, VariableID> {
+public class VariableProcessor extends QuestProcessor<Variable, VariableID> implements MetricSupplying {
     /**
      * Available Variable types.
      */
@@ -69,7 +69,8 @@ public static List<String> resolveVariables(final String text) {
         return variables;
     }
 
-    /* default */ CompositeInstructionMetricsSupplier<VariableID> metricsSupplier() {
+    @Override
+    public CompositeInstructionMetricsSupplier<VariableID> metricsSupplier() {
         return new CompositeInstructionMetricsSupplier<>(values::keySet, variableTypes::keySet);
     }
 

diff --git a/src/main/java/org/betonquest/betonquest/quest/registry/processor/package-info.java b/src/main/java/org/betonquest/betonquest/quest/registry/processor/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides the functionality of the BetonQuest types used in the API.
+ */
+package org.betonquest.betonquest.quest.registry.processor;