impl getJavaObject

DenizenScript · Aug 3, 2022 · 9bbf8f3 · 9bbf8f3
1 parent a2cd344
commit 9bbf8f3
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java
@@ -240,6 +240,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return getChunk();
+    }
+
     public boolean isLoaded() {
         if (getBukkitWorld() == null) {
             return false;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EnchantmentTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EnchantmentTag.java
@@ -132,6 +132,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return enchantment;
+    }
+
     @Override
     public EnchantmentTag setPrefix(String prefix) {
         this.prefix = prefix;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -1198,6 +1198,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return entity == null ? getBukkitEntityType() : entity;
+    }
+
     @Override
     public boolean isUnique() {
         return entity != null || uuid != null || isFake || npc != null;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -1174,6 +1174,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return inventory;
+    }
+
     public static void registerTags() {
 
         AbstractFlagTracker.registerFlagHandlers(tagProcessor);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java
@@ -484,6 +484,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return getItemStack();
+    }
+
     @Override
     public boolean isUnique() {
         return false;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -919,6 +919,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return clone();
+    }
+
     public static void registerTags() {
 
         AbstractFlagTracker.registerFlagHandlers(tagProcessor);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java
@@ -231,6 +231,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return modernData == null ? material : modernData;
+    }
+
     @Override
     public ObjectTag setPrefix(String prefix) {
         if (prefix != null) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -302,6 +302,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return getCitizen();
+    }
+
     public boolean isSpawned() {
         return npc.isSpawned();
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -607,6 +607,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return getOfflinePlayer();
+    }
+
     @Override
     public int hashCode() {
         return getUUID().hashCode();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java
@@ -147,6 +147,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return plugin;
+    }
+
     @Override
     public PluginTag setPrefix(String prefix) {
         this.prefix = prefix;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java
@@ -130,6 +130,11 @@ public String identifySimple() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return recipe;
+    }
+
     public static void registerTags() {
         PropertyParser.registerPropertyTagHandlers(TradeTag.class, tagProcessor);
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java
@@ -238,6 +238,11 @@ public String toString() {
         return identify();
     }
 
+    @Override
+    public Object getJavaObject() {
+        return getWorld();
+    }
+
     @Override
     public ObjectTag setPrefix(String prefix) {
         this.prefix = prefix;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java
@@ -7,11 +7,13 @@
 import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
+import com.denizenscript.denizencore.utilities.ReflectionRefuse;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import java.nio.charset.Charset;
 
+@ReflectionRefuse
 public class Settings {
 
     public static void refillCache() {