Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit e17be3c

Browse files
GiantTreeLPGiantTreeLP
committed
Merge branch 'development'
# Conflicts: # .travis.yml # cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/setup/SetupSpigotVersion.java
2 parents 543d878 + 5b7b2aa commit e17be3c

File tree

254 files changed

+7829
-3403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+7829
-3403
lines changed

‎.template/CloudNet-Master/localwrapper_start.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
title CloudNet-Master
2+
java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Dcloudnet.localwrapper.disableConsole=true -Xmx128m -jar CloudNet-Master.jar --installWrapper

‎.template/CloudNet-Master/localwrapper_start.command

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
cd "$(dirname "$0")"
3+
while true
4+
do
5+
java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:MaxPermSize=256M -XX:CompileThreshold=100 -Dcloudnet.localwrapper.disableConsole=true -Xmx128m -jar CloudNet-Master.jar --installWrapper
6+
echo "If you want to completely stop the server process now, press Ctrl+C before
7+
the time is up!"
8+
echo "Rebooting in:"
9+
for i in 5 4 3 2 1
10+
do
11+
echo "$i..."
12+
sleep 1
13+
done
14+
echo "Rebooting now!"
15+
done

‎.template/CloudNet-Master/localwrapper_start.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
screen -RS CloudNet java -XX:+UseG1GC -XX:MaxGCPauseMillis=50 -XX:CompileThreshold=100 -XX:MaxPermSize=256M -Dcloudnet.localwrapper.disableConsole=true -Xmx128m -jar CloudNet-Master.jar --installWrapper

‎.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
language: java
2-
jdk:
3-
- openjdk8
2+
dist: bionic
43
sudo: false
5-
addons:
6-
apt:
7-
packages:
8-
- openjdk8
94
notifications:
105
email: false

