Skip to content

Commit 60f568d

Browse files
author
Jerome van den Wyenbergh
committed
Viele kleine Änderungen gemacht; Code aufgeräumt; OpenLanguageChangeGUI kann nun von BungeeCord aus geöffnet werden; Core auf 0.1.0-Pre.36 geupdatet; noch nicht mit SQL funktionsfähig wegen Fehler im CorePlayer
1 parent e87b2a7 commit 60f568d

File tree

17 files changed

+111
-98
lines changed

17 files changed

+111
-98
lines changed

‎api/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111

1212
<artifactId>api</artifactId>
1313

14+
<name>API</name>
15+
<url>https://github.com/MineCodeDEV/Language/tree/master/api</url>
16+
1417
<dependencies>
1518
<!-- MineCode Core -->
1619
<dependency>
1720
<groupId>dev.minecode.core</groupId>
1821
<artifactId>api</artifactId>
19-
<version>0.1.0-Pre.32</version>
22+
<version>0.1.0-Pre.36</version>
2023
<exclusions>
2124
<exclusion>
2225
<groupId>com.google.code.gson</groupId>
@@ -27,6 +30,7 @@
2730
</dependencies>
2831

2932
<build>
33+
<finalName>${project.parent.name}-${project.name}-${project.version}</finalName>
3034
<plugins>
3135
<plugin>
3236
<groupId>org.apache.maven.plugins</groupId>

‎bungeecord/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
<artifactId>bungeecord</artifactId>
1313

14+
<name>BungeeCord</name>
15+
<url>https://github.com/MineCodeDEV/Language/tree/master/bungeecord</url>
16+
1417
<dependencies>
1518
<!-- MineCode Language -->
1619
<dependency>
@@ -29,7 +32,7 @@
2932
<dependency>
3033
<groupId>dev.minecode.core</groupId>
3134
<artifactId>bungeecord</artifactId>
32-
<version>0.1.0-Pre.32</version>
35+
<version>0.1.0-Pre.36</version>
3336
</dependency>
3437

3538
<!-- BungeeCord -->
@@ -49,6 +52,7 @@
4952
</dependencies>
5053

