diff --git a/gradle.properties b/gradle.properties index 45caab1..eabadde 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx2G spigot_api_version=1.20.2-R0.1-SNAPSHOT bungeecord_api_version=1.20-R0.1-SNAPSHOT hamster_core_version=1.1.0 -hamster_ball_version=1.3.0 +hamster_ball_version=1.4.1 placeholder_api_version=2.11.2 \ No newline at end of file diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index f1ba033..ccc5acd 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -1,4 +1,4 @@ -version = '1.4.1' +version = '1.4.2' setArchivesBaseName("HamsterBall-Bridge") dependencies { diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java index 344ad18..fafb4bd 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java @@ -35,6 +35,6 @@ public class BallBridgePlugin extends JavaPlugin { getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); } }); - BallAPI.getInstance().subscribe("HamsterService"); + BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java index 986746f..d979bb9 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java @@ -27,7 +27,7 @@ public abstract class ServiceMessageAPI { * @param tag 标签 */ public static void subscribeTag(String tag) { - BallAPI.getInstance().subscribe(tag); + BallAPI.getInstance().getSubConnection().sync().subscribe(tag); } /** @@ -36,7 +36,7 @@ public abstract class ServiceMessageAPI { * @param tag 标签 */ public static void unsubscribeTag(String tag) { - BallAPI.getInstance().unsubscribe(tag); + BallAPI.getInstance().getSubConnection().sync().unsubscribe(tag); } /** @@ -46,7 +46,7 @@ public abstract class ServiceMessageAPI { * @param action 执行动作 */ public static void sendServiceMessage(String tag, String action) { - BallAPI.getInstance().sendBallMessage(tag, action); + BallAPI.getInstance().sendBallMessage(tag, action, false); } /** @@ -57,7 +57,7 @@ public abstract class ServiceMessageAPI { * @param content 附加参数 */ public static void sendServiceMessage(String tag, String action, String content) { - BallAPI.getInstance().sendBallMessage(tag, action, content); + BallAPI.getInstance().sendBallMessage(tag, action, content, false); } /** @@ -70,7 +70,7 @@ public abstract class ServiceMessageAPI { * @see String#format(String, Object...) */ public static void sendServiceMessage(String tag, String action, String content, Object... args) { - BallAPI.getInstance().sendBallMessage(tag, action, new JsonPrimitive(String.format(content, args))); + BallAPI.getInstance().sendBallMessage(tag, action, String.format(content, args), false); } /** @@ -81,7 +81,7 @@ public abstract class ServiceMessageAPI { * @param content 附加参数 */ public static void sendServiceMessage(String tag, String action, JsonElement content) { - BallAPI.getInstance().sendBallMessage(tag, new BallMessage(action, content), false); + BallAPI.getInstance().sendBallMessage(tag, new BallMessage(action, content), false, false); } /** @@ -98,7 +98,7 @@ public abstract class ServiceMessageAPI { info.getAction(), info.getContent() ); - BallAPI.getInstance().sendBallMessage(info.getTag(), message, block); + BallAPI.getInstance().sendBallMessage(info.getTag(), message, false, block); } /** diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java index e4d6292..3be85d1 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java @@ -22,6 +22,6 @@ public class BallBridgePlugin extends Plugin { BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); - BallAPI.getInstance().subscribe("HamsterService"); + BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); } }