From 0d7a68df16b1482e54cad40ea766fcd2da397211 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 08:58:30 +0900 Subject: [PATCH 01/48] feat: update protocol lib to 5.3.0 (version 5.3.0 is final version which works on Java8) --- .github/workflows/build.yml | 4 ---- build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- libs/.gitignore | 1 - libs/.gitkeep | 0 src/main/java/be4rjp/sclat/api/GlowingAPI.java | 4 +--- 6 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 libs/.gitignore delete mode 100644 libs/.gitkeep diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ab06e5..b5026e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,10 +54,6 @@ jobs: wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" java -jar BuildTools.jar --rev 1.14.4 - - name: Setup ProtocolLib - run: | - wget -O ./libs/ProtocolLib.jar "https://github.com/dmulloy2/ProtocolLib/releases/download/4.6.0/ProtocolLib.jar" - - name: Build with Gradle run: ./gradlew build diff --git a/build.gradle.kts b/build.gradle.kts index 06616aa..8e64439 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { compileOnly(libs.bukkit) compileOnly(libs.noteblockapi) compileOnly(libs.lunachat) - compileOnly(files("libs/ProtocolLib.jar")) + compileOnly(libs.protocolLib) compileOnly(libs.dadadachecker) compileOnly(libs.blockstudio) compileOnly(libs.paperApi) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b41c773..026b3df 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ 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" +protocolLib = "5.3.0" # 5.4.0 can't run in Java8 paperApi = "1.14.4-R0.1-SNAPSHOT" blockstudio = "-SNAPSHOT" dadadachecker = "1.0.0" @@ -19,7 +19,7 @@ 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" } +protocolLib = { module = "net.dmulloy2: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" } diff --git a/libs/.gitignore b/libs/.gitignore deleted file mode 100644 index d392f0e..0000000 --- a/libs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.jar diff --git a/libs/.gitkeep b/libs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/be4rjp/sclat/api/GlowingAPI.java b/src/main/java/be4rjp/sclat/api/GlowingAPI.java index 0b6647c..f823586 100644 --- a/src/main/java/be4rjp/sclat/api/GlowingAPI.java +++ b/src/main/java/be4rjp/sclat/api/GlowingAPI.java @@ -7,8 +7,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import java.lang.reflect.InvocationTargetException; - public class GlowingAPI { public static void setGlowing(Entity entity, Player player, boolean flag) { PacketContainer packet = Main.protocolManager.createPacket(PacketType.Play.Server.ENTITY_METADATA); @@ -20,7 +18,7 @@ public static void setGlowing(Entity entity, Player player, boolean flag) { packet.getWatchableCollectionModifier().write(0, watcher.getWatchableObjects()); try { Main.protocolManager.sendServerPacket(player, packet); - } catch (InvocationTargetException e) { + } catch (RuntimeException e) { e.printStackTrace(); } } From 46ba3a65750df4f9df6aba4bd3ac1e713d913015 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 09:01:24 +0900 Subject: [PATCH 02/48] fix: forget to add target branches --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5026e2..b00c32e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,9 @@ name: Build on: push: - branches: [ master ] + branches: + - master + - develop paths: - '**/*.java' - '**/*.kt' @@ -10,7 +12,9 @@ on: - 'gradle/**' - 'resources/**' pull_request: - branches: [ master ] + branches: + - master + - develop paths: - '**/*.java' - '**/*.kt' From cc1b779152c32404b46becb2579f9067c6f55b37 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 09:18:38 +0900 Subject: [PATCH 03/48] feat: add jspecify as dependency --- build.gradle.kts | 1 + gradle/libs.versions.toml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e64439..3a64dce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { compileOnly(libs.blockstudio) compileOnly(libs.paperApi) implementation(libs.cloudPaper) + implementation(libs.jspecify) } // Project Settings diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 026b3df..933dc82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,7 @@ 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" +jspecify = "1.0.0" [plugins] runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" } @@ -28,4 +29,5 @@ 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" } \ No newline at end of file +cloudPaper = { module = "org.incendo:cloud-paper", version.ref = "cloudPaper" } +jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" } \ No newline at end of file From b02901ae7c91c400d7df82a445f750853bbd58fe Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 09:31:11 +0900 Subject: [PATCH 04/48] feat: move hologram code to api package --- src/main/java/be4rjp/sclat/Main.java | 3 ++ .../sclat/api/holo/PlayerHolograms.java | 47 +++++++++++++++++++ .../{data => api/holo}/RankingHolograms.java | 8 +++- src/main/java/be4rjp/sclat/data/DataMgr.java | 19 +++----- .../java/be4rjp/sclat/manager/GameMgr.java | 9 ++-- .../java/be4rjp/sclat/manager/RankMgr.java | 11 +++-- .../protocollib/SclatPacketListener.java | 5 +- 7 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java rename src/main/java/be4rjp/sclat/{data => api/holo}/RankingHolograms.java (97%) diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index 6f03546..453c0d3 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -8,6 +8,7 @@ import be4rjp.sclat.api.async.AsyncPlayerListener; import be4rjp.sclat.api.async.AsyncThreadManager; import be4rjp.sclat.api.config.CustomConfig; +import be4rjp.sclat.api.holo.PlayerHolograms; import be4rjp.sclat.commands.sclatCommandExecutor; import be4rjp.sclat.config.Config; import be4rjp.sclat.data.DataMgr; @@ -111,6 +112,8 @@ 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(); + @Override public void onEnable() { plugin = this; diff --git a/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java b/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java new file mode 100644 index 0000000..62b788d --- /dev/null +++ b/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java @@ -0,0 +1,47 @@ +package be4rjp.sclat.api.holo; + +import be4rjp.sclat.manager.PlayerStatusMgr; +import org.bukkit.entity.Player; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; + +import java.util.HashMap; +import java.util.Set; +import java.util.UUID; +import java.util.function.Consumer; + +@NullMarked +public class PlayerHolograms { + protected final HashMap rankingHoloMap = new HashMap<>(); + + public void add(Player player) { + RankingHolograms playerHolo = new RankingHolograms(player); + rankingHoloMap.put(player.getUniqueId(), playerHolo); + PlayerStatusMgr.HologramUpdateRunnable(player); + } + + public void ifPresent(Player player, Consumer holoConsumer) { + RankingHolograms holo = get(player); + if(holo != null) { + holoConsumer.accept(holo); + } + } + + @Nullable + public RankingHolograms get(Player player) { + return get(player.getUniqueId()); + } + + @Nullable + public RankingHolograms get(UUID playerUuid) { + return rankingHoloMap.get(playerUuid); + } + + public void remove(Player player) { + rankingHoloMap.remove(player.getUniqueId()); + } + + public Set getKeys() { + return rankingHoloMap.keySet(); + } +} diff --git a/src/main/java/be4rjp/sclat/data/RankingHolograms.java b/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java similarity index 97% rename from src/main/java/be4rjp/sclat/data/RankingHolograms.java rename to src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java index 531c593..4b55fa5 100644 --- a/src/main/java/be4rjp/sclat/data/RankingHolograms.java +++ b/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java @@ -1,9 +1,13 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.holo; import be4rjp.sclat.Main; +import be4rjp.sclat.data.RankingType; import be4rjp.sclat.manager.PlayerStatusMgr; import be4rjp.sclat.manager.RankMgr; -import net.minecraft.server.v1_14_R1.*; +import net.minecraft.server.v1_14_R1.EntityArmorStand; +import net.minecraft.server.v1_14_R1.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_14_R1.PacketPlayOutSpawnEntityLiving; +import net.minecraft.server.v1_14_R1.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/be4rjp/sclat/data/DataMgr.java b/src/main/java/be4rjp/sclat/data/DataMgr.java index 1e882e4..b5841df 100644 --- a/src/main/java/be4rjp/sclat/data/DataMgr.java +++ b/src/main/java/be4rjp/sclat/data/DataMgr.java @@ -1,6 +1,12 @@ package be4rjp.sclat.data; +import org.bukkit.block.Block; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.entity.Projectile; +import org.bukkit.entity.Snowball; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -8,12 +14,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.bukkit.block.Block; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.Snowball; - /** * * @author Be4rJP @@ -43,7 +43,6 @@ public class DataMgr { private static Map ssam = new HashMap<>(); private static Map kpm = new HashMap<>(); private static Map kam = new HashMap<>(); - private static Map rankingHologramsMap = new HashMap<>(); // private static Map paintdata = new HashMap<>(); private static List list = new ArrayList<>(); public static Map oto = new HashMap<>(); @@ -123,9 +122,6 @@ public static KasaData getKasaDataFromArmorStand(ArmorStand as) { public static int getSnowballHitCount(String name) { return msbn.get(name); } - public static RankingHolograms getRankingHolograms(Player player) { - return rankingHologramsMap.get(player); - } // public static PaintData getPaintDataFromMatch(Match match){return // paintdata.get(match);} @@ -195,9 +191,6 @@ public static void setKasaDataWithARmorStand(ArmorStand as, KasaData data) { public static void setSnowballHitCount(String name, int coount) { msbn.putIfAbsent(name, coount); } - public static void setRankingHolograms(Player player, RankingHolograms rankingHolograms) { - rankingHologramsMap.put(player, rankingHolograms); - } public static void addColorList(Color color) { list.add(color); diff --git a/src/main/java/be4rjp/sclat/manager/GameMgr.java b/src/main/java/be4rjp/sclat/manager/GameMgr.java index 55a53b8..5396429 100644 --- a/src/main/java/be4rjp/sclat/manager/GameMgr.java +++ b/src/main/java/be4rjp/sclat/manager/GameMgr.java @@ -10,7 +10,6 @@ import be4rjp.sclat.data.PaintData; import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.PlayerSettings; -import be4rjp.sclat.data.RankingHolograms; import be4rjp.sclat.data.ServerStatus; import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; @@ -115,9 +114,11 @@ public void onPlayerJoin(PlayerJoinEvent e) { conf.getUUIDCash().set(player.getUniqueId().toString(), player.getName()); if (Main.type == ServerType.LOBBY) { - RankingHolograms rankingHolograms = new RankingHolograms(player); - DataMgr.setRankingHolograms(player, rankingHolograms); - PlayerStatusMgr.HologramUpdateRunnable(player); + // Add user-specific hologram + // RankingHolograms rankingHolograms = new RankingHolograms(player); + // DataMgr.setRankingHolograms(player, rankingHolograms); + // PlayerStatusMgr.HologramUpdateRunnable(player); + Main.playerHolograms.add(player); } if (Main.type != ServerType.MATCH) { diff --git a/src/main/java/be4rjp/sclat/manager/RankMgr.java b/src/main/java/be4rjp/sclat/manager/RankMgr.java index 4b2bfde..bbad486 100644 --- a/src/main/java/be4rjp/sclat/manager/RankMgr.java +++ b/src/main/java/be4rjp/sclat/manager/RankMgr.java @@ -2,11 +2,16 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import be4rjp.sclat.data.DataMgr; +import be4rjp.sclat.api.holo.RankingHolograms; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; import static be4rjp.sclat.Main.conf; @@ -203,7 +208,7 @@ public void run() { makePaintRankingAsync(); for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { try { - DataMgr.getRankingHolograms(player).refreshRankingAsync(); + Main.playerHolograms.ifPresent(player, RankingHolograms::refreshRankingAsync); } catch (Exception e) { } } diff --git a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java index 6c233bd..10897ab 100644 --- a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java @@ -1,8 +1,8 @@ package be4rjp.sclat.protocollib; import be4rjp.sclat.Main; +import be4rjp.sclat.api.holo.RankingHolograms; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.RankingHolograms; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketAdapter; @@ -57,7 +57,8 @@ public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンテ final int EntityID = packet.getIntegers().readSafely(0); try { - RankingHolograms rankingHolograms = DataMgr.getRankingHolograms(event.getPlayer()); + RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); + if(rankingHolograms == null) return; for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { if (armorStand.getBukkitEntity().getEntityId() == EntityID) { player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, From eea12500821c8dc6168e1e90c5919363bfee8cc2 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 09:31:27 +0900 Subject: [PATCH 05/48] chore: format --- src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java | 2 +- .../java/be4rjp/sclat/protocollib/SclatPacketListener.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java b/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java index 62b788d..d168702 100644 --- a/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java +++ b/src/main/java/be4rjp/sclat/api/holo/PlayerHolograms.java @@ -22,7 +22,7 @@ public void add(Player player) { public void ifPresent(Player player, Consumer holoConsumer) { RankingHolograms holo = get(player); - if(holo != null) { + if (holo != null) { holoConsumer.accept(holo); } } diff --git a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java index 10897ab..d2f12f1 100644 --- a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java @@ -58,7 +58,8 @@ public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンテ try { RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); - if(rankingHolograms == null) return; + if (rankingHolograms == null) + return; for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { if (armorStand.getBukkitEntity().getEntityId() == EntityID) { player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, From a0925c9c83a32cb6ae9074407499c20874900dcd Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:05:37 +0900 Subject: [PATCH 06/48] feat: use Plugins instead of boolean flag --- src/main/java/be4rjp/sclat/Main.java | 44 ++++--------- src/main/java/be4rjp/sclat/api/Plugins.java | 63 +++++++++++++++++++ .../java/be4rjp/sclat/manager/MatchMgr.java | 5 +- 3 files changed, 77 insertions(+), 35 deletions(-) create mode 100644 src/main/java/be4rjp/sclat/api/Plugins.java diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index 453c0d3..ae6dbbb 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -3,6 +3,7 @@ import be4rjp.blockstudio.BlockStudio; import be4rjp.blockstudio.api.BlockStudioAPI; import be4rjp.dadadachecker.DADADACheckerAPI; +import be4rjp.sclat.api.Plugins; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.async.AsyncPlayerListener; @@ -51,6 +52,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; @@ -60,6 +63,7 @@ * @author Be4rJP */ public class Main extends JavaPlugin implements PluginMessageListener { + private static final Logger logger = LoggerFactory.getLogger(Main.class); public static Config conf; @@ -91,10 +95,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; @@ -125,35 +125,13 @@ public void onEnable() { AsyncThreadManager.setup(1); // ----------------------------APICheck------------------------------- - NoteBlockAPI = true; - if (!Bukkit.getPluginManager().isPluginEnabled("NoteBlockAPI")) { - getLogger().severe("*** NoteBlockAPI is not installed or not enabled. ***"); - NoteBlockAPI = false; - return; - } + 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(); + new SclatPacketListener(); - // 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------------------------------ @@ -199,7 +177,7 @@ public void onEnable() { pm.registerEvents(new SnowballListener(), this); pm.registerEvents(new AsyncPlayerListener(), this); - if (LunaChat) + if (Plugins.LUNACHAT.isLoaded()) pm.registerEvents(new LunaChatListener(), this); // ------------------------------------------------------------------- @@ -280,7 +258,7 @@ public void onEnable() { // ------------------------------------------------------------------- // ------------------------Load NBS songs----------------------------- - if (NoteBlockAPI) + if (Plugins.NOTEBLOCKAPI.isLoaded()) NoteBlockAPIMgr.LoadSongFiles(); // ------------------------------------------------------------------- diff --git a/src/main/java/be4rjp/sclat/api/Plugins.java b/src/main/java/be4rjp/sclat/api/Plugins.java new file mode 100644 index 0000000..5d8f3c7 --- /dev/null +++ b/src/main/java/be4rjp/sclat/api/Plugins.java @@ -0,0 +1,63 @@ +package be4rjp.sclat.api; + +import org.bukkit.Bukkit; +import org.slf4j.Logger; + +import java.util.ArrayList; + +public enum Plugins { + DADADACHECKER("DADADAChecker"), + LUNACHAT("LunaChat", false), + NOTEBLOCKAPI("NoteBlockAPI"), + PROTOCOLLIB("ProtocolLib"); + + public final String pluginName; + public final boolean isRequired; + private Boolean _isLoaded = null; + Plugins(String pluginName) { + this(pluginName, true); + } + Plugins(String pluginName, boolean isRequired) { + this.pluginName = pluginName; + this.isRequired = isRequired; + } + + public boolean isLoaded() { + if(_isLoaded == null) { + _isLoaded = Bukkit.getPluginManager().isPluginEnabled(pluginName); + } + return _isLoaded; + } + + /** + * To support plugman load. + */ + private void resetLoadedState() { + _isLoaded = false; + } + + /** + * Initialize check + * @return is init-check succeeded + */ + public static boolean onInit(Logger logger) { + ArrayList missingPlugins = new ArrayList<>(); + for(Plugins plugin: Plugins.values()) { + plugin.resetLoadedState(); + if(!plugin.isLoaded() && plugin.isRequired) { + missingPlugins.add(plugin.pluginName); + } + } + + // If some required plugins are missing + if(!missingPlugins.isEmpty()) { + logger.error("Some plugins are missing. Please install or enable."); + logger.error("*** Missing required plugins ***"); + missingPlugins.forEach(p -> logger.error("- {}", p)); + logger.error("********************************"); + return false; + } + + return true; + } +} diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index 4382dd2..df6d108 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -4,6 +4,7 @@ import be4rjp.sclat.Animation; import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; +import be4rjp.sclat.api.Plugins; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; @@ -809,7 +810,7 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) // p.setPlayerListName(DataMgr.getPlayerData(p).getTeam().getTeamColor().getColorCode() // + p.getDisplayName()); - if (DataMgr.getPlayerData(p).getPlayerNumber() == 1 && Main.NoteBlockAPI) { + if (DataMgr.getPlayerData(p).getPlayerNumber() == 1 && Plugins.NOTEBLOCKAPI.isLoaded()) { NoteBlockSong nbs = NoteBlockAPIMgr.getRandomNormalSong(); Song song = nbs.getSong(); RadioSongPlayer radio = new RadioSongPlayer(song); @@ -1111,7 +1112,7 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) Sclat.sendMessage("§6§n残り1分！", MessageType.PLAYER, oplayer); } } - if (DataMgr.getPlayerData(p).getPlayerNumber() == 1 && Main.NoteBlockAPI) { + if (DataMgr.getPlayerData(p).getPlayerNumber() == 1 && Plugins.NOTEBLOCKAPI.isLoaded()) { NoteBlockSong nbs = NoteBlockAPIMgr.getRandomFinalSong(); Song song = nbs.getSong(); RadioSongPlayer radio = new RadioSongPlayer(song); From 588f8a92c895a83fcd693947d9081cb154ea3b53 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:13:18 +0900 Subject: [PATCH 07/48] feat: split class of packet listener --- src/main/java/be4rjp/sclat/Main.java | 2 +- .../sclat/commands/sclatCommandExecutor.java | 1 + .../protocollib/EntityClickListener.java | 45 ++++++++++++ .../protocollib/SclatPacketListener.java | 71 +------------------ .../protocollib/VehiclePacketListener.java | 47 ++++++++++++ 5 files changed, 97 insertions(+), 69 deletions(-) create mode 100644 src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java create mode 100644 src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index ae6dbbb..b5c1716 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -129,7 +129,7 @@ public void onEnable() { logger.info("API check was complted."); protocolManager = ProtocolLibrary.getProtocolManager(); - new SclatPacketListener(); + SclatPacketListener.init(); dadadaCheckerAPI = new DADADACheckerAPI(this); // ------------------------------------------------------------------- diff --git a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java index db053fc..16323b2 100644 --- a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java +++ b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java @@ -222,6 +222,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N List commands = new ArrayList<>(); commands.add("mod " + sender.getName()); commands.add("stop"); + // Todo: use redis. fallbacks PluginMessaging EquipmentClient sc = new EquipmentClient( conf.getConfig().getString("EquipShare." + serverName + ".Host"), conf.getConfig().getInt("EquipShare." + serverName + ".Port"), commands); diff --git a/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java b/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java new file mode 100644 index 0000000..8de2921 --- /dev/null +++ b/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java @@ -0,0 +1,45 @@ +package be4rjp.sclat.protocollib; + +import be4rjp.sclat.Main; +import be4rjp.sclat.api.holo.RankingHolograms; +import com.comphenix.protocol.PacketType; +import com.comphenix.protocol.events.PacketAdapter; +import com.comphenix.protocol.events.PacketContainer; +import com.comphenix.protocol.events.PacketEvent; +import net.minecraft.server.v1_14_R1.EntityArmorStand; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; + +public class EntityClickListener extends PacketAdapter { + + public EntityClickListener(Plugin plugin, PacketType... types) { + super(plugin, types); + } + + @Override + public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティをクリックしたときのパケットの監視 + final Player player = event.getPlayer(); + if (event.getPacketType() == PacketType.Play.Client.USE_ENTITY) { + final PacketContainer packet = event.getPacket(); + + final int EntityID = packet.getIntegers().readSafely(0); + + try { + RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); + if (rankingHolograms == null) + return; + for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { + if (armorStand.getBukkitEntity().getEntityId() == EntityID) { + player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, + 1.2F); + rankingHolograms.switchNextRankingType(); + rankingHolograms.refreshRankingAsync(); + break; + } + } + } catch (Exception e) { + } + } + } +} diff --git a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java index d2f12f1..501d682 100644 --- a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java @@ -1,79 +1,14 @@ package be4rjp.sclat.protocollib; import be4rjp.sclat.Main; -import be4rjp.sclat.api.holo.RankingHolograms; -import be4rjp.sclat.data.DataMgr; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.ListenerPriority; -import com.comphenix.protocol.events.PacketAdapter; -import com.comphenix.protocol.events.PacketContainer; -import com.comphenix.protocol.events.PacketEvent; -import net.minecraft.server.v1_14_R1.EntityArmorStand; -import org.bukkit.Sound; -import org.bukkit.entity.Player; -import org.bukkit.util.Vector; public class SclatPacketListener { - public SclatPacketListener() { - Main.protocolManager.addPacketListener( - new PacketAdapter(Main.getPlugin(), ListenerPriority.NORMAL, PacketType.Play.Client.STEER_VEHICLE) { - @Override - public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティに乗っているときのパケットを監視 - final Player player = event.getPlayer(); - if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE - && player.getVehicle() != null) { - final PacketContainer packet = event.getPacket(); + public static void init() { + Main.protocolManager.addPacketListener(new VehiclePacketListener(Main.getPlugin(), ListenerPriority.NORMAL, PacketType.Play.Client.STEER_VEHICLE)); - final float z = event.getPacket().getFloat().readSafely(0); - final float x = event.getPacket().getFloat().readSafely(1); - - float y = 0F; - - try { - if (event.getPacket().getBooleans().readSafely(1)) { - y = -1F; - if (DataMgr.getPlayerData(player).isInMatch()) - event.setCancelled(true); - } - if (event.getPacket().getBooleans().readSafely(0)) { - y = 1F; - } - } catch (Error | Exception e45) { - } - - Vector vec = new Vector(x, y, z); - DataMgr.getPlayerData(player).setVehicleVector(vec); - } - } - }); - - Main.protocolManager.addPacketListener(new PacketAdapter(Main.getPlugin(), PacketType.Play.Client.USE_ENTITY) { - @Override - public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティをクリックしたときのパケットの監視 - final Player player = event.getPlayer(); - if (event.getPacketType() == PacketType.Play.Client.USE_ENTITY) { - final PacketContainer packet = event.getPacket(); - - final int EntityID = packet.getIntegers().readSafely(0); - - try { - RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); - if (rankingHolograms == null) - return; - for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { - if (armorStand.getBukkitEntity().getEntityId() == EntityID) { - player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, - 1.2F); - rankingHolograms.switchNextRankingType(); - rankingHolograms.refreshRankingAsync(); - break; - } - } - } catch (Exception e) { - } - } - } - }); + Main.protocolManager.addPacketListener(new EntityClickListener(Main.getPlugin(), PacketType.Play.Client.USE_ENTITY)); /* * Main.protocolManager.addPacketListener( new PacketAdapter(Main.getPlugin(), diff --git a/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java b/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java new file mode 100644 index 0000000..5e1ffe2 --- /dev/null +++ b/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java @@ -0,0 +1,47 @@ +package be4rjp.sclat.protocollib; + +import be4rjp.sclat.data.DataMgr; +import com.comphenix.protocol.PacketType; +import com.comphenix.protocol.events.ListenerPriority; +import com.comphenix.protocol.events.PacketAdapter; +import com.comphenix.protocol.events.PacketContainer; +import com.comphenix.protocol.events.PacketEvent; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.util.Vector; + +public class VehiclePacketListener extends PacketAdapter { + + public VehiclePacketListener(Plugin plugin, ListenerPriority listenerPriority, PacketType... types) { + super(plugin, listenerPriority, types); + } + + @Override + public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティに乗っているときのパケットを監視 + final Player player = event.getPlayer(); + if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE + && player.getVehicle() != null) { + final PacketContainer packet = event.getPacket(); + + final float z = event.getPacket().getFloat().readSafely(0); + final float x = event.getPacket().getFloat().readSafely(1); + + float y = 0F; + + try { + if (event.getPacket().getBooleans().readSafely(1)) { + y = -1F; + if (DataMgr.getPlayerData(player).isInMatch()) + event.setCancelled(true); + } + if (event.getPacket().getBooleans().readSafely(0)) { + y = 1F; + } + } catch (Error | Exception e45) { + } + + Vector vec = new Vector(x, y, z); + DataMgr.getPlayerData(player).setVehicleVector(vec); + } + } +} From c4c20221175deb705fabb85505e5832b7e459940 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:14:17 +0900 Subject: [PATCH 08/48] chore: add comment --- src/main/java/be4rjp/sclat/packet/PacketHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/be4rjp/sclat/packet/PacketHandler.java b/src/main/java/be4rjp/sclat/packet/PacketHandler.java index 39ae9ad..b9a5600 100644 --- a/src/main/java/be4rjp/sclat/packet/PacketHandler.java +++ b/src/main/java/be4rjp/sclat/packet/PacketHandler.java @@ -3,7 +3,9 @@ import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.PlayerSettings; -import io.netty.channel.*; +import io.netty.channel.ChannelDuplexHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPromise; import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.PacketPlayOutAbilities; import net.minecraft.server.v1_14_R1.PacketPlayOutSpawnEntity; @@ -33,6 +35,7 @@ public void channelRead(ChannelHandlerContext channelHandlerContext, Object pack public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise channelPromise) throws Exception { + // Snowball shown handle if (packet instanceof PacketPlayOutSpawnEntity) { Field k = packet.getClass().getDeclaredField("k"); k.setAccessible(true); @@ -44,6 +47,7 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch } } + // Charging fov handle if (packet instanceof PacketPlayOutAbilities) { if (playerData.getIsCharging()) { ((PacketPlayOutAbilities) packet).b(playerData.getFov()); From 1becc6d9dc0c8a1a831d658a1e942239fc4a8797 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:14:50 +0900 Subject: [PATCH 09/48] feat!: move package of Animation.java --- src/main/java/be4rjp/sclat/{ => api}/Animation.java | 6 ++---- src/main/java/be4rjp/sclat/manager/MatchMgr.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) rename src/main/java/be4rjp/sclat/{ => api}/Animation.java (98%) diff --git a/src/main/java/be4rjp/sclat/Animation.java b/src/main/java/be4rjp/sclat/api/Animation.java similarity index 98% rename from src/main/java/be4rjp/sclat/Animation.java rename to src/main/java/be4rjp/sclat/api/Animation.java index 40a7471..06a2829 100644 --- a/src/main/java/be4rjp/sclat/Animation.java +++ b/src/main/java/be4rjp/sclat/api/Animation.java @@ -1,9 +1,7 @@ -package be4rjp.sclat; +package be4rjp.sclat.api; -import be4rjp.sclat.api.GaugeAPI; -import be4rjp.sclat.api.Sclat; -import be4rjp.sclat.api.SoundType; +import be4rjp.sclat.Main; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Team; import org.bukkit.ChatColor; diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index df6d108..e6a6664 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -1,8 +1,8 @@ package be4rjp.sclat.manager; -import be4rjp.sclat.Animation; import be4rjp.sclat.Main; +import be4rjp.sclat.api.Animation; import be4rjp.sclat.api.MessageType; import be4rjp.sclat.api.Plugins; import be4rjp.sclat.api.Sclat; From 4dcd08b165186eb478c94a4c6b34fe0cdffb9d9a Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:16:24 +0900 Subject: [PATCH 10/48] feat: move packages of wiremesh --- src/main/java/be4rjp/sclat/Main.java | 2 +- .../{data => api/wiremesh}/Wiremesh.java | 20 +++++++++++++++---- .../wiremesh}/WiremeshListTask.java | 12 ++++++----- .../sclat/commands/sclatCommandExecutor.java | 1 + src/main/java/be4rjp/sclat/data/MapData.java | 4 +++- .../java/be4rjp/sclat/manager/MapDataMgr.java | 7 ++++--- .../java/be4rjp/sclat/manager/MatchMgr.java | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) rename src/main/java/be4rjp/sclat/{data => api/wiremesh}/Wiremesh.java (84%) rename src/main/java/be4rjp/sclat/{data => api/wiremesh}/WiremeshListTask.java (95%) diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index b5c1716..2eb098c 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -10,13 +10,13 @@ import be4rjp.sclat.api.async.AsyncThreadManager; import be4rjp.sclat.api.config.CustomConfig; import be4rjp.sclat.api.holo.PlayerHolograms; +import be4rjp.sclat.api.wiremesh.Wiremesh; import be4rjp.sclat.commands.sclatCommandExecutor; 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; diff --git a/src/main/java/be4rjp/sclat/data/Wiremesh.java b/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java similarity index 84% rename from src/main/java/be4rjp/sclat/data/Wiremesh.java rename to src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java index 13100e1..2a1f660 100644 --- a/src/main/java/be4rjp/sclat/data/Wiremesh.java +++ b/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java @@ -1,9 +1,17 @@ -package be4rjp.sclat.data; - -import java.util.*; +package be4rjp.sclat.api.wiremesh; import be4rjp.sclat.Main; -import net.minecraft.server.v1_14_R1.*; +import net.minecraft.server.v1_14_R1.DataWatcher; +import net.minecraft.server.v1_14_R1.EntityArmorStand; +import net.minecraft.server.v1_14_R1.EntityFallingBlock; +import net.minecraft.server.v1_14_R1.EntityPlayer; +import net.minecraft.server.v1_14_R1.IBlockData; +import net.minecraft.server.v1_14_R1.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_14_R1.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_14_R1.PacketPlayOutMount; +import net.minecraft.server.v1_14_R1.PacketPlayOutSpawnEntity; +import net.minecraft.server.v1_14_R1.PacketPlayOutSpawnEntityLiving; +import net.minecraft.server.v1_14_R1.WorldServer; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -14,6 +22,10 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/data/WiremeshListTask.java b/src/main/java/be4rjp/sclat/api/wiremesh/WiremeshListTask.java similarity index 95% rename from src/main/java/be4rjp/sclat/data/WiremeshListTask.java rename to src/main/java/be4rjp/sclat/api/wiremesh/WiremeshListTask.java index d91dfbf..344a668 100644 --- a/src/main/java/be4rjp/sclat/data/WiremeshListTask.java +++ b/src/main/java/be4rjp/sclat/api/wiremesh/WiremeshListTask.java @@ -1,14 +1,16 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.wiremesh; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import be4rjp.sclat.data.RegionBlocks; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java index 16323b2..ad4f836 100644 --- a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java +++ b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java @@ -31,6 +31,7 @@ import static be4rjp.sclat.Main.conf; //sclat Command +// Todo: use cloud command framework public class sclatCommandExecutor implements CommandExecutor, TabExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String commandLabel, diff --git a/src/main/java/be4rjp/sclat/data/MapData.java b/src/main/java/be4rjp/sclat/data/MapData.java index ab797bb..f596ad9 100644 --- a/src/main/java/be4rjp/sclat/data/MapData.java +++ b/src/main/java/be4rjp/sclat/data/MapData.java @@ -1,8 +1,10 @@ package be4rjp.sclat.data; +import be4rjp.sclat.api.wiremesh.WiremeshListTask; +import org.bukkit.Location; + import java.util.ArrayList; import java.util.List; -import org.bukkit.Location; /** * diff --git a/src/main/java/be4rjp/sclat/manager/MapDataMgr.java b/src/main/java/be4rjp/sclat/manager/MapDataMgr.java index fe13aa1..a2317e5 100644 --- a/src/main/java/be4rjp/sclat/manager/MapDataMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MapDataMgr.java @@ -1,16 +1,17 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import static be4rjp.sclat.Main.conf; +import be4rjp.sclat.api.wiremesh.WiremeshListTask; import be4rjp.sclat.data.Area; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.MapData; import be4rjp.sclat.data.Path; -import be4rjp.sclat.data.WiremeshListTask; -import static org.bukkit.Bukkit.getServer; import org.bukkit.Location; import org.bukkit.World; +import static be4rjp.sclat.Main.conf; +import static org.bukkit.Bukkit.getServer; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index e6a6664..a6e216e 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -9,6 +9,7 @@ import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.api.utils.ObjectiveUtil; +import be4rjp.sclat.api.wiremesh.Wiremesh; import be4rjp.sclat.data.Area; import be4rjp.sclat.data.BlockUpdater; import be4rjp.sclat.data.Color; @@ -22,7 +23,6 @@ import be4rjp.sclat.data.PlayerSettings; import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; -import be4rjp.sclat.data.Wiremesh; import be4rjp.sclat.gui.OpenGUI; import be4rjp.sclat.server.EquipmentServerManager; import be4rjp.sclat.server.StatusClient; From 2ee0a21ff6b350ee2ec3c023a187e78a4b3f2d3c Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:17:03 +0900 Subject: [PATCH 11/48] feat: move player codes to api/player --- src/main/java/be4rjp/sclat/api/Sclat.java | 2 +- .../{data => api/player}/PlayerData.java | 6 +++++- .../{data => api/player}/PlayerReturn.java | 2 +- .../{data => api/player}/PlayerSettings.java | 2 +- src/main/java/be4rjp/sclat/data/DataMgr.java | 1 + src/main/java/be4rjp/sclat/gui/OpenGUI.java | 2 +- .../be4rjp/sclat/listener/SquidListener.java | 2 +- .../sclat/listener/SquidListenerMgr.java | 7 ++++--- .../sclat/lobby/LobbyScoreboardRunnable.java | 2 +- .../sclat/lunachat/LunaChatListener.java | 2 +- .../java/be4rjp/sclat/manager/DeathMgr.java | 2 +- .../java/be4rjp/sclat/manager/GameMgr.java | 4 ++-- .../be4rjp/sclat/manager/MainWeaponMgr.java | 2 +- .../java/be4rjp/sclat/manager/MatchMgr.java | 4 ++-- .../java/be4rjp/sclat/manager/PaintMgr.java | 2 +- .../sclat/manager/PlayerReturnManager.java | 2 +- .../be4rjp/sclat/manager/SPWeaponMgr.java | 2 +- .../java/be4rjp/sclat/manager/SettingMgr.java | 2 +- .../be4rjp/sclat/manager/SprinklerMgr.java | 2 +- .../java/be4rjp/sclat/manager/SquidMgr.java | 2 +- .../be4rjp/sclat/manager/SubWeaponMgr.java | 21 ++++++++++++++++--- .../be4rjp/sclat/manager/WeaponClassMgr.java | 5 +++-- .../be4rjp/sclat/packet/PacketHandler.java | 4 ++-- .../java/be4rjp/sclat/weapon/Blaster.java | 2 +- src/main/java/be4rjp/sclat/weapon/Brush.java | 2 +- src/main/java/be4rjp/sclat/weapon/Bucket.java | 2 +- .../java/be4rjp/sclat/weapon/Buckler.java | 2 +- src/main/java/be4rjp/sclat/weapon/Burst.java | 2 +- .../java/be4rjp/sclat/weapon/Charger.java | 2 +- src/main/java/be4rjp/sclat/weapon/Decoy.java | 2 +- src/main/java/be4rjp/sclat/weapon/Funnel.java | 2 +- src/main/java/be4rjp/sclat/weapon/Hound.java | 2 +- src/main/java/be4rjp/sclat/weapon/Kasa.java | 2 +- .../java/be4rjp/sclat/weapon/MainWeapon.java | 5 +++-- .../java/be4rjp/sclat/weapon/Manuber.java | 2 +- src/main/java/be4rjp/sclat/weapon/Reeler.java | 2 +- src/main/java/be4rjp/sclat/weapon/Roller.java | 2 +- .../java/be4rjp/sclat/weapon/SPWeapon.java | 2 +- .../java/be4rjp/sclat/weapon/Shooter.java | 2 +- .../java/be4rjp/sclat/weapon/Slosher.java | 2 +- .../java/be4rjp/sclat/weapon/Spinner.java | 2 +- .../java/be4rjp/sclat/weapon/SubWeapon.java | 2 +- .../java/be4rjp/sclat/weapon/Swapper.java | 2 +- .../be4rjp/sclat/weapon/spweapon/Barrier.java | 2 +- .../sclat/weapon/spweapon/BombRush.java | 2 +- .../sclat/weapon/spweapon/LitterFiveG.java | 2 +- .../sclat/weapon/spweapon/MegaLaser.java | 2 +- .../sclat/weapon/spweapon/QuadroArms.java | 2 +- .../sclat/weapon/spweapon/SuperArmor.java | 2 +- .../sclat/weapon/spweapon/SwordMord.java | 2 +- .../be4rjp/sclat/weapon/subweapon/Beacon.java | 2 +- .../be4rjp/sclat/weapon/subweapon/Trap.java | 2 +- 52 files changed, 83 insertions(+), 60 deletions(-) rename src/main/java/be4rjp/sclat/{data => api/player}/PlayerData.java (98%) rename src/main/java/be4rjp/sclat/{data => api/player}/PlayerReturn.java (93%) rename src/main/java/be4rjp/sclat/{data => api/player}/PlayerSettings.java (98%) diff --git a/src/main/java/be4rjp/sclat/api/Sclat.java b/src/main/java/be4rjp/sclat/api/Sclat.java index 83636c9..505500e 100644 --- a/src/main/java/be4rjp/sclat/api/Sclat.java +++ b/src/main/java/be4rjp/sclat/api/Sclat.java @@ -1,8 +1,8 @@ package be4rjp.sclat.api; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.BungeeCordMgr; import be4rjp.sclat.manager.DeathMgr; diff --git a/src/main/java/be4rjp/sclat/data/PlayerData.java b/src/main/java/be4rjp/sclat/api/player/PlayerData.java similarity index 98% rename from src/main/java/be4rjp/sclat/data/PlayerData.java rename to src/main/java/be4rjp/sclat/api/player/PlayerData.java index 7f5bc22..4a0ba23 100644 --- a/src/main/java/be4rjp/sclat/data/PlayerData.java +++ b/src/main/java/be4rjp/sclat/api/player/PlayerData.java @@ -1,5 +1,9 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.player; +import be4rjp.sclat.data.MainWeapon; +import be4rjp.sclat.data.Match; +import be4rjp.sclat.data.Team; +import be4rjp.sclat.data.WeaponClass; import net.minecraft.server.v1_14_R1.ItemStack; import org.bukkit.Location; import org.bukkit.entity.ArmorStand; diff --git a/src/main/java/be4rjp/sclat/data/PlayerReturn.java b/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java similarity index 93% rename from src/main/java/be4rjp/sclat/data/PlayerReturn.java rename to src/main/java/be4rjp/sclat/api/player/PlayerReturn.java index 018909a..35ec1c4 100644 --- a/src/main/java/be4rjp/sclat/data/PlayerReturn.java +++ b/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java @@ -1,4 +1,4 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.player; import be4rjp.sclat.Main; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/be4rjp/sclat/data/PlayerSettings.java b/src/main/java/be4rjp/sclat/api/player/PlayerSettings.java similarity index 98% rename from src/main/java/be4rjp/sclat/data/PlayerSettings.java rename to src/main/java/be4rjp/sclat/api/player/PlayerSettings.java index 526f965..d2cbc33 100644 --- a/src/main/java/be4rjp/sclat/data/PlayerSettings.java +++ b/src/main/java/be4rjp/sclat/api/player/PlayerSettings.java @@ -1,5 +1,5 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.player; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/data/DataMgr.java b/src/main/java/be4rjp/sclat/data/DataMgr.java index b5841df..5d2cd88 100644 --- a/src/main/java/be4rjp/sclat/data/DataMgr.java +++ b/src/main/java/be4rjp/sclat/data/DataMgr.java @@ -1,6 +1,7 @@ package be4rjp.sclat.data; +import be4rjp.sclat.api.player.PlayerData; import org.bukkit.block.Block; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/gui/OpenGUI.java b/src/main/java/be4rjp/sclat/gui/OpenGUI.java index cdeb5af..427bd18 100644 --- a/src/main/java/be4rjp/sclat/gui/OpenGUI.java +++ b/src/main/java/be4rjp/sclat/gui/OpenGUI.java @@ -3,9 +3,9 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.ServerType; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.emblem.EmblemManager; import be4rjp.sclat.manager.MatchMgr; import be4rjp.sclat.manager.PlayerStatusMgr; diff --git a/src/main/java/be4rjp/sclat/listener/SquidListener.java b/src/main/java/be4rjp/sclat/listener/SquidListener.java index 02736aa..551c627 100644 --- a/src/main/java/be4rjp/sclat/listener/SquidListener.java +++ b/src/main/java/be4rjp/sclat/listener/SquidListener.java @@ -1,8 +1,8 @@ package be4rjp.sclat.listener; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java b/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java index ffd4d2a..304489f 100644 --- a/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java +++ b/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java @@ -1,12 +1,10 @@ package be4rjp.sclat.listener; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.DeathMgr; -import java.util.ArrayList; -import java.util.List; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; @@ -14,6 +12,9 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; +import java.util.ArrayList; +import java.util.List; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/lobby/LobbyScoreboardRunnable.java b/src/main/java/be4rjp/sclat/lobby/LobbyScoreboardRunnable.java index 8a6f6b9..5487033 100644 --- a/src/main/java/be4rjp/sclat/lobby/LobbyScoreboardRunnable.java +++ b/src/main/java/be4rjp/sclat/lobby/LobbyScoreboardRunnable.java @@ -1,10 +1,10 @@ package be4rjp.sclat.lobby; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.utils.ObjectiveUtil; import be4rjp.sclat.api.utils.TextAnimation; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.ServerStatus; import be4rjp.sclat.manager.PlayerStatusMgr; import be4rjp.sclat.manager.RankMgr; diff --git a/src/main/java/be4rjp/sclat/lunachat/LunaChatListener.java b/src/main/java/be4rjp/sclat/lunachat/LunaChatListener.java index d07d87a..8ddf4e0 100644 --- a/src/main/java/be4rjp/sclat/lunachat/LunaChatListener.java +++ b/src/main/java/be4rjp/sclat/lunachat/LunaChatListener.java @@ -1,8 +1,8 @@ package be4rjp.sclat.lunachat; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import com.github.ucchyocean.lc3.bukkit.event.LunaChatBukkitPreChatEvent; import org.bukkit.entity.Player; import org.bukkit.event.Listener; diff --git a/src/main/java/be4rjp/sclat/manager/DeathMgr.java b/src/main/java/be4rjp/sclat/manager/DeathMgr.java index 6d6df4c..22b6dc3 100644 --- a/src/main/java/be4rjp/sclat/manager/DeathMgr.java +++ b/src/main/java/be4rjp/sclat/manager/DeathMgr.java @@ -4,8 +4,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.weapon.Gear; import be4rjp.sclat.weapon.spweapon.SuperArmor; import net.md_5.bungee.api.ChatColor; diff --git a/src/main/java/be4rjp/sclat/manager/GameMgr.java b/src/main/java/be4rjp/sclat/manager/GameMgr.java index 5396429..bb08f65 100644 --- a/src/main/java/be4rjp/sclat/manager/GameMgr.java +++ b/src/main/java/be4rjp/sclat/manager/GameMgr.java @@ -5,11 +5,11 @@ import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; +import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.player.PlayerSettings; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; import be4rjp.sclat.data.PaintData; -import be4rjp.sclat.data.PlayerData; -import be4rjp.sclat.data.PlayerSettings; import be4rjp.sclat.data.ServerStatus; import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; diff --git a/src/main/java/be4rjp/sclat/manager/MainWeaponMgr.java b/src/main/java/be4rjp/sclat/manager/MainWeaponMgr.java index 8182410..c84a19e 100644 --- a/src/main/java/be4rjp/sclat/manager/MainWeaponMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MainWeaponMgr.java @@ -3,9 +3,9 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.MainWeapon; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.weapon.Blaster; import be4rjp.sclat.weapon.Brush; import be4rjp.sclat.weapon.Bucket; diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index a6e216e..a6d885e 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -8,6 +8,8 @@ import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; +import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.player.PlayerSettings; import be4rjp.sclat.api.utils.ObjectiveUtil; import be4rjp.sclat.api.wiremesh.Wiremesh; import be4rjp.sclat.data.Area; @@ -19,8 +21,6 @@ import be4rjp.sclat.data.NoteBlockSong; import be4rjp.sclat.data.PaintData; import be4rjp.sclat.data.Path; -import be4rjp.sclat.data.PlayerData; -import be4rjp.sclat.data.PlayerSettings; import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; import be4rjp.sclat.gui.OpenGUI; diff --git a/src/main/java/be4rjp/sclat/manager/PaintMgr.java b/src/main/java/be4rjp/sclat/manager/PaintMgr.java index 9bea2f7..bddee5f 100644 --- a/src/main/java/be4rjp/sclat/manager/PaintMgr.java +++ b/src/main/java/be4rjp/sclat/manager/PaintMgr.java @@ -4,10 +4,10 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; import be4rjp.sclat.data.PaintData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.Sponge; import be4rjp.sclat.data.Team; import be4rjp.sclat.weapon.Gear; diff --git a/src/main/java/be4rjp/sclat/manager/PlayerReturnManager.java b/src/main/java/be4rjp/sclat/manager/PlayerReturnManager.java index bb8bbf4..308825a 100644 --- a/src/main/java/be4rjp/sclat/manager/PlayerReturnManager.java +++ b/src/main/java/be4rjp/sclat/manager/PlayerReturnManager.java @@ -1,7 +1,7 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import be4rjp.sclat.data.PlayerReturn; +import be4rjp.sclat.api.player.PlayerReturn; import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; diff --git a/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java b/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java index 5e29f04..3654651 100644 --- a/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java @@ -5,8 +5,8 @@ import be4rjp.sclat.api.GaugeAPI; import be4rjp.sclat.api.MessageType; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.weapon.spweapon.AirStrike; import be4rjp.sclat.weapon.spweapon.Amehurasi; import be4rjp.sclat.weapon.spweapon.Barrier; diff --git a/src/main/java/be4rjp/sclat/manager/SettingMgr.java b/src/main/java/be4rjp/sclat/manager/SettingMgr.java index 18dcf28..ab05731 100644 --- a/src/main/java/be4rjp/sclat/manager/SettingMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SettingMgr.java @@ -1,7 +1,7 @@ package be4rjp.sclat.manager; +import be4rjp.sclat.api.player.PlayerSettings; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerSettings; import org.bukkit.entity.Player; import static be4rjp.sclat.Main.conf; diff --git a/src/main/java/be4rjp/sclat/manager/SprinklerMgr.java b/src/main/java/be4rjp/sclat/manager/SprinklerMgr.java index b306f5c..49ae5a1 100644 --- a/src/main/java/be4rjp/sclat/manager/SprinklerMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SprinklerMgr.java @@ -2,8 +2,8 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import org.bukkit.Sound; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftSnowball; import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; diff --git a/src/main/java/be4rjp/sclat/manager/SquidMgr.java b/src/main/java/be4rjp/sclat/manager/SquidMgr.java index 055455e..d98daf8 100644 --- a/src/main/java/be4rjp/sclat/manager/SquidMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SquidMgr.java @@ -2,8 +2,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.ServerType; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.weapon.Gear; import net.minecraft.server.v1_14_R1.EntitySquid; import net.minecraft.server.v1_14_R1.EntityTypes; diff --git a/src/main/java/be4rjp/sclat/manager/SubWeaponMgr.java b/src/main/java/be4rjp/sclat/manager/SubWeaponMgr.java index 7f94eb8..7c6f36b 100644 --- a/src/main/java/be4rjp/sclat/manager/SubWeaponMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SubWeaponMgr.java @@ -1,10 +1,25 @@ package be4rjp.sclat.manager; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; -import be4rjp.sclat.weapon.spweapon.*; -import be4rjp.sclat.weapon.subweapon.*; +import be4rjp.sclat.weapon.spweapon.JetPack; +import be4rjp.sclat.weapon.spweapon.LitterFiveG; +import be4rjp.sclat.weapon.spweapon.QuadroArms; +import be4rjp.sclat.weapon.spweapon.SuperShot; +import be4rjp.sclat.weapon.spweapon.SwordMord; +import be4rjp.sclat.weapon.subweapon.Beacon; +import be4rjp.sclat.weapon.subweapon.Boomerang; +import be4rjp.sclat.weapon.subweapon.CurlingBomb; +import be4rjp.sclat.weapon.subweapon.FloaterBomb; +import be4rjp.sclat.weapon.subweapon.KBomb; +import be4rjp.sclat.weapon.subweapon.Poison; +import be4rjp.sclat.weapon.subweapon.QuickBomb; +import be4rjp.sclat.weapon.subweapon.Sensor; +import be4rjp.sclat.weapon.subweapon.SplashBomb; +import be4rjp.sclat.weapon.subweapon.SplashShield; +import be4rjp.sclat.weapon.subweapon.Sprinkler; +import be4rjp.sclat.weapon.subweapon.Trap; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/manager/WeaponClassMgr.java b/src/main/java/be4rjp/sclat/manager/WeaponClassMgr.java index 2b40e61..84dde48 100644 --- a/src/main/java/be4rjp/sclat/manager/WeaponClassMgr.java +++ b/src/main/java/be4rjp/sclat/manager/WeaponClassMgr.java @@ -2,9 +2,8 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import static be4rjp.sclat.Main.conf; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.WeaponClass; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -12,6 +11,8 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import static be4rjp.sclat.Main.conf; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/packet/PacketHandler.java b/src/main/java/be4rjp/sclat/packet/PacketHandler.java index b9a5600..6cbb3a3 100644 --- a/src/main/java/be4rjp/sclat/packet/PacketHandler.java +++ b/src/main/java/be4rjp/sclat/packet/PacketHandler.java @@ -1,8 +1,8 @@ package be4rjp.sclat.packet; +import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.player.PlayerSettings; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; -import be4rjp.sclat.data.PlayerSettings; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; diff --git a/src/main/java/be4rjp/sclat/weapon/Blaster.java b/src/main/java/be4rjp/sclat/weapon/Blaster.java index f189ea0..6affd99 100644 --- a/src/main/java/be4rjp/sclat/weapon/Blaster.java +++ b/src/main/java/be4rjp/sclat/weapon/Blaster.java @@ -4,9 +4,9 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/Brush.java b/src/main/java/be4rjp/sclat/weapon/Brush.java index 6b18c95..6447979 100644 --- a/src/main/java/be4rjp/sclat/weapon/Brush.java +++ b/src/main/java/be4rjp/sclat/weapon/Brush.java @@ -3,8 +3,8 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; diff --git a/src/main/java/be4rjp/sclat/weapon/Bucket.java b/src/main/java/be4rjp/sclat/weapon/Bucket.java index 50c469f..96ee5c9 100644 --- a/src/main/java/be4rjp/sclat/weapon/Bucket.java +++ b/src/main/java/be4rjp/sclat/weapon/Bucket.java @@ -2,8 +2,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/Buckler.java b/src/main/java/be4rjp/sclat/weapon/Buckler.java index 2ff81cd..f8680be 100644 --- a/src/main/java/be4rjp/sclat/weapon/Buckler.java +++ b/src/main/java/be4rjp/sclat/weapon/Buckler.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import org.bukkit.GameMode; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/weapon/Burst.java b/src/main/java/be4rjp/sclat/weapon/Burst.java index dd5c47c..b5cf4db 100644 --- a/src/main/java/be4rjp/sclat/weapon/Burst.java +++ b/src/main/java/be4rjp/sclat/weapon/Burst.java @@ -2,8 +2,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/Charger.java b/src/main/java/be4rjp/sclat/weapon/Charger.java index 86f35c9..db5a856 100644 --- a/src/main/java/be4rjp/sclat/weapon/Charger.java +++ b/src/main/java/be4rjp/sclat/weapon/Charger.java @@ -3,11 +3,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GaugeAPI; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/Decoy.java b/src/main/java/be4rjp/sclat/weapon/Decoy.java index e596f57..d9b0575 100644 --- a/src/main/java/be4rjp/sclat/weapon/Decoy.java +++ b/src/main/java/be4rjp/sclat/weapon/Decoy.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import com.mojang.authlib.GameProfile; import net.minecraft.server.v1_14_R1.DataWatcherRegistry; import net.minecraft.server.v1_14_R1.EntityPlayer; diff --git a/src/main/java/be4rjp/sclat/weapon/Funnel.java b/src/main/java/be4rjp/sclat/weapon/Funnel.java index 2ade648..3a52c03 100644 --- a/src/main/java/be4rjp/sclat/weapon/Funnel.java +++ b/src/main/java/be4rjp/sclat/weapon/Funnel.java @@ -3,11 +3,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GlowingAPI; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.ArmorStandMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/Hound.java b/src/main/java/be4rjp/sclat/weapon/Hound.java index 831910c..3223943 100644 --- a/src/main/java/be4rjp/sclat/weapon/Hound.java +++ b/src/main/java/be4rjp/sclat/weapon/Hound.java @@ -5,9 +5,9 @@ import be4rjp.sclat.api.GlowingAPI; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/Kasa.java b/src/main/java/be4rjp/sclat/weapon/Kasa.java index 0b0cb58..5ce428e 100644 --- a/src/main/java/be4rjp/sclat/weapon/Kasa.java +++ b/src/main/java/be4rjp/sclat/weapon/Kasa.java @@ -3,11 +3,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.MainWeaponMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/MainWeapon.java b/src/main/java/be4rjp/sclat/weapon/MainWeapon.java index d97ba96..c3e0872 100644 --- a/src/main/java/be4rjp/sclat/weapon/MainWeapon.java +++ b/src/main/java/be4rjp/sclat/weapon/MainWeapon.java @@ -1,9 +1,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import static be4rjp.sclat.Main.conf; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.DeathMgr; import be4rjp.sclat.manager.MainWeaponMgr; import be4rjp.sclat.manager.SPWeaponMgr; @@ -21,6 +20,8 @@ import org.bukkit.event.player.PlayerToggleSneakEvent; import org.bukkit.scheduler.BukkitRunnable; +import static be4rjp.sclat.Main.conf; + /** * * @author Be4rJP diff --git a/src/main/java/be4rjp/sclat/weapon/Manuber.java b/src/main/java/be4rjp/sclat/weapon/Manuber.java index 99a1ad4..0cf2bda 100644 --- a/src/main/java/be4rjp/sclat/weapon/Manuber.java +++ b/src/main/java/be4rjp/sclat/weapon/Manuber.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/src/main/java/be4rjp/sclat/weapon/Reeler.java b/src/main/java/be4rjp/sclat/weapon/Reeler.java index 2aae03f..9e43c36 100644 --- a/src/main/java/be4rjp/sclat/weapon/Reeler.java +++ b/src/main/java/be4rjp/sclat/weapon/Reeler.java @@ -3,9 +3,9 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/Roller.java b/src/main/java/be4rjp/sclat/weapon/Roller.java index 8a74683..4ff207c 100644 --- a/src/main/java/be4rjp/sclat/weapon/Roller.java +++ b/src/main/java/be4rjp/sclat/weapon/Roller.java @@ -2,11 +2,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/SPWeapon.java b/src/main/java/be4rjp/sclat/weapon/SPWeapon.java index db88791..5cc919c 100644 --- a/src/main/java/be4rjp/sclat/weapon/SPWeapon.java +++ b/src/main/java/be4rjp/sclat/weapon/SPWeapon.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.SPWeaponMgr; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/be4rjp/sclat/weapon/Shooter.java b/src/main/java/be4rjp/sclat/weapon/Shooter.java index 7fea593..3c99ffb 100644 --- a/src/main/java/be4rjp/sclat/weapon/Shooter.java +++ b/src/main/java/be4rjp/sclat/weapon/Shooter.java @@ -2,9 +2,9 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/Slosher.java b/src/main/java/be4rjp/sclat/weapon/Slosher.java index 03440f8..5e54eb8 100644 --- a/src/main/java/be4rjp/sclat/weapon/Slosher.java +++ b/src/main/java/be4rjp/sclat/weapon/Slosher.java @@ -4,8 +4,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; diff --git a/src/main/java/be4rjp/sclat/weapon/Spinner.java b/src/main/java/be4rjp/sclat/weapon/Spinner.java index 00af716..d46beb1 100644 --- a/src/main/java/be4rjp/sclat/weapon/Spinner.java +++ b/src/main/java/be4rjp/sclat/weapon/Spinner.java @@ -3,8 +3,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GaugeAPI; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.ChatColor; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/SubWeapon.java b/src/main/java/be4rjp/sclat/weapon/SubWeapon.java index a3a3780..cbb5392 100644 --- a/src/main/java/be4rjp/sclat/weapon/SubWeapon.java +++ b/src/main/java/be4rjp/sclat/weapon/SubWeapon.java @@ -1,9 +1,9 @@ package be4rjp.sclat.weapon; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.SubWeaponMgr; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/weapon/Swapper.java b/src/main/java/be4rjp/sclat/weapon/Swapper.java index adc43ec..2068b0e 100644 --- a/src/main/java/be4rjp/sclat/weapon/Swapper.java +++ b/src/main/java/be4rjp/sclat/weapon/Swapper.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.WeaponClassMgr; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/Barrier.java b/src/main/java/be4rjp/sclat/weapon/spweapon/Barrier.java index a95c242..cb9b9de 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/Barrier.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/Barrier.java @@ -3,8 +3,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.SPWeaponMgr; import net.minecraft.server.v1_14_R1.EntityArmorStand; import org.bukkit.GameMode; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/BombRush.java b/src/main/java/be4rjp/sclat/weapon/spweapon/BombRush.java index 464f85c..a00c240 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/BombRush.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/BombRush.java @@ -2,8 +2,8 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.SPWeaponMgr; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java b/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java index e64272f..b9658c9 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java @@ -3,11 +3,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.SplashShieldData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java b/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java index cec8ca5..19a45dc 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java @@ -9,9 +9,9 @@ import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.async.AsyncTask; import be4rjp.sclat.api.async.AsyncThreadManager; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.SPWeaponMgr; import be4rjp.sclat.manager.WeaponClassMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java b/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java index 985bfcb..bb47b83 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java @@ -4,9 +4,9 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; import be4rjp.sclat.manager.SPWeaponMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/SuperArmor.java b/src/main/java/be4rjp/sclat/weapon/spweapon/SuperArmor.java index 1bf19c4..3107844 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/SuperArmor.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/SuperArmor.java @@ -2,8 +2,8 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.SPWeaponMgr; import org.bukkit.GameMode; import org.bukkit.Particle; diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java b/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java index 73d6580..4500448 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java @@ -3,11 +3,11 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; import be4rjp.sclat.manager.SPWeaponMgr; diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/Beacon.java b/src/main/java/be4rjp/sclat/weapon/subweapon/Beacon.java index 3cd205a..0296d49 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/Beacon.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/Beacon.java @@ -2,8 +2,8 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.weapon.Gear; import net.minecraft.server.v1_14_R1.EnumItemSlot; import net.minecraft.server.v1_14_R1.PacketPlayOutEntityEquipment; diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/Trap.java b/src/main/java/be4rjp/sclat/weapon/subweapon/Trap.java index 40b0f2d..378917b 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/Trap.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/Trap.java @@ -1,8 +1,8 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; +import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.PlayerData; import be4rjp.sclat.data.TrapData; import be4rjp.sclat.manager.PaintMgr; import be4rjp.sclat.weapon.Gear; From 94f9380f992035b22a24a91b33638ce7f321bde6 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:17:17 +0900 Subject: [PATCH 12/48] chore: apply format --- src/main/java/be4rjp/sclat/Main.java | 3 +- src/main/java/be4rjp/sclat/api/Plugins.java | 107 +++++++++--------- .../protocollib/EntityClickListener.java | 51 ++++----- .../protocollib/SclatPacketListener.java | 6 +- .../protocollib/VehiclePacketListener.java | 63 +++++------ 5 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index 2eb098c..8a73bfb 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -125,7 +125,8 @@ public void onEnable() { AsyncThreadManager.setup(1); // ----------------------------APICheck------------------------------- - if(!Plugins.onInit(logger)) return; + if (!Plugins.onInit(logger)) + return; logger.info("API check was complted."); protocolManager = ProtocolLibrary.getProtocolManager(); diff --git a/src/main/java/be4rjp/sclat/api/Plugins.java b/src/main/java/be4rjp/sclat/api/Plugins.java index 5d8f3c7..e14569d 100644 --- a/src/main/java/be4rjp/sclat/api/Plugins.java +++ b/src/main/java/be4rjp/sclat/api/Plugins.java @@ -6,58 +6,57 @@ import java.util.ArrayList; public enum Plugins { - DADADACHECKER("DADADAChecker"), - LUNACHAT("LunaChat", false), - NOTEBLOCKAPI("NoteBlockAPI"), - PROTOCOLLIB("ProtocolLib"); - - public final String pluginName; - public final boolean isRequired; - private Boolean _isLoaded = null; - Plugins(String pluginName) { - this(pluginName, true); - } - Plugins(String pluginName, boolean isRequired) { - this.pluginName = pluginName; - this.isRequired = isRequired; - } - - public boolean isLoaded() { - if(_isLoaded == null) { - _isLoaded = Bukkit.getPluginManager().isPluginEnabled(pluginName); - } - return _isLoaded; - } - - /** - * To support plugman load. - */ - private void resetLoadedState() { - _isLoaded = false; - } - - /** - * Initialize check - * @return is init-check succeeded - */ - public static boolean onInit(Logger logger) { - ArrayList missingPlugins = new ArrayList<>(); - for(Plugins plugin: Plugins.values()) { - plugin.resetLoadedState(); - if(!plugin.isLoaded() && plugin.isRequired) { - missingPlugins.add(plugin.pluginName); - } - } - - // If some required plugins are missing - if(!missingPlugins.isEmpty()) { - logger.error("Some plugins are missing. Please install or enable."); - logger.error("*** Missing required plugins ***"); - missingPlugins.forEach(p -> logger.error("- {}", p)); - logger.error("********************************"); - return false; - } - - return true; - } + DADADACHECKER("DADADAChecker"), LUNACHAT("LunaChat", + false), NOTEBLOCKAPI("NoteBlockAPI"), PROTOCOLLIB("ProtocolLib"); + + public final String pluginName; + public final boolean isRequired; + private Boolean _isLoaded = null; + Plugins(String pluginName) { + this(pluginName, true); + } + Plugins(String pluginName, boolean isRequired) { + this.pluginName = pluginName; + this.isRequired = isRequired; + } + + public boolean isLoaded() { + if (_isLoaded == null) { + _isLoaded = Bukkit.getPluginManager().isPluginEnabled(pluginName); + } + return _isLoaded; + } + + /** + * To support plugman load. + */ + private void resetLoadedState() { + _isLoaded = false; + } + + /** + * Initialize check + * + * @return is init-check succeeded + */ + public static boolean onInit(Logger logger) { + ArrayList missingPlugins = new ArrayList<>(); + for (Plugins plugin : Plugins.values()) { + plugin.resetLoadedState(); + if (!plugin.isLoaded() && plugin.isRequired) { + missingPlugins.add(plugin.pluginName); + } + } + + // If some required plugins are missing + if (!missingPlugins.isEmpty()) { + logger.error("Some plugins are missing. Please install or enable."); + logger.error("*** Missing required plugins ***"); + missingPlugins.forEach(p -> logger.error("- {}", p)); + logger.error("********************************"); + return false; + } + + return true; + } } diff --git a/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java b/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java index 8de2921..e816b85 100644 --- a/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/EntityClickListener.java @@ -13,33 +13,32 @@ public class EntityClickListener extends PacketAdapter { - public EntityClickListener(Plugin plugin, PacketType... types) { - super(plugin, types); - } + public EntityClickListener(Plugin plugin, PacketType... types) { + super(plugin, types); + } - @Override - public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティをクリックしたときのパケットの監視 - final Player player = event.getPlayer(); - if (event.getPacketType() == PacketType.Play.Client.USE_ENTITY) { - final PacketContainer packet = event.getPacket(); + @Override + public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティをクリックしたときのパケットの監視 + final Player player = event.getPlayer(); + if (event.getPacketType() == PacketType.Play.Client.USE_ENTITY) { + final PacketContainer packet = event.getPacket(); - final int EntityID = packet.getIntegers().readSafely(0); + final int EntityID = packet.getIntegers().readSafely(0); - try { - RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); - if (rankingHolograms == null) - return; - for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { - if (armorStand.getBukkitEntity().getEntityId() == EntityID) { - player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, - 1.2F); - rankingHolograms.switchNextRankingType(); - rankingHolograms.refreshRankingAsync(); - break; - } - } - } catch (Exception e) { - } - } - } + try { + RankingHolograms rankingHolograms = Main.playerHolograms.get(event.getPlayer()); + if (rankingHolograms == null) + return; + for (EntityArmorStand armorStand : rankingHolograms.getArmorStandList()) { + if (armorStand.getBukkitEntity().getEntityId() == EntityID) { + player.playSound(player.getLocation(), Sound.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON, 1F, 1.2F); + rankingHolograms.switchNextRankingType(); + rankingHolograms.refreshRankingAsync(); + break; + } + } + } catch (Exception e) { + } + } + } } diff --git a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java index 501d682..3bb88dd 100644 --- a/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/SclatPacketListener.java @@ -6,9 +6,11 @@ public class SclatPacketListener { public static void init() { - Main.protocolManager.addPacketListener(new VehiclePacketListener(Main.getPlugin(), ListenerPriority.NORMAL, PacketType.Play.Client.STEER_VEHICLE)); + Main.protocolManager.addPacketListener(new VehiclePacketListener(Main.getPlugin(), ListenerPriority.NORMAL, + PacketType.Play.Client.STEER_VEHICLE)); - Main.protocolManager.addPacketListener(new EntityClickListener(Main.getPlugin(), PacketType.Play.Client.USE_ENTITY)); + Main.protocolManager + .addPacketListener(new EntityClickListener(Main.getPlugin(), PacketType.Play.Client.USE_ENTITY)); /* * Main.protocolManager.addPacketListener( new PacketAdapter(Main.getPlugin(), diff --git a/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java b/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java index 5e1ffe2..4c8e6b1 100644 --- a/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java +++ b/src/main/java/be4rjp/sclat/protocollib/VehiclePacketListener.java @@ -12,36 +12,35 @@ public class VehiclePacketListener extends PacketAdapter { - public VehiclePacketListener(Plugin plugin, ListenerPriority listenerPriority, PacketType... types) { - super(plugin, listenerPriority, types); - } - - @Override - public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティに乗っているときのパケットを監視 - final Player player = event.getPlayer(); - if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE - && player.getVehicle() != null) { - final PacketContainer packet = event.getPacket(); - - final float z = event.getPacket().getFloat().readSafely(0); - final float x = event.getPacket().getFloat().readSafely(1); - - float y = 0F; - - try { - if (event.getPacket().getBooleans().readSafely(1)) { - y = -1F; - if (DataMgr.getPlayerData(player).isInMatch()) - event.setCancelled(true); - } - if (event.getPacket().getBooleans().readSafely(0)) { - y = 1F; - } - } catch (Error | Exception e45) { - } - - Vector vec = new Vector(x, y, z); - DataMgr.getPlayerData(player).setVehicleVector(vec); - } - } + public VehiclePacketListener(Plugin plugin, ListenerPriority listenerPriority, PacketType... types) { + super(plugin, listenerPriority, types); + } + + @Override + public void onPacketReceiving(PacketEvent event) {// プレイヤーがエンティティに乗っているときのパケットを監視 + final Player player = event.getPlayer(); + if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE && player.getVehicle() != null) { + final PacketContainer packet = event.getPacket(); + + final float z = event.getPacket().getFloat().readSafely(0); + final float x = event.getPacket().getFloat().readSafely(1); + + float y = 0F; + + try { + if (event.getPacket().getBooleans().readSafely(1)) { + y = -1F; + if (DataMgr.getPlayerData(player).isInMatch()) + event.setCancelled(true); + } + if (event.getPacket().getBooleans().readSafely(0)) { + y = 1F; + } + } catch (Error | Exception e45) { + } + + Vector vec = new Vector(x, y, z); + DataMgr.getPlayerData(player).setVehicleVector(vec); + } + } } From 05369e1b15b5a5b74536d7cc314484fb0d65d202 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:18:35 +0900 Subject: [PATCH 13/48] feat: move classes of team --- src/main/java/be4rjp/sclat/api/Animation.java | 2 +- src/main/java/be4rjp/sclat/api/Sclat.java | 2 +- src/main/java/be4rjp/sclat/api/player/PlayerData.java | 2 +- src/main/java/be4rjp/sclat/{data => api/team}/Team.java | 4 +++- src/main/java/be4rjp/sclat/{data => api/team}/TeamLoc.java | 6 ++++-- src/main/java/be4rjp/sclat/data/Area.java | 1 + src/main/java/be4rjp/sclat/data/DataMgr.java | 2 ++ src/main/java/be4rjp/sclat/data/Match.java | 1 + src/main/java/be4rjp/sclat/data/PaintData.java | 1 + src/main/java/be4rjp/sclat/data/Path.java | 1 + src/main/java/be4rjp/sclat/data/Sponge.java | 1 + src/main/java/be4rjp/sclat/data/TrapData.java | 1 + src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java | 2 +- src/main/java/be4rjp/sclat/manager/GameMgr.java | 2 +- src/main/java/be4rjp/sclat/manager/MatchMgr.java | 2 +- src/main/java/be4rjp/sclat/manager/PaintMgr.java | 2 +- src/main/java/be4rjp/sclat/manager/PathMgr.java | 2 +- src/main/java/be4rjp/sclat/weapon/Funnel.java | 2 +- src/main/java/be4rjp/sclat/weapon/Kasa.java | 2 +- 19 files changed, 25 insertions(+), 13 deletions(-) rename src/main/java/be4rjp/sclat/{data => api/team}/Team.java (95%) rename src/main/java/be4rjp/sclat/{data => api/team}/TeamLoc.java (96%) diff --git a/src/main/java/be4rjp/sclat/api/Animation.java b/src/main/java/be4rjp/sclat/api/Animation.java index 06a2829..c74ac26 100644 --- a/src/main/java/be4rjp/sclat/api/Animation.java +++ b/src/main/java/be4rjp/sclat/api/Animation.java @@ -2,8 +2,8 @@ package be4rjp.sclat.api; import be4rjp.sclat.Main; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.Team; import org.bukkit.ChatColor; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/api/Sclat.java b/src/main/java/be4rjp/sclat/api/Sclat.java index 505500e..c73e429 100644 --- a/src/main/java/be4rjp/sclat/api/Sclat.java +++ b/src/main/java/be4rjp/sclat/api/Sclat.java @@ -2,8 +2,8 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.BungeeCordMgr; import be4rjp.sclat.manager.DeathMgr; import be4rjp.sclat.manager.MatchMgr; diff --git a/src/main/java/be4rjp/sclat/api/player/PlayerData.java b/src/main/java/be4rjp/sclat/api/player/PlayerData.java index 4a0ba23..35aa158 100644 --- a/src/main/java/be4rjp/sclat/api/player/PlayerData.java +++ b/src/main/java/be4rjp/sclat/api/player/PlayerData.java @@ -1,8 +1,8 @@ package be4rjp.sclat.api.player; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.MainWeapon; import be4rjp.sclat.data.Match; -import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; import net.minecraft.server.v1_14_R1.ItemStack; import org.bukkit.Location; diff --git a/src/main/java/be4rjp/sclat/data/Team.java b/src/main/java/be4rjp/sclat/api/team/Team.java similarity index 95% rename from src/main/java/be4rjp/sclat/data/Team.java rename to src/main/java/be4rjp/sclat/api/team/Team.java index 56e6ed1..254ef80 100644 --- a/src/main/java/be4rjp/sclat/data/Team.java +++ b/src/main/java/be4rjp/sclat/api/team/Team.java @@ -1,4 +1,6 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.team; + +import be4rjp.sclat.data.Color; /** * diff --git a/src/main/java/be4rjp/sclat/data/TeamLoc.java b/src/main/java/be4rjp/sclat/api/team/TeamLoc.java similarity index 96% rename from src/main/java/be4rjp/sclat/data/TeamLoc.java rename to src/main/java/be4rjp/sclat/api/team/TeamLoc.java index 9b201de..80f156e 100644 --- a/src/main/java/be4rjp/sclat/data/TeamLoc.java +++ b/src/main/java/be4rjp/sclat/api/team/TeamLoc.java @@ -1,8 +1,10 @@ -package be4rjp.sclat.data; +package be4rjp.sclat.api.team; + +import be4rjp.sclat.data.MapData; +import org.bukkit.Location; import java.util.Collections; import java.util.List; -import org.bukkit.Location; /** * diff --git a/src/main/java/be4rjp/sclat/data/Area.java b/src/main/java/be4rjp/sclat/data/Area.java index 9fcff1c..46b0757 100644 --- a/src/main/java/be4rjp/sclat/data/Area.java +++ b/src/main/java/be4rjp/sclat/data/Area.java @@ -4,6 +4,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/be4rjp/sclat/data/DataMgr.java b/src/main/java/be4rjp/sclat/data/DataMgr.java index 5d2cd88..7929a88 100644 --- a/src/main/java/be4rjp/sclat/data/DataMgr.java +++ b/src/main/java/be4rjp/sclat/data/DataMgr.java @@ -2,6 +2,8 @@ package be4rjp.sclat.data; import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.team.Team; +import be4rjp.sclat.api.team.TeamLoc; import org.bukkit.block.Block; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; diff --git a/src/main/java/be4rjp/sclat/data/Match.java b/src/main/java/be4rjp/sclat/data/Match.java index 45f8399..31cc5f4 100644 --- a/src/main/java/be4rjp/sclat/data/Match.java +++ b/src/main/java/be4rjp/sclat/data/Match.java @@ -1,6 +1,7 @@ package be4rjp.sclat.data; +import be4rjp.sclat.api.team.Team; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Scoreboard; diff --git a/src/main/java/be4rjp/sclat/data/PaintData.java b/src/main/java/be4rjp/sclat/data/PaintData.java index 43789a3..48edc1f 100644 --- a/src/main/java/be4rjp/sclat/data/PaintData.java +++ b/src/main/java/be4rjp/sclat/data/PaintData.java @@ -1,6 +1,7 @@ package be4rjp.sclat.data; +import be4rjp.sclat.api.team.Team; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/src/main/java/be4rjp/sclat/data/Path.java b/src/main/java/be4rjp/sclat/data/Path.java index 49100d4..c0e07a8 100644 --- a/src/main/java/be4rjp/sclat/data/Path.java +++ b/src/main/java/be4rjp/sclat/data/Path.java @@ -2,6 +2,7 @@ package be4rjp.sclat.data; import be4rjp.sclat.Main; +import be4rjp.sclat.api.team.Team; import net.minecraft.server.v1_14_R1.EnumItemSlot; import net.minecraft.server.v1_14_R1.PacketPlayOutEntityEquipment; import org.bukkit.Location; diff --git a/src/main/java/be4rjp/sclat/data/Sponge.java b/src/main/java/be4rjp/sclat/data/Sponge.java index 1dff1f3..fe6b38f 100644 --- a/src/main/java/be4rjp/sclat/data/Sponge.java +++ b/src/main/java/be4rjp/sclat/data/Sponge.java @@ -2,6 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/be4rjp/sclat/data/TrapData.java b/src/main/java/be4rjp/sclat/data/TrapData.java index eef0f68..f324262 100644 --- a/src/main/java/be4rjp/sclat/data/TrapData.java +++ b/src/main/java/be4rjp/sclat/data/TrapData.java @@ -3,6 +3,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.Sphere; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.ArmorStandMgr; import be4rjp.sclat.manager.PaintMgr; import be4rjp.sclat.weapon.Gear; diff --git a/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java b/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java index 304489f..30cbfe7 100644 --- a/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java +++ b/src/main/java/be4rjp/sclat/listener/SquidListenerMgr.java @@ -2,8 +2,8 @@ package be4rjp.sclat.listener; import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; -import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.DeathMgr; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/src/main/java/be4rjp/sclat/manager/GameMgr.java b/src/main/java/be4rjp/sclat/manager/GameMgr.java index bb08f65..2ab824f 100644 --- a/src/main/java/be4rjp/sclat/manager/GameMgr.java +++ b/src/main/java/be4rjp/sclat/manager/GameMgr.java @@ -7,11 +7,11 @@ import be4rjp.sclat.api.SoundType; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.player.PlayerSettings; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; import be4rjp.sclat.data.PaintData; import be4rjp.sclat.data.ServerStatus; -import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; import be4rjp.sclat.gui.LootBox; import be4rjp.sclat.gui.OpenGUI; diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index a6d885e..17478e6 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -10,6 +10,7 @@ import be4rjp.sclat.api.SoundType; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.player.PlayerSettings; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.api.utils.ObjectiveUtil; import be4rjp.sclat.api.wiremesh.Wiremesh; import be4rjp.sclat.data.Area; @@ -21,7 +22,6 @@ import be4rjp.sclat.data.NoteBlockSong; import be4rjp.sclat.data.PaintData; import be4rjp.sclat.data.Path; -import be4rjp.sclat.data.Team; import be4rjp.sclat.data.WeaponClass; import be4rjp.sclat.gui.OpenGUI; import be4rjp.sclat.server.EquipmentServerManager; diff --git a/src/main/java/be4rjp/sclat/manager/PaintMgr.java b/src/main/java/be4rjp/sclat/manager/PaintMgr.java index bddee5f..a99cbe7 100644 --- a/src/main/java/be4rjp/sclat/manager/PaintMgr.java +++ b/src/main/java/be4rjp/sclat/manager/PaintMgr.java @@ -5,11 +5,11 @@ import be4rjp.sclat.api.Sclat; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.player.PlayerData; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; import be4rjp.sclat.data.PaintData; import be4rjp.sclat.data.Sponge; -import be4rjp.sclat.data.Team; import be4rjp.sclat.weapon.Gear; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/be4rjp/sclat/manager/PathMgr.java b/src/main/java/be4rjp/sclat/manager/PathMgr.java index e3c59fe..f5c69b8 100644 --- a/src/main/java/be4rjp/sclat/manager/PathMgr.java +++ b/src/main/java/be4rjp/sclat/manager/PathMgr.java @@ -3,10 +3,10 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.raytrace.RayTrace; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.Match; import be4rjp.sclat.data.Path; -import be4rjp.sclat.data.Team; import net.minecraft.server.v1_14_R1.EnumItemSlot; import net.minecraft.server.v1_14_R1.PacketPlayOutEntityEquipment; import org.bukkit.Location; diff --git a/src/main/java/be4rjp/sclat/weapon/Funnel.java b/src/main/java/be4rjp/sclat/weapon/Funnel.java index 3a52c03..d6bc651 100644 --- a/src/main/java/be4rjp/sclat/weapon/Funnel.java +++ b/src/main/java/be4rjp/sclat/weapon/Funnel.java @@ -6,10 +6,10 @@ import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; import be4rjp.sclat.data.SplashShieldData; -import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.ArmorStandMgr; import net.minecraft.server.v1_14_R1.EnumItemSlot; import net.minecraft.server.v1_14_R1.PacketPlayOutEntityEquipment; diff --git a/src/main/java/be4rjp/sclat/weapon/Kasa.java b/src/main/java/be4rjp/sclat/weapon/Kasa.java index 5ce428e..30e0bec 100644 --- a/src/main/java/be4rjp/sclat/weapon/Kasa.java +++ b/src/main/java/be4rjp/sclat/weapon/Kasa.java @@ -6,9 +6,9 @@ import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; +import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; -import be4rjp.sclat.data.Team; import be4rjp.sclat.manager.MainWeaponMgr; import be4rjp.sclat.manager.PaintMgr; import be4rjp.sclat.manager.WeaponClassMgr; From 97c6f7b7ead453220782ca895296b5ff36b5aa79 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:19:25 +0900 Subject: [PATCH 14/48] chore: change name of Sclat class --- src/main/java/be4rjp/sclat/Main.java | 4 +- src/main/java/be4rjp/sclat/api/Animation.java | 6 +- .../sclat/api/{Sclat.java => SclatUtil.java} | 2 +- .../sclat/commands/sclatCommandExecutor.java | 34 +++--- src/main/java/be4rjp/sclat/data/Area.java | 14 +-- .../java/be4rjp/sclat/data/BlockUpdater.java | 10 +- .../sclat/data/MatchServerRunnable.java | 8 +- src/main/java/be4rjp/sclat/data/Sponge.java | 8 +- src/main/java/be4rjp/sclat/data/TrapData.java | 8 +- .../java/be4rjp/sclat/gui/ClickListener.java | 62 +++++------ src/main/java/be4rjp/sclat/gui/LootBox.java | 22 ++-- .../be4rjp/sclat/manager/ArmorStandMgr.java | 4 +- .../java/be4rjp/sclat/manager/DeathMgr.java | 4 +- .../java/be4rjp/sclat/manager/GameMgr.java | 26 ++--- .../java/be4rjp/sclat/manager/MatchMgr.java | 104 +++++++++--------- .../java/be4rjp/sclat/manager/PaintMgr.java | 6 +- .../be4rjp/sclat/manager/SPWeaponMgr.java | 4 +- .../sclat/server/EquipmentServerManager.java | 4 +- .../be4rjp/sclat/server/StatusServer.java | 10 +- .../java/be4rjp/sclat/tutorial/Tutorial.java | 12 +- .../java/be4rjp/sclat/weapon/Blaster.java | 14 +-- src/main/java/be4rjp/sclat/weapon/Brush.java | 4 +- .../java/be4rjp/sclat/weapon/Charger.java | 10 +- src/main/java/be4rjp/sclat/weapon/Funnel.java | 8 +- src/main/java/be4rjp/sclat/weapon/Hound.java | 8 +- src/main/java/be4rjp/sclat/weapon/Kasa.java | 4 +- src/main/java/be4rjp/sclat/weapon/Reeler.java | 4 +- src/main/java/be4rjp/sclat/weapon/Roller.java | 8 +- .../java/be4rjp/sclat/weapon/Slosher.java | 6 +- .../be4rjp/sclat/weapon/SnowballListener.java | 22 ++-- .../sclat/weapon/spweapon/AirStrike.java | 6 +- .../sclat/weapon/spweapon/Amehurasi.java | 4 +- .../be4rjp/sclat/weapon/spweapon/JetPack.java | 6 +- .../sclat/weapon/spweapon/LitterFiveG.java | 8 +- .../sclat/weapon/spweapon/MegaLaser.java | 10 +- .../sclat/weapon/spweapon/MultiMissile.java | 6 +- .../sclat/weapon/spweapon/QuadroArms.java | 6 +- .../sclat/weapon/spweapon/SuperTyakuti.java | 6 +- .../sclat/weapon/spweapon/SwordMord.java | 6 +- .../sclat/weapon/subweapon/Blinder.java | 4 +- .../sclat/weapon/subweapon/Boomerang.java | 10 +- .../sclat/weapon/subweapon/CurlingBomb.java | 10 +- .../sclat/weapon/subweapon/FloaterBomb.java | 8 +- .../be4rjp/sclat/weapon/subweapon/KBomb.java | 8 +- .../sclat/weapon/subweapon/QuickBomb.java | 8 +- .../sclat/weapon/subweapon/SplashBomb.java | 8 +- .../sclat/weapon/subweapon/SplashShield.java | 6 +- 47 files changed, 280 insertions(+), 280 deletions(-) rename src/main/java/be4rjp/sclat/api/{Sclat.java => SclatUtil.java} (99%) diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Main.java index 8a73bfb..0e7c166 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Main.java @@ -4,7 +4,7 @@ import be4rjp.blockstudio.api.BlockStudioAPI; import be4rjp.dadadachecker.DADADACheckerAPI; import be4rjp.sclat.api.Plugins; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.async.AsyncPlayerListener; import be4rjp.sclat.api.async.AsyncThreadManager; @@ -306,7 +306,7 @@ public void onEnable() { // --------------------Send restarted server info--------------------- if (conf.getConfig().contains("RestartMatchCount")) - Sclat.sendRestartedServerInfo(); + SclatUtil.sendRestartedServerInfo(); // ------------------------------------------------------------------- // -----------------------------Shop---------------------------------- diff --git a/src/main/java/be4rjp/sclat/api/Animation.java b/src/main/java/be4rjp/sclat/api/Animation.java index c74ac26..399e790 100644 --- a/src/main/java/be4rjp/sclat/api/Animation.java +++ b/src/main/java/be4rjp/sclat/api/Animation.java @@ -59,7 +59,7 @@ public void run() { } if (i == 40) { if (winteam == DataMgr.getPlayerData(player).getTeam()) - Sclat.playGameSound(player, SoundType.CONGRATULATIONS); + SclatUtil.playGameSound(player, SoundType.CONGRATULATIONS); cancel(); } i++; @@ -101,7 +101,7 @@ public void run() { } if (i == 40) { if (winteam == DataMgr.getPlayerData(player).getTeam()) - Sclat.playGameSound(player, SoundType.CONGRATULATIONS); + SclatUtil.playGameSound(player, SoundType.CONGRATULATIONS); cancel(); } i++; @@ -171,7 +171,7 @@ public void run() { } if (i == 40) { if (winteam == DataMgr.getPlayerData(player).getTeam()) - Sclat.playGameSound(player, SoundType.CONGRATULATIONS); + SclatUtil.playGameSound(player, SoundType.CONGRATULATIONS); cancel(); } i++; diff --git a/src/main/java/be4rjp/sclat/api/Sclat.java b/src/main/java/be4rjp/sclat/api/SclatUtil.java similarity index 99% rename from src/main/java/be4rjp/sclat/api/Sclat.java rename to src/main/java/be4rjp/sclat/api/SclatUtil.java index c73e429..b0382c5 100644 --- a/src/main/java/be4rjp/sclat/api/Sclat.java +++ b/src/main/java/be4rjp/sclat/api/SclatUtil.java @@ -46,7 +46,7 @@ * */ -public class Sclat { +public class SclatUtil { public static void setBlockByNMS(org.bukkit.block.Block b, org.bukkit.Material material, boolean applyPhysics) { Location loc = b.getLocation(); diff --git a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java index ad4f836..be432f0 100644 --- a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java +++ b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.data.DataMgr; @@ -58,12 +58,12 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } String num = args[1]; - if (Sclat.isNumber(num)) { + if (SclatUtil.isNumber(num)) { Main.conf.getConfig().set("BlockUpdateRate", Integer.valueOf(num)); sender.sendMessage("setConfig [BlockUpdateRate] : " + num); return true; @@ -81,7 +81,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -102,14 +102,14 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } if (sender instanceof Player) { Player player = (Player) sender; String targetConfig = args[1]; - Sclat.sendMessage(String.format("%sの設定を再読み込み中...", targetConfig), MessageType.PLAYER, player); + SclatUtil.sendMessage(String.format("%sの設定を再読み込み中...", targetConfig), MessageType.PLAYER, player); switch (targetConfig.toLowerCase()) { case "emblemuserdata" : conf.loadEmblemUserData(); @@ -118,10 +118,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N conf.loadEmblemLoreData(); break; default : - Sclat.sendMessage("そのオプションは存在しません！", MessageType.PLAYER, player); + SclatUtil.sendMessage("そのオプションは存在しません！", MessageType.PLAYER, player); return true; } - Sclat.sendMessage("再読み込み完了", MessageType.PLAYER, player); + SclatUtil.sendMessage("再読み込み完了", MessageType.PLAYER, player); } } // -------------------------------- @@ -133,7 +133,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -170,7 +170,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -192,7 +192,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -212,7 +212,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -229,9 +229,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N conf.getConfig().getInt("EquipShare." + serverName + ".Port"), commands); sc.startClient(); - Sclat.sendMessage("Moderatorとして転送中...", MessageType.PLAYER, (Player) sender); - Sclat.sendMessage("2秒後に転送されます", MessageType.PLAYER, (Player) sender); - Sclat.playGameSound((Player) sender, SoundType.SUCCESS); + SclatUtil.sendMessage("Moderatorとして転送中...", MessageType.PLAYER, (Player) sender); + SclatUtil.sendMessage("2秒後に転送されます", MessageType.PLAYER, (Player) sender); + SclatUtil.playGameSound((Player) sender, SoundType.SUCCESS); BukkitRunnable task = new BukkitRunnable() { @Override @@ -261,7 +261,7 @@ public void run() { if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } @@ -286,7 +286,7 @@ public void run() { if (type == CommanderType.MEMBER) { sender.sendMessage(ChatColor.RED + "You don't have permission."); - Sclat.playGameSound((Player) sender, SoundType.ERROR); + SclatUtil.playGameSound((Player) sender, SoundType.ERROR); return true; } diff --git a/src/main/java/be4rjp/sclat/data/Area.java b/src/main/java/be4rjp/sclat/data/Area.java index 46b0757..fe33a7f 100644 --- a/src/main/java/be4rjp/sclat/data/Area.java +++ b/src/main/java/be4rjp/sclat/data/Area.java @@ -3,7 +3,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.Location; @@ -122,7 +122,7 @@ public void run() { if (team != null) { if (team == match.getTeam0()) { if ((blist.size() * 0.5) < (double) t1c) { - Sclat.sendMessage("§3§lカウントストップ!", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§3§lカウントストップ!", MessageType.ALL_PLAYER); for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 2F); @@ -134,7 +134,7 @@ public void run() { } if (team == match.getTeam1()) { if ((blist.size() * 0.5) < (double) t0c) { - Sclat.sendMessage("§3§lカウントストップ!", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§3§lカウントストップ!", MessageType.ALL_PLAYER); for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 2F); @@ -150,11 +150,11 @@ public void run() { for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { if (team == DataMgr.getPlayerData(oplayer).getTeam()) { - Sclat.sendMessage("§fエリアを確保した!", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§fエリアを確保した!", MessageType.PLAYER, oplayer); oplayer.sendTitle("", "§fエリアを確保した!", 10, 20, 10); oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 3F); } else { - Sclat.sendMessage("§4エリアが確保された!", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§4エリアが確保された!", MessageType.PLAYER, oplayer); oplayer.sendTitle("", "§4エリアが確保された!", 10, 20, 10); oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 3F); } @@ -166,11 +166,11 @@ public void run() { for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { if (team == DataMgr.getPlayerData(oplayer).getTeam()) { - Sclat.sendMessage("§fエリアを確保した!", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§fエリアを確保した!", MessageType.PLAYER, oplayer); oplayer.sendTitle("", "§fエリアを確保した!", 10, 20, 10); oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 3F); } else { - Sclat.sendMessage("§4エリアが確保された!", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§4エリアが確保された!", MessageType.PLAYER, oplayer); oplayer.sendTitle("", "§4エリアが確保された!", 10, 20, 10); oplayer.playSound(oplayer.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 3F); } diff --git a/src/main/java/be4rjp/sclat/data/BlockUpdater.java b/src/main/java/be4rjp/sclat/data/BlockUpdater.java index 6295de3..02efbb0 100644 --- a/src/main/java/be4rjp/sclat/data/BlockUpdater.java +++ b/src/main/java/be4rjp/sclat/data/BlockUpdater.java @@ -2,7 +2,7 @@ package be4rjp.sclat.data; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import net.minecraft.server.v1_14_R1.PacketPlayOutMultiBlockChange; import org.bukkit.Chunk; import org.bukkit.Material; @@ -120,12 +120,12 @@ public void setBlock(Block block, Material material) { if (block.getLocation().getChunk().isLoaded()) { try { - Sclat.setBlockByNMSChunk(block, blocklist.get(block), true); + SclatUtil.setBlockByNMSChunk(block, blocklist.get(block), true); } catch (Exception e) { } } else { try { - Sclat.setBlockByNMS(block, blocklist.get(block), true); + SclatUtil.setBlockByNMS(block, blocklist.get(block), true); // Main.getPlugin().getServer().broadcastMessage("ChangeBlockByNMS!!"); } catch (Exception e) { } @@ -139,12 +139,12 @@ public void setBlock(Block block, Material material) { if (block.getLocation().getChunk().isLoaded()) { try { - Sclat.setBlockByNMSChunk(block, blocklist.get(block), true); + SclatUtil.setBlockByNMSChunk(block, blocklist.get(block), true); } catch (Exception e) { } } else { try { - Sclat.setBlockByNMS(block, blocklist.get(block), true); + SclatUtil.setBlockByNMS(block, blocklist.get(block), true); // Main.getPlugin().getServer().broadcastMessage("ChangeBlockByNMS!!"); } catch (Exception e) { } diff --git a/src/main/java/be4rjp/sclat/data/MatchServerRunnable.java b/src/main/java/be4rjp/sclat/data/MatchServerRunnable.java index dea1fee..a57a300 100644 --- a/src/main/java/be4rjp/sclat/data/MatchServerRunnable.java +++ b/src/main/java/be4rjp/sclat/data/MatchServerRunnable.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.manager.BungeeCordMgr; import org.bukkit.entity.Player; @@ -17,10 +17,10 @@ public class MatchServerRunnable extends BukkitRunnable { public MatchServerRunnable(ServerStatus serverStatus) { this.serverStatus = serverStatus; - Sclat.sendMessage(serverStatus.getDisplayName() + "§rの試合待機カウントダウンが開始されました", MessageType.ALL_PLAYER); - Sclat.sendMessage("§a30秒後にマッチングを開始します", MessageType.ALL_PLAYER); + SclatUtil.sendMessage(serverStatus.getDisplayName() + "§rの試合待機カウントダウンが開始されました", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a30秒後にマッチングを開始します", MessageType.ALL_PLAYER); Main.getPlugin().getServer().getOnlinePlayers() - .forEach(player -> Sclat.playGameSound(player, SoundType.SUCCESS)); + .forEach(player -> SclatUtil.playGameSound(player, SoundType.SUCCESS)); } @Override diff --git a/src/main/java/be4rjp/sclat/data/Sponge.java b/src/main/java/be4rjp/sclat/data/Sponge.java index fe6b38f..2309ad7 100644 --- a/src/main/java/be4rjp/sclat/data/Sponge.java +++ b/src/main/java/be4rjp/sclat/data/Sponge.java @@ -1,7 +1,7 @@ package be4rjp.sclat.data; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.PaintMgr; import org.bukkit.Material; @@ -118,7 +118,7 @@ public void run() { PaintData data = DataMgr.getPaintDataFromBlock(b); data.setTeam(this.team); // match.getBlockUpdater().setBlock(b, Material.AIR); - Sclat.setBlockByNMS(b, Material.AIR, true); + SclatUtil.setBlockByNMS(b, Material.AIR, true); // b.setType(Material.AIR); } else { PaintData data = new PaintData(b); @@ -126,7 +126,7 @@ public void run() { data.setOrigianlType(b.getType()); data.setTeam(this.team); // match.getBlockUpdater().setBlock(b, Material.AIR); - Sclat.setBlockByNMS(b, Material.AIR, true); + SclatUtil.setBlockByNMS(b, Material.AIR, true); // b.setType(Material.AIR); DataMgr.setPaintDataFromBlock(b, data); DataMgr.setSpongeWithBlock(b, this); @@ -142,7 +142,7 @@ public void run() { // match.getBlockUpdater().setBlock(b, // Material.getMaterial(this.team.getTeamColor().getConcrete().toString() + // "_POWDER")); - Sclat.setBlockByNMS(b, + SclatUtil.setBlockByNMS(b, Material.getMaterial(this.team.getTeamColor().getConcrete().toString() + "_POWDER"), false); // b.setType(Material.getMaterial(this.team.getTeamColor().getConcrete().toString() // + "_POWDER")); diff --git a/src/main/java/be4rjp/sclat/data/TrapData.java b/src/main/java/be4rjp/sclat/data/TrapData.java index f324262..6b763bc 100644 --- a/src/main/java/be4rjp/sclat/data/TrapData.java +++ b/src/main/java/be4rjp/sclat/data/TrapData.java @@ -1,7 +1,7 @@ package be4rjp.sclat.data; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.team.Team; import be4rjp.sclat.manager.ArmorStandMgr; @@ -133,10 +133,10 @@ public void run() { player.getWorld().playSound(location, Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(location, maxDist, 15, player); + SclatUtil.createInkExplosionEffect(location, maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(location, maxDist, player); + SclatUtil.repelBarrier(location, maxDist, player); // センサーエフェクト List s_locs = Sphere.getSphere(location, maxDist + 1, 25); @@ -224,7 +224,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/gui/ClickListener.java b/src/main/java/be4rjp/sclat/gui/ClickListener.java index 719e369..af2a1a0 100644 --- a/src/main/java/be4rjp/sclat/gui/ClickListener.java +++ b/src/main/java/be4rjp/sclat/gui/ClickListener.java @@ -3,7 +3,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.data.BlockUpdater; @@ -116,10 +116,10 @@ public void onGUIClick(InventoryClickEvent event) { break; case "塗りをリセット / RESET INK" : if (MatchMgr.canRollback) { - Sclat.sendMessage("§a§lインクがリセットされました！", MessageType.ALL_PLAYER); - Sclat.sendMessage("§a§l3分後に再リセットできるようになります", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a§lインクがリセットされました！", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a§l3分後に再リセットできるようになります", MessageType.ALL_PLAYER); for (Player op : Main.getPlugin().getServer().getOnlinePlayers()) - Sclat.playGameSound(op, SoundType.SUCCESS); + SclatUtil.playGameSound(op, SoundType.SUCCESS); } Match match = DataMgr.getPlayerData(player).getMatch(); match.getBlockUpdater().stop(); @@ -196,7 +196,7 @@ public void onGUIClick(InventoryClickEvent event) { if (Gear.getGearName(i).equals(name)) { DataMgr.getPlayerData(player).setGearNumber(i); PlayerStatusMgr.setGear(player, i); - Sclat.sendMessage("ギア[" + ChatColor.AQUA + name + ChatColor.RESET + "]を選択しました", MessageType.PLAYER, + SclatUtil.sendMessage("ギア[" + ChatColor.AQUA + name + ChatColor.RESET + "]を選択しました", MessageType.PLAYER, player); break; } @@ -208,12 +208,12 @@ public void onGUIClick(InventoryClickEvent event) { if (PlayerStatusMgr.getMoney(player) >= Gear.getGearPrice(i)) { PlayerStatusMgr.addGear(player, i); PlayerStatusMgr.subMoney(player, Gear.getGearPrice(i)); - Sclat.sendMessage(ChatColor.GREEN + "購入に成功しました", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.SUCCESS); + SclatUtil.sendMessage(ChatColor.GREEN + "購入に成功しました", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.SUCCESS); PlayerStatusMgr.sendHologramUpdate(player); } else { - Sclat.sendMessage(ChatColor.RED + "お金が足りません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage(ChatColor.RED + "お金が足りません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } break; } @@ -224,29 +224,29 @@ public void onGUIClick(InventoryClickEvent event) { for (ServerStatus ss : ServerStatusManager.serverList) { if (ss.getDisplayName().equals(name)) { if (ss.getRestartingServer()) { - Sclat.sendMessage("§c§nこのサーバーは再起動中です1~2分程度お待ちください", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは再起動中です1~2分程度お待ちください", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } if (ss.isOnline()) { if (ss.getPlayerCount() < ss.getMaxPlayer()) { if (ss.getRunningMatch()) { - Sclat.sendMessage("§c§nこのサーバーは試合中のため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは試合中のため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } BungeeCordMgr.PlayerSendServer(player, ss.getServerName()); DataMgr.getPlayerData(player).setServerName(ss.getDisplayName()); } else { - Sclat.sendMessage("§c§nこのサーバーは満員のため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは満員のため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } else { if (ss.isMaintenance()) - Sclat.sendMessage("§c§nこのサーバーは現在メンテナンス中のため参加できません", MessageType.PLAYER, player); + SclatUtil.sendMessage("§c§nこのサーバーは現在メンテナンス中のため参加できません", MessageType.PLAYER, player); else - Sclat.sendMessage("§c§nこのサーバーは現在再起動中です1~2分程度お待ちください。", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは現在再起動中です1~2分程度お待ちください。", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } return; } @@ -315,8 +315,8 @@ public void onGUIClick(InventoryClickEvent event) { return; } if (name.contains("§6レベル")) { - Sclat.sendMessage("§cレベルが足りないため、まだ選択できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§cレベルが足りないため、まだ選択できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } // 試しうちモード @@ -445,7 +445,7 @@ public void run() { } else { DataMgr.getPlayerData(player).setWeaponClass(DataMgr.getWeaponClass(name)); } - Sclat.sendMessage("ブキ[" + ChatColor.GOLD + name + ChatColor.RESET + "]を選択しました", MessageType.PLAYER, player); + SclatUtil.sendMessage("ブキ[" + ChatColor.GOLD + name + ChatColor.RESET + "]を選択しました", MessageType.PLAYER, player); } if (event.getView().getTitle().equals("Shop")) { @@ -510,13 +510,13 @@ public void run() { return; } if (name.contains("§6レベル")) { - Sclat.sendMessage("§cレベルが足りないため、まだ購入できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§cレベルが足りないため、まだ購入できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } if (name.contains("§6ガチャ武器です")) { - Sclat.sendMessage("§cガチャから手に入るよ", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§cガチャから手に入るよ", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } @@ -526,12 +526,12 @@ public void run() { } else if (PlayerStatusMgr.getMoney(player) >= DataMgr.getWeaponClass(name).getMainWeapon().getMoney()) { PlayerStatusMgr.addWeapon(player, name); PlayerStatusMgr.subMoney(player, DataMgr.getWeaponClass(name).getMainWeapon().getMoney()); - Sclat.sendMessage(ChatColor.GREEN + "購入に成功しました", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.SUCCESS); + SclatUtil.sendMessage(ChatColor.GREEN + "購入に成功しました", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.SUCCESS); PlayerStatusMgr.sendHologramUpdate(player); } else { - Sclat.sendMessage(ChatColor.RED + "お金が足りません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage(ChatColor.RED + "お金が足りません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } @@ -565,8 +565,8 @@ public void run() { if (p.getName().equals(name)) { if (event.getCurrentItem().getType().equals(Material.PLAYER_HEAD)) { if (p.getGameMode() == GameMode.SPECTATOR) { - Sclat.sendMessage("§c今そのプレイヤーにはジャンプできない！", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c今そのプレイヤーにはジャンプできない！", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); break; } SuperJumpMgr.SuperJumpCollTime(player, DataMgr.getPlayerData(p).getPlayerGroundLocation(), diff --git a/src/main/java/be4rjp/sclat/gui/LootBox.java b/src/main/java/be4rjp/sclat/gui/LootBox.java index 5ed59bb..99806fe 100644 --- a/src/main/java/be4rjp/sclat/gui/LootBox.java +++ b/src/main/java/be4rjp/sclat/gui/LootBox.java @@ -1,7 +1,7 @@ package be4rjp.sclat.gui; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.PlayerStatusMgr; import org.bukkit.Bukkit; @@ -26,7 +26,7 @@ public class LootBox { private static final int Fifthprize = 50; public static void turnLootBox(Player player) { if (PlayerStatusMgr.getTicket(player) < 10) { - Sclat.sendMessage(ChatColor.RED + "ガチャを引くには1回10Ticket必要です", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.RED + "ガチャを引くには1回10Ticket必要です", MessageType.PLAYER, player); return; } boolean isHit = false; @@ -40,9 +40,9 @@ public static void turnLootBox(Player player) { isHit = true; if (!PlayerStatusMgr.haveWeapon(player, ClassName)) { PlayerStatusMgr.addWeapon(player, ClassName); - Sclat.sendMessage(ChatColor.GREEN + ClassName + "が当たったよ、おめでとう！", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + ClassName + "が当たったよ、おめでとう！", MessageType.PLAYER, player); } else { - Sclat.sendMessage(ChatColor.GREEN + ClassName + "が重複したよ +" + Firstprize + "coin", + SclatUtil.sendMessage(ChatColor.GREEN + ClassName + "が重複したよ +" + Firstprize + "coin", MessageType.PLAYER, player); PlayerStatusMgr.addMoney(player, Firstprize); } @@ -53,23 +53,23 @@ public static void turnLootBox(Player player) { if (nextLootSeed < 5 && !isHit && LootSeed < 5) { isHit = true; PlayerStatusMgr.addMoney(player, Firstprize); - Sclat.sendMessage(ChatColor.GREEN + "「1等!」おめでとう! +" + Firstprize + "coin", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + "「1等!」おめでとう! +" + Firstprize + "coin", MessageType.PLAYER, player); } else if (nextLootSeed < 10 && !isHit && LootSeed < 10) { isHit = true; PlayerStatusMgr.addMoney(player, Secondprize); - Sclat.sendMessage(ChatColor.GREEN + "「2等!」ラッキー! +" + Secondprize + "coin", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + "「2等!」ラッキー! +" + Secondprize + "coin", MessageType.PLAYER, player); } else if (nextLootSeed < 30 && !isHit && LootSeed < 30) { isHit = true; PlayerStatusMgr.addMoney(player, Thirdprize); - Sclat.sendMessage(ChatColor.GREEN + "「3等」 +" + Thirdprize + "coin", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + "「3等」 +" + Thirdprize + "coin", MessageType.PLAYER, player); } else if (nextLootSeed < 70 && !isHit && LootSeed < 70) { isHit = true; PlayerStatusMgr.addMoney(player, Fourthprize); - Sclat.sendMessage(ChatColor.GREEN + "「4等」 +" + Fourthprize + "coin", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + "「4等」 +" + Fourthprize + "coin", MessageType.PLAYER, player); } else { isHit = true; PlayerStatusMgr.addMoney(player, Fifthprize); - Sclat.sendMessage(ChatColor.GREEN + "「5等」 +" + Fifthprize + "coin", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + "「5等」 +" + Fifthprize + "coin", MessageType.PLAYER, player); } PlayerStatusMgr.subTicket(player, 10); } @@ -169,9 +169,9 @@ public static void GiftWeapon(Player player, String Weapon) { String ClassName = Weapon; if (!PlayerStatusMgr.haveWeapon(player, ClassName)) { PlayerStatusMgr.addWeapon(player, ClassName); - Sclat.sendMessage(ChatColor.GREEN + ClassName + "が手に入ったよ", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + ClassName + "が手に入ったよ", MessageType.PLAYER, player); } else { - Sclat.sendMessage(ChatColor.GREEN + ClassName + "はすでに持っているよ", MessageType.PLAYER, player); + SclatUtil.sendMessage(ChatColor.GREEN + ClassName + "はすでに持っているよ", MessageType.PLAYER, player); } } public static void changeteam(Player player) { diff --git a/src/main/java/be4rjp/sclat/manager/ArmorStandMgr.java b/src/main/java/be4rjp/sclat/manager/ArmorStandMgr.java index 4525348..8ee4fe1 100644 --- a/src/main/java/be4rjp/sclat/manager/ArmorStandMgr.java +++ b/src/main/java/be4rjp/sclat/manager/ArmorStandMgr.java @@ -1,7 +1,7 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -376,7 +376,7 @@ public static void giveDamageArmorStand(ArmorStand as, double damage, Player sho as.setCustomName(String.valueOf(rh)); as.getLocation().getWorld().playSound(as.getLocation(), Sound.ENTITY_PLAYER_HURT, 1, 1); } else { - Sclat.createInkExplosionEffect(as.getEyeLocation().add(0, -1, 0), 3, 30, shooter); + SclatUtil.createInkExplosionEffect(as.getEyeLocation().add(0, -1, 0), 3, 30, shooter); shooter.playSound(shooter.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1, 10); Item drop1 = as.getWorld().dropItem(as.getEyeLocation(), new ItemStack(Material.LEATHER_HELMET)); Item drop2 = as.getWorld().dropItem(as.getEyeLocation(), diff --git a/src/main/java/be4rjp/sclat/manager/DeathMgr.java b/src/main/java/be4rjp/sclat/manager/DeathMgr.java index 22b6dc3..a450fec 100644 --- a/src/main/java/be4rjp/sclat/manager/DeathMgr.java +++ b/src/main/java/be4rjp/sclat/manager/DeathMgr.java @@ -2,7 +2,7 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; @@ -45,7 +45,7 @@ public static void PlayerDeathRunnable(Player target, Player shooter, String typ drop2.setVelocity( new Vector(Math.random() * random - random / 2, random * 2 / 3, Math.random() * random - random / 2)); - Sclat.createInkExplosionEffect(target.getEyeLocation().add(0, -1, 0), 3, 30, shooter); + SclatUtil.createInkExplosionEffect(target.getEyeLocation().add(0, -1, 0), 3, 30, shooter); if (Gear.getGearInfluence(target, Gear.Type.PENA_DOWN) == 1.0) { DataMgr.getPlayerData(target).setSPGauge((int) (DataMgr.getPlayerData(target).getSPGauge() * 0.7)); diff --git a/src/main/java/be4rjp/sclat/manager/GameMgr.java b/src/main/java/be4rjp/sclat/manager/GameMgr.java index 2ab824f..f5dd427 100644 --- a/src/main/java/be4rjp/sclat/manager/GameMgr.java +++ b/src/main/java/be4rjp/sclat/manager/GameMgr.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.api.player.PlayerData; @@ -662,29 +662,29 @@ public void onClickSign(PlayerInteractEvent e) { for (ServerStatus ss : ServerStatusManager.serverList) { if (ss.getSign().equals(e.getClickedBlock())) { if (ss.getRestartingServer()) { - Sclat.sendMessage("§c§nこのサーバーは再起動中です1~2分程度お待ちください", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは再起動中です1~2分程度お待ちください", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } if (ss.isOnline()) { if (ss.getPlayerCount() < ss.getMaxPlayer()) { if (ss.getRunningMatch()) { - Sclat.sendMessage("§c§nこのサーバーは試合中のため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは試合中のため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); return; } BungeeCordMgr.PlayerSendServer(player, ss.getServerName()); DataMgr.getPlayerData(player).setServerName(ss.getDisplayName()); } else { - Sclat.sendMessage("§c§nこのサーバーは満員のため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは満員のため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } else { if (ss.isMaintenance()) - Sclat.sendMessage("§c§nこのサーバーは現在メンテナンス中のため参加できません", MessageType.PLAYER, player); + SclatUtil.sendMessage("§c§nこのサーバーは現在メンテナンス中のため参加できません", MessageType.PLAYER, player); else - Sclat.sendMessage("§c§nこのサーバーは現在再起動中です1~2分程度お待ちください。", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのサーバーは現在再起動中です1~2分程度お待ちください。", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } return; } @@ -772,14 +772,14 @@ public void onClickSign(PlayerInteractEvent e) { if (PlayerStatusMgr.getMoney(player) > 1000) { PlayerStatusMgr.subMoney(player, 1000); PlayerStatusMgr.addTicket(player, 1); - Sclat.sendMessage("1000coinを1ticketに交換しました", MessageType.PLAYER, player); + SclatUtil.sendMessage("1000coinを1ticketに交換しました", MessageType.PLAYER, player); } else { - Sclat.sendMessage("coinが足りません", MessageType.PLAYER, player); + SclatUtil.sendMessage("coinが足りません", MessageType.PLAYER, player); } break; case "[ give ticket ]" : PlayerStatusMgr.addTicket(player, 10); - Sclat.sendMessage("10ticket付与しました", MessageType.PLAYER, player); + SclatUtil.sendMessage("10ticket付与しました", MessageType.PLAYER, player); break; case "[ Tutorial ]" : List list = Main.tutorialServers.getConfig().getStringList("server-list"); diff --git a/src/main/java/be4rjp/sclat/manager/MatchMgr.java b/src/main/java/be4rjp/sclat/manager/MatchMgr.java index 17478e6..d6b9b39 100644 --- a/src/main/java/be4rjp/sclat/manager/MatchMgr.java +++ b/src/main/java/be4rjp/sclat/manager/MatchMgr.java @@ -5,7 +5,7 @@ import be4rjp.sclat.api.Animation; import be4rjp.sclat.api.MessageType; import be4rjp.sclat.api.Plugins; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.api.player.PlayerData; @@ -114,7 +114,7 @@ public static void PlayerJoinMatch(Player player) { DataMgr.joinedList.add(player); - Sclat.sendMessage("§b§n" + player.getDisplayName() + " joined the match", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§b§n" + player.getDisplayName() + " joined the match", MessageType.ALL_PLAYER); player.teleport(match.getMapData().getTaikibayso()); if (conf.getConfig().getBoolean("CanVoting") @@ -124,8 +124,8 @@ public static void PlayerJoinMatch(Player player) { int startPlayerCount = conf.getConfig().getInt("StartPlayerCount"); if (match.getJoinedPlayerCount() < startPlayerCount) { - Sclat.sendMessage("§a人数が足りないため試合を開始することができません", MessageType.ALL_PLAYER); - Sclat.sendMessage( + SclatUtil.sendMessage("§a人数が足りないため試合を開始することができません", MessageType.ALL_PLAYER); + SclatUtil.sendMessage( "§aあと§c" + String.valueOf(startPlayerCount - match.getJoinedPlayerCount()) + "§a人必要です", MessageType.ALL_PLAYER); } @@ -140,8 +140,8 @@ public static void PlayerJoinMatch(Player player) { @Override public void run() { if (match.getJoinedPlayerCount() < startPlayerCount) { - Sclat.sendMessage("§a人数が足りないため試合を開始することができません", MessageType.ALL_PLAYER); - Sclat.sendMessage( + SclatUtil.sendMessage("§a人数が足りないため試合を開始することができません", MessageType.ALL_PLAYER); + SclatUtil.sendMessage( "§aあと§c" + String.valueOf(startPlayerCount - match.getJoinedPlayerCount()) + "§a人必要です", MessageType.ALL_PLAYER); @@ -171,22 +171,22 @@ public void run() { conf.getConfig().getInt("StatusShare.Port"), commands); sc.startClient(); } - Sclat.sendMessage("§a試合開始まで後§c30§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c30§a秒", MessageType.ALL_PLAYER); } if (s == 10) - Sclat.sendMessage("§a試合開始まで後§c20§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c20§a秒", MessageType.ALL_PLAYER); if (s == 20) - Sclat.sendMessage("§a試合開始まで後§c10§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c10§a秒", MessageType.ALL_PLAYER); if (s == 25) - Sclat.sendMessage("§a試合開始まで後§c5§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c5§a秒", MessageType.ALL_PLAYER); if (s == 26) - Sclat.sendMessage("§a試合開始まで後§c4§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c4§a秒", MessageType.ALL_PLAYER); if (s == 27) - Sclat.sendMessage("§a試合開始まで後§c3§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c3§a秒", MessageType.ALL_PLAYER); if (s == 28) - Sclat.sendMessage("§a試合開始まで後§c2§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c2§a秒", MessageType.ALL_PLAYER); if (s == 29) - Sclat.sendMessage("§a試合開始まで後§c1§a秒", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a試合開始まで後§c1§a秒", MessageType.ALL_PLAYER); if (s == 30) { match.setCanJoin(false); @@ -253,10 +253,10 @@ public void run() { } } - Sclat.sendMessage("§6試合が開始されました", MessageType.BROADCAST); + SclatUtil.sendMessage("§6試合が開始されました", MessageType.BROADCAST); if (conf.getConfig().getBoolean("RateMatch")) { - Sclat.sendMessage("", MessageType.ALL_PLAYER); - Sclat.sendMessage("§b試合の総合レート : §r" + SclatUtil.sendMessage("", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§b試合の総合レート : §r" + (match.getTeam0().getRateTotal() + match.getTeam1().getRateTotal()), MessageType.ALL_PLAYER); } @@ -298,16 +298,16 @@ public void run() { task.runTaskTimer(Main.getPlugin(), 0, 20); } } else { - Sclat.sendMessage("§c§n上限人数を超えているため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§n上限人数を超えているため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } else { - Sclat.sendMessage("§c§nこのマッチには既に開始しているため参加できません", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§nこのマッチには既に開始しているため参加できません", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } else { - Sclat.sendMessage("§c§n既にチームに参加しています", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.ERROR); + SclatUtil.sendMessage("§c§n既にチームに参加しています", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.ERROR); } } @@ -316,7 +316,7 @@ public static synchronized void MatchSetup() { // 再起動オプション if (conf.getConfig().contains("RestartMatchCount")) if (conf.getConfig().getInt("RestartMatchCount") == matchcount) - Sclat.restartServer(); + SclatUtil.restartServer(); final int id = matchcount; Match match = new Match(id); @@ -503,16 +503,16 @@ public void run() { switch (conf.getConfig().getString("WorkMode")) { case "Normal" : - Sclat.sendMessage("§6ゲームモード : §b§lナワバリバトル", MessageType.PLAYER, p); - Sclat.sendMessage("§f§l敵よりもたくさんナワバリを確保しろ！", MessageType.PLAYER, p); + SclatUtil.sendMessage("§6ゲームモード : §b§lナワバリバトル", MessageType.PLAYER, p); + SclatUtil.sendMessage("§f§l敵よりもたくさんナワバリを確保しろ！", MessageType.PLAYER, p); break; case "TDM" : - Sclat.sendMessage("§6ゲームモード : §b§lチームデスマッチ", MessageType.PLAYER, p); - Sclat.sendMessage("§f§l敵よりもキルをしろ！", MessageType.PLAYER, p); + SclatUtil.sendMessage("§6ゲームモード : §b§lチームデスマッチ", MessageType.PLAYER, p); + SclatUtil.sendMessage("§f§l敵よりもキルをしろ！", MessageType.PLAYER, p); break; case "Area" : - Sclat.sendMessage("§6ゲームモード : §b§lガチエリア", MessageType.PLAYER, p); - Sclat.sendMessage("§f§lエリアを確保して守り抜け！", MessageType.PLAYER, p); + SclatUtil.sendMessage("§6ゲームモード : §b§lガチエリア", MessageType.PLAYER, p); + SclatUtil.sendMessage("§f§lエリアを確保して守り抜け！", MessageType.PLAYER, p); break; } @@ -1031,11 +1031,11 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) continue; if (data.getTeam() == wteam) { - Sclat.sendMessage("§b§lカウントリードした!", MessageType.PLAYER, player); + SclatUtil.sendMessage("§b§lカウントリードした!", MessageType.PLAYER, player); player.sendTitle("", "§b§lカウントリードした!", 10, 20, 10); - Sclat.playGameSound(player, SoundType.CONGRATULATIONS); + SclatUtil.playGameSound(player, SoundType.CONGRATULATIONS); } else { - Sclat.sendMessage("§c§lカウントリードされた!", MessageType.PLAYER, player); + SclatUtil.sendMessage("§c§lカウントリードされた!", MessageType.PLAYER, player); player.sendTitle("", "§c§lカウントリードされた!", 10, 20, 10); player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1F, 3F); } @@ -1070,7 +1070,7 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { oplayer.sendTitle("", "§7延長戦！", 10, 20, 10); - Sclat.sendMessage("§7延長戦！", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§7延長戦！", MessageType.PLAYER, oplayer); } } } @@ -1097,7 +1097,7 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).isInMatch()) { oplayer.sendTitle("", "§7残りカウントあとわずか！", 10, 20, 10); - Sclat.sendMessage("§7残りカウントあとわずか！", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§7残りカウントあとわずか！", MessageType.PLAYER, oplayer); p.playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_INFECT, 8.0F, 2.0F); } } @@ -1109,7 +1109,7 @@ else if (conf.getConfig().getString("WorkMode").equals("Area")) if (s == 60 && !conf.getConfig().getString("WorkMode").equals("Area")) { for (Player oplayer : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(oplayer).getIsJoined()) { - Sclat.sendMessage("§6§n残り1分！", MessageType.PLAYER, oplayer); + SclatUtil.sendMessage("§6§n残り1分！", MessageType.PLAYER, oplayer); } } if (DataMgr.getPlayerData(p).getPlayerNumber() == 1 && Plugins.NOTEBLOCKAPI.isLoaded()) { @@ -1209,7 +1209,7 @@ public void run() { DataMgr.getPlayerData(p).getMatch().getBlockUpdater().stop(); for (Player target : Main.getPlugin().getServer().getOnlinePlayers()) { - Sclat.sendWorldBorderWarningClearPacket(target); + SclatUtil.sendWorldBorderWarningClearPacket(target); } try { @@ -1416,8 +1416,8 @@ else if (team1 == 100) // int paint = data.getPaintCount(); data.setCanFly(false); - Sclat.sendMessage("§a----------<< Match result >>----------", MessageType.PLAYER, p); - Sclat.sendMessage("", MessageType.PLAYER, p); + SclatUtil.sendMessage("§a----------<< Match result >>----------", MessageType.PLAYER, p); + SclatUtil.sendMessage("", MessageType.PLAYER, p); for (Player op : Main.getPlugin(Main.class).getServer().getOnlinePlayers()) { PlayerData odata = DataMgr.getPlayerData(op); @@ -1425,7 +1425,7 @@ else if (team1 == 100) continue; if (odata.getTeam().getID() == data.getTeam().getID()) { if (op.equals(p)) { - Sclat.sendMessage( + SclatUtil.sendMessage( odata.getTeam().getTeamColor().getColorCode() + "§l[ §l" + op.getDisplayName() + "§l ]" + ChatColor.RESET + "Kills : " + ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET @@ -1436,7 +1436,7 @@ else if (team1 == 100) // ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET + "Points : " // + ChatColor.YELLOW + odata.getPaintCount()); } else { - Sclat.sendMessage(odata.getTeam().getTeamColor().getColorCode() + "[ " + SclatUtil.sendMessage(odata.getTeam().getTeamColor().getColorCode() + "[ " + op.getDisplayName() + " ]" + ChatColor.RESET + "Kills : " + ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET + "Points : " + ChatColor.YELLOW + odata.getPaintCount(), @@ -1461,7 +1461,7 @@ else if (team1 == 100) continue; if (odata.getTeam().getID() != data.getTeam().getID()) { if (op.equals(p)) { - Sclat.sendMessage( + SclatUtil.sendMessage( odata.getTeam().getTeamColor().getColorCode() + "§l[ §l" + op.getDisplayName() + "§l ]" + ChatColor.RESET + "Kills : " + ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET @@ -1472,7 +1472,7 @@ else if (team1 == 100) // ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET + "Points : " // + ChatColor.YELLOW + odata.getPaintCount()); } else { - Sclat.sendMessage(odata.getTeam().getTeamColor().getColorCode() + "[ " + SclatUtil.sendMessage(odata.getTeam().getTeamColor().getColorCode() + "[ " + op.getDisplayName() + " ]" + ChatColor.RESET + "Kills : " + ChatColor.YELLOW + odata.getKillCount() + " " + ChatColor.RESET + "Points : " + ChatColor.YELLOW + odata.getPaintCount(), @@ -1539,31 +1539,31 @@ else if (team1 == 100) sc.startClient(); } - Sclat.sendMessage("", MessageType.PLAYER, p); - Sclat.sendMessage("§a----------<< Match bonus >>----------", MessageType.PLAYER, p); + SclatUtil.sendMessage("", MessageType.PLAYER, p); + SclatUtil.sendMessage("§a----------<< Match bonus >>----------", MessageType.PLAYER, p); - Sclat.sendMessage("", MessageType.PLAYER, p); - Sclat.sendMessage( + SclatUtil.sendMessage("", MessageType.PLAYER, p); + SclatUtil.sendMessage( ChatColor.GREEN + " Money : " + ChatColor.RESET + "+" + String.valueOf(pMoney) + ChatColor.AQUA + " Lv : " + ChatColor.RESET + "+" + String.valueOf(pLv) + ChatColor.GOLD + " Ticket : " + ChatColor.RESET + String.valueOf(pTicket), MessageType.PLAYER, p); - Sclat.sendMessage("", MessageType.PLAYER, p); + SclatUtil.sendMessage("", MessageType.PLAYER, p); if (pRank < 0) - Sclat.sendMessage(ChatColor.GOLD + " RankPoint : " + ChatColor.RESET + String.valueOf(pRank) + SclatUtil.sendMessage(ChatColor.GOLD + " RankPoint : " + ChatColor.RESET + String.valueOf(pRank) + (Main.type == ServerType.NORMAL ? " [ §b" + RankMgr.toABCRank(getRank(player)) + " §r]" : ""), MessageType.PLAYER, p); else - Sclat.sendMessage( + SclatUtil.sendMessage( ChatColor.GOLD + " RankPoint : " + ChatColor.RESET + "+" + String.valueOf(pMoveRank) + (Main.type == ServerType.NORMAL ? " [ §b" + RankMgr.toABCRank(getRank(player)) + " §r]" : ""), MessageType.PLAYER, p); - Sclat.sendMessage("", MessageType.PLAYER, p); - Sclat.sendMessage("§a-----------------------------------", MessageType.PLAYER, p); + SclatUtil.sendMessage("", MessageType.PLAYER, p); + SclatUtil.sendMessage("§a-----------------------------------", MessageType.PLAYER, p); /* * p.sendMessage(ChatColor.GREEN + "##########################"); * p.sendMessage(ChatColor.GREEN + " 試合結果"); diff --git a/src/main/java/be4rjp/sclat/manager/PaintMgr.java b/src/main/java/be4rjp/sclat/manager/PaintMgr.java index a99cbe7..4bac732 100644 --- a/src/main/java/be4rjp/sclat/manager/PaintMgr.java +++ b/src/main/java/be4rjp/sclat/manager/PaintMgr.java @@ -2,7 +2,7 @@ package be4rjp.sclat.manager; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.team.Team; @@ -315,7 +315,7 @@ public static void PaintGlass(Match match) { data.setTeam(match.getTeam0()); data.setOrigianlType(block.getType()); DataMgr.setPaintDataFromBlock(block, data); - Sclat.setBlockByNMS(block, match.getTeam0().getTeamColor().getGlass(), false); + SclatUtil.setBlockByNMS(block, match.getTeam0().getTeamColor().getGlass(), false); // block.setType(match.getTeam0().getTeamColor().getGlass()); match.getTeam0().addPaintCount(); } @@ -340,7 +340,7 @@ public static void PaintGlass(Match match) { data.setTeam(match.getTeam1()); data.setOrigianlType(block.getType()); DataMgr.setPaintDataFromBlock(block, data); - Sclat.setBlockByNMS(block, match.getTeam1().getTeamColor().getGlass(), false); + SclatUtil.setBlockByNMS(block, match.getTeam1().getTeamColor().getGlass(), false); // block.setType(match.getTeam1().getTeamColor().getGlass()); match.getTeam1().addPaintCount(); } diff --git a/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java b/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java index 3654651..f1ddba9 100644 --- a/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java +++ b/src/main/java/be4rjp/sclat/manager/SPWeaponMgr.java @@ -4,7 +4,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GaugeAPI; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.weapon.spweapon.AirStrike; @@ -103,7 +103,7 @@ public void run() { if (!data.getIsSP()) { setSPWeapon(p); p.playSound(p.getLocation(), Sound.BLOCK_CHEST_OPEN, 0.8F, 2); - Sclat.sendMessage("§6§l！ スペシャルウエポン使用可能 ！", MessageType.PLAYER, player); + SclatUtil.sendMessage("§6§l！ スペシャルウエポン使用可能 ！", MessageType.PLAYER, player); data.setIsUsingSP(false); } DataMgr.getPlayerData(p).setIsSP(true); diff --git a/src/main/java/be4rjp/sclat/server/EquipmentServerManager.java b/src/main/java/be4rjp/sclat/server/EquipmentServerManager.java index 49ef192..7d9dd98 100644 --- a/src/main/java/be4rjp/sclat/server/EquipmentServerManager.java +++ b/src/main/java/be4rjp/sclat/server/EquipmentServerManager.java @@ -1,7 +1,7 @@ package be4rjp.sclat.server; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.PlayerStatusMgr; import org.bukkit.entity.Player; @@ -34,7 +34,7 @@ public static void doCommands() { break; case "gear" : for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) - if (player.getUniqueId().toString().equals(args[3]) && Sclat.isNumber(args[2])) + if (player.getUniqueId().toString().equals(args[3]) && SclatUtil.isNumber(args[2])) DataMgr.getPlayerData(player).setGearNumber(Integer.parseInt(args[2])); break; case "rank" : diff --git a/src/main/java/be4rjp/sclat/server/StatusServer.java b/src/main/java/be4rjp/sclat/server/StatusServer.java index ea639ef..2a54e2a 100644 --- a/src/main/java/be4rjp/sclat/server/StatusServer.java +++ b/src/main/java/be4rjp/sclat/server/StatusServer.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.data.ServerStatus; import be4rjp.sclat.manager.PlayerReturnManager; @@ -109,7 +109,7 @@ public void run() { } case "add" : { // add [statusName] [number] [uuid] if (args.length == 4) { - if (Sclat.isNumber(args[2]) && args[3].length() == 36) { + if (SclatUtil.isNumber(args[2]) && args[3].length() == 36) { switch (args[1]) { case "money" : PlayerStatusMgr.addMoney(args[3], Integer.parseInt(args[2])); @@ -151,14 +151,14 @@ public void run() { for (ServerStatus ss : ServerStatusManager.serverList) { if (ss.getServerName().equals(args[1])) { ss.setWaitingEndTime(Long.parseLong(args[2])); - Sclat.sendMessage(ss.getDisplayName() + "§aの試合待機が開始されました！", + SclatUtil.sendMessage(ss.getDisplayName() + "§aの試合待機が開始されました！", MessageType.ALL_PLAYER); - Sclat.sendMessage( + SclatUtil.sendMessage( "§a§l" + (ss.getWaitingEndTime() - (System.currentTimeMillis() / 1000)) + "§b秒後に開始されます", MessageType.ALL_PLAYER); Main.getPlugin().getServer().getOnlinePlayers() - .forEach(player -> Sclat.playGameSound(player, SoundType.SUCCESS)); + .forEach(player -> SclatUtil.playGameSound(player, SoundType.SUCCESS)); } } } diff --git a/src/main/java/be4rjp/sclat/tutorial/Tutorial.java b/src/main/java/be4rjp/sclat/tutorial/Tutorial.java index 0c1421d..38fcae4 100644 --- a/src/main/java/be4rjp/sclat/tutorial/Tutorial.java +++ b/src/main/java/be4rjp/sclat/tutorial/Tutorial.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.MessageType; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.SoundType; import be4rjp.sclat.data.BlockUpdater; import be4rjp.sclat.data.DataMgr; @@ -284,12 +284,12 @@ public void run() { player.getInventory().clear(); player.getInventory().setItem(0, join); - Sclat.sendMessage("§6Sclatへようこそ！", MessageType.PLAYER, player); + SclatUtil.sendMessage("§6Sclatへようこそ！", MessageType.PLAYER, player); player.sendMessage("§aチェストをもって右クリックするとメインメニューを開くことができます。"); player.sendMessage("§a初期から使える武器がいくつかあります。"); player.sendMessage("§aメインメニューの装備変更から武器を選んで、試合に参加してみましょう！"); - Sclat.sendMessage("§6初回ログインボーナスを受け取りました！ §bMoney +10000", MessageType.PLAYER, player); - Sclat.playGameSound(player, SoundType.CONGRATULATIONS); + SclatUtil.sendMessage("§6初回ログインボーナスを受け取りました！ §bMoney +10000", MessageType.PLAYER, player); + SclatUtil.playGameSound(player, SoundType.CONGRATULATIONS); } } } @@ -383,9 +383,9 @@ public void run() { } } - Sclat.sendMessage("§a§lインクがリセットされました！", MessageType.ALL_PLAYER); + SclatUtil.sendMessage("§a§lインクがリセットされました！", MessageType.ALL_PLAYER); for (Player op : Main.getPlugin().getServer().getOnlinePlayers()) - Sclat.playGameSound(op, SoundType.SUCCESS); + SclatUtil.playGameSound(op, SoundType.SUCCESS); time = 0; } time++; diff --git a/src/main/java/be4rjp/sclat/weapon/Blaster.java b/src/main/java/be4rjp/sclat/weapon/Blaster.java index 6affd99..2e0ff17 100644 --- a/src/main/java/be4rjp/sclat/weapon/Blaster.java +++ b/src/main/java/be4rjp/sclat/weapon/Blaster.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; @@ -131,10 +131,10 @@ public void run() { player.getWorld().playSound(inkball.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); + SclatUtil.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); // バリアをはじく - Sclat.repelBarrier(inkball.getLocation(), maxDist, player); + SclatUtil.repelBarrier(inkball.getLocation(), maxDist, player); // 塗る for (int i = 0; i <= maxDist - 1; i++) { @@ -189,7 +189,7 @@ public void run() { } if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -240,10 +240,10 @@ public static void Explode(Player player, Location blastcenter) { player.getWorld().playSound(blastcenter, Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(blastcenter, maxDist, 25, player); + SclatUtil.createInkExplosionEffect(blastcenter, maxDist, 25, player); // バリアをはじく - Sclat.repelBarrier(blastcenter, maxDist, player); + SclatUtil.repelBarrier(blastcenter, maxDist, player); // 塗る for (int i = 0; i <= maxDist - 1; i++) { @@ -299,7 +299,7 @@ public static void Explode(Player player, Location blastcenter) { } if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/Brush.java b/src/main/java/be4rjp/sclat/weapon/Brush.java index 6447979..1fd3651 100644 --- a/src/main/java/be4rjp/sclat/weapon/Brush.java +++ b/src/main/java/be4rjp/sclat/weapon/Brush.java @@ -2,7 +2,7 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -126,7 +126,7 @@ public void run() { double damage = DataMgr.getPlayerData(p).getWeaponClass().getMainWeapon() .getRollerDamage(); - Sclat.giveDamage(p, target, damage, "killed"); + SclatUtil.giveDamage(p, target, damage, "killed"); } } } diff --git a/src/main/java/be4rjp/sclat/weapon/Charger.java b/src/main/java/be4rjp/sclat/weapon/Charger.java index db5a856..fc71114 100644 --- a/src/main/java/be4rjp/sclat/weapon/Charger.java +++ b/src/main/java/be4rjp/sclat/weapon/Charger.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GaugeAPI; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; @@ -78,7 +78,7 @@ public void run() { * PotionEffect(PotionEffectType.SLOW, 40000, (int)charge / 3)); */ if (charge < max) { - Sclat.setPlayerFOV(p, -0.1F / ((float) charge / 19.0F)); + SclatUtil.setPlayerFOV(p, -0.1F / ((float) charge / 19.0F)); } } @@ -140,7 +140,7 @@ public void run() { */ if (data.getWeaponClass().getMainWeapon().getScope()) { data.setIsCharging(false); - Sclat.setPlayerFOV(player, 0.06F); + SclatUtil.setPlayerFOV(player, 0.06F); } if (charge <= min) { if (p.getExp() > data.getWeaponClass().getMainWeapon().getNeedInk() @@ -308,7 +308,7 @@ public static void Shoot(Player player, int reach, double damage, double decRate if (Isbackstab(player, target)) { hitDamage = damage * decRate; } - death = Sclat.giveDamage(player, target, hitDamage, "killed"); + death = SclatUtil.giveDamage(player, target, hitDamage, "killed"); if (death) player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1.2F, 1.3F); else @@ -353,7 +353,7 @@ public void run() { break loop; } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) if (((ArmorStand) as).isVisible()) player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, diff --git a/src/main/java/be4rjp/sclat/weapon/Funnel.java b/src/main/java/be4rjp/sclat/weapon/Funnel.java index d6bc651..904cd8b 100644 --- a/src/main/java/be4rjp/sclat/weapon/Funnel.java +++ b/src/main/java/be4rjp/sclat/weapon/Funnel.java @@ -2,7 +2,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GlowingAPI; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; @@ -80,7 +80,7 @@ public static void FunnelShot(Player player, ArmorStand funnel, Location taegetl && target.getGameMode().equals(GameMode.ADVENTURE)) { if (target.getLocation().distanceSquared(position) <= maxDistSquad) { if (rayTrace.intersects(new BoundingBox((Entity) target), 4, 0.05)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT, 1.2F, 1.3F); // AntiNoDamageTime @@ -122,7 +122,7 @@ public void run() { break loop; } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) if (((ArmorStand) as).isVisible()) player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, @@ -939,7 +939,7 @@ public void run() { // break loop; // } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) if (((ArmorStand) as).isVisible()) diff --git a/src/main/java/be4rjp/sclat/weapon/Hound.java b/src/main/java/be4rjp/sclat/weapon/Hound.java index 3223943..6f83a37 100644 --- a/src/main/java/be4rjp/sclat/weapon/Hound.java +++ b/src/main/java/be4rjp/sclat/weapon/Hound.java @@ -3,7 +3,7 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; import be4rjp.sclat.api.GlowingAPI; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; @@ -203,10 +203,10 @@ public void run() { player.getWorld().playSound(as1l, Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(as1l, maxDist, 15, player); + SclatUtil.createInkExplosionEffect(as1l, maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(as1l, (int) (maxDist / 2), player); + SclatUtil.repelBarrier(as1l, (int) (maxDist / 2), player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -255,7 +255,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.MAIN_SPEC_UP)); if (data.getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/Kasa.java b/src/main/java/be4rjp/sclat/weapon/Kasa.java index 30e0bec..cffd2e4 100644 --- a/src/main/java/be4rjp/sclat/weapon/Kasa.java +++ b/src/main/java/be4rjp/sclat/weapon/Kasa.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; @@ -581,7 +581,7 @@ public void run() { if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target) .getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { if (rayTrace.intersects(new BoundingBox((Entity) target), 5, 0.05)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/Reeler.java b/src/main/java/be4rjp/sclat/weapon/Reeler.java index 9e43c36..909bbbc 100644 --- a/src/main/java/be4rjp/sclat/weapon/Reeler.java +++ b/src/main/java/be4rjp/sclat/weapon/Reeler.java @@ -2,7 +2,7 @@ import be4rjp.dadadachecker.ClickType; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; @@ -396,7 +396,7 @@ public static ArmorStand graptest(Player player) { // break loop; // } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) { if (((ArmorStand) as).isVisible()) { dest = (ArmorStand) as; diff --git a/src/main/java/be4rjp/sclat/weapon/Roller.java b/src/main/java/be4rjp/sclat/weapon/Roller.java index 4ff207c..a92ae21 100644 --- a/src/main/java/be4rjp/sclat/weapon/Roller.java +++ b/src/main/java/be4rjp/sclat/weapon/Roller.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; @@ -128,7 +128,7 @@ public void run() { double damage = DataMgr.getPlayerData(p).getWeaponClass().getMainWeapon() .getRollerDamage(); - Sclat.giveDamage(p, target, damage, "killed"); + SclatUtil.giveDamage(p, target, damage, "killed"); } } } @@ -212,7 +212,7 @@ public void run() { double damage = DataMgr.getPlayerData(p).getWeaponClass().getMainWeapon() .getRollerDamage(); - Sclat.giveDamage(p, target, damage, "killed"); + SclatUtil.giveDamage(p, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -302,7 +302,7 @@ public void run() { double damage = DataMgr.getPlayerData(p).getWeaponClass().getMainWeapon() .getRollerDamage(); - Sclat.giveDamage(p, target, damage, "killed"); + SclatUtil.giveDamage(p, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/Slosher.java b/src/main/java/be4rjp/sclat/weapon/Slosher.java index 5e54eb8..763fe38 100644 --- a/src/main/java/be4rjp/sclat/weapon/Slosher.java +++ b/src/main/java/be4rjp/sclat/weapon/Slosher.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.data.DataMgr; @@ -139,7 +139,7 @@ public void run() { player.getWorld().playSound(inkball.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 0.7F, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); + SclatUtil.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -160,7 +160,7 @@ public void run() { * data.getWeaponClass().getMainWeapon().getBlasterExDamage(); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "killed"); + SclatUtil.giveDamage(player, target, damage, "killed"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/SnowballListener.java b/src/main/java/be4rjp/sclat/weapon/SnowballListener.java index 0818eb2..6da9712 100644 --- a/src/main/java/be4rjp/sclat/weapon/SnowballListener.java +++ b/src/main/java/be4rjp/sclat/weapon/SnowballListener.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -62,7 +62,7 @@ public void onBlockHit(ProjectileHitEvent event) { if (!DataMgr.getPlayerData(shooter).getIsUsingSP()) SPWeaponMgr.addSPCharge(shooter); - Sclat.giveDamage(shooter, target, 47, "spWeapon"); + SclatUtil.giveDamage(shooter, target, 47, "spWeapon"); } } else if (event.getHitEntity() instanceof ArmorStand) { ArmorStand as = (ArmorStand) event.getHitEntity(); @@ -92,15 +92,15 @@ public void onBlockHit(ProjectileHitEvent event) { if (projectile.getCustomName().equals("Sprinkler") || projectile.getCustomName().equals("Amehurasi")) { if (projectile.getCustomName().equals("Sprinkler")) - Sclat.giveDamage(shooter, target, 4, "subWeapon"); + SclatUtil.giveDamage(shooter, target, 4, "subWeapon"); else if (projectile.getCustomName().equals("Amehurasi")) - Sclat.giveDamage(shooter, target, 4, "spWeapon"); + SclatUtil.giveDamage(shooter, target, 4, "spWeapon"); PaintMgr.Paint(target.getLocation(), shooter, true); } if (projectile.getCustomName().equals("SuperShot")) { shooter.playSound(shooter.getLocation(), Sound.ENTITY_PLAYER_HURT, 0.5F, 1F); - Sclat.giveDamage(shooter, target, 47, "spWeapon"); + SclatUtil.giveDamage(shooter, target, 47, "spWeapon"); } if (projectile.getCustomName().contains("#QuadroArmsSpinner")) { shooter.playSound(shooter.getLocation(), Sound.ENTITY_PLAYER_HURT, 0.5F, 1F); @@ -109,7 +109,7 @@ else if (projectile.getCustomName().equals("Amehurasi")) if (QuadroticksLived > 60) QuadroticksLived = 60; Quadrodamage += Quadrodamage * (QuadroticksLived / 30); - Sclat.giveDamage(shooter, target, Quadrodamage, "spWeapon"); + SclatUtil.giveDamage(shooter, target, Quadrodamage, "spWeapon"); return; } if (projectile.getCustomName().contains("#QuadroArmsShotgun")) { @@ -122,7 +122,7 @@ else if (projectile.getCustomName().equals("Amehurasi")) if (projectile.getCustomName().contains("CounterShot")) { Quadrodamage = 6.5; } - Sclat.giveDamage(shooter, target, Quadrodamage, "spWeapon"); + SclatUtil.giveDamage(shooter, target, Quadrodamage, "spWeapon"); return; } @@ -188,7 +188,7 @@ else if (projectile.getCustomName().equals("Amehurasi")) } } - Sclat.giveDamage(shooter, target, damage, "killed"); + SclatUtil.giveDamage(shooter, target, damage, "killed"); } } // AntiNoDamageTime @@ -223,7 +223,7 @@ public void run() { if (projectile.getCustomName() != null) { if (DataMgr.mws.contains(projectile.getCustomName())) { if (DataMgr.tsl.contains(projectile.getCustomName())) { - if (Sclat.isNumber(as.getCustomName())) { + if (SclatUtil.isNumber(as.getCustomName())) { if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) { if (as.isVisible()) { if (projectile.getCustomName().contains("#slided")) { @@ -535,7 +535,7 @@ public void onEntityHit(EntityDamageByEntityEvent event) { if (!DataMgr.getPlayerData(shooter).getIsUsingSP()) SPWeaponMgr.addSPCharge(shooter); - Sclat.giveDamage(shooter, target, 47, "spWeapon"); + SclatUtil.giveDamage(shooter, target, 47, "spWeapon"); } } else if (event.getEntity() instanceof ArmorStand) { ArmorStand as = (ArmorStand) event.getEntity(); @@ -620,7 +620,7 @@ public void onEntityHit(EntityDamageByEntityEvent event) { if (projectile.getCustomName() != null) { if (DataMgr.mws.contains(projectile.getCustomName())) { if (DataMgr.tsl.contains(projectile.getCustomName())) { - if (Sclat.isNumber(as.getCustomName())) { + if (SclatUtil.isNumber(as.getCustomName())) { if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) { if (as.isVisible()) { if (projectile.getCustomName().contains("#slided")) { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/AirStrike.java b/src/main/java/be4rjp/sclat/weapon/spweapon/AirStrike.java index 6789dc1..2a6b7c4 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/AirStrike.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/AirStrike.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; @@ -160,7 +160,7 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), maxDist, 25, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), maxDist, 25, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -184,7 +184,7 @@ public void run() { } if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "spWeapon"); + SclatUtil.giveDamage(player, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/Amehurasi.java b/src/main/java/be4rjp/sclat/weapon/spweapon/Amehurasi.java index 2427f7b..bb95b94 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/Amehurasi.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/Amehurasi.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; @@ -172,7 +172,7 @@ public void run() { && new Random().nextInt(100) == 0) { if (DataMgr.getPlayerData(p).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(p, target, damage, "spWeapon"); + SclatUtil.giveDamage(p, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/JetPack.java b/src/main/java/be4rjp/sclat/weapon/spweapon/JetPack.java index 477f348..fe55545 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/JetPack.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/JetPack.java @@ -6,7 +6,7 @@ import be4rjp.blockstudio.api.BlockStudioAPI; import be4rjp.blockstudio.file.ObjectData; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -369,7 +369,7 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), 3, 25, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), 3, 25, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -388,7 +388,7 @@ public void run() { double damage = (3.5 - target.getLocation().distance(drop.getLocation())) * 10; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "spWeapon"); + SclatUtil.giveDamage(player, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java b/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java index b9658c9..b4ce52f 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/LitterFiveG.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; @@ -212,7 +212,7 @@ public static void Shoot_LitterFiveG(Player player) { player.getWorld().playSound(position, Sound.ENTITY_GENERIC_EXPLODE, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(position, maxDist, 25, player); + SclatUtil.createInkExplosionEffect(position, maxDist, 25, player); // 塗る for (int in = 0; in <= maxDist - 1; in++) { @@ -248,7 +248,7 @@ public static void Shoot_LitterFiveG(Player player) { if (target.getLocation().distanceSquared(position) <= maxDistSquad) { if (rayTrace.intersects(new BoundingBox((Entity) target), (int) (reach), 0.05)) { boolean death; - death = Sclat.giveDamage(player, target, damage, "spWeapon"); + death = SclatUtil.giveDamage(player, target, damage, "spWeapon"); if (death) { player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1.2F, 1.3F); player.getWorld().playSound(target.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1, 1); @@ -296,7 +296,7 @@ public void run() { break loop; } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) if (((ArmorStand) as).isVisible()) player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java b/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java index 19a45dc..0ad6639 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/MegaLaser.java @@ -6,7 +6,7 @@ import be4rjp.blockstudio.api.BlockStudioAPI; import be4rjp.blockstudio.file.ObjectData; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.async.AsyncTask; import be4rjp.sclat.api.async.AsyncThreadManager; import be4rjp.sclat.api.player.PlayerData; @@ -143,7 +143,7 @@ public void run() { if (c == 13 || !playerData.isInMatch() || !p.isOnline()) { playerData.setIsUsingSP(false); for (Player target : AsyncThreadManager.onlinePlayers) { - Sclat.sendWorldBorderWarningClearPacket(target); + SclatUtil.sendWorldBorderWarningClearPacket(target); } bsObject.remove(); cancel(); @@ -232,9 +232,9 @@ public void run() { continue; if (target.getLocation().distanceSquared(position.clone().add(0, 1, 0)) <= maxDistSquared) { // list.add(target); - Sclat.sendWorldBorderWarningPacket(target); + SclatUtil.sendWorldBorderWarningPacket(target); } else { - Sclat.sendWorldBorderWarningClearPacket(target); + SclatUtil.sendWorldBorderWarningClearPacket(target); } } // ここは上のループに含ませちゃってもいいのか...? @@ -296,7 +296,7 @@ public void run() { AsyncThreadManager.sync(() -> { for (Player target : damageTargets) { - Sclat.giveDamage(p, target, damage, "spWeapon"); + SclatUtil.giveDamage(p, target, damage, "spWeapon"); } }); diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/MultiMissile.java b/src/main/java/be4rjp/sclat/weapon/spweapon/MultiMissile.java index f909a46..963b554 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/MultiMissile.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/MultiMissile.java @@ -3,7 +3,7 @@ import be4rjp.sclat.Main; import be4rjp.sclat.api.GlowingAPI; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -334,7 +334,7 @@ public void run() { s.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), maxDist, 25, s); + SclatUtil.createInkExplosionEffect(drop.getLocation(), maxDist, 25, s); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -352,7 +352,7 @@ public void run() { double damage = (maxDist - target.getLocation().distance(drop.getLocation())) * 14; if (DataMgr.getPlayerData(s).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(s, target, damage, "spWeapon"); + SclatUtil.giveDamage(s, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java b/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java index bb47b83..7613ea1 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/QuadroArms.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.RayTrace; @@ -523,7 +523,7 @@ public void run() { player.getWorld().playSound(inkball.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 0.7F, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); + SclatUtil.createInkExplosionEffect(inkball.getLocation(), maxDist, 25, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -543,7 +543,7 @@ public void run() { * BlasterExDamage; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "spWeapon"); + SclatUtil.giveDamage(player, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/SuperTyakuti.java b/src/main/java/be4rjp/sclat/weapon/spweapon/SuperTyakuti.java index a548b35..fc2f68f 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/SuperTyakuti.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/SuperTyakuti.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -132,7 +132,7 @@ public void run() { 0.9F); // 爆発エフェクト - Sclat.createInkExplosionEffect(player.getLocation(), 7, 10, player); + SclatUtil.createInkExplosionEffect(player.getLocation(), 7, 10, player); double maxDist = 8; double maxDistSquared = 64; /* 8^2 */ @@ -153,7 +153,7 @@ public void run() { double damage = (maxDist - target.getLocation().distance(player.getLocation())) * 15; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "spWeapon"); + SclatUtil.giveDamage(player, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java b/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java index 4500448..7f61ba4 100644 --- a/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java +++ b/src/main/java/be4rjp/sclat/weapon/spweapon/SwordMord.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon.spweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.raytrace.BoundingBox; @@ -111,7 +111,7 @@ public static void AttackSword(Player player) { double damage = 15.1; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "spWeapon"); + SclatUtil.giveDamage(player, target, damage, "spWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -269,7 +269,7 @@ public void run() { if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target) .getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { if (rayTrace.intersects(new BoundingBox((Entity) target), 5, 0.05)) { - Sclat.giveDamage(player, target, 6, "spWeapon"); + SclatUtil.giveDamage(player, target, 6, "spWeapon"); // AntiNoDamageTime BukkitRunnable taskdamage = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/Blinder.java b/src/main/java/be4rjp/sclat/weapon/subweapon/Blinder.java index a43431f..2b2f895 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/Blinder.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/Blinder.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; @@ -140,7 +140,7 @@ public static void Shootblind(Player player, int reach) { break loop; } } else { - if (Sclat.isNumber(as.getCustomName())) + if (SclatUtil.isNumber(as.getCustomName())) if (!as.getCustomName().equals("21") && !as.getCustomName().equals("100")) if (((ArmorStand) as).isVisible()) if (i > 85) { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/Boomerang.java b/src/main/java/be4rjp/sclat/weapon/subweapon/Boomerang.java index 94d591b..06f22ef 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/Boomerang.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/Boomerang.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -165,7 +165,7 @@ public void run() { double damage = 0.2; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target) .getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -205,10 +205,10 @@ public void run() { player.getWorld().playSound(as1l, Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(as1l, maxDist, 15, player); + SclatUtil.createInkExplosionEffect(as1l, maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(as1l, maxDist, player); + SclatUtil.repelBarrier(as1l, maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -262,7 +262,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/CurlingBomb.java b/src/main/java/be4rjp/sclat/weapon/subweapon/CurlingBomb.java index a944c79..c6883b6 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/CurlingBomb.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/CurlingBomb.java @@ -1,7 +1,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -133,7 +133,7 @@ public void run() { double damage = 2; if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target) .getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -173,10 +173,10 @@ public void run() { player.getWorld().playSound(as1l, Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(as1l, maxDist, 15, player); + SclatUtil.createInkExplosionEffect(as1l, maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(as1l, maxDist, player); + SclatUtil.repelBarrier(as1l, maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -230,7 +230,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/FloaterBomb.java b/src/main/java/be4rjp/sclat/weapon/subweapon/FloaterBomb.java index 5947c6b..ac41d53 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/FloaterBomb.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/FloaterBomb.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -116,10 +116,10 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), maxDist, 15, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(drop.getLocation(), maxDist, player); + SclatUtil.repelBarrier(drop.getLocation(), maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -169,7 +169,7 @@ public void run() { } if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/KBomb.java b/src/main/java/be4rjp/sclat/weapon/subweapon/KBomb.java index 3caa36d..42b87ed 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/KBomb.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/KBomb.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -105,12 +105,12 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), 5, 15, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), 5, 15, player); double maxDist = 4; // バリアをはじく - Sclat.repelBarrier(drop.getLocation(), maxDist, player); + SclatUtil.repelBarrier(drop.getLocation(), maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -130,7 +130,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/QuickBomb.java b/src/main/java/be4rjp/sclat/weapon/subweapon/QuickBomb.java index cf83264..da93d16 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/QuickBomb.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/QuickBomb.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.data.KasaData; @@ -85,10 +85,10 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), maxDist, 15, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), maxDist, 15, player); // バリアをはじく - Sclat.repelBarrier(drop.getLocation(), maxDist, player); + SclatUtil.repelBarrier(drop.getLocation(), maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -135,7 +135,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/SplashBomb.java b/src/main/java/be4rjp/sclat/weapon/subweapon/SplashBomb.java index 3500058..dd7d359 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/SplashBomb.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/SplashBomb.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.Sphere; import be4rjp.sclat.data.DataMgr; import be4rjp.sclat.manager.ArmorStandMgr; @@ -60,12 +60,12 @@ public void run() { player.getWorld().playSound(drop.getLocation(), Sound.ENTITY_FIREWORK_ROCKET_BLAST, 1, 1); // 爆発エフェクト - Sclat.createInkExplosionEffect(drop.getLocation(), 5, 15, player); + SclatUtil.createInkExplosionEffect(drop.getLocation(), 5, 15, player); double maxDist = 4; // バリアをはじく - Sclat.repelBarrier(drop.getLocation(), maxDist, player); + SclatUtil.repelBarrier(drop.getLocation(), maxDist, player); // 塗る for (int i = 0; i <= maxDist; i++) { @@ -85,7 +85,7 @@ public void run() { * Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP); if (DataMgr.getPlayerData(player).getTeam() != DataMgr.getPlayerData(target).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { diff --git a/src/main/java/be4rjp/sclat/weapon/subweapon/SplashShield.java b/src/main/java/be4rjp/sclat/weapon/subweapon/SplashShield.java index 8ca27d5..c968c4d 100644 --- a/src/main/java/be4rjp/sclat/weapon/subweapon/SplashShield.java +++ b/src/main/java/be4rjp/sclat/weapon/subweapon/SplashShield.java @@ -2,7 +2,7 @@ package be4rjp.sclat.weapon.subweapon; import be4rjp.sclat.Main; -import be4rjp.sclat.api.Sclat; +import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.raytrace.BoundingBox; import be4rjp.sclat.api.raytrace.RayTrace; import be4rjp.sclat.data.DataMgr; @@ -354,7 +354,7 @@ public void run() { if (rayTrace4.intersects(new BoundingBox((Entity) target), 3, 0.5) && DataMgr .getPlayerData(target).getTeam() != DataMgr.getPlayerData(p).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { @@ -386,7 +386,7 @@ public void run() { if (rayTrace4.intersects(new BoundingBox((Entity) target), 3, 0.5) && DataMgr .getPlayerData(target).getTeam() != DataMgr.getPlayerData(p).getTeam() && target.getGameMode().equals(GameMode.ADVENTURE)) { - Sclat.giveDamage(player, target, damage, "subWeapon"); + SclatUtil.giveDamage(player, target, damage, "subWeapon"); // AntiNoDamageTime BukkitRunnable task = new BukkitRunnable() { From f7a0e44a35cd1a82a49e36811a39d14695407291 Mon Sep 17 00:00:00 2001 From: sysnote8main Date: Sat, 24 Jan 2026 10:19:56 +0900 Subject: [PATCH 15/48] feat: rename Main.java to Sclat.java --- .../be4rjp/sclat/{Main.java => Sclat.java} | 12 +- src/main/java/be4rjp/sclat/api/Animation.java | 8 +- .../java/be4rjp/sclat/api/GlowingAPI.java | 6 +- src/main/java/be4rjp/sclat/api/SclatUtil.java | 28 ++--- .../be4rjp/sclat/api/async/AsyncTask.java | 6 +- .../sclat/api/async/AsyncThreadManager.java | 4 +- .../sclat/api/holo/RankingHolograms.java | 6 +- .../be4rjp/sclat/api/player/PlayerReturn.java | 4 +- .../be4rjp/sclat/api/wiremesh/Wiremesh.java | 8 +- .../sclat/commands/sclatCommandExecutor.java | 24 ++-- src/main/java/be4rjp/sclat/data/Area.java | 16 +-- .../java/be4rjp/sclat/data/BlockUpdater.java | 6 +- .../sclat/data/MatchServerRunnable.java | 6 +- src/main/java/be4rjp/sclat/data/Path.java | 6 +- .../java/be4rjp/sclat/data/ServerStatus.java | 6 +- src/main/java/be4rjp/sclat/data/Sponge.java | 4 +- src/main/java/be4rjp/sclat/data/TrapData.java | 24 ++-- .../be4rjp/sclat/emblem/EmblemManager.java | 2 +- .../java/be4rjp/sclat/gui/ClickListener.java | 22 ++-- src/main/java/be4rjp/sclat/gui/LootBox.java | 2 +- src/main/java/be4rjp/sclat/gui/OpenGUI.java | 20 ++-- .../sclat/lobby/LobbyScoreboardRunnable.java | 10 +- .../sclat/lunachat/LunaChatListener.java | 4 +- .../be4rjp/sclat/manager/ArmorStandMgr.java | 40 +++---- .../be4rjp/sclat/manager/BungeeCordMgr.java | 4 +- .../java/be4rjp/sclat/manager/ColorMgr.java | 12 +- .../java/be4rjp/sclat/manager/DeathMgr.java | 28 ++--- .../java/be4rjp/sclat/manager/GameMgr.java | 64 +++++------ .../be4rjp/sclat/manager/MainWeaponMgr.java | 8 +- .../java/be4rjp/sclat/manager/MapDataMgr.java | 6 +- .../java/be4rjp/sclat/manager/MatchMgr.java | 104 +++++++++--------- .../java/be4rjp/sclat/manager/NPCMgr.java | 29 +++-- .../be4rjp/sclat/manager/NoteBlockAPIMgr.java | 4 +- .../java/be4rjp/sclat/manager/PaintMgr.java | 6 +- .../java/be4rjp/sclat/manager/PathMgr.java | 22 ++-- .../sclat/manager/PlayerReturnManager.java | 4 +- .../be4rjp/sclat/manager/PlayerStatusMgr.java | 33 ++++-- .../java/be4rjp/sclat/manager/RankMgr.java | 16 +-- .../be4rjp/sclat/manager/SPWeaponMgr.java | 20 ++-- .../sclat/manager/ServerStatusManager.java | 6 +- .../java/be4rjp/sclat/manager/SettingMgr.java | 2 +- .../be4rjp/sclat/manager/SprinklerMgr.java | 6 +- .../java/be4rjp/sclat/manager/SquidMgr.java | 26 ++--- .../be4rjp/sclat/manager/SuperJumpMgr.java | 14 +-- .../be4rjp/sclat/manager/WeaponClassMgr.java | 10 +- .../protocollib/EntityClickListener.java | 4 +- .../protocollib/SclatPacketListener.java | 8 +- .../be4rjp/sclat/server/EquipmentClient.java | 4 +- .../be4rjp/sclat/server/EquipmentServer.java | 8 +- .../sclat/server/EquipmentServerManager.java | 6 +- .../be4rjp/sclat/server/StatusClient.java | 4 +- .../be4rjp/sclat/server/StatusServer.java | 4 +- .../java/be4rjp/sclat/tutorial/Tutorial.java | 42 +++---- .../java/be4rjp/sclat/weapon/Blaster.java | 22 ++-- src/main/java/be4rjp/sclat/weapon/Brush.java | 32 +++--- src/main/java/be4rjp/sclat/weapon/Bucket.java | 18 +-- .../java/be4rjp/sclat/weapon/Buckler.java | 6 +- src/main/java/be4rjp/sclat/weapon/Burst.java | 18 +-- .../java/be4rjp/sclat/weapon/Charger.java | 10 +- src/main/java/be4rjp/sclat/weapon/Decoy.java | 28 ++--- src/main/java/be4rjp/sclat/weapon/Funnel.java | 68 ++++++------ src/main/java/be4rjp/sclat/weapon/Hound.java | 20 ++-- src/main/java/be4rjp/sclat/weapon/Kasa.java | 40 +++---- .../java/be4rjp/sclat/weapon/MainWeapon.java | 10 +- .../java/be4rjp/sclat/weapon/Manuber.java | 16 +-- src/main/java/be4rjp/sclat/weapon/Reeler.java | 44 ++++---- src/main/java/be4rjp/sclat/weapon/Roller.java | 44 ++++---- .../java/be4rjp/sclat/weapon/Shooter.java | 34 +++--- .../java/be4rjp/sclat/weapon/Slosher.java | 18 +-- .../be4rjp/sclat/weapon/SnowballListener.java | 12 +- .../java/be4rjp/sclat/weapon/Spinner.java | 14 +-- .../java/be4rjp/sclat/weapon/Swapper.java | 8 +- .../sclat/weapon/spweapon/AirStrike.java | 20 ++-- .../sclat/weapon/spweapon/Amehurasi.java | 30 ++--- .../be4rjp/sclat/weapon/spweapon/Barrier.java | 8 +- .../sclat/weapon/spweapon/BombRush.java | 4 +- .../be4rjp/sclat/weapon/spweapon/JetPack.java | 36 +++--- .../sclat/weapon/spweapon/LitterFiveG.java | 28 ++--- .../sclat/weapon/spweapon/MegaLaser.java | 8 +- .../sclat/weapon/spweapon/MultiMissile.java | 26 ++--- .../sclat/weapon/spweapon/QuadroArms.java | 78 ++++++------- .../sclat/weapon/spweapon/SuperArmor.java | 20 ++-- .../sclat/weapon/spweapon/SuperSensor.java | 6 +- .../sclat/weapon/spweapon/SuperShot.java | 25 ++--- .../sclat/weapon/spweapon/SuperTyakuti.java | 16 +-- .../sclat/weapon/spweapon/SwordMord.java | 32 +++--- .../be4rjp/sclat/weapon/subweapon/Beacon.java | 10 +- .../sclat/weapon/subweapon/Blinder.java | 12 +- .../sclat/weapon/subweapon/Boomerang.java | 20 ++-- .../sclat/weapon/subweapon/CurlingBomb.java | 20 ++-- .../sclat/weapon/subweapon/FloaterBomb.java | 20 ++-- .../be4rjp/sclat/weapon/subweapon/KBomb.java | 20 ++-- .../be4rjp/sclat/weapon/subweapon/Poison.java | 24 ++-- .../sclat/weapon/subweapon/QuickBomb.java | 20 ++-- .../be4rjp/sclat/weapon/subweapon/Sensor.java | 22 ++-- .../sclat/weapon/subweapon/SplashBomb.java | 18 +-- .../sclat/weapon/subweapon/SplashShield.java | 30 ++--- .../sclat/weapon/subweapon/Sprinkler.java | 20 ++-- .../be4rjp/sclat/weapon/subweapon/Trap.java | 4 +- src/main/resources/plugin.yml | 2 +- 100 files changed, 923 insertions(+), 896 deletions(-) rename src/main/java/be4rjp/sclat/{Main.java => Sclat.java} (98%) diff --git a/src/main/java/be4rjp/sclat/Main.java b/src/main/java/be4rjp/sclat/Sclat.java similarity index 98% rename from src/main/java/be4rjp/sclat/Main.java rename to src/main/java/be4rjp/sclat/Sclat.java index 0e7c166..156b675 100644 --- a/src/main/java/be4rjp/sclat/Main.java +++ b/src/main/java/be4rjp/sclat/Sclat.java @@ -62,12 +62,12 @@ * * @author Be4rJP */ -public class Main extends JavaPlugin implements PluginMessageListener { - private static final Logger logger = LoggerFactory.getLogger(Main.class); +public class Sclat extends JavaPlugin implements PluginMessageListener { + private static final Logger logger = LoggerFactory.getLogger(Sclat.class); public static Config conf; - private static Main plugin; + private static Sclat plugin; public static Location lobby; @@ -351,7 +351,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(); @@ -424,7 +424,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); @@ -436,7 +436,7 @@ public void onDisable() { } } - public static Main getPlugin() { + public static Sclat getPlugin() { return plugin; } diff --git a/src/main/java/be4rjp/sclat/api/Animation.java b/src/main/java/be4rjp/sclat/api/Animation.java index 399e790..8714960 100644 --- a/src/main/java/be4rjp/sclat/api/Animation.java +++ b/src/main/java/be4rjp/sclat/api/Animation.java @@ -1,7 +1,7 @@ package be4rjp.sclat.api; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; import org.bukkit.ChatColor; @@ -65,7 +65,7 @@ public void run() { i++; } }; - task.runTaskTimer(Main.getPlugin(), 0, 2); + task.runTaskTimer(Sclat.getPlugin(), 0, 2); } public static void AreaResultAnimation(Player p, int team0point, int team1point, String team0color, @@ -107,7 +107,7 @@ public void run() { i++; } }; - task.runTaskTimer(Main.getPlugin(), 0, 2); + task.runTaskTimer(Sclat.getPlugin(), 0, 2); } public static void TDMResultAnimation(Player p, int team0point, int team1point, String team0color, @@ -177,6 +177,6 @@ public void run() { i++; } }; - task.runTaskTimer(Main.getPlugin(), 0, 2); + task.runTaskTimer(Sclat.getPlugin(), 0, 2); } } diff --git a/src/main/java/be4rjp/sclat/api/GlowingAPI.java b/src/main/java/be4rjp/sclat/api/GlowingAPI.java index f823586..35359ac 100644 --- a/src/main/java/be4rjp/sclat/api/GlowingAPI.java +++ b/src/main/java/be4rjp/sclat/api/GlowingAPI.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedDataWatcher; @@ -9,7 +9,7 @@ public class GlowingAPI { public static void setGlowing(Entity entity, Player player, boolean flag) { - PacketContainer packet = Main.protocolManager.createPacket(PacketType.Play.Server.ENTITY_METADATA); + PacketContainer packet = Sclat.protocolManager.createPacket(PacketType.Play.Server.ENTITY_METADATA); packet.getIntegers().write(0, entity.getEntityId()); WrappedDataWatcher watcher = new WrappedDataWatcher(); WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.get(Byte.class); @@ -17,7 +17,7 @@ public static void setGlowing(Entity entity, Player player, boolean flag) { watcher.setObject(0, serializer, (byte) (flag ? 0x40 : 0)); packet.getWatchableCollectionModifier().write(0, watcher.getWatchableObjects()); try { - Main.protocolManager.sendServerPacket(player, packet); + Sclat.protocolManager.sendServerPacket(player, packet); } catch (RuntimeException e) { e.printStackTrace(); } diff --git a/src/main/java/be4rjp/sclat/api/SclatUtil.java b/src/main/java/be4rjp/sclat/api/SclatUtil.java index b0382c5..9c26482 100644 --- a/src/main/java/be4rjp/sclat/api/SclatUtil.java +++ b/src/main/java/be4rjp/sclat/api/SclatUtil.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import be4rjp.sclat.api.player.PlayerData; import be4rjp.sclat.api.team.Team; import be4rjp.sclat.data.DataMgr; @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; -import static be4rjp.sclat.Main.conf; +import static be4rjp.sclat.Sclat.conf; /** * @@ -82,7 +82,7 @@ public static void sendBlockChangeForAllPlayer(org.bukkit.block.Block b, org.buk Block block = ((CraftBlockData) Bukkit.createBlockData(material)).getState().getBlock(); IBlockAccess iba = (IBlockAccess) nmsWorld; PacketPlayOutBlockChange packet = new PacketPlayOutBlockChange(iba, bp); - for (Player target : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player target : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (target.getWorld() == b.getWorld()) { ((CraftPlayer) target).getHandle().playerConnection.sendPacket(packet); } @@ -143,7 +143,7 @@ public static void restartServer() { conf.getConfig().getInt("StatusShare.Port"), commands); sc.startClient(); - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { BungeeCordMgr.PlayerSendServer(player, "sclat"); DataMgr.getPlayerData(player).setServerName("Sclat"); } @@ -153,7 +153,7 @@ public void run() { Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart"); } }; - task.runTaskLater(Main.getPlugin(), 100); + task.runTaskLater(Sclat.getPlugin(), 100); } public static void sendRestartedServerInfo() { @@ -172,7 +172,7 @@ public static void setPlayerPrefix(Player player, String prefix) { CraftPlayer cp = (CraftPlayer) player; EntityPlayer ep = cp.getHandle(); String origName = ep.getName(); - for (Player target : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player target : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (player != target) { CraftPlayer ct = (CraftPlayer) player; ct.getHandle().playerConnection.sendPacket(new PacketPlayOutNamedEntitySpawn(ep)); @@ -188,17 +188,17 @@ public static void sendMessage(String message, MessageType type) { buff.append(message); switch (type) { case ALL_PLAYER : { - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { player.sendMessage(buff.toString()); } break; } case CONSOLE : { - Main.getPlugin().getServer().getLogger().info(buff.toString()); + Sclat.getPlugin().getServer().getLogger().info(buff.toString()); break; } case BROADCAST : { - Main.getPlugin().getServer().broadcastMessage(buff.toString()); + Sclat.getPlugin().getServer().broadcastMessage(buff.toString()); break; } } @@ -210,7 +210,7 @@ public static void sendMessage(String message, MessageType type, Team team) { buff.append(sclat); buff.append(message); if (type == MessageType.TEAM) { - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { Team playerTeam = DataMgr.getPlayerData(player).getTeam(); if (playerTeam == null) continue; @@ -258,18 +258,18 @@ public void run() { } } }; - send.runTaskLater(Main.getPlugin(), 20); + send.runTaskLater(Sclat.getPlugin(), 20); } public static void createInkExplosionEffect(Location center, double radius, int accuracy, Player player) { List s_locs = Sphere.getSphere(center, radius - 0.5, accuracy); org.bukkit.block.data.BlockData bd = DataMgr.getPlayerData(player).getTeam().getTeamColor().getWool() .createBlockData(); - for (Player o_player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player o_player : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (DataMgr.getPlayerData(o_player).getSettings().ShowEffect_BombEx()) { for (Location loc : s_locs) { if (o_player.getWorld() == loc.getWorld()) { - if (o_player.getLocation().distanceSquared(loc) < Main.PARTICLE_RENDER_DISTANCE_SQUARED) { + if (o_player.getLocation().distanceSquared(loc) < Sclat.PARTICLE_RENDER_DISTANCE_SQUARED) { o_player.spawnParticle(org.bukkit.Particle.BLOCK_DUST, loc, 0, loc.getX() - center.getX(), loc.getY() - center.getY(), loc.getZ() - center.getZ(), 1, bd); } @@ -280,7 +280,7 @@ public static void createInkExplosionEffect(Location center, double radius, int } public static void repelBarrier(Location center, double radius, Player shooter) { - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { PlayerData playerData = DataMgr.getPlayerData(player); if (player.getWorld() != center.getWorld()) diff --git a/src/main/java/be4rjp/sclat/api/async/AsyncTask.java b/src/main/java/be4rjp/sclat/api/async/AsyncTask.java index 1e3a243..168d851 100644 --- a/src/main/java/be4rjp/sclat/api/async/AsyncTask.java +++ b/src/main/java/be4rjp/sclat/api/async/AsyncTask.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api.async; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import org.bukkit.scheduler.BukkitRunnable; public abstract class AsyncTask implements Runnable { @@ -26,7 +26,7 @@ public void runTaskLater(long delay) { public void run() { AsyncThreadManager.getRandomTickThread().runTask(runnable); } - }.runTaskLater(Main.getPlugin(), delay); + }.runTaskLater(Sclat.getPlugin(), delay); } public void runTaskTimer(long delay, long period) { @@ -41,7 +41,7 @@ public void run() { } thread.runTask(runnable); } - }.runTaskTimer(Main.getPlugin(), delay, period); + }.runTaskTimer(Sclat.getPlugin(), delay, period); } } diff --git a/src/main/java/be4rjp/sclat/api/async/AsyncThreadManager.java b/src/main/java/be4rjp/sclat/api/async/AsyncThreadManager.java index de222c6..ef71d34 100644 --- a/src/main/java/be4rjp/sclat/api/async/AsyncThreadManager.java +++ b/src/main/java/be4rjp/sclat/api/async/AsyncThreadManager.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api.async; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -42,7 +42,7 @@ public static void toOffline(Player player) { } public static void sync(Runnable runnable) { - Bukkit.getScheduler().runTask(Main.getPlugin(), runnable); + Bukkit.getScheduler().runTask(Sclat.getPlugin(), runnable); } } diff --git a/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java b/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java index 4b55fa5..bad6e3f 100644 --- a/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java +++ b/src/main/java/be4rjp/sclat/api/holo/RankingHolograms.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api.holo; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import be4rjp.sclat.data.RankingType; import be4rjp.sclat.manager.PlayerStatusMgr; import be4rjp.sclat.manager.RankMgr; @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import static be4rjp.sclat.Main.conf; +import static be4rjp.sclat.Sclat.conf; public class RankingHolograms { private final EntityArmorStand title; @@ -329,6 +329,6 @@ public void run() { } } }; - async.runTaskAsynchronously(Main.getPlugin()); + async.runTaskAsynchronously(Sclat.getPlugin()); } } diff --git a/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java b/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java index 35ec1c4..4bfbdd6 100644 --- a/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java +++ b/src/main/java/be4rjp/sclat/api/player/PlayerReturn.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api.player; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import org.bukkit.scheduler.BukkitRunnable; public class PlayerReturn { @@ -18,7 +18,7 @@ public void run() { flag = false; } }; - this.task.runTaskLater(Main.getPlugin(), 400); + this.task.runTaskLater(Sclat.getPlugin(), 400); } public boolean getFlag() { diff --git a/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java b/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java index 2a1f660..ccb726d 100644 --- a/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java +++ b/src/main/java/be4rjp/sclat/api/wiremesh/Wiremesh.java @@ -1,6 +1,6 @@ package be4rjp.sclat.api.wiremesh; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import net.minecraft.server.v1_14_R1.DataWatcher; import net.minecraft.server.v1_14_R1.EntityArmorStand; import net.minecraft.server.v1_14_R1.EntityFallingBlock; @@ -65,7 +65,7 @@ public Wiremesh(Block b, Material origType, BlockData bData) { as.setInvisible(true); fb.startRiding(as); - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (block.getWorld() != player.getWorld()) continue; @@ -78,7 +78,7 @@ public void run() { try { playerList.removeIf(player -> !player.isOnline()); - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (block.getWorld() != player.getWorld()) continue; @@ -135,7 +135,7 @@ public void run() { } public void startTask() { - this.runTaskTimerAsynchronously(Main.getPlugin(), 0, 5); + this.runTaskTimerAsynchronously(Sclat.getPlugin(), 0, 5); } public void stopTask() { diff --git a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java index be432f0..4de9b89 100644 --- a/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java +++ b/src/main/java/be4rjp/sclat/commands/sclatCommandExecutor.java @@ -1,6 +1,6 @@ package be4rjp.sclat.commands; -import be4rjp.sclat.Main; +import be4rjp.sclat.Sclat; import be4rjp.sclat.api.MessageType; import be4rjp.sclat.api.SclatUtil; import be4rjp.sclat.api.ServerType; @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; -import static be4rjp.sclat.Main.conf; +import static be4rjp.sclat.Sclat.conf; //sclat Command // Todo: use cloud command framework @@ -64,7 +64,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N String num = args[1]; if (SclatUtil.isNumber(num)) { - Main.conf.getConfig().set("BlockUpdateRate", Integer.valueOf(num)); + Sclat.conf.getConfig().set("BlockUpdateRate", Integer.valueOf(num)); sender.sendMessage("setConfig [BlockUpdateRate] : " + num); return true; } else { @@ -86,9 +86,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N } String playerName = args[1]; - for (Player player : Main.getPlugin().getServer().getOnlinePlayers()) { + for (Player player : Sclat.getPlugin().getServer().getOnlinePlayers()) { if (playerName.equals(player.getName())) { - Main.flyList.add(playerName); + Sclat.flyList.add(playerName); return true; } } @@ -243,7 +243,7 @@ public void run() { } } }; - task.runTaskLater(Main.getPlugin(), 40); + task.runTaskLater(Sclat.getPlugin(), 40); } } return true; @@ -256,7 +256,7 @@ public void run() { // ------------------/sclat ss --------------------- if (args[0].equalsIgnoreCase("ss")) { - if (args.length < 4 || Main.type != ServerType.LOBBY) + if (args.length < 4 || Sclat.type != ServerType.LOBBY) return false; if (type == CommanderType.MEMBER) { @@ -281,7 +281,7 @@ public void run() { // ---------------------/sclat tutorial