5154
<build>
55+
<finalName>${project.parent.name}-${project.name}-${project.version}</finalName>
5256
<plugins>
5357
<plugin>
5458
<groupId>org.apache.maven.plugins</groupId>

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
public class LanguageBungeeCord extends Plugin {
1010
private static LanguageBungeeCord instance;
1111

12-
private CoreBungeeCord coreBungeeCord;
13-
private LanguageCommon languageCommon;
14-
1512
public static LanguageBungeeCord getInstance() {
1613
return instance;
1714
}
@@ -24,22 +21,23 @@ public void onEnable() {
2421
registerChannels();
2522
}
2623

27-
private void makeInstances() {
28-
instance = this;
29-
coreBungeeCord = new CoreBungeeCord(this);
30-
languageCommon = new LanguageCommon();
31-
}
32-
24+
@Override
3325
public void onDisable() {
3426
CoreBungeeCord.getInstance().onDisable();
3527
}
3628

29+
private void makeInstances() {
30+
instance = this;
31+
new CoreBungeeCord(this);
32+
new LanguageCommon();
33+
}
34+
3735
private void registerCommands() {
3836
getProxy().getPluginManager().registerCommand(this, new LanguageCommand("language"));
3937
}
4038

4139
private void registerListeners() {
42-
new PlayerListener();
40+
getProxy().getPluginManager().registerListener(this, new PlayerListener());
4341
}
4442

4543
private void registerChannels() {

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import dev.minecode.core.api.object.CorePlayer;
55
import dev.minecode.core.api.object.Language;
66
import dev.minecode.language.api.LanguageAPI;
7+
import dev.minecode.language.bungeecord.helper.PluginMessageHelper;
78
import dev.minecode.language.bungeecord.object.LanguageLanguageBungeeCord;
89
import net.md_5.bungee.api.CommandSender;
910
import net.md_5.bungee.api.chat.BaseComponent;
@@ -13,16 +14,12 @@
1314
import net.md_5.bungee.api.plugin.Command;
1415
import net.md_5.bungee.api.plugin.TabExecutor;
1516

16-
import java.io.ByteArrayOutputStream;
17-
import java.io.DataOutputStream;
18-
import java.io.IOException;
1917
import java.util.ArrayList;
2018
import java.util.HashSet;
2119
import java.util.List;
2220
import java.util.Set;
2321

2422
public class LanguageCommand extends Command implements TabExecutor {
25-
2623
public LanguageCommand(String name) {
2724
super(name);
2825
}
@@ -49,16 +46,7 @@ public void execute(CommandSender commandSender, String[] args) {
4946
}
5047

5148
if (LanguageAPI.getInstance().isUsingGUI()) {
52-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
53-
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
54-
55-
try {
56-
dataOutputStream.writeUTF("Language");
57-
dataOutputStream.writeUTF("OpenLanguageChangeGUI");
58-
} catch (IOException ignored) {
59-
}
60-
61-
((ProxiedPlayer) commandSender).sendData("MineCode", byteArrayOutputStream.toByteArray());
49+
PluginMessageHelper.openLanguageChangeGUI((ProxiedPlayer) commandSender);
6250
return;
6351
}
6452

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package dev.minecode.language.bungeecord.helper;
2+
3+
import net.md_5.bungee.api.config.ServerInfo;
4+
import net.md_5.bungee.api.connection.ProxiedPlayer;
5+
6+
import java.io.ByteArrayOutputStream;
7+
import java.io.DataOutputStream;
8+
import java.io.IOException;
9+
10+
public class PluginMessageHelper {
11+
public static void openLanguageChangeGUI(ProxiedPlayer proxiedPlayer) {
12+
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
13+
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
14+
15+
try {
16+
dataOutputStream.writeUTF("Language");
17+
dataOutputStream.writeUTF("OpenLanguageChangeGUI");
18+
} catch (IOException e) {
19+
e.printStackTrace();
20+
}
21+
22+
ServerInfo serverInfo = proxiedPlayer.getServer().getInfo();
23+
serverInfo.sendData("MineCode", byteArrayOutputStream.toByteArray());
24+
}
25+
}

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

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
11
package dev.minecode.language.bungeecord.listener;
22

3+
import dev.minecode.core.api.CoreAPI;
34
import dev.minecode.language.api.LanguageAPI;
45
import dev.minecode.language.bungeecord.LanguageBungeeCord;
6+
import dev.minecode.language.bungeecord.helper.PluginMessageHelper;
7+
import net.md_5.bungee.api.ProxyServer;
58
import net.md_5.bungee.api.connection.ProxiedPlayer;
69
import net.md_5.bungee.api.event.PostLoginEvent;
710
import net.md_5.bungee.api.plugin.Listener;
811
import net.md_5.bungee.event.EventHandler;
912

10-
import java.io.ByteArrayOutputStream;
11-
import java.io.DataOutputStream;
12-
import java.io.IOException;
13+
import java.util.concurrent.TimeUnit;
1314

1415
public class PlayerListener implements Listener {
15-
16-
public PlayerListener() {
17-
LanguageBungeeCord.getInstance().getProxy().getPluginManager().registerListener(LanguageBungeeCord.getInstance(), this);
18-
}
19-
2016
@EventHandler
2117
public void handlePlayerJoin(PostLoginEvent event) {
2218
ProxiedPlayer proxiedPlayer = event.getPlayer();
2319

24-
if (LanguageAPI.getInstance().isUsingGUI()) {
25-
if (LanguageAPI.getInstance().isForceOpenInventory()) {
26-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
27-
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
28-
29-
try {
30-
dataOutputStream.writeUTF("Language");
31-
dataOutputStream.writeUTF("OpenLanguageChangeGUI");
32-
} catch (IOException ignored) {
33-
}
34-
35-
proxiedPlayer.sendData("MineCode", byteArrayOutputStream.toByteArray());
20+
if (LanguageAPI.getInstance().isForceOpenInventory()) {
21+
if (CoreAPI.getInstance().getCorePlayer(proxiedPlayer.getUniqueId()).getLanguage() == null) {
22+
ProxyServer.getInstance().getScheduler().schedule(LanguageBungeeCord.getInstance(), new Runnable() {
23+
@Override
24+
public void run() {
25+
PluginMessageHelper.openLanguageChangeGUI(proxiedPlayer);
26+
}
27+
}, 1, TimeUnit.SECONDS);
3628
}
3729
}
3830
}
39-
4031
}

‎bungeecord/src/main/resources/Language/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
usingGUI: false
1313

1414
# if a player joins for first time, he/she is opened the language change inventory
15-
forceOpenInventory: false
15+
forceOpenInventory: false

‎common/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
<artifactId>common</artifactId>
1313

14+
<name>Common</name>
15+
<url>https://github.com/MineCodeDEV/Language/tree/master/common</url>
16+
1417
<dependencies>
1518
<!-- MineCode Language -->
1619
<dependency>
@@ -23,11 +26,12 @@
2326
<dependency>
2427
<groupId>dev.minecode.core</groupId>
2528
<artifactId>common</artifactId>
26-
<version>0.1.0-Pre.32</version>
29+
<version>0.1.0-Pre.36</version>
2730
</dependency>
2831
</dependencies>
2932

3033
<build>
34+
<finalName>${project.parent.name}-${project.name}-${project.version}</finalName>
3135
<plugins>
3236
<plugin>
3337
<groupId>org.apache.maven.plugins</groupId>

‎common/src/main/java/dev/minecode/language/common/LanguageCommon.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package dev.minecode.language.common;
22

3+
import dev.minecode.core.api.CoreAPI;
4+
import dev.minecode.core.api.manager.UpdateManager;
35
import dev.minecode.language.common.api.LanguageAPIProvider;
46

57
public class LanguageCommon {
68

79
private static LanguageCommon instance;
810

9-
private LanguageAPIProvider languageAPIProvider;
10-
1111
public LanguageCommon() {
1212
makeInstances();
13+
14+
UpdateManager updateManager = CoreAPI.getInstance().getUpdateManager();
15+
if (updateManager.updateAvailable()) {
16+
System.out.println("[" + CoreAPI.getInstance().getPluginName() + "] There is a newer Version available! You can download it at " + updateManager.getReleaseURL(updateManager.getMatchingRelease()));
17+
}
1318
}
1419

1520
public static LanguageCommon getInstance() {
@@ -18,6 +23,6 @@ public static LanguageCommon getInstance() {
1823

1924
private void makeInstances() {
2025
instance = this;
21-
languageAPIProvider = new LanguageAPIProvider();
26+
new LanguageAPIProvider();
2227
}
2328
}

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<module>bungeecord</module>
1616
</modules>
1717

18+
<name>Language</name>
19+
<description>A plugin to manage the language</description>
20+
<url>https://github.com/MineCodeDEV/Language</url>
21+
1822
<properties>
1923
<maven.compiler.source>8</maven.compiler.source>
2024
<maven.compiler.target>8</maven.compiler.target>

0 commit comments

Comments
 (0)