Merge pull request #7 from AzisabaNetwork/develop

Update to 1.15.2

Author: sysnote8main

.github/workflows/build.yml

@@ -2,15 +2,19 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - develop
     paths:
       - '**/*.java'
       - '**/*.kt'
       - '**/*.gradle'
       - 'gradle/**'
       - 'resources/**'
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - develop
     paths:
       - '**/*.java'
       - '**/*.kt'
@@ -52,14 +56,13 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
-          java -jar BuildTools.jar --rev 1.14.4
+          java -jar BuildTools.jar --rev 1.15.2
 
-      - name: Setup ProtocolLib
-        run: |
-          wget -O ./libs/ProtocolLib.jar "https://github.com/dmulloy2/ProtocolLib/releases/download/4.6.0/ProtocolLib.jar"
+      - name: Download ProtocolLib
+        run: wget -O ./libs/ProtocolLib.jar "https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar"
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew shadowJar
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

build.gradle.kts

@@ -2,7 +2,6 @@
 plugins {
     `java-library`
     `maven-publish`
-    alias(libs.plugins.runPaper)
     alias(libs.plugins.spotless)
     alias(libs.plugins.shadow)
 }
@@ -26,16 +25,16 @@ repositories {
 }
 
 dependencies {
-    compileOnly(libs.spigotApi)
     compileOnly(libs.spigot)
-    compileOnly(libs.bukkit)
     compileOnly(libs.noteblockapi)
     compileOnly(libs.lunachat)
+//    compileOnly(libs.protocolLib)
     compileOnly(files("libs/ProtocolLib.jar"))
     compileOnly(libs.dadadachecker)
     compileOnly(libs.blockstudio)
     compileOnly(libs.paperApi)
-    implementation(libs.cloudPaper)
+    implementation(libs.acfPaper)
+    implementation(libs.jspecify)
 }
 
 // Project Settings
