Merge pull request #1878 from mcmonkey4eva/master

pull request for wow 1.13 issues fixing doing happening

plugin/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java

@@ -101,8 +101,8 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? dEntity.getPlayerFrom(event.getEntity()) : null,
-                entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getEntity()) : null);
+        return new BukkitScriptEntryData(entity != null && entity.isPlayer() ? dEntity.getPlayerFrom(event.getEntity()) : null,
+                entity != null && entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getEntity()) : null);
     }
 
     @Override

plugin/src/main/java/net/aufdemrand/denizen/objects/dChunk.java

@@ -406,11 +406,11 @@ public String run(Attribute attribute, dObject object) {
                 int x = heightMap[0];
                 for (int i : heightMap) {
                     if (Math.abs(x - i) > tolerance) {
-                        return Element.FALSE.getAttribute(attribute.fulfill(1));
+                        return new Element(false).getAttribute(attribute.fulfill(1));
                     }
                 }
 
-                return Element.TRUE.getAttribute(attribute.fulfill(1));
+                return new Element(true).getAttribute(attribute.fulfill(1));
             }
         });
 

plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java

@@ -2061,14 +2061,8 @@ else if (mtr.angle == BlockFace.EAST) {
         // Returns whether the entity is leashed.
         // -->
         if (attribute.startsWith("leashed") || attribute.startsWith("is_leashed")) {
-            if (isLivingEntity()) {
-                return new Element(getLivingEntity().isLeashed())
-                        .getAttribute(attribute.fulfill(1));
-            }
-            else {
-                return Element.FALSE
-                        .getAttribute(attribute.fulfill(1));
-            }
+            return new Element(isLivingEntity() && getLivingEntity().isLeashed())
+                    .getAttribute(attribute.fulfill(1));
         }
 
         // <--[tag]
@@ -2103,14 +2097,8 @@ else if (mtr.angle == BlockFace.EAST) {
         // Returns whether the entity will not be removed completely when far away from players.
         // -->
         if (attribute.startsWith("persistent") || attribute.startsWith("is_persistent")) {
-            if (isLivingEntity()) {
-                return new Element(!getLivingEntity().getRemoveWhenFarAway())
-                        .getAttribute(attribute.fulfill(1));
-            }
-            else {
-                return Element.FALSE
-                        .getAttribute(attribute.fulfill(1));
-            }
+            return new Element(isLivingEntity() && !getLivingEntity().getRemoveWhenFarAway())
+                    .getAttribute(attribute.fulfill(1));
         }
 
         // <--[tag]
@@ -2355,12 +2343,8 @@ && getBukkitEntity() instanceof Item) {
         // Returns whether the entity is a mob (Not a player or NPC).
         // -->
         if (attribute.startsWith("is_mob")) {
-            if (!isPlayer() && !isNPC()) {
-                return Element.TRUE.getAttribute(attribute.fulfill(1));
-            }
-            else {
-                return Element.FALSE.getAttribute(attribute.fulfill(1));
-            }
+            return new Element(!isPlayer() && !isNPC() && isLivingEntity())
+                    .getAttribute(attribute.fulfill(1));
         }
 
         // <--[tag]
@@ -2695,10 +2679,10 @@ && getBukkitEntity() instanceof Item) {
                     PotionEffectType effectType = PotionEffectType.getByName(attribute.getContext(1));
                     for (PotionEffect effect : helper.getCustomEffects()) {
                         if (effect.getType().equals(effectType)) {
-                            return Element.TRUE.getAttribute(attribute.fulfill(1));
+                            return new Element(true).getAttribute(attribute.fulfill(1));
                         }
                     }
-                    return Element.FALSE.getAttribute(attribute.fulfill(1));
+                    return new Element(false).getAttribute(attribute.fulfill(1));
                 }
 
                 return new Element(helper.hasCustomEffects())

plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java

@@ -26,17 +26,13 @@
 import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Nameable;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.CraftingInventory;
-import org.bukkit.inventory.HorseInventory;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.*;
 import org.bukkit.inventory.meta.BookMeta;
 
 import java.util.*;
@@ -87,7 +83,7 @@ public static dInventory mirrorBukkitInventory(Inventory inventory) {
     public final static int maxSlots = 54;
 
     // All of the inventory id types we use
-    public final static String[] idTypes = {"npc", "player", "enderchest", "workbench", "entity", "location", "generic"};
+    public final static String[] idTypes = {"npc", "player", "crafting", "enderchest", "workbench", "entity", "location", "generic"};
 
 
     /////////////////////
@@ -245,6 +241,16 @@ else if (type.equals("npc")) {
                     return dNPC.valueOf(holder).getDenizenInventory();
                 }
             }
+            else if (type.equals("crafting")) {
+                if (dPlayer.matches(holder)) {
+                    dPlayer holderPlayer = dPlayer.valueOf(holder);
+                    Inventory opened = holderPlayer.getPlayerEntity().getOpenInventory().getTopInventory();
+                    if (opened instanceof CraftingInventory) {
+                        return new dInventory(opened);
+                    }
+                    return dPlayer.valueOf(holder).getInventory();
+                }
+            }
             else if (type.equals("player")) {
                 if (dPlayer.matches(holder)) {
                     return dPlayer.valueOf(holder).getInventory();
@@ -426,7 +432,16 @@ public void setInventory(Inventory inventory, dPlayer player) {
     }
 
     public void setTitle(String title) {
-        if (!(getIdType().equals("generic") || getIdType().equals("script")) || title == null) {
+        if (title == null) {
+            return;
+        }
+        if (getIdType().equals("location")) {
+            dLocation location = dLocation.valueOf(getIdHolder());
+            if (location.getBlock().getBlockData() instanceof Nameable) {
+                ((Nameable) location.getBlock().getBlockData()).setCustomName(title);
+            }
+        }
+        if (!(getIdType().equals("generic") || getIdType().equals("script"))) {
             return;
         }
         if (inventory != null && inventory.getTitle().equals(title)) {
@@ -569,6 +584,9 @@ else if (holder instanceof Player) {
                     idHolder = (dNPC.fromEntity((Player) holder)).identify();
                     return;
                 }
+                if (inventory.getType() == InventoryType.CRAFTING) {
+                    idType = "crafting";
+                }
                 if (inventory.getType() == InventoryType.ENDER_CHEST) {
                     idType = "enderchest";
                 }
@@ -631,6 +649,13 @@ public dInventory setIdentifiers(String type, String holder) {
         return this;
     }
 
+    /**
+     * Generally shouldn't be used.
+     */
+    public void setIdType(String type) {
+        idType = type;
+    }
+
     public String getIdType() {
         return idType == null ? "" : idType;
     }
@@ -1775,11 +1800,11 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName
             if (!contains.isEmpty()) {
                 for (dItem item : contains) {
                     if (containsItem(item, qty)) {
-                        return Element.TRUE.getAttribute(attribute.fulfill(attribs));
+                        return new Element(true).getAttribute(attribute.fulfill(attribs));
                     }
                 }
             }
-            return Element.FALSE.getAttribute(attribute.fulfill(attribs));
+            return new Element(false).getAttribute(attribute.fulfill(attribs));
         }
 
         // <--[tag]
@@ -1811,12 +1836,12 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName
             if (contains.size() == list.size()) {
                 for (dItem item : contains) {
                     if (!containsItem(item, qty)) {
-                        return Element.FALSE.getAttribute(attribute.fulfill(attribs));
+                        return new Element(false).getAttribute(attribute.fulfill(attribs));
                     }
                 }
-                return Element.TRUE.getAttribute(attribute.fulfill(attribs));
+                return new Element(true).getAttribute(attribute.fulfill(attribs));
             }
-            return Element.FALSE.getAttribute(attribute.fulfill(attribs));
+            return new Element(false).getAttribute(attribute.fulfill(attribs));
         }
 
         // <--[tag]

plugin/src/main/java/net/aufdemrand/denizen/objects/dItem.java

@@ -465,6 +465,9 @@ public String getScriptName() {
     }
 
     public dMaterial getMaterial() {
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
+            return dMaterial.getMaterialFrom(getItemStack().getType());
+        }
         return dMaterial.getMaterialFrom(getItemStack().getType(), getItemStack().getData().getData());
     }
 
@@ -583,16 +586,12 @@ else if (isItemscript()) {
         return "i@" + identifyMaterial().replace("m@", "");
     }
 
-
-    // Special-case that essentially fetches the material of the items and uses its 'identify()' method
     public String identifyMaterial() {
-        return dMaterial.getMaterialFrom(item.getType(), item.getData().getData()).identifySimple();
+        return getMaterial().identifySimple();
     }
 
-
-    // Special-case that essentially fetches the material of the items and uses its 'identify()' method
     public String identifyMaterialNoIdentifier() {
-        return dMaterial.getMaterialFrom(item.getType(), item.getData().getData()).identifySimpleNoIdentifier();
+        return getMaterial().identifySimpleNoIdentifier();
     }
 
     public String identifyNoIdentifier() {

plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java

@@ -34,6 +34,7 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Attachable;
+import org.bukkit.material.Directional;
 import org.bukkit.material.MaterialData;
 import org.bukkit.util.BlockIterator;
 import org.bukkit.util.Vector;
@@ -517,6 +518,23 @@ public String getAttribute(Attribute attribute) {
         //   BLOCK ATTRIBUTES
         /////////////////
 
+        // <--[tag]
+        // @attribute <l@location.block_facing>
+        // @returns dLocation
+        // @description
+        // Returns the relative location vector of where this block is facing.
+        // Only works for block types that have directionality (such as signs, chests, stairs, etc.).
+        // This can return for example "1,0,0" to mean the block is facing towards the positive X axis.
+        // You can use <some_block_location.add[<some_block_location.block_facing>]> to get the block directly in front of this block (based on its facing direction).
+        // -->
+        if (attribute.matches("block_facing")) {
+            if (getBlock().getBlockData() instanceof Directional) {
+                Vector facing = ((Directional) getBlock().getBlockData()).getFacing().getDirection();
+                return new dLocation(getWorld(), facing.getX(), facing.getY(), facing.getZ())
+                        .getAttribute(attribute.fulfill(1));
+            }
+        }
+
         // <--[tag]
         // @attribute <l@location.above>
         // @returns dLocation
@@ -546,7 +564,7 @@ public String getAttribute(Attribute attribute) {
         // Returns the location of the block this location is on,
         // i.e. returns a location without decimals or direction.
         // -->
-        if (attribute.startsWith("block")) {
+        if (attribute.matches("block")) {
             return new dLocation(getWorld(), getBlockX(), getBlockY(), getBlockZ())
                     .getAttribute(attribute.fulfill(1));
         }

plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java

@@ -534,6 +534,9 @@ public static dMaterial registerVariety(dMaterial material) {
 
     // Called on startup
     public static void _initialize() {
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
+            return;
+        }
         for (dMaterials material : dMaterials.values()) {
             try {
                 Field field = dMaterial.class.getField(material.name());
@@ -596,8 +599,11 @@ public static dMaterial getMaterialFrom(Material material, int data) {
                 return material_varieties.get(material).get(data);
             }
         }
-        if (material.isBlock()) {
-            material = NMSHandler.getInstance().getBlockHelper().getBlockData(material, (byte) data).getMaterial();
+        if (data != 0 && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
+            // upvert old data valued materials
+            if (material.isBlock()) {
+                material = NMSHandler.getInstance().getBlockHelper().getBlockData(material, (byte) data).getMaterial();
+            }
         }
         // Forcible upvert.
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
@@ -717,10 +723,6 @@ public static dMaterial quickOfNamed(String string) {
      * @return true if matched, otherwise false
      */
     public static boolean matches(String arg) {
-        arg = arg.toUpperCase();
-        if (arg.startsWith("m@")) {
-            return true;
-        }
         if (valueOf(arg, noDebugContext) != null) {
             return true;
         }
@@ -1140,18 +1142,14 @@ public String run(Attribute attribute, dObject object) {
         // @description
         // Returns true if the material is a variety of the specified material.
         // Example: <m@red_wool.is_made_of[m@wool]> will return true.
+        // Invalid for 1.13+ servers.
         // -->
         registerTag("is_made_of", new TagRunnable() {
             @Override
             public String run(Attribute attribute, dObject object) {
                 dMaterial compared = dMaterial.valueOf(attribute.getContext(1));
-                if (compared == null) {
-                    return Element.FALSE.getAttribute(attribute.fulfill(1));
-                }
-                else {
-                    return new Element(((dMaterial) object).material == compared.getMaterial())
-                            .getAttribute(attribute.fulfill(1));
-                }
+                return new Element(compared != null && ((dMaterial) object).material == compared.getMaterial())
+                        .getAttribute(attribute.fulfill(1));
             }
         });
 
@@ -1161,6 +1159,7 @@ public String run(Attribute attribute, dObject object) {
         // @description
         // Returns the bukkit Material enum value. For example: <m@birch_sapling.bukkit_enum>
         // will return 'sapling'
+        // Unneeded for 1.13+ servers.
         // -->
         registerTag("bukkit_enum", new TagRunnable() {
             @Override

plugin/src/main/java/net/aufdemrand/denizen/objects/dNPC.java

@@ -452,7 +452,7 @@ public String getAttribute(Attribute attribute) {
 
         // Defined in dEntity
         if (attribute.startsWith("is_npc")) {
-            return Element.TRUE.getAttribute(attribute.fulfill(1));
+            return new Element(true).getAttribute(attribute.fulfill(1));
         }
 
         // Defined in dEntity
@@ -549,7 +549,7 @@ public String getAttribute(Attribute attribute) {
         if (attribute.startsWith("has_trigger")
                 && attribute.hasContext(1)) {
             if (!getCitizen().hasTrait(TriggerTrait.class)) {
-                return Element.FALSE.getAttribute(attribute.fulfill(1));
+                return new Element(false).getAttribute(attribute.fulfill(1));
             }
             TriggerTrait trait = getCitizen().getTrait(TriggerTrait.class);
             return new Element(trait.hasTrigger(attribute.getContext(1)))
@@ -873,7 +873,7 @@ && getCitizen().getTrait(ConstantsTrait.class).getConstant(attribute.getContext(
                 lookclose = lookclose.substring(10, lookclose.length() - 1);
                 return new Element(Boolean.valueOf(lookclose)).getAttribute(attribute.fulfill(1));
             }
-            return Element.FALSE.getAttribute(attribute.fulfill(1));
+            return new Element(false).getAttribute(attribute.fulfill(1));
         }
 
         // <--[tag]