Skip to content

Commit 2f85fb2

Browse files
author
Jerome van den Wyenbergh
committed
Auf die neuste Version von Core geupdatet; APIs geupdatet; weitere kleine Feinheiten
1 parent 0489a89 commit 2f85fb2

File tree

27 files changed

+171
-232
lines changed

27 files changed

+171
-232
lines changed

‎api/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@
1515
<url>https://github.com/MineCodeDEV/Language/tree/master/api</url>
1616

1717
<dependencies>
18-
<!-- MineCode Core -->
18+
<!-- MineCodeDEV Core -->
1919
<dependency>
2020
<groupId>dev.minecode.core</groupId>
2121
<artifactId>api</artifactId>
22-
<version>0.1.0-Pre.48</version>
23-
<exclusions>
24-
<exclusion>
25-
<groupId>com.google.code.gson</groupId>
26-
<artifactId>gson</artifactId>
27-
</exclusion>
28-
</exclusions>
22+
<version>0.1.0-Pre.57</version>
2923
</dependency>
3024
</dependencies>
3125

‎api/src/main/java/dev/minecode/language/api/LanguageAPI.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.minecode.language.api;
22

33
import dev.minecode.core.api.CoreAPI;
4+
import dev.minecode.core.api.object.CorePlugin;
45
import dev.minecode.language.api.manager.FileManager;
56

67
public abstract class LanguageAPI {
@@ -27,7 +28,9 @@ private static CoreAPI getCoreAPI() {
2728
public abstract FileManager getFileManager();
2829

2930

30-
// Variables
31+
// Getter & Setter
32+
public abstract CorePlugin getThisCorePlugin();
33+
3134
public abstract boolean isUsingGUI();
3235

3336
public abstract boolean isForceOpenInventory();

‎bungeecord/pom.xml‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,33 @@
1414
<name>BungeeCord</name>
1515
<url>https://github.com/MineCodeDEV/Language/tree/master/bungeecord</url>
1616

17+
<repositories>
18+
<repository>
19+
<id>bungeecord-repo</id>
20+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
21+
</repository>
22+
</repositories>
23+
1724
<dependencies>
18-
<!-- MineCode Language -->
25+
<!-- MineCodeDEV Language -->
1926
<dependency>
2027
<groupId>dev.minecode.language</groupId>
2128
<artifactId>common</artifactId>
2229
<version>0.1.0-Pre.1</version>
23-
<exclusions>
24-
<exclusion>
25-
<groupId>net.md-5</groupId>
26-
<artifactId>bungeecord-chat</artifactId>
27-
</exclusion>
28-
</exclusions>
2930
</dependency>
3031

31-
<!-- MineCode Core -->
32+
<!-- MineCodeDEV Core -->
3233
<dependency>
3334
<groupId>dev.minecode.core</groupId>
3435
<artifactId>bungeecord</artifactId>
35-
<version>0.1.0-Pre.48</version>
36+
<version>0.1.0-Pre.57</version>
3637
</dependency>
3738

3839
<!-- BungeeCord -->
3940
<dependency>
4041
<groupId>net.md-5</groupId>
4142
<artifactId>bungeecord-api</artifactId>
4243
<version>1.16-R0.5-SNAPSHOT</version>
43-
<type>jar</type>
44-
<scope>provided</scope>
45-
<exclusions>
46-
<exclusion>
47-
<groupId>org.yaml</groupId>
48-
<artifactId>snakeyaml</artifactId>
49-
</exclusion>
50-
</exclusions>
5144
</dependency>
5245
</dependencies>
5346

@@ -85,25 +78,16 @@
8578

8679
<include>org.spongepowered:configurate-core</include>
8780
<include>io.leangen.geantyref:geantyref</include>
81+
<include>com.google.errorprone:error_prone_annotations</include>
8882
<include>org.checkerframework:checkerframework</include>
8983

9084
<include>org.spongepowered:configurate-yaml</include>
9185
<include>org.yaml:snakeyaml</include>
9286

9387
<include>org.spongepowered:configurate-gson</include>
94-
<include>com.google.code.gson:gson</include>
88+
<include>com.google.gson:gson</include>
9589
</includes>
9690
</artifactSet>
97-
<relocations>
98-
<relocation>
99-
<pattern>dev.minecode.core</pattern>
100-
<shadedPattern>dev.minecode.language.shade.core</shadedPattern>
101-
</relocation>
102-
<relocation>
103-
<pattern>org.yaml</pattern>
104-
<shadedPattern>dev.minecode.language.shade.yaml</shadedPattern>
105-
</relocation>
106-
</relocations>
10791
<filters>
10892
<filter>
10993
<artifact>*:*</artifact>

‎bungeecord/src/main/java/dev/minecode/language/bungeecord/LanguageBungeeCord.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void onDisable() {
2828

2929
private void makeInstances() {
3030
instance = this;
31-
new CoreBungeeCord(this);
31+
CoreBungeeCord.getInstance().registerPlugin(getDescription().getName(), getDescription().getName(), this);
3232
new LanguageCommon();
3333
}
3434

@@ -41,6 +41,6 @@ private void registerListeners() {
4141
}
4242

4343
private void registerChannels() {
44-
getProxy().registerChannel("MineCode");
44+
getProxy().registerChannel("minecode:language");
4545
}
4646
}

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

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dev.minecode.core.api.CoreAPI;
44
import dev.minecode.core.api.object.CorePlayer;
5+
import dev.minecode.core.api.object.CorePlugin;
56
import dev.minecode.core.api.object.Language;
67
import dev.minecode.language.api.LanguageAPI;
78
import dev.minecode.language.bungeecord.helper.PluginMessageHelper;
@@ -20,6 +21,9 @@
2021
import java.util.Set;
2122

2223
public class LanguageCommand extends Command implements TabExecutor {
24+
25+
private final CorePlugin corePlugin = LanguageAPI.getInstance().getThisCorePlugin();
26+
2327
public LanguageCommand(String name) {
2428
super(name);
2529
}
@@ -30,17 +34,17 @@ public LanguageCommand(String name, String permission, String... aliases) {
3034

3135
@Override
3236
public void execute(CommandSender commandSender, String[] args) {
33-
CorePlayer coreExecuter = CoreAPI.getInstance().getPlayerManager().getCorePlayer(commandSender.getName());
37+
CorePlayer coreExecuter = CoreAPI.getInstance().getPlayerManager().getPlayer(commandSender.getName());
3438

3539
if (!commandSender.hasPermission("language.use")) {
36-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.noPermission)
40+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandNoPermission)
3741
.args("language", args, "arg").chatcolorAll().getBaseMessage());
3842
return;
3943
}
4044

4145
if (args.length == 0) {
4246
if (!(commandSender instanceof ProxiedPlayer)) {
43-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.noPlayer)
47+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandNoPlayer)
4448
.args("language", args, "arg").chatcolorAll().getBaseMessage());
4549
return;
4650
}
@@ -50,21 +54,21 @@ public void execute(CommandSender commandSender, String[] args) {
5054
return;
5155
}
5256

