diff --git a/pom.xml b/pom.xml index 7e72806..31ec9a3 100644 --- a/pom.xml +++ b/pom.xml @@ -100,24 +100,6 @@ 7.1.0-SNAPSHOT provided - - net.kyori - adventure-api - 4.17.0 - provided - - - org.geysermc.geyser - api - 2.2.0-SNAPSHOT - provided - - - org.geysermc.floodgate - api - 2.2.2-SNAPSHOT - provided - 21 diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java index 2cae70c..cca4af3 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java @@ -10,8 +10,6 @@ import org.bukkit.event.Listener; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; -import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.geyser.api.GeyserApi; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -29,14 +27,9 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor public boolean chatLocked = false; private Essentials essentials; public boolean fixRanTooOften = false; - public GeyserApi geyserApi; - public FloodgateApi floodgateApi; @Override public void onEnable() { - geyserApi = GeyserApi.api(); - floodgateApi = FloodgateApi.getInstance(); - Plugin essentialsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Essentials"); getLogger().info("Essentials detected. Attempting to hook..."); if (essentialsPlugin instanceof Essentials) { @@ -68,7 +61,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor } private void registerEvents() { - getServer().getPluginManager().registerEvents(new BlockPlaceListener(this), this); + getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this); getServer().getPluginManager().registerEvents(new BlockBreakListener(this), this); getServer().getPluginManager().registerEvents(new CraftItemListener(), this); getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this); diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java index cd87881..0d4c0c1 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/BlockPlaceListener.java @@ -1,6 +1,5 @@ package io.github.lncvrt.lncvrtbox.events; -import io.github.lncvrt.lncvrtbox.LncvrtBox; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor; @@ -10,16 +9,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPlaceEvent; -import org.geysermc.cumulus.form.CustomForm; -import org.geysermc.floodgate.api.player.FloodgatePlayer; public class BlockPlaceListener implements Listener { - private final LncvrtBox plugin; - - public BlockPlaceListener(LncvrtBox plugin) { - this.plugin = plugin; - } - @EventHandler public void onBlockPlace(BlockPlaceEvent event) { if (event.getBlockPlaced().getType() == Material.POLISHED_BLACKSTONE_BUTTON) { @@ -34,29 +25,15 @@ public class BlockPlaceListener implements Listener { event.getBlockPlaced().getType() == Material.BLAST_FURNACE) { Player player = event.getPlayer(); - if (plugin.geyserApi.isBedrockPlayer(player.getUniqueId())) { - FloodgatePlayer floodgatePlayer = plugin.floodgateApi.getPlayer(player.getUniqueId()); - floodgatePlayer.sendForm(CustomForm.builder() - .title("Smelter Shop") - .label("If you are trying to smelt iron, gold, etc, you can use the Smelter Shop.") - .toggle("Warp to smelter?") - .validResultHandler(response -> { - if (Boolean.TRUE.equals(response.next())) { - player.performCommand("warp smelter"); - } - }) - .build()); - } else { - Component message = Component.text("[TIP] ", NamedTextColor.GREEN) - .decorate(TextDecoration.BOLD) - .append(Component.text("If you are trying to smelt iron, gold, etc you can use the Smelter Shop. Click ", NamedTextColor.GREEN)) - .append(Component.text("[HERE]", NamedTextColor.GREEN) - .decorate(TextDecoration.UNDERLINED) - .clickEvent(ClickEvent.runCommand("/warp smelter"))) - .append(Component.text(" to teleport to the smelter shop!", NamedTextColor.GREEN)); + Component message = Component.text("[TIP] ", NamedTextColor.GREEN) + .decorate(TextDecoration.BOLD) + .append(Component.text("If you are trying to smelt iron, gold, etc you can use the Smelter Shop. Click ", NamedTextColor.GREEN)) + .append(Component.text("[HERE]", NamedTextColor.GREEN) + .decorate(TextDecoration.UNDERLINED) + .clickEvent(ClickEvent.runCommand("/warp smelter"))) + .append(Component.text(" to teleport to the smelter shop!", NamedTextColor.GREEN)); - player.sendMessage(message); - } + player.sendMessage(message); } } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7cd96db..5552cc5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -7,8 +7,6 @@ depend: - Essentials - WorldEdit - WorldGuard - - Geyser-Spigot - - floodgate commands: autocompress: description: Auto compressor