Skip to content

Commit bb23655

Browse files
WillFPWillFP
committed
Changed /ecodebug to only send the held item - /ecodebug full now sends full output
1 parent d428f56 commit bb23655

File tree

1 file changed

+88
-77
lines changed

1 file changed

+88
-77
lines changed

‎eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java

+88-77
Original file line numberDiff line numberDiff line change
@@ -37,92 +37,103 @@ public CommandEcodebug(@NotNull final AbstractEcoPlugin plugin) {
3737
@Override
3838
public void onExecute(@NotNull final CommandSender sender,
3939
@NotNull final List<String> args) {
40-
Bukkit.getLogger().info("--------------- BEGIN DEBUG ----------------");
41-
if (sender instanceof Player) {
42-
Player player = (Player) sender;
43-
player.sendMessage("Held Item: " + player.getInventory().getItemInMainHand().toString());
40+
if (!args.isEmpty() && args.get(0).equalsIgnoreCase("full")) {
41+
Bukkit.getLogger().info("--------------- BEGIN DEBUG ----------------");
42+
if (sender instanceof Player) {
43+
Player player = (Player) sender;
44+
player.sendMessage("Held Item: " + player.getInventory().getItemInMainHand().toString());
45+
Bukkit.getLogger().info("");
46+
47+
Bukkit.getLogger().info("Held Item: " + player.getInventory().getItemInMainHand().toString());
48+
Bukkit.getLogger().info("");
49+
}
50+
51+
Bukkit.getLogger().info("Running Version: " + this.getPlugin().getDescription().getVersion());
4452
Bukkit.getLogger().info("");
4553

46-
Bukkit.getLogger().info("Held Item: " + player.getInventory().getItemInMainHand().toString());
54+
Bukkit.getLogger().info("Loaded Extensions: " + this.getPlugin().getExtensionLoader().getLoadedExtensions().stream()
55+
.map(extension -> extension.getName() + " v" + extension.getVersion())
56+
.collect(Collectors.joining()));
4757
Bukkit.getLogger().info("");
48-
}
4958

50-
Bukkit.getLogger().info("Running Version: " + this.getPlugin().getDescription().getVersion());
51-
Bukkit.getLogger().info("");
59+
Bukkit.getLogger().info("EcoEnchants.getAll(): " + EcoEnchants.values().toString());
60+
Bukkit.getLogger().info("");
61+
62+
Bukkit.getLogger().info("Enchantment.values(): " + Arrays.toString(Enchantment.values()));
63+
Bukkit.getLogger().info("");
5264

53-
Bukkit.getLogger().info("Loaded Extensions: " + this.getPlugin().getExtensionLoader().getLoadedExtensions().stream()
54-
.map(extension -> extension.getName() + " v" + extension.getVersion())
55-
.collect(Collectors.joining()));
56-
Bukkit.getLogger().info("");
65+
Bukkit.getLogger().info("Enchantment Cache: " + EnchantmentCache.getCache().toString());
66+
Bukkit.getLogger().info("");
5767

58-
Bukkit.getLogger().info("EcoEnchants.getAll(): " + EcoEnchants.values().toString());
59-
Bukkit.getLogger().info("");
68+
try {
69+
Field byNameField = Enchantment.class.getDeclaredField("byName");
70+
byNameField.setAccessible(true);
71+
Map<String, Enchantment> byName = (Map<String, Enchantment>) byNameField.get(null);
72+
Bukkit.getLogger().info("Enchantment.byName: " + byName.toString());
73+
} catch (NoSuchFieldException | IllegalAccessException e) {
74+
e.printStackTrace();
75+
}
76+
Bukkit.getLogger().info("");
6077

61-
Bukkit.getLogger().info("Enchantment.values(): " + Arrays.toString(Enchantment.values()));
62-
Bukkit.getLogger().info("");
6378

64-
Bukkit.getLogger().info("Enchantment Cache: " + EnchantmentCache.getCache().toString());
65-
Bukkit.getLogger().info("");
79+
List<Enchantment> extern = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
80+
extern.removeAll(EcoEnchants.values().stream().map(EcoEnchant::getEnchantment).collect(Collectors.toList()));
81+
extern.removeIf(enchantment -> enchantment.getClass().toString().toLowerCase().contains("craftbukkit"));
82+
String external = extern.stream().map(enchantment -> "{" + enchantment.toString() + ", Provider: " + enchantment.getClass().toString() + "}").collect(Collectors.joining(", "));
83+
Bukkit.getLogger().info("External Enchantments: " + external);
84+
Bukkit.getLogger().info("");
6685

67-
try {
68-
Field byNameField = Enchantment.class.getDeclaredField("byName");
69-
byNameField.setAccessible(true);
70-
Map<String, Enchantment> byName = (Map<String, Enchantment>) byNameField.get(null);
71-
Bukkit.getLogger().info("Enchantment.byName: " + byName.toString());
72-
} catch (NoSuchFieldException | IllegalAccessException e) {
73-
e.printStackTrace();
74-
}
75-
Bukkit.getLogger().info("");
76-
77-
78-
List<Enchantment> extern = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
79-
extern.removeAll(EcoEnchants.values().stream().map(EcoEnchant::getEnchantment).collect(Collectors.toList()));
80-
extern.removeIf(enchantment -> enchantment.getClass().toString().toLowerCase().contains("craftbukkit"));
81-
String external = extern.stream().map(enchantment -> "{" + enchantment.toString() + ", Provider: " + enchantment.getClass().toString() + "}").collect(Collectors.joining(", "));
82-
Bukkit.getLogger().info("External Enchantments: " + external);
83-
Bukkit.getLogger().info("");
84-
85-
List<Enchantment> uncached = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
86-
uncached.removeAll(EnchantmentCache.getCache().values().stream().map(EnchantmentCache.CacheEntry::getEnchantment).collect(Collectors.toList()));
87-
Bukkit.getLogger().info("Uncached Enchantments: " + uncached.toString());
88-
Bukkit.getLogger().info("");
89-
90-
List<Enchantment> brokenCache = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
91-
brokenCache.removeIf(enchantment -> !(
92-
EnchantmentCache.getEntry(enchantment).getName().equalsIgnoreCase("null")
93-
|| EnchantmentCache.getEntry(enchantment).getRawName().equalsIgnoreCase("null")
94-
|| EnchantmentCache.getEntry(enchantment).getStringDescription().equalsIgnoreCase("null")));
95-
Bukkit.getLogger().info("Enchantments with broken cache: " + brokenCache.toString());
96-
Bukkit.getLogger().info("");
97-
98-
Bukkit.getLogger().info("Installed Plugins: " + Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toList()).toString());
99-
Bukkit.getLogger().info("");
100-
101-
Set<EcoEnchant> withIssues = new HashSet<>();
102-
EcoEnchants.values().forEach(enchant -> {
103-
if (enchant.getRarity() == null) {
104-
withIssues.add(enchant);
105-
}
106-
if (enchant.getTargets().isEmpty()) {
107-
withIssues.add(enchant);
86+
List<Enchantment> uncached = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
87+
uncached.removeAll(EnchantmentCache.getCache().values().stream().map(EnchantmentCache.CacheEntry::getEnchantment).collect(Collectors.toList()));
88+
Bukkit.getLogger().info("Uncached Enchantments: " + uncached.toString());
89+
Bukkit.getLogger().info("");
90+
91+
List<Enchantment> brokenCache = Arrays.stream(Enchantment.values()).collect(Collectors.toList());
92+
brokenCache.removeIf(enchantment -> !(
93+
EnchantmentCache.getEntry(enchantment).getName().equalsIgnoreCase("null")
94+
|| EnchantmentCache.getEntry(enchantment).getRawName().equalsIgnoreCase("null")
95+
|| EnchantmentCache.getEntry(enchantment).getStringDescription().equalsIgnoreCase("null")));
96+
Bukkit.getLogger().info("Enchantments with broken cache: " + brokenCache.toString());
97+
Bukkit.getLogger().info("");
98+
99+
Bukkit.getLogger().info("Installed Plugins: " + Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toList()).toString());
100+
Bukkit.getLogger().info("");
101+
102+
Set<EcoEnchant> withIssues = new HashSet<>();
103+
EcoEnchants.values().forEach(enchant -> {
104+
if (enchant.getRarity() == null) {
105+
withIssues.add(enchant);
106+
}
107+
if (enchant.getTargets().isEmpty()) {
108+
withIssues.add(enchant);
109+
}
110+
});
111+
Bukkit.getLogger().info("Enchantments with evident issues: " + withIssues.toString());
112+
Bukkit.getLogger().info("");
113+
114+
Bukkit.getLogger().info("Packets: " + ProtocolLibrary.getProtocolManager().getPacketListeners().stream()
115+
.filter(packetListener -> packetListener.getSendingWhitelist().getPriority().equals(ListenerPriority.MONITOR))
116+
.collect(Collectors.toList()).toString());
117+
Bukkit.getLogger().info("");
118+
119+
Bukkit.getLogger().info("Server Information: ");
120+
Bukkit.getLogger().info("Players Online: " + Bukkit.getServer().getOnlinePlayers().size());
121+
Bukkit.getLogger().info("Bukkit IP: " + Bukkit.getIp());
122+
Bukkit.getLogger().info("Running Version: " + Bukkit.getVersion()
123+
+ ", Bukkit Version: " + Bukkit.getBukkitVersion()
124+
+ ", Alt Version: " + Bukkit.getServer().getVersion()
125+
+ ", NMS: " + ProxyConstants.NMS_VERSION);
126+
Bukkit.getLogger().info("Motd: " + Bukkit.getServer().getMotd());
127+
Bukkit.getLogger().info("--------------- END DEBUG ----------------");
128+
} else {
129+
if (sender instanceof Player) {
130+
Player player = (Player) sender;
131+
player.sendMessage("Held Item: " + player.getInventory().getItemInMainHand().toString());
132+
Bukkit.getLogger().info("");
133+
134+
Bukkit.getLogger().info("Held Item: " + player.getInventory().getItemInMainHand().toString());
135+
Bukkit.getLogger().info("");
108136
}
109-
});
110-
Bukkit.getLogger().info("Enchantments with evident issues: " + withIssues.toString());
111-
Bukkit.getLogger().info("");
112-
113-
Bukkit.getLogger().info("Packets: " + ProtocolLibrary.getProtocolManager().getPacketListeners().stream()
114-
.filter(packetListener -> packetListener.getSendingWhitelist().getPriority().equals(ListenerPriority.MONITOR))
115-
.collect(Collectors.toList()).toString());
116-
Bukkit.getLogger().info("");
117-
118-
Bukkit.getLogger().info("Server Information: ");
119-
Bukkit.getLogger().info("Players Online: " + Bukkit.getServer().getOnlinePlayers().size());
120-
Bukkit.getLogger().info("Bukkit IP: " + Bukkit.getIp());
121-
Bukkit.getLogger().info("Running Version: " + Bukkit.getVersion()
122-
+ ", Bukkit Version: " + Bukkit.getBukkitVersion()
123-
+ ", Alt Version: " + Bukkit.getServer().getVersion()
124-
+ ", NMS: " + ProxyConstants.NMS_VERSION);
125-
Bukkit.getLogger().info("Motd: " + Bukkit.getServer().getMotd());
126-
Bukkit.getLogger().info("--------------- END DEBUG ----------------");
137+
}
127138
}
128139
}

0 commit comments

Comments
 (0)