funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 06:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MC Timing upgrade, fix timing integrations, add parent timing

Browse Source
This commit is contained in:
Aikar
2017-06-24 01:23:22 -04:00
parent 26daa86c5b
commit 3a4ebe2d45
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bukkit/acf-bukkit.iml
+1 -1
View File
@@ -19,7 +19,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="acf-core" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.12-pre2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
bukkit/pom.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<dependency>
<groupId>co.aikar</groupId>
<artifactId>minecraft-timings</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
<dependency>
bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+5 -1
View File
@@ -24,6 +24,7 @@
package co.aikar.commands;
import co.aikar.commands.apachecommonslang.ApacheCommonsExceptionUtil;
import co.aikar.timings.lib.MCTiming;
import co.aikar.timings.lib.TimingManager;
import org.bukkit.Bukkit;
import org.bukkit.Server;
@@ -57,10 +58,13 @@ public class BukkitCommandManager extends CommandManager {
protected Map<String, BukkitRootCommand> registeredCommands = new HashMap<>();
protected BukkitCommandContexts contexts;
protected BukkitCommandCompletions completions;
MCTiming commandTiming;
@SuppressWarnings("JavaReflectionMemberAccess")
public BukkitCommandManager(Plugin plugin) {
this.plugin = plugin;
this.timingManager = TimingManager.of(plugin);
this.commandTiming = this.timingManager.of("Commands");
CommandMap commandMap = null;
try {
Server server = Bukkit.getServer();
@@ -194,7 +198,7 @@ public class BukkitCommandManager extends CommandManager {
@Override
public RegisteredCommand createRegisteredCommand(BaseCommand command, String cmdName, Method method, String prefSubCommand) {
return new RegisteredCommand(command, cmdName, method, prefSubCommand);
return new BukkitRegisteredCommand(command, cmdName, method, prefSubCommand);
}
@Override
bukkit/src/main/java/co/aikar/commands/BukkitRegisteredCommand.java
+3 -1
View File
@@ -24,6 +24,7 @@
package co.aikar.commands;
import co.aikar.timings.lib.MCTiming;
import co.aikar.timings.lib.TimingManager;
import java.lang.reflect.Method;
@@ -31,7 +32,8 @@ public class BukkitRegisteredCommand extends RegisteredCommand<BukkitCommandExec
private final MCTiming timing;
BukkitRegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {
super(scope, command, method, prefSubCommand);
this.timing = ((BukkitCommandManager) scope.manager).getTimings().of("Command: " + command);
BukkitCommandManager manager = (BukkitCommandManager) scope.manager;
this.timing = manager.getTimings().of("Command: " + this.command, manager.commandTiming);
}
example/acf-example.iml
+1 -1
View File
@@ -36,7 +36,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
<orderEntry type="module" module-name="acf-bukkit" />
<orderEntry type="module" module-name="acf-core" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
</component>
</module>
paper/acf-paper.iml
+1 -1
View File
@@ -20,7 +20,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="acf-bukkit" />
<orderEntry type="module" module-name="acf-core" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
<orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.12-pre2-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
sponge/src/main/java/co/aikar/commands/SpongeCommandManager.java
+5 -3
View File
@@ -43,9 +43,11 @@ public class SpongeCommandManager extends CommandManager {
protected Map<String, SpongeRootCommand> registeredCommands = new HashMap<>();
protected SpongeCommandContexts contexts;
protected SpongeCommandCompletions completions;
private Timing commandTiming;
public SpongeCommandManager(PluginContainer plugin) {
this.plugin = plugin;
this.commandTiming = Timings.of(plugin, "Commands");
}
@Override
@@ -89,8 +91,8 @@ public class SpongeCommandManager extends CommandManager {
}
}
public Timing createTiming(final SpongeRegisteredCommand command) {
return Timings.of(this.plugin, "Command: " + command.command);
public Timing createTiming(final String name) {
return Timings.of(this.plugin, name, this.commandTiming);
}
@Override
@@ -118,7 +120,7 @@ public class SpongeCommandManager extends CommandManager {
@Override
public RegisteredCommand createRegisteredCommand(BaseCommand command, String cmdName, Method method, String prefSubCommand) {
return new RegisteredCommand(command, cmdName, method, prefSubCommand);
return new SpongeRegisteredCommand(command, cmdName, method, prefSubCommand);
}
@Override
sponge/src/main/java/co/aikar/commands/SpongeRegisteredCommand.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class SpongeRegisteredCommand extends RegisteredCommand<SpongeCommandExec
SpongeRegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {
super(scope, command, method, prefSubCommand);
this.timing = ((SpongeCommandManager) scope.manager).createTiming(this);
this.timing = ((SpongeCommandManager) scope.manager).createTiming("Command: " + this.command);
}
@Override