‎Jenkinsfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
}
1616
stage('Version') {
1717
steps {
18-
sh 'mvn versions:set -DnewVersion=2.1.15'
18+
sh 'mvn versions:set -DnewVersion=2.1.16'
1919
}
2020
}
2121
stage('Compile') {
@@ -39,11 +39,6 @@ pipeline {
3939
sh 'mvn package javadoc:aggregate-jar'
4040
}
4141
}
42-
stage('Install') {
43-
steps {
44-
sh 'mvn install'
45-
}
46-
}
4742
stage('Release ZIP') {
4843
steps {
4944
sh '''mkdir -p temp;

‎cloudnet-api/cloudnet-api-bridge/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
<dependency>
3131
<groupId>org.apache.logging.log4j</groupId>
3232
<artifactId>log4j-api</artifactId>
33-
<version>2.11.2</version>
33+
<version>2.12.1</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.logging.log4j</groupId>
3838
<artifactId>log4j-core</artifactId>
39-
<version>2.11.2</version>
39+
<version>2.12.1</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/BukkitBootstrap.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,16 @@ public void run()
157157
CloudServer.getInstance().getMotd(), Bukkit.getOnlinePlayers().size(), CloudServer.getInstance().getMaxPlayers()
158158
);
159159
Bukkit.getPluginManager().callEvent(serverListPingEvent);
160-
if (!serverListPingEvent.getMotd().equals(CloudServer.getInstance().getMotd()))
161-
{
160+
if (!serverListPingEvent.getMotd().equalsIgnoreCase(CloudServer.getInstance().getMotd()) ||
161+
serverListPingEvent.getMaxPlayers() != CloudServer.getInstance().getMaxPlayers()) {
162162
CloudServer.getInstance().setMotd(serverListPingEvent.getMotd());
163-
if (serverListPingEvent.getMotd().toLowerCase().contains("running") || serverListPingEvent.getMotd().toLowerCase().contains("ingame"))
164-
{
163+
CloudServer.getInstance().setMaxPlayers(serverListPingEvent.getMaxPlayers());
164+
if (serverListPingEvent.getMotd().toLowerCase().contains("running") || serverListPingEvent.getMotd().toLowerCase().contains("ingame")) {
165165
CloudServer.getInstance().changeToIngame();
166+
} else {
167+
CloudServer.getInstance().update();
166168
}
167169
}
168-
169-
if (serverListPingEvent.getMaxPlayers() != CloudServer.getInstance().getMaxPlayers())
170-
{
171-
CloudServer.getInstance().setMaxPlayers(serverListPingEvent.getMaxPlayers());
172-
}
173170
} catch (Exception ex)
174171
{
175172
}

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/ProxiedBootstrap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.nio.file.Paths;
2323
import java.util.concurrent.TimeUnit;
24+
import java.util.logging.Level;
2425

2526
/**
2627
* Created by Tareko on 17.08.2017.
@@ -37,6 +38,7 @@ public void run()
3738
getProxy().stop("CloudNet-Stop!");
3839
}
3940
});
41+
getLogger().setLevel(Level.INFO);
4042
CloudAPI.getInstance().setLogger(getLogger());
4143
}
4244

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitCloudNetworkUpdateEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.CloudNetwork;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Calls if the cloudnetwork objective was updated
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitCloudNetworkUpdateEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private CloudNetwork cloudNetwork;
2018

19+
public BukkitCloudNetworkUpdateEvent(CloudNetwork cloudNetwork) {
20+
this.cloudNetwork = cloudNetwork;
21+
}
22+
2123
public CloudNetwork getCloudNetwork()
2224
{
2325
return cloudNetwork;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitCloudServerInitEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.bridge.CloudServer;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Calls before the first init update of the serverInfo for a online state
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitCloudServerInitEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private CloudServer cloudServer;
2018

19+
public BukkitCloudServerInitEvent(CloudServer cloudServer) {
20+
this.cloudServer = cloudServer;
21+
}
22+
2123
public CloudServer getCloudServer()
2224
{
2325
return cloudServer;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitCustomChannelMessageReceiveEvent.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.utility.document.Document;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Called if a custom channel message was received
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitCustomChannelMessageReceiveEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
@@ -22,6 +20,12 @@ public class BukkitCustomChannelMessageReceiveEvent extends BukkitCloudEvent {
2220

2321
private Document document;
2422

23+
public BukkitCustomChannelMessageReceiveEvent(String channel, String message, Document document) {
24+
this.channel = channel;
25+
this.message = message;
26+
this.document = document;
27+
}
28+
2529
public String getMessage()
2630
{
2731
return message;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitMobInitEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.bridge.internal.serverselectors.MobSelector;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Calls if a server mob is created
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitMobInitEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private MobSelector.MobImpl mob;
2018

19+
public BukkitMobInitEvent(MobSelector.MobImpl mob) {
20+
this.mob = mob;
21+
}
22+
2123
public MobSelector.MobImpl getMob()
2224
{
2325
return mob;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitMobUpdateEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.serverselectors.mob.ServerMob;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Updates a ServerMob
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitMobUpdateEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private ServerMob serverMob;
2018

19+
public BukkitMobUpdateEvent(ServerMob serverMob) {
20+
this.serverMob = serverMob;
21+
}
22+
2123
public ServerMob getServerMob()
2224
{
2325
return serverMob;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitOfflinePlayerUpdateEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package de.dytanic.cloudnet.bridge.event.bukkit;
22

33
import de.dytanic.cloudnet.lib.player.OfflinePlayer;
4-
import lombok.Getter;
54
import org.bukkit.event.HandlerList;
65

7-
@Getter
86
public class BukkitOfflinePlayerUpdateEvent extends BukkitCloudEvent {
97

108
private static final HandlerList handlerList = new HandlerList();
@@ -16,6 +14,10 @@ public BukkitOfflinePlayerUpdateEvent(OfflinePlayer offlinePlayer)
1614
this.offlinePlayer = offlinePlayer;
1715
}
1816

17+
public OfflinePlayer getOfflinePlayer() {
18+
return offlinePlayer;
19+
}
20+
1921
@Override
2022
public HandlerList getHandlers()
2123
{

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitOnlineCountUpdateEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44

55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

7-
import lombok.Getter;
87
import org.bukkit.event.HandlerList;
98

109
/**
1110
* Created by Tareko on 11.10.2017.
1211
*/
13-
@Getter
1412
public class BukkitOnlineCountUpdateEvent extends BukkitCloudEvent {
1513

1614
private static HandlerList handlerList = new HandlerList();
@@ -22,6 +20,10 @@ public BukkitOnlineCountUpdateEvent(int onlineCount)
2220
this.onlineCount = onlineCount;
2321
}
2422

23+
public int getOnlineCount() {
24+
return onlineCount;
25+
}
26+
2527
public static HandlerList getHandlerList()
2628
{
2729
return handlerList;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitPlayerDisconnectEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.player.CloudPlayer;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Created by Tareko on 18.08.2017.
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitPlayerDisconnectEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private CloudPlayer cloudPlayer;
2018

19+
public BukkitPlayerDisconnectEvent(CloudPlayer cloudPlayer) {
20+
this.cloudPlayer = cloudPlayer;
21+
}
22+
2123
public CloudPlayer getCloudPlayer()
2224
{
2325
return cloudPlayer;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitPlayerLoginNetworkEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.player.CloudPlayer;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Calls if a player logins to the network successfully
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitPlayerLoginNetworkEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private CloudPlayer cloudPlayer;
2018

19+
public BukkitPlayerLoginNetworkEvent(CloudPlayer cloudPlayer) {
20+
this.cloudPlayer = cloudPlayer;
21+
}
22+
2123
public CloudPlayer getCloudPlayer()
2224
{
2325
return cloudPlayer;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitPlayerUpdateEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.player.CloudPlayer;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Calls if a player was updated on network
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitPlayerUpdateEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
@@ -23,6 +21,10 @@ public static HandlerList getHandlerList()
2321

2422
private CloudPlayer cloudPlayer;
2523

24+
public BukkitPlayerUpdateEvent(CloudPlayer cloudPlayer) {
25+
this.cloudPlayer = cloudPlayer;
26+
}
27+
2628
public CloudPlayer getCloudPlayer()
2729
{
2830
return cloudPlayer;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/event/bukkit/BukkitProxyAddEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
package de.dytanic.cloudnet.bridge.event.bukkit;
66

77
import de.dytanic.cloudnet.lib.server.info.ProxyInfo;
8-
import lombok.AllArgsConstructor;
98
import org.bukkit.event.HandlerList;
109

1110
/**
1211
* Called if a proxy server was add into network
1312
*/
14-
@AllArgsConstructor
1513
public class BukkitProxyAddEvent extends BukkitCloudEvent {
1614

1715
private static HandlerList handlerList = new HandlerList();
1816

1917
private ProxyInfo serverInfo;
2018

19+
public BukkitProxyAddEvent(ProxyInfo serverInfo) {
20+
this.serverInfo = serverInfo;
21+
}
22+
2123
public ProxyInfo getProxyInfo()
2224
{
2325
return serverInfo;

0 commit comments

Comments
 (0)