diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index 2e9797de..9ec6914e 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -65,7 +65,7 @@ public abstract class BaseSide { * * @return 玩家列表 */ - public abstract Collection getPlayers(); + public abstract Collection getPlayers(); /** * 获取玩家名字 diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index 9b036843..3c054d84 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -121,7 +121,7 @@ public class DataSql { init(); } Statement stat = connection.createStatement(); - ResultSet set = stat.executeQuery("SELECT allmusic.id FROM allmusic WHERE allmusic.name ='" + name + "'"); + ResultSet set = stat.executeQuery("SELECT id FROM allmusic WHERE name ='" + name + "'"); if (set.next()) { have = true; } @@ -245,7 +245,7 @@ public class DataSql { */ public static SaveObj readHud(String name) { try { - AllMusic.log.info("正在读取玩家数据"); + AllMusic.log.info("正在读取玩家数据:" + name); if (connection.isReadOnly() || connection.isClosed()) { init(); } @@ -253,7 +253,7 @@ public class DataSql { ResultSet set = stat.executeQuery("SELECT info_x,info_y,info_enable,lyric_x," + "lyric_y,lyric_enable,list_x,list_y,list_enable,pic_x,pic_y,pic_enable,pic_size," + "pic_rotate,pic_rotate_speed,info_color,info_dir,info_shadow,lyric_color," + - "lyric_dir,lyric_shadow,list_color,list_dir,list_shadow,pic_dir FROM allmusic WHERE name=" + name); + "lyric_dir,lyric_shadow,list_color,list_dir,list_shadow,pic_dir FROM allmusic WHERE name='" + name + "'"); HudDirType[] vas = HudDirType.values(); SaveObj obj = null; if (set.next()) { diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index cdee1742..aab7d75c 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -58,8 +58,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 230ec1e5..257677e1 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -69,8 +69,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 051ef529..a61923fa 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -66,8 +66,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index f43c899d..2fc55af3 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -66,8 +66,8 @@ public class SideFabric extends BaseSide { @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 91cb8eb4..2110e22c 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -65,8 +65,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 91cb8eb4..2110e22c 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -65,8 +65,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 3a8b1abc..f508c61b 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -63,8 +63,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 545f1aa2..f8438791 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -64,8 +64,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 3a8b1abc..f508c61b 100644 --- a/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_21_4/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -63,8 +63,8 @@ public class SideFabric extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicFabric.server.getPlayerManager().getPlayerList()); + public Collection getPlayers() { + return AllMusicFabric.server.getPlayerManager().getPlayerList(); } @Override diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index 39b556a9..3daaa30d 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -21,12 +21,11 @@ import org.bukkit.permissions.ServerOperator; import java.io.File; import java.util.Collection; -import java.util.Collections; public class SideFolia extends BaseSide { @Override - public Collection getPlayers() { - return Collections.singleton(Bukkit.getOnlinePlayers()); + public Collection getPlayers() { + return Bukkit.getOnlinePlayers(); } @Override diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 46b5590f..936e6db3 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -73,8 +73,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3fbbdaba..15e20594 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -72,8 +72,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 52267f92..eadf80de 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -69,8 +69,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index bda779c1..0ee4fa73 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -68,8 +68,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index bda779c1..0ee4fa73 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -68,8 +68,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 1bcd2008..d485052d 100644 --- a/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_7_10/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -73,7 +73,7 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { + public Collection getPlayers() { return AllMusicForge.server.getConfigurationManager().playerEntityList; } diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index fede40ff..cbf2cdee 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -63,8 +63,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/neoforge_1_20_5/build.gradle b/neoforge_1_20_5/build.gradle index d2cf84ac..e55b08e5 100644 --- a/neoforge_1_20_5/build.gradle +++ b/neoforge_1_20_5/build.gradle @@ -1,9 +1,16 @@ plugins { id 'java-library' - id 'eclipse' - id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.109' + id 'net.neoforged.gradle.userdev' version '7.0.184' +} + +tasks.named('wrapper', Wrapper).configure { + // Define wrapper values here so as to not have to always do so when updating gradlew.properties. + // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with + // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. + // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) + distributionType = Wrapper.DistributionType.BIN } def getVersionFromFile() { diff --git a/neoforge_1_20_5/gradle.properties b/neoforge_1_20_5/gradle.properties index d754aa6c..5638e15f 100644 --- a/neoforge_1_20_5/gradle.properties +++ b/neoforge_1_20_5/gradle.properties @@ -20,7 +20,7 @@ neo_version=20.5.21-beta # The Neo version range can use any version of Neo as bounds neo_version_range=[20.5,) # The loader version range can only use the major version of FML as bounds -loader_version_range=[2,) +loader_version_range=[1,) ## Mod Properties diff --git a/neoforge_1_20_5/gradle/wrapper/gradle-wrapper.properties b/neoforge_1_20_5/gradle/wrapper/gradle-wrapper.properties index 81c736bb..adda1f21 100644 --- a/neoforge_1_20_5/gradle/wrapper/gradle-wrapper.properties +++ b/neoforge_1_20_5/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3c516b86..6cec1748 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -63,8 +63,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3c516b86..87fd0f63 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -18,7 +18,6 @@ import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; import java.util.Collection; -import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { @@ -63,8 +62,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3c516b86..87fd0f63 100644 --- a/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -18,7 +18,6 @@ import net.neoforged.neoforge.network.PacketDistributor; import java.io.File; import java.util.Collection; -import java.util.Collections; import java.util.Locale; public class SideForge extends BaseSide { @@ -63,8 +62,8 @@ public class SideForge extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicForge.server.getPlayerList().getPlayers()); + public Collection getPlayers() { + return AllMusicForge.server.getPlayerList().getPlayers(); } @Override diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index f791c1a9..172225c2 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -110,8 +110,8 @@ public class SideBukkit extends BaseSide { } @Override - public Collection getPlayers() { - return Collections.singleton(Bukkit.getOnlinePlayers()); + public Collection getPlayers() { + return Bukkit.getOnlinePlayers(); } @Override diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java index e93a0f97..bd8ad444 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java @@ -211,8 +211,8 @@ public class SideBC extends BaseSide implements IEconomy { } @Override - public Collection getPlayers() { - return Collections.singleton(ProxyServer.getInstance().getPlayers()); + public Collection getPlayers() { + return ProxyServer.getInstance().getPlayers(); } @Override diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 304197ec..85580bbe 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -177,8 +177,8 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public Collection getPlayers() { - return Collections.singleton(AllMusicVelocity.plugin.server.getAllPlayers()); + public Collection getPlayers() { + return AllMusicVelocity.plugin.server.getAllPlayers(); } @Override