Didn't end up needing the listener, adjust config, add bed teleport option

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>simplexity</groupId>
   <artifactId>SimpleHomes</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.0</version>
   <packaging>jar</packaging>
 
   <name>SimpleHomes</name>

src/main/java/simplexity/simplehomes/SimpleHomes.java

@@ -2,11 +2,14 @@
 
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.plugin.java.JavaPlugin;
-import simplexity.simplehomes.commands.*;
+import simplexity.simplehomes.commands.DeleteHome;
 import simplexity.simplehomes.commands.Home;
+import simplexity.simplehomes.commands.HomeList;
+import simplexity.simplehomes.commands.HomesReload;
+import simplexity.simplehomes.commands.ImportHomes;
+import simplexity.simplehomes.commands.SetHome;
 import simplexity.simplehomes.configs.ConfigHandler;
 import simplexity.simplehomes.configs.LocaleHandler;
-import simplexity.simplehomes.listeners.BedEnterListener;
 import simplexity.simplehomes.listeners.PlayerMoveListener;
 import simplexity.simplehomes.saving.SQLHandler;
 
@@ -27,7 +30,6 @@ public void onEnable() {
         LocaleHandler.getInstance().loadLocale();
         SQLHandler.getInstance().init();
         this.getServer().getPluginManager().registerEvents(new PlayerMoveListener(), this);
-        this.getServer().getPluginManager().registerEvents(new BedEnterListener(), this);
         registerCommands();
     }
 

src/main/java/simplexity/simplehomes/commands/Home.java

@@ -50,6 +50,18 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             }
         }
         String homeName = args[0].toLowerCase();
+        boolean bypass = false;
+        if (args.length > 1) {
+            if (args[1].equalsIgnoreCase("-o")) {
+                bypass = true;
+            }
+        }
+        if (ConfigHandler.getInstance().areBedHomesEnabled() && homeName.equalsIgnoreCase("bed") && player.hasPermission("homes.bed")) {
+            Location location = player.getPotentialBedLocation();
+            if (!safeTeleport(location, bypass, player)) return false;
+            delayTeleport(location, player, "bed");
+            return true;
+        }
         simplexity.simplehomes.Home home = null;
         if (Util.homeExists(playerHomes, homeName)) {
             home = SQLHandler.getInstance().getHome(player.getUniqueId(), homeName);
@@ -59,12 +71,6 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return false;
         }
         Location homeLocation = home.location();
-        boolean bypass = false;
-        if (args.length > 1) {
-            if (args[1].equalsIgnoreCase("-o")) {
-                bypass = true;
-            }
-        }
         if (!safeTeleport(homeLocation, bypass, player)) return false;
         delayTeleport(homeLocation, player, homeName);
         return false;
@@ -142,6 +148,9 @@ private boolean bypassSafetyChecks(Player player, boolean bypass) {
             for (simplexity.simplehomes.Home home : SQLHandler.getInstance().getHomes(player.getUniqueId())) {
                 homeList.add(home.name());
             }
+            if (ConfigHandler.getInstance().areBedHomesEnabled() && player.getPotentialBedLocation() != null) {
+                homeList.add("bed");
+            }
             return homeList;
         }
         return null;

src/main/java/simplexity/simplehomes/configs/ConfigHandler.java

@@ -2,7 +2,6 @@
 
 import org.bukkit.Material;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.event.player.PlayerBedEnterEvent;
 import simplexity.simplehomes.SimpleHomes;
 
 import java.util.ArrayList;
