Skip to content

Commit cf24453

Browse files
nellieldevnellieldev
committed
Code style improvements, bug fixes
1 parent 0140307 commit cf24453

36 files changed

+191
-192
lines changed

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ build/
3737
.vscode/
3838

3939
### Mac OS ###
40-
.DS_Store
40+
.DS_Store
41+
42+
### Convey ###
43+
config.json

‎api/src/main/java/net/outfluencer/convey/api/Convey.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public abstract class Convey {
1313
private static Convey instance;
1414

1515
public static void setInstance(Convey instance) {
16-
Preconditions.checkNotNull( instance, "instance" );
17-
Preconditions.checkArgument( Convey.instance == null, "Instance already set" );
16+
Preconditions.checkNotNull(instance, "instance");
17+
Preconditions.checkArgument(Convey.instance == null, "Instance already set");
1818
Convey.instance = instance;
1919
}
2020

‎api/src/main/java/net/outfluencer/convey/api/Server.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface Server {
2323
List<ConveyPlayer> getConnectedUsers();
2424

2525
default String getJoinPermission() {
26-
return "convey.join." + getName();
26+
return "convey.join." + this.getName();
2727
}
2828

2929
boolean isConnected();

‎api/src/main/java/net/outfluencer/convey/api/cookie/CookieCache.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.outfluencer.convey.api.cookie;
22

3-
import net.outfluencer.convey.api.cookie.builtint.FriendlyCookie;
3+
import net.outfluencer.convey.api.cookie.builtin.FriendlyCookie;
44

55
import java.util.ArrayList;
66
import java.util.Collection;
@@ -20,17 +20,16 @@ public CookieCache(Collection<? extends FriendlyCookie> c) {
2020
super(c);
2121
}
2222

23-
2423
@Override
2524
public boolean add(FriendlyCookie newCookie) {
26-
boolean removed = removeIf(cookie -> cookie.getCookieName().equals(newCookie.getCookieName()));
25+
boolean removed = super.removeIf(cookie -> cookie.getCookieName().equals(newCookie.getCookieName()));
2726
super.add(newCookie);
2827
return removed;
2928
}
3029

3130
@Override
32-
public boolean addAll(Collection<? extends FriendlyCookie> c) {
33-
c.forEach(this::add);
31+
public boolean addAll(Collection<? extends FriendlyCookie> collection) {
32+
collection.forEach(this::add);
3433
return true;
3534
}
3635

‎api/src/main/java/net/outfluencer/convey/api/cookie/CookieRegistry.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package net.outfluencer.convey.api.cookie;
22

3-
import lombok.SneakyThrows;
4-
import net.outfluencer.convey.api.cookie.builtint.FriendlyCookie;
5-
import net.outfluencer.convey.api.cookie.builtint.KickCookie;
3+
import net.outfluencer.convey.api.cookie.builtin.FriendlyCookie;
4+
import net.outfluencer.convey.api.cookie.builtin.KickCookie;
65

76
import java.util.HashMap;
87
import java.util.Map;
@@ -14,13 +13,6 @@ public class CookieRegistry {
1413
public static final String FALLBACK_MESSAGE = "convey:fallback_message";
1514

1615
static {
17-
try {
18-
Class.forName(VerifyCookie.class.getName(), true, CookieRegistry.class.getClassLoader());
19-
Class.forName(InternalCookie.class.getName(), true, CookieRegistry.class.getClassLoader());
20-
} catch (Exception e) {
21-
throw new RuntimeException(e);
22-
}
23-
2416
COOKIE_NAME_MAP = new HashMap<>();
2517
COOKIE_CREATION_MAP = new HashMap<>();
2618
registerCookie(KickCookie.class, KickCookie::new);

‎api/src/main/java/net/outfluencer/convey/api/cookie/InternalCookie.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.Data;
55
import lombok.NoArgsConstructor;
66
import lombok.SneakyThrows;
7-
import net.outfluencer.convey.api.cookie.builtint.FriendlyCookie;
7+
import net.outfluencer.convey.api.cookie.builtin.FriendlyCookie;
88

99
import java.io.DataInputStream;
1010
import java.io.DataOutputStream;

‎api/src/main/java/net/outfluencer/convey/api/cookie/VerifyCookie.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ public class VerifyCookie extends AbstractCookie {
2626
@SneakyThrows
2727
@Override
2828
public void read(DataInputStream dataInputStream) {
29-
fromServer = dataInputStream.readUTF();
30-
forServer = dataInputStream.readUTF();
31-
uuid = new UUID(dataInputStream.readLong(), dataInputStream.readLong());
32-
creationTime = dataInputStream.readLong();
29+
this.fromServer = dataInputStream.readUTF();
30+
this.forServer = dataInputStream.readUTF();
31+
this.uuid = new UUID(dataInputStream.readLong(), dataInputStream.readLong());
32+
this.creationTime = dataInputStream.readLong();
3333
int size = dataInputStream.readInt();
3434
for (int i = 0; i < size; i++) {
35-
clientCookies.add(dataInputStream.readUTF());
35+
this.clientCookies.add(dataInputStream.readUTF());
3636
}
3737
}
3838

3939
@Override
4040
public void write(DataOutputStream dataOutputStream) throws IOException {
41-
dataOutputStream.writeUTF(fromServer);
42-
dataOutputStream.writeUTF(forServer);
43-
dataOutputStream.writeLong(uuid.getMostSignificantBits());
44-
dataOutputStream.writeLong(uuid.getLeastSignificantBits());
45-
dataOutputStream.writeLong(creationTime);
46-
dataOutputStream.writeInt(clientCookies.size());
47-
for (String cookie : clientCookies) {
41+
dataOutputStream.writeUTF(this.fromServer);
42+
dataOutputStream.writeUTF(this.forServer);
43+
dataOutputStream.writeLong(this.uuid.getMostSignificantBits());
44+
dataOutputStream.writeLong(this.uuid.getLeastSignificantBits());
45+
dataOutputStream.writeLong(this.creationTime);
46+
dataOutputStream.writeInt(this.clientCookies.size());
47+
for (String cookie : this.clientCookies) {
4848
dataOutputStream.writeUTF(cookie);
4949
}
5050
}

‎api/src/main/java/net/outfluencer/convey/api/cookie/builtint/FriendlyCookie.java ‎api/src/main/java/net/outfluencer/convey/api/cookie/builtin/FriendlyCookie.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.outfluencer.convey.api.cookie.builtint;
1+
package net.outfluencer.convey.api.cookie.builtin;
22

33
import net.outfluencer.convey.api.cookie.AbstractCookie;
44

‎api/src/main/java/net/outfluencer/convey/api/cookie/builtint/KickCookie.java ‎api/src/main/java/net/outfluencer/convey/api/cookie/builtin/KickCookie.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.outfluencer.convey.api.cookie.builtint;
1+
package net.outfluencer.convey.api.cookie.builtin;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Data;

‎api/src/main/java/net/outfluencer/convey/api/player/LocalConveyPlayer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package net.outfluencer.convey.api.player;
22

3-
import net.outfluencer.convey.api.cookie.CookieCache;
43
import net.outfluencer.convey.api.cookie.VerifyCookie;
5-
import net.outfluencer.convey.api.cookie.builtint.FriendlyCookie;
4+
import net.outfluencer.convey.api.cookie.builtin.FriendlyCookie;
65

76
import java.util.List;
87

‎bukkit/src/main/java/net/outfluencer/convey/bukkit/ConveyBukkit.java

+29-25
Original file line numberDiff line numberDiff line change
@@ -105,50 +105,54 @@ public void onEnable() {
105105
setInstance(this);
106106

107107
// preload
108-
CookieRegistry.VERIFY_COOKIE.length();
109-
KickCatcher.VERSION.length();
108+
try {
109+
Class.forName(CookieRegistry.class.getName(), true, ConveyBukkit.class.getClassLoader());
110+
Class.forName(KickCatcher.class.getName(), true, ConveyBukkit.class.getClassLoader());
111+
} catch (ClassNotFoundException exception) {
112+
throw new RuntimeException(exception);
113+
}
110114

111-
plugin.saveDefaultConfig();
115+
this.plugin.saveDefaultConfig();
112116
try {
113-
secretKey = AESUtils.bytesToSecretKey(Base64.getDecoder().decode(plugin.getConfig().getString("encryption_key")));
117+
this.secretKey = AESUtils.bytesToSecretKey(Base64.getDecoder().decode(plugin.getConfig().getString("encryption_key")));
114118
} catch (Exception exception) {
115-
plugin.getLogger().severe("Please set the encryption key in the config.yml to the same as in the convey server config.json");
119+
this.plugin.getLogger().severe("Please set the encryption key in the config.yml to the same as in the convey server config.json");
116120
Bukkit.getPluginManager().disablePlugin(plugin);
117121
return;
118122
}
119123

120-
aesUtils = new AESUtils(secretKey);
121-
reloadMessages();
124+
this.aesUtils = new AESUtils(secretKey);
125+
this.reloadMessages();
122126

123-
Bukkit.getPluginManager().registerEvents(new PlayerLoginListener(), plugin);
124-
Bukkit.getPluginManager().registerEvents(new PlayerKickListener(), plugin);
125-
Bukkit.getPluginManager().registerEvents(new PlayerQuitListener(), plugin);
126-
Bukkit.getPluginManager().registerEvents(new PlayerJoinListener(), plugin);
127+
Bukkit.getPluginManager().registerEvents(new PlayerLoginListener(), this.plugin);
128+
Bukkit.getPluginManager().registerEvents(new PlayerKickListener(), this.plugin);
129+
Bukkit.getPluginManager().registerEvents(new PlayerQuitListener(), this.plugin);
130+
Bukkit.getPluginManager().registerEvents(new PlayerJoinListener(), this.plugin);
127131

128132

129-
plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> {
133+
this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, () -> {
130134
if (!masterIsConnected()) {
131-
master = null;
135+
this.master = null;
132136
connectToMaster();
133137
}
134138
}, 0, 20 * 30);
135139

136-
plugin.getCommand("convey").setExecutor(new ConveyCommand());
137-
plugin.getCommand("server").setExecutor(new ServerCommand());
138-
plugin.getCommand("glist").setExecutor(new GListCommand());
140+
this.plugin.getCommand("convey").setExecutor(new ConveyCommand());
141+
this.plugin.getCommand("server").setExecutor(new ServerCommand());
142+
this.plugin.getCommand("glist").setExecutor(new GListCommand());
139143

140-
Bukkit.getOnlinePlayers().forEach(player -> playerMap.put(player, new ConveyPlayerImplBukkit(player)));
144+
Bukkit.getOnlinePlayers().forEach(player -> this.playerMap.put(player, new ConveyPlayerImplBukkit(player)));
141145
}
142146

143147
public void onDisable() {
144-
if (master != null) {
145-
master.close();
148+
if (this.master != null) {
149+
this.master.close();
146150
}
147-
eventLoopGroup.shutdownGracefully();
151+
this.eventLoopGroup.shutdownGracefully();
148152
}
149153

150154

151-
public ChannelInitializer<io.netty.channel.Channel> CHANNEL_CHANNEL_INITIALIZER_CLIENT = new ChannelInitializer<>() {
155+
public ChannelInitializer<io.netty.channel.Channel> clientChannelInitializer = new ChannelInitializer<>() {
152156
@Override
153157
protected void initChannel(Channel ch) {
154158
AESUtils aes = new AESUtils(secretKey);
@@ -167,10 +171,10 @@ protected void initChannel(Channel ch) {
167171
public void connectToMaster() {
168172
Bootstrap bootstrap = new Bootstrap();
169173
bootstrap.channel(NioSocketChannel.class);
170-
bootstrap.handler(CHANNEL_CHANNEL_INITIALIZER_CLIENT);
171-
bootstrap.group(eventLoopGroup);
172-
new NioEventLoopGroup().close();
173-
bootstrap.connect("157.90.241.237", 21639).addListener((ChannelFutureListener) channelFuture -> {
174+
bootstrap.handler(this.clientChannelInitializer);
175+
bootstrap.group(this.eventLoopGroup);
176+
final String[] arr = this.plugin.getConfig().getString("master").split(":");
177+
bootstrap.connect(arr[0], Integer.parseInt(arr[1])).addListener((ChannelFutureListener) channelFuture -> {
174178
if (!channelFuture.isSuccess()) {
175179
channelFuture.cause().printStackTrace();
176180
plugin.getLogger().warning("Could not connect to master server");

‎bukkit/src/main/java/net/outfluencer/convey/bukkit/ConveyBukkitPlugin.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ public class ConveyBukkitPlugin extends JavaPlugin {
88

99
@Override
1010
public void onEnable() {
11-
convey = new ConveyBukkit(this);
12-
convey.onEnable();
11+
this.convey = new ConveyBukkit(this);
12+
this.convey.onEnable();
1313
}
1414

1515
@Override
1616
public void onDisable() {
17-
convey.onDisable();
17+
this.convey.onDisable();
1818
}
1919
}

‎bukkit/src/main/java/net/outfluencer/convey/bukkit/handler/ClientPacketHandler.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ public class ClientPacketHandler extends AbstractPacketHandler {
2727
private final ConveyBukkit convey;
2828
@Getter
2929
private Channel channel;
30-
public boolean isActive() {
31-
return channel != null && channel.isActive() && !closed;
32-
}
3330
private ScheduledFuture<?> keepAliveSchedule;
3431
private PingPacket lastPingPacket;
35-
3632
@Getter
3733
long ping = -1;
3834

35+
public boolean isActive() {
36+
return this.channel != null && this.channel.isActive() && !this.closed;
37+
}
38+
3939
private void keepAliveSchedule() {
40-
keepAliveSchedule = channel.eventLoop().scheduleAtFixedRate(() -> {
41-
if (!channel.isActive()) {
42-
keepAliveSchedule.cancel(false);
40+
this.keepAliveSchedule = this.channel.eventLoop().scheduleAtFixedRate(() -> {
41+
if (!this.channel.isActive()) {
42+
this.keepAliveSchedule.cancel(false);
4343
return;
4444
}
45-
channel.writeAndFlush(lastPingPacket = new PingPacket(System.currentTimeMillis()));
45+
this.channel.writeAndFlush(this.lastPingPacket = new PingPacket(System.currentTimeMillis()));
4646
}, 5, 5, TimeUnit.SECONDS);
4747
}
4848

@@ -58,11 +58,11 @@ public void handle(PingPacket pingPacket) {
5858
@Override
5959
public void connected(Channel channel) {
6060
this.channel = channel;
61-
convey.setMaster(this);
61+
this.convey.setMaster(this);
6262
channel.writeAndFlush(new HelloPacket(Bukkit.getPort(), Bukkit.getOnlinePlayers().stream().map(player ->
6363
new UserData(player.getName(), player.getUniqueId())).toList()));
64-
keepAliveSchedule();
65-
convey.getPlugin().getLogger().info("Connected to master server");
64+
this.keepAliveSchedule();
65+
this.convey.getPlugin().getLogger().info("Connected to master server");
6666

6767
List<UserData> userData = ConveyBukkit.getInstance().getLocalPlayers().stream().map(player -> new UserData(player.getName(), player.getUniqueId())).collect(Collectors.toList());
6868
ServerSyncPacket serverSyncPacket = new ServerSyncPacket("", false, true, userData);
@@ -130,7 +130,7 @@ public void handle(ServerSyncPacket serverDisconnectedPacket) {
130130

131131
@Override
132132
public void disconnected(Channel channel) {
133-
convey.getServers().forEach( (s, server) -> ((ServerImplBukkit) server).setConnected(false));
133+
convey.getServers().forEach((s, server) -> ((ServerImplBukkit) server).setConnected(false));
134134
convey.getPlugin().getLogger().severe("master server disconnected");
135135
closed = true;
136136
if (convey.getMaster().equals(this)) {

‎bukkit/src/main/java/net/outfluencer/convey/bukkit/impl/ConveyPlayerImplBukkit.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.outfluencer.convey.api.cookie.CookieRegistry;
99
import net.outfluencer.convey.api.cookie.InternalCookie;
1010
import net.outfluencer.convey.api.cookie.VerifyCookie;
11-
import net.outfluencer.convey.api.cookie.builtint.FriendlyCookie;
11+
import net.outfluencer.convey.api.cookie.builtin.FriendlyCookie;
1212
import net.outfluencer.convey.api.player.LocalConveyPlayer;
1313
import net.outfluencer.convey.bukkit.ConveyBukkit;
1414
import org.bukkit.NamespacedKey;
@@ -22,31 +22,30 @@
2222
@Data
2323
public class ConveyPlayerImplBukkit implements LocalConveyPlayer {
2424

25-
// this list need tp be mutable
25+
// this list need to be mutable
2626
private CookieCache cookieCache;
2727
private VerifyCookie verifyCookie;
2828

2929
private final Player player;
3030

3131
@Override
3232
public String getName() {
33-
return player.getName();
33+
return this.player.getName();
3434
}
3535

3636
@Override
3737
public UUID getUniqueId() {
38-
return player.getUniqueId();
38+
return this.player.getUniqueId();
3939
}
4040

4141
@Override
4242
public void connect(Server server) {
4343
ConveyBukkit.getInstance().getTransferUtils().transferPlayer(this, server, false, null);
4444
}
4545

46-
4746
@Override
4847
public void sendMessage(String message) {
49-
player.sendMessage(message);
48+
this.player.sendMessage(message);
5049
}
5150

5251
@SneakyThrows
@@ -55,7 +54,7 @@ public void sendVerifyCookie(VerifyCookie cookie) {
5554
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
5655
cookie.write(dataOutputStream);
5756
byte[] encrypted = ConveyBukkit.getInstance().getAesUtils().encrypt(byteArrayOutputStream.toByteArray());
58-
player.storeCookie(NamespacedKey.fromString(CookieRegistry.VERIFY_COOKIE), encrypted);
57+
this.player.storeCookie(NamespacedKey.fromString(CookieRegistry.VERIFY_COOKIE), encrypted);
5958
}
6059

6160
@SneakyThrows
@@ -64,17 +63,17 @@ public void sendInternalCookie(InternalCookie cookie) {
6463
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
6564
cookie.write(dataOutputStream);
6665
byte[] encrypted = ConveyBukkit.getInstance().getAesUtils().encrypt(byteArrayOutputStream.toByteArray());
67-
player.storeCookie(NamespacedKey.fromString(cookie.getCookieName()), encrypted);
66+
this.player.storeCookie(NamespacedKey.fromString(cookie.getCookieName()), encrypted);
6867
}
6968

7069
@Override
7170
public List<FriendlyCookie> getCookies() {
72-
return List.copyOf(cookieCache);
71+
return List.copyOf(this.cookieCache);
7372
}
7473

7574
@Override
7675
public boolean addCookie(FriendlyCookie cookie) {
7776
Preconditions.checkState(CookieRegistry.isRegistered(cookie.getClass()), "cookie not registered");
78-
return cookieCache.add(cookie);
77+
return this.cookieCache.add(cookie);
7978
}
8079
}

0 commit comments

Comments
 (0)