aboutsummaryrefslogtreecommitdiff
path: root/spark-forge
diff options
context:
space:
mode:
authorLuck <git@lucko.me>2018-10-15 22:00:05 +0100
committerLuck <git@lucko.me>2018-10-15 22:00:05 +0100
commit8e25dac340a07f7a57a13bdde53b0605779ea920 (patch)
tree3f034154fe8630f6cbf5648c9d2cb6b1426b9efe /spark-forge
parent91775dd2ecc3f3e70dd422f68cf6d06e74db5d49 (diff)
downloadspark-8e25dac340a07f7a57a13bdde53b0605779ea920.tar.gz
spark-8e25dac340a07f7a57a13bdde53b0605779ea920.tar.bz2
spark-8e25dac340a07f7a57a13bdde53b0605779ea920.zip
Implement tab completion, update readme
Diffstat (limited to 'spark-forge')
-rw-r--r--spark-forge/build.gradle1
-rw-r--r--spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java6
-rw-r--r--spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java6
-rw-r--r--spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java5
-rw-r--r--spark-forge/src/main/resources/mcmod.info2
5 files changed, 12 insertions, 8 deletions
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index 68322c3..be1982d 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -24,6 +24,7 @@ minecraft {
processResources {
from(sourceSets.main.resources.srcDirs) {
expand 'pluginVersion': project.pluginVersion
+ expand 'pluginDesc': project.pluginDesc
include 'mcmod.info'
}
}
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java
index d073497..b56dd70 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlatform.java
@@ -50,17 +50,17 @@ public class ForgeClientSparkPlatform extends ForgeSparkPlatform {
@Override
public String getLabel() {
- return "sparkclient";
+ return "sparkc";
}
@Override
public String getName() {
- return "sparkclient";
+ return "sparkc";
}
@Override
public List<String> getAliases() {
- return Collections.singletonList("cprofiler");
+ return Collections.singletonList("sparkclient");
}
@Override
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java
index 6b64b95..d667234 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlatform.java
@@ -40,7 +40,7 @@ public class ForgeServerSparkPlatform extends ForgeSparkPlatform {
List<EntityPlayerMP> players = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayers();
for (EntityPlayerMP player : players) {
- if (player.canUseCommand(4, "spark.profiler")) {
+ if (player.canUseCommand(4, "spark")) {
player.sendMessage(msg);
}
}
@@ -63,11 +63,11 @@ public class ForgeServerSparkPlatform extends ForgeSparkPlatform {
@Override
public List<String> getAliases() {
- return Collections.singletonList("profiler");
+ return Collections.emptyList();
}
@Override
public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
- return sender.canUseCommand(4, "spark.profiler");
+ return sender.canUseCommand(4, "spark");
}
}
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java
index 542c782..5b62f3f 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkPlatform.java
@@ -122,7 +122,10 @@ public abstract class ForgeSparkPlatform extends SparkPlatform<ICommandSender> i
@Override
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos blockPos) {
- return Collections.emptyList();
+ if (!checkPermission(server, sender)) {
+ return Collections.emptyList();
+ }
+ return tabCompleteCommand(sender, args);
}
@Override
diff --git a/spark-forge/src/main/resources/mcmod.info b/spark-forge/src/main/resources/mcmod.info
index 88b1ccb..861646f 100644
--- a/spark-forge/src/main/resources/mcmod.info
+++ b/spark-forge/src/main/resources/mcmod.info
@@ -1,7 +1,7 @@
[{
"modid": "spark",
"name": "spark",
- "description": "Spark is a CPU profiling plugin based on sk89q's WarmRoast profiler",
+ "description": "${pluginDesc}",
"version": "${pluginVersion}",
"authors": ["Luck", "sk89q"]
}] \ No newline at end of file