From d256f7da4cb1ae2d6884a995c8fc016dc210d1d3 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Fri, 4 Apr 2025 17:48:43 -0700 Subject: [PATCH] Remove unused shading, remove rules loading, and temp fix for blackstone buttons / coal fragments --- pom.xml | 12 ------- .../xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java | 32 +++---------------- .../xyz/lncvrt/galaxyboxpvp/commands/Sky.java | 1 - .../events/BlockPlaceListener.java | 5 +-- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index b1b4eb6..7ff1bfe 100644 --- a/pom.xml +++ b/pom.xml @@ -21,18 +21,6 @@ ${java.version} - - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java index 91965cd..552b316 100644 --- a/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/GalaxyBoxPvP.java @@ -6,7 +6,6 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; -import org.bukkit.event.Listener; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; @@ -18,16 +17,18 @@ import xyz.lncvrt.galaxyboxpvp.commands.Autocompress; import xyz.lncvrt.galaxyboxpvp.commands.Sky; import xyz.lncvrt.galaxyboxpvp.events.*; -import java.io.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.UUID; import java.util.logging.Level; -public final class GalaxyBoxPvP extends JavaPlugin implements Listener, TabExecutor { +public final class GalaxyBoxPvP extends JavaPlugin implements TabExecutor { public final Map autoCompressStatus = new HashMap<>(); - public String serverRules; private Essentials essentials; private final PlaceholderAPIExpansion placeholderAPIExpansion = new PlaceholderAPIExpansion(); @@ -55,7 +56,6 @@ public final class GalaxyBoxPvP extends JavaPlugin implements Listener, TabExecu registerCommands(); loadAutoCompressStatus(); - loadServerRules(); } @Override @@ -77,7 +77,6 @@ public final class GalaxyBoxPvP extends JavaPlugin implements Listener, TabExecu getServer().getPluginManager().registerEvents(new PrepareItemEnchantListener(), this); getServer().getPluginManager().registerEvents(new ProjectileHitListener(), this); getServer().getPluginManager().registerEvents(new SignChangeListener(this), this); - getServer().getPluginManager().registerEvents(this, this); } private void registerCommands() { @@ -158,27 +157,6 @@ public final class GalaxyBoxPvP extends JavaPlugin implements Listener, TabExecu } } - public void loadServerRules() { - File rulesFile = new File(getDataFolder(), "rules.txt"); - - if (!rulesFile.exists()) { - getLogger().log(Level.WARNING, "rules.txt file not found in plugin folder."); - return; - } - - StringBuilder rulesContent = new StringBuilder(); - try (BufferedReader reader = new BufferedReader(new FileReader(rulesFile))) { - String line; - while ((line = reader.readLine()) != null) { - rulesContent.append(line).append("\n"); - } - } catch (IOException e) { - getLogger().log(Level.SEVERE, "Error reading rules.txt file.", e); - } - - serverRules = rulesContent.toString(); - } - @SuppressWarnings("unchecked") private void saveAutoCompressStatus() { File file = new File(getDataFolder(), "autocompress.json"); diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java index 7a64a11..693c9cb 100644 --- a/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/commands/Sky.java @@ -7,7 +7,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class Sky implements CommandExecutor { - @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { if (sender instanceof Player player) { diff --git a/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java index 2c9d9a8..b21cf24 100644 --- a/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java +++ b/src/main/java/xyz/lncvrt/galaxyboxpvp/events/BlockPlaceListener.java @@ -15,10 +15,7 @@ public class BlockPlaceListener implements Listener { public void onBlockPlace(BlockPlaceEvent event) { if (event.getBlockPlaced().getType() == Material.POLISHED_BLACKSTONE_BUTTON) { if (event.getItemInHand().hasItemMeta() && event.getItemInHand().getItemMeta().hasDisplayName()) { - String displayName = event.getItemInHand().getItemMeta().getDisplayName(); - if (displayName.equalsIgnoreCase("Coal Fragment")) { - event.setCancelled(true); - } + event.setCancelled(true); //temp fix } } else if (event.getBlockPlaced().getType() == Material.FURNACE || event.getBlockPlaced().getType() == Material.FURNACE_MINECART ||