53-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageCommandLanguageSelection).chatcolorAll().getBaseMessage());
57+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandLanguageSelection).chatcolorAll().getBaseMessage());
5458

55-
String repeat = CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageCommandLanguageCollection).chatcolorAll().getMessage();
59+
String repeat = CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandLanguageCollection).chatcolorAll().getMessage();
5660
String isocode;
57-
for (Language language : CoreAPI.getInstance().getLanguageManager().getAllLanguages()) {
61+
for (Language language : CoreAPI.getInstance().getLanguageManager().getAllLanguages(corePlugin)) {
5862
isocode = language.getIsocode();
59-
BaseComponent[] b = CoreAPI.getInstance().getReplaceManager(repeat).language(CoreAPI.getInstance().getLanguageManager().getLanguage(isocode), "language").chatcolorAll().getBaseMessage();
63+
BaseComponent[] b = CoreAPI.getInstance().getReplaceManager(repeat).language(CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode), "language").chatcolorAll().getBaseMessage();
6064
for (BaseComponent baseComponent : b) {
6165
baseComponent.setClickEvent(
6266
new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/language " + isocode));
6367
baseComponent.setHoverEvent(
6468
new HoverEvent(
6569
HoverEvent.Action.SHOW_TEXT,
66-
CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageHoverText)
67-
.language(CoreAPI.getInstance().getLanguageManager().getLanguage(isocode), "language")
70+
CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageHoverText)
71+
.language(CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode), "language")
6872
.chatcolorAll().getBaseMessage()));
6973
}
7074
commandSender.sendMessage(b);
@@ -75,26 +79,26 @@ public void execute(CommandSender commandSender, String[] args) {
7579
if (args.length == 1) {
7680
String isocode = args[0];
7781
Language language;
78-
if ((language = CoreAPI.getInstance().getLanguageManager().getLanguage(isocode)) == null) {
79-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.noValidIsocode)
82+
if ((language = CoreAPI.getInstance().getLanguageManager().getLanguage(corePlugin, isocode)) == null) {
83+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandNoValidIsocode)
8084
.args("language", args, "arg").chatcolorAll().getBaseMessage());
8185
return;
8286
}
8387

