Remove geyser and floodgate

This commit is contained in:
2024-10-12 22:12:03 -07:00
parent 372c53b526
commit 8eddf078c1
4 changed files with 9 additions and 59 deletions

18
pom.xml
View File

@@ -100,24 +100,6 @@
<version>7.1.0-SNAPSHOT</version> <version>7.1.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.17.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.geysermc.geyser</groupId>
<artifactId>api</artifactId>
<version>2.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.geysermc.floodgate</groupId>
<artifactId>api</artifactId>
<version>2.2.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>

View File

@@ -10,8 +10,6 @@ import org.bukkit.event.Listener;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin; 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.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
@@ -29,14 +27,9 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor
public boolean chatLocked = false; public boolean chatLocked = false;
private Essentials essentials; private Essentials essentials;
public boolean fixRanTooOften = false; public boolean fixRanTooOften = false;
public GeyserApi geyserApi;
public FloodgateApi floodgateApi;
@Override @Override
public void onEnable() { public void onEnable() {
geyserApi = GeyserApi.api();
floodgateApi = FloodgateApi.getInstance();
Plugin essentialsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Essentials"); Plugin essentialsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Essentials");
getLogger().info("Essentials detected. Attempting to hook..."); getLogger().info("Essentials detected. Attempting to hook...");
if (essentialsPlugin instanceof Essentials) { if (essentialsPlugin instanceof Essentials) {
@@ -68,7 +61,7 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor
} }
private void registerEvents() { 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 BlockBreakListener(this), this);
getServer().getPluginManager().registerEvents(new CraftItemListener(), this); getServer().getPluginManager().registerEvents(new CraftItemListener(), this);
getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this); getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this);

View File

@@ -1,6 +1,5 @@
package io.github.lncvrt.lncvrtbox.events; package io.github.lncvrt.lncvrtbox.events;
import io.github.lncvrt.lncvrtbox.LncvrtBox;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.format.NamedTextColor; 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.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.geysermc.cumulus.form.CustomForm;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
public class BlockPlaceListener implements Listener { public class BlockPlaceListener implements Listener {
private final LncvrtBox plugin;
public BlockPlaceListener(LncvrtBox plugin) {
this.plugin = plugin;
}
@EventHandler @EventHandler
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (event.getBlockPlaced().getType() == Material.POLISHED_BLACKSTONE_BUTTON) { if (event.getBlockPlaced().getType() == Material.POLISHED_BLACKSTONE_BUTTON) {
@@ -34,19 +25,6 @@ public class BlockPlaceListener implements Listener {
event.getBlockPlaced().getType() == Material.BLAST_FURNACE) { event.getBlockPlaced().getType() == Material.BLAST_FURNACE) {
Player player = event.getPlayer(); 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) Component message = Component.text("[TIP] ", NamedTextColor.GREEN)
.decorate(TextDecoration.BOLD) .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("If you are trying to smelt iron, gold, etc you can use the Smelter Shop. Click ", NamedTextColor.GREEN))
@@ -59,4 +37,3 @@ public class BlockPlaceListener implements Listener {
} }
} }
} }
}

View File

@@ -7,8 +7,6 @@ depend:
- Essentials - Essentials
- WorldEdit - WorldEdit
- WorldGuard - WorldGuard
- Geyser-Spigot
- floodgate
commands: commands:
autocompress: autocompress:
description: Auto compressor description: Auto compressor