Small improvements

DenizenScript · Jun 15, 2018 · 42cb601 · 42cb601
1 parent f1608fc
commit 42cb601
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/com/denizenscript/denizen2sponge/tags/objects/BlockTypeTag.java b/src/main/java/com/denizenscript/denizen2sponge/tags/objects/BlockTypeTag.java
@@ -6,6 +6,7 @@
 import com.denizenscript.denizen2core.utilities.Action;
 import com.denizenscript.denizen2core.utilities.CoreUtilities;
 import com.denizenscript.denizen2core.utilities.Function2;
+import com.denizenscript.denizen2sponge.utilities.Utilities;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.block.BlockType;
 
@@ -80,12 +81,12 @@ public BlockType getInternal() {
     }
 
     public static BlockTypeTag getFor(Action<String> error, String text) {
-        Optional<BlockType> optItemType = Sponge.getRegistry().getType(BlockType.class, text);
-        if (!optItemType.isPresent()) {
+        BlockType blockType = (BlockType) Utilities.getTypeWithDefaultPrefix(BlockType.class, text);
+        if (blockType == null) {
             error.run("Invalid BlockTypeTag input!");
             return null;
         }
-        return new BlockTypeTag(optItemType.get());
+        return new BlockTypeTag(blockType);
     }
 
     public static BlockTypeTag getFor(Action<String> error, AbstractTagObject text) {

diff --git a/src/main/java/com/denizenscript/denizen2sponge/tags/objects/ItemTypeTag.java b/src/main/java/com/denizenscript/denizen2sponge/tags/objects/ItemTypeTag.java
@@ -6,6 +6,7 @@
 import com.denizenscript.denizen2core.utilities.Action;
 import com.denizenscript.denizen2core.utilities.CoreUtilities;
 import com.denizenscript.denizen2core.utilities.Function2;
+import com.denizenscript.denizen2sponge.utilities.Utilities;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.item.ItemType;
 
@@ -70,12 +71,12 @@ public ItemType getInternal() {
     }
 
     public static ItemTypeTag getFor(Action<String> error, String text) {
-        Optional<ItemType> optItemType = Sponge.getRegistry().getType(ItemType.class, text);
-        if (!optItemType.isPresent()) {
+        ItemType itemType = (ItemType) Utilities.getTypeWithDefaultPrefix(ItemType.class, text);
+        if (itemType == null) {
             error.run("Invalid ItemTypeTag input!");
             return null;
         }
-        return new ItemTypeTag(optItemType.get());
+        return new ItemTypeTag(itemType);
     }
 
     public static ItemTypeTag getFor(Action<String> error, AbstractTagObject text) {

diff --git a/src/main/java/com/denizenscript/denizen2sponge/utilities/DataKeys.java b/src/main/java/com/denizenscript/denizen2sponge/utilities/DataKeys.java
@@ -6,6 +6,7 @@
 import com.denizenscript.denizen2core.utilities.CoreUtilities;
 import com.denizenscript.denizen2core.utilities.ErrorInducedException;
 import com.denizenscript.denizen2core.utilities.debugging.Debug;
+import com.denizenscript.denizen2sponge.Denizen2Sponge;
 import com.denizenscript.denizen2sponge.tags.objects.FormattedTextTag;
 import com.denizenscript.denizen2sponge.tags.objects.LocationTag;
 import com.denizenscript.denizen2sponge.utilities.flags.FlagHelper;
@@ -104,7 +105,12 @@ else if (type.isSubtypeOf(Vector3d.class)) {
             return LocationTag.getFor(error, value).getInternal().toVector3d();
         }
         else if (type.isSubtypeOf(Text.class)) {
-            return FormattedTextTag.getFor(error, value).getInternal();
+            if (value instanceof FormattedTextTag) {
+                return ((FormattedTextTag) value).getInternal();
+            }
+            else {
+                return Denizen2Sponge.parseColor(value.toString());
+            }
         }
         else if (type.isSubtypeOf(UUID.class)) {
             return UUID.fromString(value.toString());