Skip to content

Commit 9074a38

Browse files
author
BuildTools
committed
Updated GitHub repository. Downgraded to Java 11. Updated to 1.20.2 API. Updated all dependencies. Rewritten reload command. Removed inline variables. Refactored console messages. Rewritten server version checking system. Fixed Folia multithreading checks. Moved hooks to external classes. Made all teleports async. Changed plugin version to 2.5.4-BETA-02.
1 parent 53d6bae commit 9074a38

File tree

15 files changed

+235
-162
lines changed

15 files changed

+235
-162
lines changed

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66

77
<groupId>me.loving11ish</groupId>
88
<artifactId>RedLightGreenLight</artifactId>
9-
<version>2.5.4-BETA-01</version>
9+
<version>2.5.4-BETA-02</version>
1010
<packaging>jar</packaging>
1111

1212
<name>RedLightGreenLight</name>
1313

1414
<description>A Red Light, Green Light mini-game based off the Netflix series Squid Games.</description>
1515
<properties>
16-
<java.version>17</java.version>
16+
<java.version>11</java.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
</properties>
1919

2020
<build>
21-
<defaultGoal>clean package</defaultGoal>
21+
<defaultGoal>package</defaultGoal>
2222
<plugins>
2323
<plugin>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-compiler-plugin</artifactId>
26-
<version>3.8.1</version>
26+
<version>3.11.0</version>
2727
<configuration>
2828
<source>${java.version}</source>
2929
<target>${java.version}</target>
@@ -32,7 +32,7 @@
3232
<plugin>
3333
<groupId>org.apache.maven.plugins</groupId>
3434
<artifactId>maven-shade-plugin</artifactId>
35-
<version>3.4.1</version> <!-- Make sure to always use the latest version (https://maven.apache.org/plugins/maven-shade-plugin/) -->
35+
<version>3.5.0</version> <!-- Make sure to always use the latest version (https://maven.apache.org/plugins/maven-shade-plugin/) -->
3636
<configuration>
3737
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
3838
<relocations>
@@ -92,13 +92,13 @@
9292
<dependency>
9393
<groupId>org.spigotmc</groupId>
9494
<artifactId>spigot-api</artifactId>
95-
<version>1.20.1-R0.1-SNAPSHOT</version>
95+
<version>1.20.2-R0.1-SNAPSHOT</version>
9696
<scope>provided</scope>
9797
</dependency>
9898
<dependency>
9999
<groupId>com.tcoded</groupId>
100100
<artifactId>FoliaLib</artifactId>
101-
<version>0.2.4</version>
101+
<version>0.3.0</version>
102102
<scope>compile</scope>
103103
</dependency>
104104
<dependency>
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>com.rylinaux</groupId>
112112
<artifactId>PlugMan</artifactId>
113-
<version>2.2.9</version>
113+
<version>2.3.3</version>
114114
<scope>provided</scope>
115115
</dependency>
116116
</dependencies>

‎src/main/java/me/loving11ish/redlightgreenlight/RedLightGreenLight.java‎

Lines changed: 79 additions & 87 deletions
Large diffs are not rendered by default.

‎src/main/java/me/loving11ish/redlightgreenlight/commands/CommandManager.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import me.loving11ish.redlightgreenlight.commands.consolecommands.ConsoleReload;
88
import me.loving11ish.redlightgreenlight.commands.subcommands.*;
99
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
10+
import org.bukkit.Bukkit;
1011
import org.bukkit.command.Command;
1112
import org.bukkit.command.CommandSender;
1213
import org.bukkit.command.ConsoleCommandSender;
@@ -15,13 +16,13 @@
1516

1617
import java.util.ArrayList;
1718
import java.util.List;
18-
import java.util.logging.Logger;
1919

2020
public class CommandManager implements TabExecutor {
2121

22+
ConsoleCommandSender console = Bukkit.getConsoleSender();
23+
2224
private ArrayList<SubCommand> subcommands = new ArrayList<>();
2325
private ArrayList<ConsoleCommand> consolecommands = new ArrayList<>();
24-
Logger logger = RedLightGreenLight.getPlugin().getLogger();
2526

2627
public CommandManager() {
2728
//Get the subcommands so we can access them in the command manager class(here)
@@ -39,7 +40,8 @@ public CommandManager() {
3940

4041
@Override
4142
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
42-
if (sender instanceof Player player) {
43+
if (sender instanceof Player) {
44+
Player player = (Player) sender;
4345
if (args.length > 0) {
4446
for (int i = 0; i < getSubCommands().size(); i++) {
4547
if (args[0].equalsIgnoreCase(getSubCommands().get(i).getName())) {
@@ -55,9 +57,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
5557
}
5658
}
5759
} else {
58-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-1")));
59-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-2")));
60-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-3")));
60+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-1")));
61+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-2")));
62+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Syntax-error-3")));
6163
}
6264
}
6365
return true;

‎src/main/java/me/loving11ish/redlightgreenlight/commands/consolecommands/ConsoleHelp.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
import me.loving11ish.redlightgreenlight.RedLightGreenLight;
44
import me.loving11ish.redlightgreenlight.commands.ConsoleCommand;
55
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
6+
import org.bukkit.Bukkit;
7+
import org.bukkit.command.ConsoleCommandSender;
68
import org.bukkit.plugin.PluginDescriptionFile;
79

8-
import java.util.logging.Logger;
9-
1010
public class ConsoleHelp extends ConsoleCommand {
1111

12+
ConsoleCommandSender console = Bukkit.getConsoleSender();
13+
1214
private PluginDescriptionFile pluginInfo = RedLightGreenLight.getPlugin().getDescription();
1315
private String pluginVersion = pluginInfo.getVersion();
1416

15-
Logger logger = RedLightGreenLight.getPlugin().getLogger();
16-
1717
@Override
1818
public String getName() {
1919
return "help";
@@ -31,25 +31,25 @@ public String getSyntax() {
3131

3232
@Override
3333
public void perform(String[] args) {
34-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-1").replace("%version%", pluginVersion)));
35-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-2").replace("%version%", pluginVersion)));
36-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-3").replace("%version%", pluginVersion)));
37-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-4").replace("%version%", pluginVersion)));
38-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-5").replace("%version%", pluginVersion)));
39-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-6").replace("%version%", pluginVersion)));
40-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-7").replace("%version%", pluginVersion)));
41-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-8").replace("%version%", pluginVersion)));
42-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-9").replace("%version%", pluginVersion)));
43-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-10").replace("%version%", pluginVersion)));
44-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-11").replace("%version%", pluginVersion)));
45-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-12").replace("%version%", pluginVersion)));
46-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-13").replace("%version%", pluginVersion)));
47-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-14").replace("%version%", pluginVersion)));
48-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-15").replace("%version%", pluginVersion)));
49-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-16").replace("%version%", pluginVersion)));
50-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-17").replace("%version%", pluginVersion)));
51-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-18").replace("%version%", pluginVersion)));
52-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-19").replace("%version%", pluginVersion)));
34+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-1").replace("%version%", pluginVersion)));
35+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-2").replace("%version%", pluginVersion)));
36+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-3").replace("%version%", pluginVersion)));
37+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-4").replace("%version%", pluginVersion)));
38+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-5").replace("%version%", pluginVersion)));
39+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-6").replace("%version%", pluginVersion)));
40+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-7").replace("%version%", pluginVersion)));
41+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-8").replace("%version%", pluginVersion)));
42+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-9").replace("%version%", pluginVersion)));
43+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-10").replace("%version%", pluginVersion)));
44+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-11").replace("%version%", pluginVersion)));
45+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-12").replace("%version%", pluginVersion)));
46+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-13").replace("%version%", pluginVersion)));
47+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-14").replace("%version%", pluginVersion)));
48+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-15").replace("%version%", pluginVersion)));
49+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-16").replace("%version%", pluginVersion)));
50+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-17").replace("%version%", pluginVersion)));
51+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-18").replace("%version%", pluginVersion)));
52+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Help-19").replace("%version%", pluginVersion)));
5353

5454
}
5555
}

‎src/main/java/me/loving11ish/redlightgreenlight/commands/consolecommands/ConsoleJoinAll.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import me.loving11ish.redlightgreenlight.utils.GameManager;
77
import me.loving11ish.redlightgreenlight.utils.PlayerInventoryHandler;
88
import org.bukkit.Bukkit;
9+
import org.bukkit.command.ConsoleCommandSender;
910
import org.bukkit.entity.Player;
1011

1112
import java.util.ArrayList;
1213
import java.util.List;
1314
import java.util.UUID;
14-
import java.util.logging.Logger;
1515

1616
public class ConsoleJoinAll extends ConsoleCommand {
1717

18-
Logger logger = RedLightGreenLight.getPlugin().getLogger();
18+
ConsoleCommandSender console = Bukkit.getConsoleSender();
1919

2020
@Override
2121
public String getName() {
@@ -36,7 +36,7 @@ public String getSyntax() {
3636
public void perform(String[] args) {
3737
List<Player> onlinePlayers = new ArrayList<>(Bukkit.getServer().getOnlinePlayers());
3838
if (!(GameManager.getGameRunning() == 0)) {
39-
logger.warning(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-already-running")));
39+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-already-running")));
4040
return;
4141
}
4242
for (Player onlinePlayer : onlinePlayers) {

‎src/main/java/me/loving11ish/redlightgreenlight/commands/consolecommands/ConsoleLeaveAll.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import me.loving11ish.redlightgreenlight.commands.ConsoleCommand;
55
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
66
import me.loving11ish.redlightgreenlight.utils.GameManager;
7-
8-
import java.util.logging.Logger;
7+
import org.bukkit.Bukkit;
8+
import org.bukkit.command.ConsoleCommandSender;
99

1010
public class ConsoleLeaveAll extends ConsoleCommand {
1111

12-
Logger logger = RedLightGreenLight.getPlugin().getLogger();
12+
ConsoleCommandSender console = Bukkit.getConsoleSender();
1313

1414
@Override
1515
public String getName() {
@@ -29,7 +29,7 @@ public String getSyntax() {
2929
@Override
3030
public void perform(String[] args) {
3131
if (GameManager.getGameRunning() == 0) {
32-
logger.warning(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("No-game-running")));
32+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("No-game-running")));
3333
return;
3434
}
3535
GameManager.endSpectatingGame();

‎src/main/java/me/loving11ish/redlightgreenlight/commands/consolecommands/ConsoleReload.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
77
import org.bukkit.Bukkit;
88
import org.bukkit.ChatColor;
9+
import org.bukkit.command.ConsoleCommandSender;
910

1011
import java.util.concurrent.TimeUnit;
11-
import java.util.logging.Logger;
1212

1313
public class ConsoleReload extends ConsoleCommand {
1414

15-
Logger logger = RedLightGreenLight.getPlugin().getLogger();
15+
ConsoleCommandSender console = Bukkit.getConsoleSender();
1616

1717
@Override
1818
public String getName() {
@@ -31,15 +31,15 @@ public String getSyntax() {
3131

3232
@Override
3333
public void perform(String[] args) {
34-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Plugin-reload-beginning")));
34+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Plugin-reload-beginning")));
3535
FoliaLib foliaLib = RedLightGreenLight.getFoliaLib();
3636
RedLightGreenLight.getPlugin().onDisable();
3737
foliaLib.getImpl().runLater(() -> {
3838
Bukkit.getPluginManager().getPlugin("RedLightGreenLight").onEnable();
3939
}, 5L, TimeUnit.SECONDS);
4040
foliaLib.getImpl().runLater(() -> {
4141
RedLightGreenLight.getPlugin().reloadConfig();
42-
logger.info(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Plugin-reload-successful")));
42+
console.sendMessage(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Plugin-reload-successful")));
4343
}, 5L, TimeUnit.SECONDS);
4444
}
4545
}

‎src/main/java/me/loving11ish/redlightgreenlight/events/PlayerJoin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.loving11ish.redlightgreenlight.events;
22

3+
import io.papermc.lib.PaperLib;
34
import me.loving11ish.redlightgreenlight.RedLightGreenLight;
45
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
56
import me.loving11ish.redlightgreenlight.utils.GameManager;
@@ -45,7 +46,7 @@ public void onPlayerJoin(PlayerJoinEvent event){
4546
float yaw = (float) RedLightGreenLight.getPlugin().getConfig().getDouble("lobby-yaw");
4647
float pitch = (float) RedLightGreenLight.getPlugin().getConfig().getDouble("lobby-pitch");
4748
Location location = new Location(player.getWorld(), x, y, z, yaw, pitch);
48-
player.teleport(location);
49+
PaperLib.teleportAsync(player, location);
4950
}
5051
}
5152
}

‎src/main/java/me/loving11ish/redlightgreenlight/events/PlayerMove.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.loving11ish.redlightgreenlight.events;
22

3+
import com.tcoded.folialib.FoliaLib;
34
import me.loving11ish.redlightgreenlight.RedLightGreenLight;
45
import me.loving11ish.redlightgreenlight.utils.ColorUtils;
56
import me.loving11ish.redlightgreenlight.utils.CountDownTasksUtils;
@@ -21,6 +22,8 @@
2122

2223
public class PlayerMove implements Listener {
2324

25+
FoliaLib foliaLib = RedLightGreenLight.getFoliaLib();
26+
2427
List<String> wincommands = RedLightGreenLight.getPlugin().getConfig().getStringList("Win-commands-list");
2528
List<String> losecommands = RedLightGreenLight.getPlugin().getConfig().getStringList("Lose-commands-list");
2629

@@ -55,11 +58,13 @@ public void onPlayerMove(PlayerMoveEvent event){
5558
ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-subtitle")),
5659
10, 30, 10);
5760
if (RedLightGreenLight.getPlugin().getConfig().getBoolean("Smite-losing-players")){
58-
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:lightning_bolt ~ ~ ~");
61+
foliaLib.getImpl().runNextTick((task) ->
62+
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:lightning_bolt ~ ~ ~"));
5963
}
6064
if (RedLightGreenLight.getPlugin().getConfig().getBoolean("Run-lose-commands")){
6165
for (String string : losecommands) {
62-
getServer().dispatchCommand(Bukkit.getConsoleSender(), string.replace("%player%", target));
66+
foliaLib.getImpl().runNextTick((task) ->
67+
getServer().dispatchCommand(Bukkit.getConsoleSender(), string.replace("%player%", target)));
6368
}
6469
}
6570
if (RedLightGreenLight.getPlugin().getConfig().getBoolean("Losers-spectate-game")){
@@ -93,10 +98,12 @@ public void playerBlockMove(PlayerMoveEvent event){
9398
player.sendTitle(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-win-title")),
9499
ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-win-subtitle")),
95100
10, 30, 10);
96-
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:firework_rocket ~ ~ ~");
101+
foliaLib.getImpl().runNextTick((task) ->
102+
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:firework_rocket ~ ~ ~"));
97103
if (RedLightGreenLight.getPlugin().getConfig().getBoolean("Run-win-commands")){
98104
for (String string : wincommands) {
99-
getServer().dispatchCommand(Bukkit.getConsoleSender(), string.replace("%player%", target));
105+
foliaLib.getImpl().runNextTick((task) ->
106+
getServer().dispatchCommand(Bukkit.getConsoleSender(), string.replace("%player%", target)));
100107
}
101108
}
102109
GameManager.teleportToLobby(player);

0 commit comments

Comments
 (0)