From f162fdb7565abdd654f1b115c742091d70b55e18 Mon Sep 17 00:00:00 2001 From: Me4502 Date: Thu, 2 Nov 2017 15:14:07 +1000 Subject: [PATCH] Pipe signs through NMSAdapter --- .../craftbook/bukkit/CraftBookPlugin.java | 9 +++++++++ .../craftbook/bukkit/util/BukkitUtil.java | 3 +-- .../craftbook/util/compat/nms/NMSAdapter.java | 18 +++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java b/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java index 1f7a48994a..2721b438e7 100644 --- a/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java +++ b/src/main/java/com/sk89q/craftbook/bukkit/CraftBookPlugin.java @@ -369,6 +369,15 @@ public NMSAdapter getNmsAdapter() { return this.nmsAdapter; } + /** + * Sets the NMS Adapter. + * + * @param nmsAdapter The NMS Adapter + */ + public void setNmsAdapter(NMSAdapter nmsAdapter) { + this.nmsAdapter = nmsAdapter; + } + /** * Called on plugin enable. */ diff --git a/src/main/java/com/sk89q/craftbook/bukkit/util/BukkitUtil.java b/src/main/java/com/sk89q/craftbook/bukkit/util/BukkitUtil.java index 08bbc589cf..23d066eb19 100644 --- a/src/main/java/com/sk89q/craftbook/bukkit/util/BukkitUtil.java +++ b/src/main/java/com/sk89q/craftbook/bukkit/util/BukkitUtil.java @@ -52,8 +52,7 @@ public static ChangedSign toChangedSign(Block block, String[] lines) { } public static ChangedSign toChangedSign(Block block, String[] lines, LocalPlayer player) { - if (!SignUtil.isSign(block)) return null; - return new ChangedSign(block, lines, player); + return CraftBookPlugin.inst().getNmsAdapter().getChangedSign(block, lines, player); } public static Block toBlock(ChangedSign sign) { diff --git a/src/main/java/com/sk89q/craftbook/util/compat/nms/NMSAdapter.java b/src/main/java/com/sk89q/craftbook/util/compat/nms/NMSAdapter.java index 64e5d22c43..843ba3e6ac 100644 --- a/src/main/java/com/sk89q/craftbook/util/compat/nms/NMSAdapter.java +++ b/src/main/java/com/sk89q/craftbook/util/compat/nms/NMSAdapter.java @@ -1,5 +1,10 @@ package com.sk89q.craftbook.util.compat.nms; +import com.sk89q.craftbook.ChangedSign; +import com.sk89q.craftbook.LocalPlayer; +import com.sk89q.craftbook.util.SignUtil; +import org.bukkit.block.Block; + public class NMSAdapter { /** @@ -11,5 +16,16 @@ public boolean hasNMSExtension() { return false; } - + /** + * Get a CraftBook sign-wrapper instance + * + * @param block The block + * @param lines The lines + * @param player The player (Optional) + * @return The ChangedSign + */ + public ChangedSign getChangedSign(Block block, String[] lines, LocalPlayer player) { + if (!SignUtil.isSign(block)) return null; + return new ChangedSign(block, lines, player); + } }