From 884f9471ca96c369129d9efd0f57d9f352f7e553 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Tue, 21 Apr 2020 14:54:10 +1200
Subject: [PATCH] Falling Block and Dropped Item now show their proper name for
 disguise name

---
 .../disguisetypes/watchers/DroppedItemWatcher.java        | 8 ++++++++
 .../disguisetypes/watchers/FallingBlockWatcher.java       | 5 +++++
 .../disguise/utilities/parser/DisguiseParser.java         | 1 +
 .../disguise/utilities/reflection/ReflectionManager.java  | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
index cc9d0d25..91a5744b 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java
@@ -1,8 +1,12 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import me.libraryaddict.disguise.utilities.translations.TranslateType;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 public class DroppedItemWatcher extends FlagWatcher {
@@ -17,5 +21,9 @@ public class DroppedItemWatcher extends FlagWatcher {
     public void setItemStack(ItemStack item) {
         setData(MetaIndex.DROPPED_ITEM, item);
         sendData(MetaIndex.DROPPED_ITEM);
+
+        getDisguise().setDisguiseName(TranslateType.DISGUISES.get(DisguiseType.DROPPED_ITEM.toReadable()) + " " +
+                TranslateType.DISGUISE_OPTIONS_PARAMETERS
+                        .get(ReflectionManager.toReadable((item == null ? Material.AIR : item.getType()).name())));
     }
 }
diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
index 4784a4f2..cad8bab9 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
@@ -8,6 +8,8 @@ import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import me.libraryaddict.disguise.utilities.translations.TranslateType;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -85,6 +87,9 @@ public class FallingBlockWatcher extends FlagWatcher {
 
         this.block = block;
 
+        getDisguise().setDisguiseName(TranslateType.DISGUISE_OPTIONS_PARAMETERS.get("Block") + " " +
+                TranslateType.DISGUISE_OPTIONS_PARAMETERS.get(ReflectionManager.toReadable(block.getType().name())));
+
         if (DisguiseAPI.isDisguiseInUse(getDisguise()) && getDisguise().getWatcher() == this) {
             DisguiseUtilities.refreshTrackers(getDisguise());
         }
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java b/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
index 9d172378..9ad8f382 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
@@ -792,6 +792,7 @@ public class DisguiseParser {
                     if (disguisePerm.getType() == DisguiseType.DROPPED_ITEM ||
                             disguisePerm.getType() == DisguiseType.FALLING_BLOCK) {
                         disguise = new MiscDisguise(disguisePerm.getType(), itemStack);
+                        name = disguise.getDisguiseName();
                     } else {
                         disguise = new MiscDisguise(disguisePerm.getType(), miscId);
                     }
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
index 895d052c..9a5f7f74 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
@@ -1841,7 +1841,7 @@ public class ReflectionManager {
         return split;
     }
 
-    private static String toReadable(String string) {
+    public static String toReadable(String string) {
         return StringUtils.join(splitReadable(string));
     }
 }