@@ -13,7 +12,6 @@ public class ConfigHandler {
     private static ConfigHandler instance;
 
     private final ArrayList<Material> blacklistedBlocks = new ArrayList<>();
-    private final ArrayList<PlayerBedEnterEvent.BedEnterResult> allowedResults = new ArrayList<>();
     private boolean creativeBypass, invulnerableBypass, mysql, lockoutEnabled, disableHome, disableHomeList,
             disableDeleteHome, delayEnabled, cancelOnMove, bedHomesEnabled;
     private String ip, name, username, password;
@@ -29,7 +27,6 @@ public void loadConfigValues() {
         SimpleHomes.getInstance().reloadConfig();
         FileConfiguration config = SimpleHomes.getInstance().getConfig();
         List<String> blockList = config.getStringList("blacklisted-blocks");
-        List<String> resultList = config.getStringList("bed-home.allowed-results");
         creativeBypass = config.getBoolean("safety-bypass.creative", true);
         invulnerableBypass = config.getBoolean("safety-bypass.invulnerable", true);
         lockoutEnabled = config.getBoolean("lockout.enabled", false);
@@ -40,9 +37,8 @@ public void loadConfigValues() {
         cancelOnMove = config.getBoolean("delay.cancel-on-move", true);
         timeInSeconds = config.getInt("delay.time-in-seconds", 5);
         bufferMovement = config.getDouble("delay.buffer-movement", 0.5);
-        bedHomesEnabled = config.getBoolean("bed-home.enabled", true);
+        bedHomesEnabled = config.getBoolean("bed-home.enabled", false);
         fillList(blockList);
-        verifyEnterEventResults(resultList);
         mysql = config.getBoolean("mysql.enabled", false);
         ip = config.getString("mysql.ip");
         name = config.getString("mysql.name");
@@ -62,36 +58,10 @@ private void fillList(List<String> stringList) {
         }
     }
 
-    private void verifyEnterEventResults(List<String> stringList) {
-        allowedResults.clear();
-        if (stringList.isEmpty()) {
-            SimpleHomes.getInstance().getLogger().warning(stringList + " is empty. Please check your config, setting default configuration");
-            allowedResults.add(PlayerBedEnterEvent.BedEnterResult.NOT_POSSIBLE_NOW);
-            allowedResults.add(PlayerBedEnterEvent.BedEnterResult.NOT_SAFE);
-            allowedResults.add(PlayerBedEnterEvent.BedEnterResult.OK);
-            return;
-        }
-        for (String string : stringList) {
-            PlayerBedEnterEvent.BedEnterResult result;
-            try {
-                result = PlayerBedEnterEvent.BedEnterResult.valueOf(string);
-            } catch (IllegalArgumentException e) {
-                SimpleHomes.getInstance().getLogger().warning(string + " is not a valid event result, please check your config");
-                continue;
-            }
-            allowedResults.add(result);
-        }
-    }
-
-
     public ArrayList<Material> getBlacklistedBlocks() {
         return blacklistedBlocks;
     }
 
-    public ArrayList<PlayerBedEnterEvent.BedEnterResult> getAllowedResults() {
-        return allowedResults;
-    }
-
     public boolean doCreativeBypass() {
         return creativeBypass;
     }
@@ -151,4 +121,8 @@ public int getTimeInSeconds() {
     public double getBufferMovement() {
         return bufferMovement;
     }
+
+    public boolean areBedHomesEnabled() {
+        return bedHomesEnabled;
+    }
 }

src/main/java/simplexity/simplehomes/listeners/BedEnterListener.java

@@ -1,9 +1,6 @@
 package simplexity.simplehomes.saving;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
 import simplexity.simplehomes.Home;
 import simplexity.simplehomes.SimpleHomes;
 import simplexity.simplehomes.configs.ConfigHandler;
@@ -52,7 +49,6 @@ world_name VARCHAR(255),
                         pitch FLOAT
                         );""");
             }
-
         } catch (SQLException e) {
             logger.severe("Failed to connect to SQLite database");
             logger.severe("Error: " + e.getMessage());

src/main/java/simplexity/simplehomes/saving/SQLHandler.java

@@ -25,8 +25,4 @@ delay: # Delay after running the command to teleporting
   cancel-on-move: true
   buffer: 0.5
 bed-home: #set a home when interacting with a bed
-  enabled: true
-  allowed-results: #results on interaction with a bed to set a home automatically with. https://jd.papermc.io/paper/1.21.3/org/bukkit/event/player/PlayerBedEnterEvent.BedEnterResult.html
-    - OK
-    - NOT_POSSIBLE_NOW
-    - NOT_SAFE
+  enabled: false