@@ -53,14 +52,6 @@ java {
 }
 
 tasks {
-    runServer {
-        minecraftVersion("1.14.4")
-        downloadPlugins {
-            url("https://github.com/ucchyocean/LunaChat/releases/download/v3.0.16/LunaChat.jar") // LunaChat 3.0.16
-            url("https://github.com/koca2000/NoteBlockAPI/releases/download/1.6.3/NoteBlockAPI-1.6.3.jar") // NoteBlockAPI 1.6.3
-            url("https://github.com/dmulloy2/ProtocolLib/releases/download/4.6.0/ProtocolLib.jar") // ProtocolLib 4.6.0
-        }
-    }
 
     compileJava {
         options.encoding = defaultEncoding

gradle/libs.versions.toml

@@ -1,31 +1,25 @@
 [versions]
-runPaper = "2.3.1" # 3.x.x can't run in Java8
 spotless = "6.13.0" # 6.14.0 can't run in Java8
 shadow = "8.3.0"
-protocolLib = "4.5.0"
-paperApi = "1.14.4-R0.1-SNAPSHOT"
+paperApi = "1.15.2-R0.1-SNAPSHOT"
 blockstudio = "-SNAPSHOT"
 dadadachecker = "1.0.0"
 noteblockapi = "1.6.3"
 lunachat = "3.0.16"
-bukkit = "1.14.4-R0.1-SNAPSHOT"
-spigot = "1.14.4-R0.1-SNAPSHOT"
-spigotApi = "1.14.4-R0.1-SNAPSHOT"
-cloudPaper = "2.0.0-beta.10"
+spigot = "1.15.2-R0.1-SNAPSHOT"
+jspecify = "1.0.0"
+acfPaper = "0.5.1-SNAPSHOT"
 
 [plugins]
-runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 
 [libraries]
-protocolLib = { module = "com.comphenix.protocol:ProtocolLib", version.ref = "protocolLib" }
 paperApi = { module = "com.destroystokyo.paper:paper-api", version.ref = "paperApi" }
 blockstudio = { module = "com.github.Be4rJP:BlockStudio", version.ref = "blockstudio" }
 dadadachecker = { module = "com.github.Be4rJP:DADADAChecker", version.ref = "dadadachecker" }
 noteblockapi = { module = "com.github.koca2000:NoteBlockAPI", version.ref = "noteblockapi" }
 lunachat = { module = "com.github.ucchyocean:LunaChat", version.ref = "lunachat" }
-bukkit = { module = "org.bukkit:bukkit", version.ref = "bukkit" }
 spigot = { module = "org.spigotmc:spigot", version.ref = "spigot" }
-spigotApi = { module = "org.spigotmc:spigot-api", version.ref = "spigotApi" }
-cloudPaper = { module = "org.incendo:cloud-paper", version.ref = "cloudPaper" }
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
+acfPaper = { module = "co.aikar:acf-paper", version.ref = "acfPaper" }

libs/.gitignore

@@ -1 +1 @@
-*.jar
+*.jar

src/main/java/be4rjp/sclat/Main.java src/main/java/be4rjp/sclat/Sclat.javasrc/main/java/be4rjp/sclat/Main.java renamed to src/main/java/be4rjp/sclat/Sclat.java

@@ -3,37 +3,44 @@
 import be4rjp.blockstudio.BlockStudio;
 import be4rjp.blockstudio.api.BlockStudioAPI;
 import be4rjp.dadadachecker.DADADACheckerAPI;
-import be4rjp.sclat.api.Sclat;
+import be4rjp.sclat.api.Plugins;
+import be4rjp.sclat.api.SclatUtil;
 import be4rjp.sclat.api.ServerType;
 import be4rjp.sclat.api.async.AsyncPlayerListener;
 import be4rjp.sclat.api.async.AsyncThreadManager;
+import be4rjp.sclat.api.color.TeamColorSets;
 import be4rjp.sclat.api.config.CustomConfig;
-import be4rjp.sclat.commands.sclatCommandExecutor;
+import be4rjp.sclat.api.enchant.GlowEnchant;
+import be4rjp.sclat.api.equipment.EquipmentServer;
+import be4rjp.sclat.api.holo.PlayerHolograms;
+import be4rjp.sclat.api.rank.RankingUpdater;
+import be4rjp.sclat.api.status.StatusServer;
+import be4rjp.sclat.api.wiremesh.Wiremesh;
+import be4rjp.sclat.commands.SclatCommand;
 import be4rjp.sclat.config.Config;
 import be4rjp.sclat.data.DataMgr;
 import be4rjp.sclat.data.MapData;
 import be4rjp.sclat.data.Match;
 import be4rjp.sclat.data.PaintData;
-import be4rjp.sclat.data.Wiremesh;
 import be4rjp.sclat.gui.ClickListener;
 import be4rjp.sclat.listener.SquidListener;
 import be4rjp.sclat.lunachat.LunaChatListener;
 import be4rjp.sclat.manager.ArmorStandMgr;
-import be4rjp.sclat.manager.ColorMgr;
 import be4rjp.sclat.manager.GameMgr;
 import be4rjp.sclat.manager.MainWeaponMgr;
 import be4rjp.sclat.manager.MapDataMgr;
 import be4rjp.sclat.manager.MatchMgr;
 import be4rjp.sclat.manager.NoteBlockAPIMgr;
 import be4rjp.sclat.manager.PlayerReturnManager;
-import be4rjp.sclat.manager.RankMgr;
 import be4rjp.sclat.manager.ServerStatusManager;
 import be4rjp.sclat.manager.WeaponClassMgr;
 import be4rjp.sclat.protocollib.SclatPacketListener;
-import be4rjp.sclat.server.EquipmentServer;
-import be4rjp.sclat.server.StatusServer;
 import be4rjp.sclat.tutorial.Tutorial;
-import be4rjp.sclat.weapon.SnowballListener;
+import be4rjp.sclat.weapon.listener.MainWeapon;
+import be4rjp.sclat.weapon.listener.SPWeapon;
+import be4rjp.sclat.weapon.listener.SnowballListener;
+import be4rjp.sclat.weapon.listener.SubWeapon;
+import co.aikar.commands.PaperCommandManager;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.google.common.io.ByteArrayDataInput;
@@ -50,6 +57,8 @@
 import org.bukkit.scoreboard.NameTagVisibility;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.ScoreboardManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,15 +67,16 @@
  *
  * @author Be4rJP
  */
-public class Main extends JavaPlugin implements PluginMessageListener {
+public class Sclat extends JavaPlugin implements PluginMessageListener {
+	public static final Logger logger = LoggerFactory.getLogger(Sclat.class);
 
 	public static Config conf;
 
-	private static Main plugin;
+	private static Sclat plugin;
 
 	public static Location lobby;
 
-	public static Glow glow;
+	public static GlowEnchant glowEnchant;
 
 	public static List<Player> pdspList;
 
@@ -90,10 +100,6 @@ public class Main extends JavaPlugin implements PluginMessageListener {
 	// EquipmentShare
 	public static EquipmentServer es = null;
 
-	// API
-	public static boolean NoteBlockAPI = true;
-	public static boolean LunaChat = true;
-
 	// 重複しない数字
 	// ボム等で使用
 	private static int NDNumber = 0;
@@ -111,46 +117,29 @@ public class Main extends JavaPlugin implements PluginMessageListener {
 	public static double PARTICLE_RENDER_DISTANCE = 0;
 	public static double PARTICLE_RENDER_DISTANCE_SQUARED;
 
+	public static final PlayerHolograms playerHolograms = new PlayerHolograms();
+
+	private static PaperCommandManager commandManager;
+
 	@Override
 	public void onEnable() {
 		plugin = this;
-		glow = new Glow();
+		glowEnchant = new GlowEnchant();
 
 		pdspList = new ArrayList<>();
 
 		// Setup async tick thread
 		AsyncThreadManager.setup(1);
 
 		// ----------------------------APICheck-------------------------------
-		NoteBlockAPI = true;
-		if (!Bukkit.getPluginManager().isPluginEnabled("NoteBlockAPI")) {
-			getLogger().severe("*** NoteBlockAPI is not installed or not enabled. ***");
-			NoteBlockAPI = false;
+		if (!Plugins.onInit(logger))
 			return;
-		}
+		logger.info("API check was complted.");
 
-		// LunaChat
-		if (!Bukkit.getPluginManager().isPluginEnabled("LunaChat")) {
-			getLogger().severe("*** LunaChat is not installed or not enabled. ***");
-			LunaChat = false;
-		}
+		protocolManager = ProtocolLibrary.getProtocolManager();
+		SclatPacketListener.init();
 
-		// ProtocolLib
-		if (!Bukkit.getPluginManager().isPluginEnabled("ProtocolLib")) {
-			getLogger().severe("*** ProtocolLib is not installed or not enabled. ***");
-			return;
-		} else {
-			protocolManager = ProtocolLibrary.getProtocolManager();
-			new SclatPacketListener();
-		}
-
-		// DADADAChecker
-		if (!Bukkit.getPluginManager().isPluginEnabled("DADADAChecker")) {
-			getLogger().severe("*** DADADAChecker is not installed or not enabled. ***");
-			return;
-		} else {
-			dadadaCheckerAPI = new DADADACheckerAPI(this);
-		}
+		dadadaCheckerAPI = new DADADACheckerAPI(this);
 		// -------------------------------------------------------------------
 
 		// --------------------------Load config------------------------------
@@ -190,25 +179,26 @@ public void onEnable() {
 		pm.registerEvents(new GameMgr(), this);
 		pm.registerEvents(new SquidListener(), this);
 		pm.registerEvents(new ClickListener(), this);
-		pm.registerEvents(new be4rjp.sclat.weapon.MainWeapon(), this);
-		pm.registerEvents(new be4rjp.sclat.weapon.SubWeapon(), this);
-		pm.registerEvents(new be4rjp.sclat.weapon.SPWeapon(), this);
+		pm.registerEvents(new MainWeapon(), this);
+		pm.registerEvents(new SubWeapon(), this);
+		pm.registerEvents(new SPWeapon(), this);
 		pm.registerEvents(new SnowballListener(), this);
 		pm.registerEvents(new AsyncPlayerListener(), this);
 
-		if (LunaChat)
+		if (Plugins.LUNACHAT.isLoaded())
 			pm.registerEvents(new LunaChatListener(), this);
 		// -------------------------------------------------------------------
 
 		// ------------------------RegisteringCommands------------------------
 		getLogger().info("Registering Commands...");
-		getCommand("sclat").setExecutor(new sclatCommandExecutor());
-		getCommand("sclat").setTabCompleter(new sclatCommandExecutor());
+		commandManager = new PaperCommandManager(this);
+		// commandManager.enableUnstableAPI("help");
+		commandManager.registerCommand(new SclatCommand(this), true);
 		// -------------------------------------------------------------------
 
 		// ------------------------Setup from config--------------------------
 		getLogger().info("SetupColor...");
-		ColorMgr.SetupColor();
+		TeamColorSets.SetupColor();
 		getLogger().info("SetupMainWeapon...");
 		MainWeaponMgr.SetupMainWeapon();
 		getLogger().info("WeaponClassSetup...");
@@ -277,7 +267,7 @@ public void onEnable() {
 		// -------------------------------------------------------------------
 
 		// ------------------------Load NBS songs-----------------------------
-		if (NoteBlockAPI)
+		if (Plugins.NOTEBLOCKAPI.isLoaded())
 			NoteBlockAPIMgr.LoadSongFiles();
 		// -------------------------------------------------------------------
 
@@ -324,7 +314,7 @@ public void onEnable() {
 
 		// --------------------Send restarted server info---------------------
 		if (conf.getConfig().contains("RestartMatchCount"))
-			Sclat.sendRestartedServerInfo();
+			SclatUtil.sendRestartedServerInfo();
 		// -------------------------------------------------------------------
 
 		// -----------------------------Shop----------------------------------
@@ -350,7 +340,7 @@ public void onEnable() {
 
 		// -----------------------Ranking Holograms---------------------------
 		if (type == ServerType.LOBBY) {
-			RankMgr.makeRankingTask();
+			RankingUpdater.makeRankingTask();
 		}
 		// -------------------------------------------------------------------
 
@@ -369,7 +359,7 @@ public void onEnable() {
 		// -------------------------------------------------------------------
 
 		// ------------------------Tutorial wire mesh-------------------------
-		if (Main.tutorial) {
+		if (Sclat.tutorial) {
 			for (MapData mData : DataMgr.maplist) {
 				for (Wiremesh wiremesh : mData.getWiremeshListTask().getWiremeshsList()) {
 					wiremesh.startTask();
@@ -406,6 +396,8 @@ public void onDisable() {
 			e.printStackTrace();
 		}
 
+		commandManager.unregisterCommands();
+
 		// -----------------------Tutorial server list------------------------
 		if (type == ServerType.LOBBY) {
 			tutorialServers = new CustomConfig(this, "tutorial.yml");
@@ -442,7 +434,7 @@ public void onDisable() {
 			as.remove();
 
 		// Worldが保存される前にアンロードして塗られた状態で保存されるのを防ぐ
-		if (Main.type == ServerType.LOBBY) {
+		if (Sclat.type == ServerType.LOBBY) {
 			for (String mapname : conf.getMapConfig().getConfigurationSection("Maps").getKeys(false)) {
 				String worldName = conf.getMapConfig().getString("Maps." + mapname + ".WorldName");
 				Bukkit.unloadWorld(worldName, false);
@@ -454,7 +446,7 @@ public void onDisable() {
 		}
 	}
 
-	public static Main getPlugin() {
+	public static Sclat getPlugin() {
 		return plugin;
 	}