Skip to content

Commit

Permalink
mix of automated and manual cleanups and java modernizations
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Mar 5, 2021
1 parent d62c27c commit 998749d
Show file tree
Hide file tree
Showing 44 changed files with 482 additions and 607 deletions.
76 changes: 38 additions & 38 deletions src/main/java/com/denizenscript/depenizen/bukkit/Depenizen.java
View file
Expand Up @@ -94,44 +94,44 @@ public void loadBridge(String name, Supplier<Bridge> bridgeSupplier) {

public void registerCoreBridges() {
// Yes it needs to be `new MyBridge()` not `MyBridge::new` - this is due to an error in the Java runtime.
registerBridge("AreaShop", () -> new AreaShopBridge());
registerBridge("ASkyBlock", () -> new ASkyBlockBridge());
registerBridge("BigDoors", () -> new BigDoorsBridge());
registerBridge("BossShopPro", () -> new BossShopBridge());
registerBridge("CrackShot", () -> new CrackShotBridge());
registerBridge("EffectLib", () -> new EffectLibBridge());
registerBridge("Essentials", () -> new EssentialsBridge());
registerBridge("Factions", () -> new FactionsBridge());
registerBridge("GriefPrevention", () -> new GriefPreventionBridge());
registerBridge("Jobs", () -> new JobsBridge());
registerBridge("LibsDisguises", () -> new LibsDisguisesBridge());
registerBridge("LuckPerms", () -> new LuckPermsBridge());
registerBridge("MagicSpells", () -> new MagicSpellsBridge());
registerBridge("mcMMO", () -> new McMMOBridge());
registerBridge("MobArena", () -> new MobArenaBridge());
registerBridge("MythicMobs", () -> new MythicMobsBridge());
registerBridge("NoCheatPlus", () -> new NoCheatPlusBridge());
registerBridge("NoteBlockAPI", () -> new NoteBlockAPIBridge());
registerBridge("OpenTerrainGenerator", () -> new OpenTerrainGeneratorBridge());
registerBridge("PlaceholderAPI", () -> new PlaceholderAPIBridge());
registerBridge("PlayerPoints", () -> new PlayerPointsBridge());
registerBridge("PlotSquared", () -> new PlotSquaredBridge());
registerBridge("PVPArena", () -> new PVPArenaBridge());
registerBridge("PVPStats", () -> new PVPStatsBridge());
registerBridge("Quests", () -> new QuestsBridge());
registerBridge("Residence", () -> new ResidenceBridge());
registerBridge("Sentinel", () -> new SentinelBridge());
registerBridge("Shopkeepers", () -> new ShopkeepersBridge());
registerBridge("SkillAPI", () -> new SkillAPIBridge());
registerBridge("TerrainControl", () -> new TerrainControlBridge());
registerBridge("TownyChat", () -> new TownyChatBridge());
registerBridge("Towny", () -> new TownyBridge());
registerBridge("Vampire", () -> new VampireBridge());
registerBridge("ViaVersion", () -> new ViaVersionBridge());
registerBridge("Votifier", () -> new VotifierBridge());
registerBridge("WorldEdit", () -> new WorldEditBridge());
registerBridge("WorldGuard", () -> new WorldGuardBridge());
registerBridge("BetonQuest", () -> new BetonQuestBridge());
registerBridge("AreaShop", AreaShopBridge::new);
registerBridge("ASkyBlock", ASkyBlockBridge::new);
registerBridge("BigDoors", BigDoorsBridge::new);
registerBridge("BossShopPro", BossShopBridge::new);
registerBridge("CrackShot", CrackShotBridge::new);
registerBridge("EffectLib", EffectLibBridge::new);
registerBridge("Essentials", EssentialsBridge::new);
registerBridge("Factions", FactionsBridge::new);
registerBridge("GriefPrevention", GriefPreventionBridge::new);
registerBridge("Jobs", JobsBridge::new);
registerBridge("LibsDisguises", LibsDisguisesBridge::new);
registerBridge("LuckPerms", LuckPermsBridge::new);
registerBridge("MagicSpells", MagicSpellsBridge::new);
registerBridge("mcMMO", McMMOBridge::new);
registerBridge("MobArena", MobArenaBridge::new);
registerBridge("MythicMobs", MythicMobsBridge::new);
registerBridge("NoCheatPlus", NoCheatPlusBridge::new);
registerBridge("NoteBlockAPI", NoteBlockAPIBridge::new);
registerBridge("OpenTerrainGenerator", OpenTerrainGeneratorBridge::new);
registerBridge("PlaceholderAPI", PlaceholderAPIBridge::new);
registerBridge("PlayerPoints", PlayerPointsBridge::new);
registerBridge("PlotSquared", PlotSquaredBridge::new);
registerBridge("PVPArena", PVPArenaBridge::new);
registerBridge("PVPStats", PVPStatsBridge::new);
registerBridge("Quests", QuestsBridge::new);
registerBridge("Residence", ResidenceBridge::new);
registerBridge("Sentinel", SentinelBridge::new);
registerBridge("Shopkeepers", ShopkeepersBridge::new);
registerBridge("SkillAPI", SkillAPIBridge::new);
registerBridge("TerrainControl", TerrainControlBridge::new);
registerBridge("TownyChat", TownyChatBridge::new);
registerBridge("Towny", TownyBridge::new);
registerBridge("Vampire", VampireBridge::new);
registerBridge("ViaVersion", ViaVersionBridge::new);
registerBridge("Votifier", VotifierBridge::new);
registerBridge("WorldEdit", WorldEditBridge::new);
registerBridge("WorldGuard", WorldGuardBridge::new);
registerBridge("BetonQuest", BetonQuestBridge::new);
}

public void registerBridge(String name, Supplier<Bridge> bridgeSupplier) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/denizenscript/depenizen/bukkit/bridges/BetonQuestBridge.java
View file
Expand Up @@ -26,5 +26,5 @@ public void init() {
}
return null;
});
};
}
}
56 changes: 20 additions & 36 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java
View file
Expand Up @@ -17,8 +17,6 @@
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import com.denizenscript.denizen.utilities.debugging.Debug;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.tags.TagRunnable;
Expand Down Expand Up @@ -127,12 +125,9 @@ public void reconnect() {
return;
}
connected = false;
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
reconnectPending = false;
connect();
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
reconnectPending = false;
connect();
}, 20 * 5);
}

