Skip to content

Commit 36f4ca9

Browse files
Merge pull request #58 from OneLiteFeatherNET/OneLiteFeather/chore/update-dependency-and-fix-command
Update testing and fix issues with commands and translation gathering on startup
2 parents 92490da + d437762 commit 36f4ca9

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import net.minecrell.pluginyml.paper.PaperPluginDescription
44
plugins {
55
id("java")
66
id("net.minecrell.plugin-yml.paper") version "0.6.0"
7-
id("io.github.goooler.shadow") version "8.1.8"
7+
id("com.gradleup.shadow").version("9.3.0")
88
id("xyz.jpenilla.run-paper") version "3.0.2"
99
}
1010

@@ -34,7 +34,7 @@ tasks {
3434
}
3535

3636
runServer {
37-
minecraftVersion("1.21.1")
37+
minecraftVersion("1.21.10")
3838
jvmArgs("-Dcom.mojang.eula.agree=true")
3939
}
4040

src/main/java/de/theshadowsdust/ultimatespawn/command/SpawnCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public SpawnCommand(@NotNull UltimateSpawnPlugin plugin) {
3838
public void executeSpawnCommand(Player player, final @Argument(value = "name", suggestions = "spawn_names") @Greedy String name) {
3939

4040
String positionName = name == null ? "spawn" : name;
41+
if (positionName.isEmpty()) positionName = "spawn";
4142

4243
try {
4344
SpawnPosition spawnPosition = this.plugin.getSpawnPositionService().getSpawnPosition(positionName).get();

src/main/java/de/theshadowsdust/ultimatespawn/service/CommandService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public CommandService(@NotNull UltimateSpawnPlugin plugin) {
3535
public PaperCommandManager<CommandSender> buildCommandSystem() {
3636
return PaperCommandManager
3737
.builder(new BukkitSenderMapper())
38-
.executionCoordinator(ExecutionCoordinator.asyncCoordinator())
38+
.executionCoordinator(ExecutionCoordinator.simpleCoordinator())
3939
.buildOnEnable(this.plugin);
4040
}
4141

@@ -50,7 +50,8 @@ public MinecraftHelp<CommandSender> buildHelpSystem(PaperCommandManager<CommandS
5050
return MinecraftHelp.<CommandSender>builder()
5151
.commandManager(paperCommandManager)
5252
.audienceProvider(this.bukkitAudiences::sender)
53-
.commandPrefix("/ultimatespawn")
53+
// TODO: find out why this clicking and executing command feature has an empty space in chat, might be fault by cloud
54+
.commandPrefix("/")
5455
.colors(MinecraftHelp.helpColors(
5556
NamedTextColor.GOLD,
5657
NamedTextColor.GRAY,

src/main/java/de/theshadowsdust/ultimatespawn/service/LanguageService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public Component getMessage(@NotNull String key, Object... placeholders) {
5454
public void loadMessages() {
5555
try {
5656
if (Files.notExists(this.translationDir.toPath())) Files.createDirectory(this.translationDir.toPath());
57-
this.defaultMessages = ResourceBundle.getBundle("ultimatespawn_%s".formatted(
58-
this.plugin.getConfigurationService().getConfig().getLanguage()), new UTF8ResourceBundleControl());
57+
this.defaultMessages = ResourceBundle.getBundle("ultimatespawn", Locale.forLanguageTag(this.plugin.getConfigurationService().getConfig().getLanguage()), new UTF8ResourceBundleControl());
5958
this.languageConfiguration = loadLanguageConfig();
6059
} catch (IOException e) {
6160
this.plugin.getLogger().log(Level.SEVERE, "Can't load messages", e);

src/main/resources/ultimatespawn_de_DE.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ command.reload.success={0} &7Plugin &e{1} &7wurde &aerfolgreich &7neugeladen.
33
command.removespawn.success={0} &7Spawn &e{1} &7wurde &aerfolgreich &7entfernt.
44
command.setspawn.success={0} &7Spawn &e{1} &7wurde &aerfolgreich &7gesetzt.
55
spawn-teleport-success={0} &7Du wurdest &aerfolgreich &7teleportiert!
6-
spawn-teleport-failure={0} &cDer Teleport ist fehlgeschlagen! Bitte gebe einem Administrator bescheid.
6+
spawn-teleport-failure={0} &cDer Teleport ist fehlgeschlagen! Bitte gebe einem Administrator Bescheid.
77
invalid-world={0} &cUnbekannte Welt!
8-
spawn-not-exists={0} &cSpawn &c&l{1} &ckonnte nicht gefunden.
8+
spawn-not-exists={0} &cSpawn &c&l{1} &ckonnte nicht gefunden werden.
99
spawn-already-exists={0} &cSpawn &c&l{1} &cexistiert bereits.

0 commit comments

Comments
 (0)