From 1e8976c9fcf3166538b6ca0ad58113f0e965273e Mon Sep 17 00:00:00 2001 From: LT_Name <572413378@qq.com> Date: Sat, 7 Oct 2023 20:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E9=80=82=E9=85=8DNSGB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/FakeNsGameBase.jar | Bin 0 -> 6681 bytes pom.xml | 11 ++++++-- .../lanink/murdermystery/MurderMystery.java | 13 +++++++++- .../room/classic/ClassicModeRoom.java | 21 +++++++++++++++ .../utils/update/ConfigUpdateUtils.java | 24 ++++++++++++++++++ 5 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 lib/FakeNsGameBase.jar diff --git a/lib/FakeNsGameBase.jar b/lib/FakeNsGameBase.jar new file mode 100644 index 0000000000000000000000000000000000000000..d8272b63f744d0f1346e33e4dd8feee5a81ce689 GIT binary patch literal 6681 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.lanink MurderMystery - 1.4.2-PM1E + 1.4.3-PM1E-SNAPSHOT @@ -169,6 +169,14 @@ ${project.basedir}/lib/SimpleScoreboards-2.6.1.jar + + FakeNsGameBase + FakeNsGameBase + 1.0.0 + system + ${project.basedir}/lib/FakeNsGameBase.jar + + org.jetbrains annotations @@ -182,7 +190,6 @@ 1.18.26 provided - \ No newline at end of file diff --git a/src/main/java/cn/lanink/murdermystery/MurderMystery.java b/src/main/java/cn/lanink/murdermystery/MurderMystery.java index c45b828..82b1849 100644 --- a/src/main/java/cn/lanink/murdermystery/MurderMystery.java +++ b/src/main/java/cn/lanink/murdermystery/MurderMystery.java @@ -96,6 +96,8 @@ public class MurderMystery extends PluginBase { private IScoreboard scoreboard; private boolean hasTips = false; + @Getter + private boolean hasNsGB = false; private String serverWorldPath; private String worldBackupPath; @@ -294,8 +296,17 @@ public void onEnable() { } this.hasTips = true; } catch (Exception ignored) { - //注册RsNPC变量 + + } + //检查FAP基础插件 + try { + Class.forName("cn.nsgamebase.NsGameBaseMain"); + ConfigUpdateUtils.checkFapNsGB(this); + this.hasNsGB = true; + } catch (Exception ignored) { + } + //注册RsNPC变量 try { Class.forName("com.smallaswater.npc.variable.BaseVariableV2"); com.smallaswater.npc.variable.VariableManage.addVariableV2("MurderMysteryVariable", RsNpcVariable.class); diff --git a/src/main/java/cn/lanink/murdermystery/room/classic/ClassicModeRoom.java b/src/main/java/cn/lanink/murdermystery/room/classic/ClassicModeRoom.java index 3a8c33b..e7d7ff2 100644 --- a/src/main/java/cn/lanink/murdermystery/room/classic/ClassicModeRoom.java +++ b/src/main/java/cn/lanink/murdermystery/room/classic/ClassicModeRoom.java @@ -4,6 +4,8 @@ import cn.lanink.murdermystery.room.base.BaseRoom; import cn.lanink.murdermystery.room.base.PlayerIdentity; import cn.lanink.murdermystery.utils.Tools; +import cn.nsgamebase.api.GbGameApi; +import cn.nsgamebase.entity.pojo.AbstractDataGamePlayerPojo; import cn.nukkit.Player; import cn.nukkit.Server; import cn.nukkit.level.Level; @@ -51,7 +53,9 @@ protected void victoryReward(int victory) { Player killerVictory = null; Set commonPeopleVictory = new HashSet<>(); Set defeatPlayers = new HashSet<>(); + Set players = new HashSet<>(); for (Map.Entry entry : this.getPlayers().entrySet()) { + players.add(entry.getKey()); if (victory == 3) { if (entry.getValue() == PlayerIdentity.KILLER) { killerVictory = entry.getKey(); @@ -88,6 +92,23 @@ public void onRun(int i) { for (Player player : defeatPlayers) { Tools.executeCommands(player, murderMystery.getConfig().getStringList("defeatCmd")); } + + if (murderMystery.isHasNsGB()) { + for (Player player : players) { + AbstractDataGamePlayerPojo pojo = new AbstractDataGamePlayerPojo(); + pojo.add("played"); + Config config = murderMystery.getConfig(); + int money = config.getInt("fapIntegral.money"); + int point = config.getInt("fapIntegral.point"); + int exp = config.getInt("fapIntegral.exp"); + int maxMultiplier = config.getInt("fapIntegral.maxMultiplier"); + if (maxMultiplier > 1) { //nsgb没有检查，这里检查下防止报错 + GbGameApi.saveAndReward(player, "MurderMystery", pojo, money, point, exp, maxMultiplier); + } else { + GbGameApi.saveAndReward(player.getName(), "MurderMystery", pojo, money, point, exp); + } + } + } } }, 1); } diff --git a/src/main/java/cn/lanink/murdermystery/utils/update/ConfigUpdateUtils.java b/src/main/java/cn/lanink/murdermystery/utils/update/ConfigUpdateUtils.java index a15292f..f648498 100644 --- a/src/main/java/cn/lanink/murdermystery/utils/update/ConfigUpdateUtils.java +++ b/src/main/java/cn/lanink/murdermystery/utils/update/ConfigUpdateUtils.java @@ -7,6 +7,8 @@ import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; +import java.util.LinkedHashMap; + /** * @author LT_Name */ @@ -37,4 +39,26 @@ private static void update1_X_X_To_1_4_2() { config.save(); } + // 需要在NsGB加载后检查，放到onEnable里 + public static void checkFapNsGB(MurderMystery murderMystery) { + try { + Class.forName("cn.nsgamebase.NsGameBaseMain"); + + Config config = murderMystery.getConfig(); + + LinkedHashMap fapIntegral = new LinkedHashMap<>(); + fapIntegral.put("money", 10); + fapIntegral.put("point", 0); + fapIntegral.put("exp", 10); + fapIntegral.put("maxMultiplier", 1); + + if (!config.exists("fapIntegral")) { + config.set("fapIntegral", fapIntegral); + config.save(); + } + } catch (Exception ignored) { + + } + } + }