Expand Down Expand Up @@ -174,19 +169,11 @@ public void initChannel(SocketChannel ch) {
channel = ch;
}
});
b.connect(address, port).addListener(new GenericFutureListener<Future<? super Void>>() {
@Override
public void operationComplete(Future<? super Void> future) {
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
if (!connected && !hasConnectionLoading) {
reconnect();
}
}
}, 10);
b.connect(address, port).addListener(future -> Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
if (!connected && !hasConnectionLoading) {
reconnect();
}
});
}, 10));
showedLastError = false;
}
catch (Throwable ex) {
Expand Down Expand Up @@ -217,22 +204,19 @@ public void run(ReplaceableTagEvent event) {
tagEvent(event);
}
}, "bungee");
Bukkit.getScheduler().scheduleSyncRepeatingTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
if (!connected) {
return;
}
if (System.currentTimeMillis() > lastPacketReceived + 20 * 1000) {
// 20 seconds without a packet = connection lost!
handler.fail("Connection time out.");
return;
}
ticksTilKeepalive--;
if (ticksTilKeepalive <= 0) {
sendPacket(new KeepAlivePacketOut());
ticksTilKeepalive = keepAliveTickRate;
}
Bukkit.getScheduler().scheduleSyncRepeatingTask(Depenizen.instance, () -> {
if (!connected) {
return;
}
if (System.currentTimeMillis() > lastPacketReceived + 20 * 1000) {
// 20 seconds without a packet = connection lost!
handler.fail("Connection time out.");
return;
}
ticksTilKeepalive--;
if (ticksTilKeepalive <= 0) {
sendPacket(new KeepAlivePacketOut());
ticksTilKeepalive = keepAliveTickRate;
}
}, 1, 1);
}
Expand Down
22 changes: 7 additions & 15 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeClientHandler.java
View file
Expand Up @@ -78,21 +78,13 @@ public void channelActive(ChannelHandlerContext ctx) {
ByteBuf handshake = ctx.alloc().buffer(FAKE_HANDSHAKE.length);
handshake.writeBytes(FAKE_HANDSHAKE);
ctx.writeAndFlush(handshake); // Will release handshake
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
Debug.log("Depenizen now connected to Bungee server.");
BungeeBridge.instance.lastPacketReceived = System.currentTimeMillis();
BungeeBridge.instance.sendPacket(new MyInfoPacketOut(Bukkit.getPort()));
BungeeBridge.instance.sendPacket(new ControlsProxyPingPacketOut(BungeeBridge.instance.controlsProxyPing));
BungeeBridge.instance.sendPacket(new ControlsProxyCommandPacketOut(BungeeBridge.instance.controlsProxyCommand));
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeeBridge.instance.connected = true;
}
}, 10);
}
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
Debug.log("Depenizen now connected to Bungee server.");
BungeeBridge.instance.lastPacketReceived = System.currentTimeMillis();
BungeeBridge.instance.sendPacket(new MyInfoPacketOut(Bukkit.getPort()));
BungeeBridge.instance.sendPacket(new ControlsProxyPingPacketOut(BungeeBridge.instance.controlsProxyPing));
BungeeBridge.instance.sendPacket(new ControlsProxyCommandPacketOut(BungeeBridge.instance.controlsProxyCommand));
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> BungeeBridge.instance.connected = true, 10);
}, 30);
}