84-
Language oldLanguage = coreExecuter.getLanguage();
85-
coreExecuter.setLanguage(language);
88+
Language oldLanguage = coreExecuter.getLanguage(corePlugin);
89+
coreExecuter.setLanguage(language.getIsocode());
8690
coreExecuter.save();
8791

88-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageCommandChange)
89-
.language(coreExecuter.getLanguage(), "language")
92+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandChange)
93+
.language(coreExecuter.getLanguage(corePlugin), "language")
9094
.language(oldLanguage, "oldLanguage")
9195
.args("language", args, "arg").chatcolorAll().getBaseMessage());
9296
return;
9397
}
9498

95-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.syntax).chatcolorAll().getBaseMessage());
96-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageCommandSyntaxChoose).chatcolorAll().getBaseMessage());
97-
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(), LanguageLanguageBungeeCord.languageCommandSyntaxSet).chatcolorAll().getBaseMessage());
99+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxInfo).chatcolorAll().getBaseMessage());
100+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxChoose).chatcolorAll().getBaseMessage());
101+
commandSender.sendMessage(CoreAPI.getInstance().getReplaceManager(coreExecuter.getLanguage(corePlugin), LanguageLanguageBungeeCord.languageCommandSyntaxSet).chatcolorAll().getBaseMessage());
98102
}
99103

100104
@Override
@@ -108,7 +112,7 @@ public Iterable<String> onTabComplete(CommandSender commandSender, String[] args
108112
}
109113

