Skip to content

Commit 85595a5

Browse files
author
Jerome
committed
Help-Befehl für Language erstellt
1 parent 1e4cdfa commit 85595a5

File tree

2 files changed

+40
-10
lines changed

2 files changed

+40
-10
lines changed

bungeecord/src/main/java/dev/minecode/language/bungeecord/command/LanguageCommand.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.md_5.bungee.api.chat.BaseComponent;
1212
import net.md_5.bungee.api.chat.ClickEvent;
1313
import net.md_5.bungee.api.chat.HoverEvent;
14+
import net.md_5.bungee.api.chat.hover.content.Text;
1415
import net.md_5.bungee.api.connection.ProxiedPlayer;
1516
import net.md_5.bungee.api.plugin.Command;
1617
import net.md_5.bungee.api.plugin.TabExecutor;
@@ -67,16 +68,21 @@ public void execute(CommandSender commandSender, String[] args) {
6768
baseComponent.setHoverEvent(
6869
new HoverEvent(
6970
HoverEvent.Action.SHOW_TEXT,
70-
CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageHoverLanguageChoose)
71+
new Text(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageHoverLanguageChoose)
7172
.language(CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode), "language")
72-
.chatcolorAll().getBaseMessage()));
73+
.chatcolorAll().getBaseMessage())));
7374
}
7475
commandSender.sendMessage(b);
7576
}
7677
return;
7778
}
7879

7980
if (args.length == 1) {
81+
if (args[0].equalsIgnoreCase("help")) {
82+
syntaxMessage(commandSender, coreExecuter);
83+
return;
84+
}
85+
8086
String isocode = args[0];
8187
Language language;
8288
if ((language = CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode)) == null) {
@@ -104,9 +110,7 @@ public void execute(CommandSender commandSender, String[] args) {
104110
return;
105111
}
106112

107-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxInfo).chatcolorAll().getBaseMessage());
108-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxChoose).chatcolorAll().getBaseMessage());
109-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxSet).chatcolorAll().getBaseMessage());
113+
syntaxMessage(commandSender, coreExecuter);
110114
}
111115

112116
@Override
@@ -133,4 +137,15 @@ public Iterable<String> onTabComplete(CommandSender commandSender, String[] args
133137

134138
return tab;
135139
}
140+
141+
private void syntaxMessage(CommandSender commandSender, CorePlayer corePlayer) {
142+
if (!commandSender.hasPermission("language.use")) {
143+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandNoPermission).chatcolorAll().getBaseMessage());
144+
return;
145+
}
146+
147+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxInfo).chatcolorAll().getBaseMessage());
148+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxChoose).chatcolorAll().getBaseMessage());
149+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxSet).chatcolorAll().getBaseMessage());
150+
}
136151
}

spigot/src/main/java/dev/minecode/language/spigot/command/LanguageCommand.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
7676
}
7777

7878
if (args.length == 1) {
79+
if (args[0].equalsIgnoreCase("help")) {
80+
syntaxMessage(commandSender, coreExecuter);
81+
return true;
82+
}
83+
7984
String isocode = args[0];
8085
Language language;
8186
if ((language = CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode)) == null) {
@@ -103,9 +108,7 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
103108
return true;
104109
}
105110

106-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxInfo).chatcolorAll().getMessage());
107-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxChoose).chatcolorAll().getMessage());
108-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxSet).chatcolorAll().getMessage());
111+
syntaxMessage(commandSender, coreExecuter);
109112
return true;
110113
}
111114

@@ -120,17 +123,29 @@ public List<String> onTabComplete(CommandSender commandSender, Command command,
120123
}
121124

122125
if (args.length == 1) {
126+
list.add("help");
123127
for (Language language : CoreAPI.getInstance().getLanguageManager().getAllLanguages(corePlugin)) {
124128
list.add(language.getIsocode());
125129
}
126-
search = args[0].toLowerCase();
130+
search = args[0];
127131
}
128132

129133
for (String start : list) {
130-
if (start.toLowerCase().startsWith(search))
134+
if (start.toLowerCase().startsWith(search.toLowerCase()))
131135
tab.add(start);
132136
}
133137

134138
return tab;
135139
}
140+
141+
private void syntaxMessage(CommandSender commandSender, CorePlayer corePlayer) {
142+
if (!commandSender.hasPermission("language.use")) {
143+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandNoPermission).chatcolorAll().getMessage());
144+
return;
145+
}
146+
147+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxInfo).chatcolorAll().getMessage());
148+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxChoose).chatcolorAll().getMessage());
149+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(corePlayer.getLanguage(corePlugin), LanguageLanguageSpigot.languageCommandSyntaxSet).chatcolorAll().getMessage());
150+
}
136151
}

0 commit comments

Comments
 (0)