AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-10-31 21:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to intercept native commands

Browse Source
This commit is contained in:
Paul Reilly 2023-04-10 01:27:30 -05:00
parent 33ac3a36ca
commit 6c0856d647
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commons/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View File

@ -161,8 +161,7 @@ public class TotalFreedomMod extends JavaPlugin
}
cl = new CommandLoader();
Bukkit.getScheduler().runTaskLater(plugin, cl::loadCommands, 1);
// Deferring command loading allowing TFD4J and Shop to load before registering our commands.
cl.loadCommands();
BackupManager backups = new BackupManager();
backups.createAllBackups();

17
commons/src/main/java/me/totalfreedom/totalfreedommod/command/handling/Interceptor.java
View File

@ -31,6 +31,13 @@ public class Interceptor
.getName()
.equalsIgnoreCase(command))
.forEach(entry -> overrides.put(entry.getKey(), entry.getValue())); // Intercept.
getFallbackCommands().entrySet()
.stream()
.filter(entry -> entry.getValue() // Check that the command is the one we want to intercept
.getName()
.equalsIgnoreCase(command))
.forEach(entry -> overrides.put(entry.getKey(), entry.getValue())); // Intercept.
}
public void setOverrides()
@ -42,6 +49,16 @@ public class Interceptor
});
}
private Map<String, Command> getFallbackCommands() {
final Map<String, Command> fallbackCommands = new HashMap<>();
for (final Map.Entry<String, Command> entry : Bukkit.getCommandMap().getKnownCommands().entrySet()) {
if (!(entry.getValue() instanceof PluginIdentifiableCommand)) {
fallbackCommands.put(entry.getKey(), entry.getValue());
}
}
return fallbackCommands;
}
private Map<String, Command> getPluginCommands()
{
final Map<String, Command> pluginCommands = new HashMap<>();