110114
if (args.length == 1) {
111-
for (Language language : CoreAPI.getInstance().getLanguageManager().getAllLanguages()) {
115+
for (Language language : CoreAPI.getInstance().getLanguageManager().getAllLanguages(corePlugin)) {
112116
list.add(language.getIsocode());
113117
}
114118
search = args[0].toLowerCase();

‎bungeecord/src/main/java/dev/minecode/language/bungeecord/helper/PluginMessageHelper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ public static void openLanguageChangeGUI(ProxiedPlayer proxiedPlayer) {
1313
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
1414

1515
try {
16-
dataOutputStream.writeUTF("Language");
1716
dataOutputStream.writeUTF("OpenLanguageChangeGUI");
1817
dataOutputStream.writeUTF(proxiedPlayer.getUniqueId().toString());
1918
} catch (IOException e) {
2019
e.printStackTrace();
2120
}
2221

2322
ServerInfo serverInfo = proxiedPlayer.getServer().getInfo();
24-
serverInfo.sendData("MineCode", byteArrayOutputStream.toByteArray());
23+
serverInfo.sendData("minecode:language", byteArrayOutputStream.toByteArray());
2524
}
2625
}

‎bungeecord/src/main/java/dev/minecode/language/bungeecord/listener/PlayerListener.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.minecode.language.bungeecord.listener;
22

33
import dev.minecode.core.api.CoreAPI;
4-
import dev.minecode.core.api.object.CorePlayer;
54
import dev.minecode.language.api.LanguageAPI;
65
import dev.minecode.language.bungeecord.LanguageBungeeCord;
76
import dev.minecode.language.bungeecord.helper.PluginMessageHelper;
@@ -10,7 +9,6 @@
109
import net.md_5.bungee.api.event.PostLoginEvent;
1110
import net.md_5.bungee.api.plugin.Listener;
1211
import net.md_5.bungee.event.EventHandler;
13-
import org.spongepowered.configurate.ConfigurationNode;
1412

1513
import java.util.concurrent.TimeUnit;
1614

@@ -20,7 +18,7 @@ public void handlePlayerJoin(PostLoginEvent event) {
2018
ProxiedPlayer proxiedPlayer = event.getPlayer();
2119

2220
if (LanguageAPI.getInstance().isForceOpenInventory()) {
23-
if (CoreAPI.getInstance().getPlayerManager().getCorePlayer(proxiedPlayer.getUniqueId()).isLanguageEmpty()) {
21+
if (CoreAPI.getInstance().getPlayerManager().getPlayer(proxiedPlayer.getUniqueId()).isLanguageEmpty()) {
2422
ProxyServer.getInstance().getScheduler().schedule(LanguageBungeeCord.getInstance(), new Runnable() {
2523
@Override
2624
public void run() {

‎bungeecord/src/main/java/dev/minecode/language/bungeecord/object/LanguageLanguageBungeeCord.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44

55
public enum LanguageLanguageBungeeCord implements LanguageAbstract {
66

7-
noPermission("noPermission"),
8-
noPlayer("noPlayer"),
9-
playerNotOnline("playerNotOnline"),
10-
playerNotExists("playerNotExists"),
11-
noValidIsocode("noValidIsocode"),
12-
syntax("syntax"),
13-
7+
languageCommandNoPermission("language", "command", "noPermission"),
8+
languageCommandNoPlayer("language", "command", "noPlayer"),
9+
languageCommandSyntaxInfo("language", "command", "syntax", "info"),
1410
languageCommandSyntaxChoose("language", "command", "syntax", "choose"),
1511
languageCommandSyntaxSet("language", "command", "syntax", "set"),
12+
languageCommandNoValidIsocode("language", "command", "noValidIsocode"),
1613
languageCommandChange("language", "command", "change"),
1714
languageCommandLanguageCollection("language", "command", "languageCollection"),
1815
languageCommandLanguageSelection("language", "command", "languageSelection"),
16+
1917
languageHoverText("language", "hover", "text");
2018

21-
private String[] path;
19+
private final String[] path;
2220

2321
LanguageLanguageBungeeCord(String... path) {
2422
this.path = path;

bungeecord/src/main/resources/Language/message/de.yml renamed to bungeecord/src/main/resources/Language/message/de_de.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77
# | $$ \/ | $$| $$| $$ | $$| $$$$$$$| $$$$$$/| $$$$$$/| $$$$$$$| $$$$$$$
88
# |__/ |__/|__/|__/ |__/ \_______/ \______/ \______/ \_______/ \_______/
99

10-
noPermission: "&cLanguage &8» &7Dazu hast du keine Rechte"
11-
noPlayer: "&cLanguage &8» &7Dies kannst du nur als Spieler"
12-
playerNotOnline: "&cLanguage &8» &7Der Spieler &b%targetName% &7ist nicht online"
13-
playerNotExists: "&cLanguage &8» &7Der Spieler &b%arg-1% &7existiert nicht"
14-
noValidIsocode: "&cLanguage &8» &7Bitte gib einen gültigen Isocode an"
15-
syntax: "&9Language &8» &7Du kannst die folgenden Befehle ausführen:"
16-
1710
language:
1811
command:
12+
noPermission: "&cLanguage &8» &7Dazu hast du keine Rechte"
13+
noPlayer: "&cLanguage &8» &7Dies kannst du nur als Spieler"
1914
syntax:
15+
info: "&9Language &8» &7Du kannst die folgenden Befehle ausführen:"
2016
choose: "&8- &6/language &8- &7Wähle deine Sprache aus"
2117
set: "&8- &6/language [Isocode] &8- &7Stelle deine Sprache ein"
18+
noValidIsocode: "&cLanguage &8» &7Bitte gib einen gültigen Isocode an"
2219
change: "&aLanguage &8» &7Du hast deine Sprache von &e%oldLanguageDisplayname% &7zu &6%languageDisplayname% &7geändert"
2320
languageSelection: "&9Language &8» &7Du kannst eine der folgenden Sprachen auswählen:"
2421
languageCollection: "&8- %languageDisplayname%"

bungeecord/src/main/resources/Language/message/en-us.yml renamed to bungeecord/src/main/resources/Language/message/en_us.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77
# | $$ \/ | $$| $$| $$ | $$| $$$$$$$| $$$$$$/| $$$$$$/| $$$$$$$| $$$$$$$
88
# |__/ |__/|__/|__/ |__/ \_______/ \______/ \______/ \_______/ \_______/
99

10-
noPermission: "&cLanguage &8» &7You have no permissions to do this"
11-
noPlayer: "&cLanguage &8» &7You can only do this as a player"
12-
playerNotOnline: "&cLanguage &8» &7The player &b%targetName% &7is not online"
13-
playerNotExists: "&cLanguage &8» &7The player &b%arg-1% &7does not exist"
14-
noValidIsocode: "&cLanguage &8» &7Please enter a valid isocode"
15-
syntax: "&9Language &8» &7You can run the following commands:"
16-
1710
language:
1811
command:
12+
noPermission: "&cLanguage &8» &7You have no permissions to do this"
13+
noPlayer: "&cLanguage &8» &7You can only do this as a player"
1914
syntax:
15+
info: "&9Language &8» &7You can run the following commands:"
2016
choose: "&8- &6/language &8- &7Choose a language"
2117
set: "&8- &6/language [Isocode] &8- &7Set your language"
18+
noValidIsocode: "&cLanguage &8» &7Please enter a valid isocode"
2219
change: "&aLanguage &8» &7You have changed your language from &e%oldLanguageDisplayname% &7to &6%languageDisplayname%"
2320
languageCollection: "&8- %languageDisplayname%"
2421
languageSelection: "&9Language &8» &7You can choose one of the following languages:"

0 commit comments

Comments
 (0)