Revert "Remove deprecated code"

This reverts commit 090ab04.
ClubObsidian · Apr 29, 2023 · 6a558fb · 6a558fb
1 parent c294cac
commit 6a558fb
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 1 deletion.
diff --git a/api/src/main/java/com/clubobsidian/dynamicgui/api/manager/FunctionManager.java b/api/src/main/java/com/clubobsidian/dynamicgui/api/manager/FunctionManager.java
@@ -20,6 +20,7 @@
 import com.clubobsidian.dynamicgui.api.function.Function;
 import com.clubobsidian.dynamicgui.api.function.FunctionOwner;
 import com.clubobsidian.dynamicgui.api.parser.function.FunctionType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
@@ -39,6 +40,18 @@ public static FunctionManager get() {
         return instance;
     }
 
+    /**
+     * Gets a registered function
+     *
+     * @param functionName function name to get
+     * @return the function if registered or null
+     * @deprecated As of release 6.0.0, replaced by {@link #getFunction(String)}
+     */
+    @Deprecated(since = "6.0.0", forRemoval = true)
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    public @Nullable Function getFunctionByName(String functionName) {
+        return this.getFunction(functionName);
+    }
 
     /**
      * Gets a registered function
@@ -48,7 +61,21 @@ public static FunctionManager get() {
      */
     public abstract @Nullable Function getFunction(@NotNull String functionName);
 
-    public abstract @Unmodifiable Collection<Function> getFunctions();
+    public @Unmodifiable
+    abstract Collection<Function> getFunctions();
+
+    /**
+     * Registers a function
+     *
+     * @param function function to register
+     * @return if the function was registered
+     * @deprecated As of release 6.0.0, replaced by {@link #registerFunction(Function)}
+     */
+    @Deprecated(since = "6.0.0", forRemoval = true)
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    public boolean addFunction(Function function) {
+        return this.registerFunction(function);
+    }
 
     /**
      * Registers a function
@@ -58,6 +85,19 @@ public static FunctionManager get() {
      */
     public abstract boolean registerFunction(@NotNull Function function);
 
+    /**
+     * Unregisters a function
+     *
+     * @param functionName name of the function to unregister
+     * @return if the function was unregistered
+     * @deprecated As of release 6.0.0, replaced by {@link #unregisterFunction(String)}
+     */
+    @Deprecated(since = "6.0.0", forRemoval = true)
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    public boolean removeFunctionByName(String functionName) {
+        return this.unregisterFunction(functionName);
+    }
+
     /**
      * Unregisters a function
      *

diff --git a/api/src/main/java/com/clubobsidian/dynamicgui/api/plugin/DynamicGuiPlugin.java b/api/src/main/java/com/clubobsidian/dynamicgui/api/plugin/DynamicGuiPlugin.java
@@ -16,14 +16,40 @@
 
 package com.clubobsidian.dynamicgui.api.plugin;
 
+import com.clubobsidian.dynamicgui.api.DynamicGui;
+import com.clubobsidian.dynamicgui.api.economy.Economy;
+import com.clubobsidian.dynamicgui.api.permission.Permission;
+import com.clubobsidian.dynamicgui.api.registry.npc.NPCRegistry;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Unmodifiable;
+
 import java.io.File;
+import java.util.List;
 
 public interface DynamicGuiPlugin {
 
     void start();
 
     void stop();
 
+    @Deprecated(since = "6.0.0")
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    default Economy getEconomy() {
+        return DynamicGui.get().getEconomy();
+    }
+
+    @Deprecated(since = "6.0.0")
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    default Permission getPermission() {
+        return DynamicGui.get().getPermission();
+    }
+
+    @Deprecated(since = "6.0.0")
+    @ApiStatus.ScheduledForRemoval(inVersion = "7.0.0")
+    default @Unmodifiable List<NPCRegistry> getNPCRegistries() {
+        return DynamicGui.get().getNpcRegistries();
+    }
+
     File getDataFolder();
 
     default File getConfigFile() {