Expand Down
18 changes: 6 additions & 12 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/NettyExceptionHandler.java
View file
Expand Up @@ -14,24 +14,18 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {

@Override
public void connect(ChannelHandlerContext ctx, SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
ctx.connect(remoteAddress, localAddress, promise.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) {
if (!future.isSuccess()) {
Debug.echoError(future.cause());
}
ctx.connect(remoteAddress, localAddress, promise.addListener((ChannelFutureListener) future -> {
if (!future.isSuccess()) {
Debug.echoError(future.cause());
}
}));
}

@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
ctx.write(msg, promise.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) {
if (!future.isSuccess()) {
Debug.echoError(future.cause());
}
ctx.write(msg, promise.addListener((ChannelFutureListener) future -> {
if (!future.isSuccess()) {
Debug.echoError(future.cause());
}
}));
}
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/AddServerPacketIn.java
View file
Expand Up @@ -26,13 +26,10 @@ public void process(ByteBuf data) {
return;
}
String serverName = readString(data, yourNameLength);
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeeBridge.instance.knownServers.add(serverName);
BungeeServerConnectScriptEvent.instance.serverName = serverName;
BungeeServerConnectScriptEvent.instance.fire();
}
});
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
BungeeBridge.instance.knownServers.add(serverName);
BungeeServerConnectScriptEvent.instance.serverName = serverName;
BungeeServerConnectScriptEvent.instance.fire();
});
}
}
13 changes: 5 additions & 8 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/PlayerJoinPacketIn.java
View file
Expand Up @@ -31,13 +31,10 @@ public void process(ByteBuf data) {
return;
}
String name = readString(data, nameLength);
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeePlayerJoinsScriptEvent.instance.name = name;
BungeePlayerJoinsScriptEvent.instance.uuid = uuid;
BungeePlayerJoinsScriptEvent.instance.fire();
}
});
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
BungeePlayerJoinsScriptEvent.instance.name = name;
BungeePlayerJoinsScriptEvent.instance.uuid = uuid;
BungeePlayerJoinsScriptEvent.instance.fire();
});
}
}
13 changes: 5 additions & 8 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/PlayerQuitPacketIn.java
View file
Expand Up @@ -31,13 +31,10 @@ public void process(ByteBuf data) {
return;
}
String name = readString(data, nameLength);
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeePlayerQuitsScriptEvent.instance.name = name;
BungeePlayerQuitsScriptEvent.instance.uuid = uuid;
BungeePlayerQuitsScriptEvent.instance.fire();
}
});
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
BungeePlayerQuitsScriptEvent.instance.name = name;
BungeePlayerQuitsScriptEvent.instance.uuid = uuid;
BungeePlayerQuitsScriptEvent.instance.fire();
});
}
}
15 changes: 6 additions & 9 deletions ...java/com/denizenscript/depenizen/bukkit/bungee/packets/in/PlayerSwitchServerPacketIn.java
View file
Expand Up @@ -37,14 +37,11 @@ public void process(ByteBuf data) {
return;
}
String serverName = readString(data, serverNameLength);
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeePlayerServerSwitchScriptEvent.instance.name = name;
BungeePlayerServerSwitchScriptEvent.instance.uuid = uuid;
BungeePlayerServerSwitchScriptEvent.instance.newServer = serverName;
BungeePlayerServerSwitchScriptEvent.instance.fire();
}
});
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
BungeePlayerServerSwitchScriptEvent.instance.name = name;
BungeePlayerServerSwitchScriptEvent.instance.uuid = uuid;
BungeePlayerServerSwitchScriptEvent.instance.newServer = serverName;
BungeePlayerServerSwitchScriptEvent.instance.fire();
});
}
}
29 changes: 13 additions & 16 deletions src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/ProxyCommandPacketIn.java
View file
Expand Up @@ -43,21 +43,18 @@ public void process(ByteBuf data) {
}
String senderIdText = readString(data, senderIdLength);
UUID senderId = senderIdText.isEmpty() ? null : UUID.fromString(senderIdText);
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@Override
public void run() {
BungeeProxyServerCommandScriptEvent.instance.sender = sender;
BungeeProxyServerCommandScriptEvent.instance.senderId = senderId;
BungeeProxyServerCommandScriptEvent.instance.command = new BungeeProxyServerCommandScriptEvent.CommandData();
BungeeProxyServerCommandScriptEvent.instance.command.command = command;
BungeeProxyServerCommandScriptEvent.instance.fire();
ProxyCommandResultPacketOut packetOut = new ProxyCommandResultPacketOut();
packetOut.id = id;
packetOut.result = BungeeProxyServerCommandScriptEvent.instance.command.cancelled ? "cancelled" :
(!BungeeProxyServerCommandScriptEvent.instance.command.command.equals(command) ?
BungeeProxyServerCommandScriptEvent.instance.command.command : "");
BungeeBridge.instance.sendPacket(packetOut);
}
});
Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
BungeeProxyServerCommandScriptEvent.instance.sender = sender;
BungeeProxyServerCommandScriptEvent.instance.senderId = senderId;
BungeeProxyServerCommandScriptEvent.instance.command = new BungeeProxyServerCommandScriptEvent.CommandData();
BungeeProxyServerCommandScriptEvent.instance.command.command = command;
BungeeProxyServerCommandScriptEvent.instance.fire();
ProxyCommandResultPacketOut packetOut = new ProxyCommandResultPacketOut();
packetOut.id = id;
packetOut.result = BungeeProxyServerCommandScriptEvent.instance.command.cancelled ? "cancelled" :
(!BungeeProxyServerCommandScriptEvent.instance.command.command.equals(command) ?
BungeeProxyServerCommandScriptEvent.instance.command.command : "");
BungeeBridge.instance.sendPacket(packetOut);
});
}
}

0 comments on commit 998749d

Please sign in to comment.