General Feature Additions

bukkit/src/main/java/net/william278/huskhomes/command/BukkitCommand.java

@@ -136,7 +136,7 @@ protected static PermissionDefault getPermissionDefault(boolean isOperatorComman
     public enum Type {
         HOME_COMMAND(PrivateHomeCommand::new),
         SET_HOME_COMMAND(SetHomeCommand::new),
-        HOME_LIST_COMMAND(PrivateHomeListCommand::new),
+        HOME_LIST_COMMAND(HomeListCommand::new),
         DEL_HOME_COMMAND(DelHomeCommand::new),
         EDIT_HOME_COMMAND(EditHomeCommand::new),
         PUBLIC_HOME_COMMAND(PublicHomeCommand::new),

bukkit/src/main/java/net/william278/huskhomes/user/BukkitUser.java

@@ -25,10 +25,14 @@
 import net.william278.huskhomes.position.Position;
 import net.william278.huskhomes.teleport.TeleportationException;
 import net.william278.huskhomes.util.BukkitAdapter;
+import net.william278.huskhomes.util.BukkitTask;
+import net.william278.huskhomes.util.Task;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import space.arim.morepaperlib.scheduling.GracefulScheduling;
 
@@ -160,6 +164,20 @@ public boolean isVanished() {
                 .orElse(false);
     }
 
+    /**
+     * Handles player invulnerability after teleporting
+     */
+    @Override
+    public void handleInvulnerability() {
+        if (plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime() <= 0) {
+            return;
+        }
+        long invulnerabilityTimeInTicks = 20L * plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime();
+        player.setInvulnerable(true);
+        // Remove the invulnerability
+        plugin.runSyncDelayed(() -> player.setInvulnerable(false), invulnerabilityTimeInTicks);
+    }
+
     /**
      * Send a Bukkit plugin message to the player.
      */

common/src/main/java/net/william278/huskhomes/command/PrivateHomeListCommand.java → common/src/main/java/net/william278/huskhomes/command/HomeListCommand.java

@@ -19,6 +19,8 @@
 
 package net.william278.huskhomes.command;
 
+import de.themoep.minedown.adventure.MineDown;
+import de.themoep.minedown.adventure.MineDownParser;
 import net.william278.huskhomes.HuskHomes;
 import net.william278.huskhomes.config.Locales;
 import net.william278.huskhomes.position.Home;
@@ -34,9 +36,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class PrivateHomeListCommand extends ListCommand {
+public class HomeListCommand extends ListCommand {
 
-    protected PrivateHomeListCommand(@NotNull HuskHomes plugin) {
+    protected HomeListCommand(@NotNull HuskHomes plugin) {
         super("homelist", List.of("homes"), "[player] [page]", plugin);
         addAdditionalPermissions(Map.of("other", true));
     }
@@ -110,6 +112,8 @@ private Optional<PaginatedList> generateList(@NotNull CommandUser executor, @Not
                         plugin.getLocales()
                                 .getRawLocale("home_list_item",
                                         Locales.escapeText(home.getName()), home.getSafeIdentifier(),
+                                        home.isPublic() ? plugin.getLocales().getRawLocale("home_is_public").orElse("&#00fb9a&Public"):
+                                                plugin.getLocales().getRawLocale("home_is_private").orElse("&#239e6f&Private"),
                                         Locales.escapeText(home.getMeta().getDescription()))
                                 .orElse(home.getName())).sorted().collect(Collectors.toList()),
                 plugin.getLocales()

common/src/main/java/net/william278/huskhomes/command/PrivateHomeCommand.java

@@ -48,7 +48,7 @@ public void execute(@NotNull CommandUser executor, @NotNull String[] args) {
                 super.execute(executor, homes.get(0), args);
                 return;
             }
-            plugin.getCommand(PrivateHomeListCommand.class)
+            plugin.getCommand(HomeListCommand.class)
                     .ifPresent(command -> command.showHomeList(executor, user.getUsername(), 1));
             return;
         }

common/src/main/java/net/william278/huskhomes/config/Settings.java

@@ -140,6 +140,9 @@ public static class GeneralSettings {
         @Comment("Where the teleport warmup timer should display (CHAT, ACTION_BAR, TITLE, SUBTITLE or NONE)")
         private Locales.DisplaySlot teleportWarmupDisplay = Locales.DisplaySlot.ACTION_BAR;
 
+        @Comment("How long the player should be invulnerable for after teleporting (in seconds)")
+        private int teleportInvulnerabilityTime = 0;
+
         @Comment("How long before received teleport requests expire (in seconds)")
         private int teleportRequestExpiryTime = 60;
 

common/src/main/java/net/william278/huskhomes/listener/EventListener.java

@@ -148,6 +148,7 @@ private void handleInboundTeleport(@NotNull OnlineUser teleporter) {
             }
             plugin.getDatabase().clearCurrentTeleport(teleporter);
             teleport.displayTeleportingComplete(teleporter);
+            teleporter.handleInvulnerability();
         });
     }
 

common/src/main/java/net/william278/huskhomes/teleport/Teleport.java

@@ -95,9 +95,9 @@ private void executeLocal(@NotNull OnlineUser teleporter) throws TeleportationEx
                     if (updateLastPosition) {
                         plugin.getDatabase().setLastPosition(teleporter, teleporter.getPosition());
                     }
-
                     teleporter.teleportLocally(localTarget.get().getPosition(), async);
                     this.displayTeleportingComplete(teleporter);
+                    teleporter.handleInvulnerability();
                 });
                 return;
             }
@@ -127,6 +127,7 @@ private void executeLocal(@NotNull OnlineUser teleporter) throws TeleportationEx
                     || target.getServer().equals(plugin.getServerName())) {
                 teleporter.teleportLocally(target, async);
                 this.displayTeleportingComplete(teleporter);
+                teleporter.handleInvulnerability();
                 return;
             }
 

common/src/main/java/net/william278/huskhomes/user/OnlineUser.java

@@ -211,6 +211,12 @@ public Audience getAudience() {
      */
     public abstract boolean isVanished();
 
+    /**
+     * Handles player invulnerability after teleporting
+     *
+     */
+    public abstract void handleInvulnerability();
+
     /**
      * Get the maximum number of homes this user may set.
      *

common/src/main/resources/locales/en-gb.yml

@@ -64,8 +64,10 @@ locales:
   public_home_list_page_title: '[☀ Public Homes:](#00fb9a) [(%1%-%2% of](#00fb9a) [%3%](#00fb9a bold)[)](#00fb9a)\n'
   warp_list_page_title: '[Warps:](#00fb9a) [(%1%-%2% of](#00fb9a) [%3%](#00fb9a bold)[)](#00fb9a)\n'
   command_list_title: '[HuskHomes](#00fb9a bold) [| Command List](#00fb9a)\n'
-  home_list_item: '[[%1%]](show_text=&#00fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:edithome %2%)'
+  home_list_item: '[[%1%]](show_text=&#00fb9a&%1%\n&7Status: %3%\n&7ℹ %4% run_command=/huskhomes:edithome %2%)'
   public_home_list_item: '[[%1%]](show_text=&#00fb9a&%1%\n&7☻ %3%\n&7ℹ %4% run_command=/huskhomes:phome %2%)'
+  home_is_public: "&#00fb9a&Public"
+  home_is_private: "&#239e6f&Private"
   warp_list_item: '[[%1%]](show_text=&#00fb9a&%1%\n&7ℹ %3% run_command=/huskhomes:warp %2%)'
   command_list_item: '[/%1%](#00fb9a show_text=&7Click to suggest command suggest_command=/%1%)   [%2%](gray show_text=&#00fb9a&/%1%\n&7%3%)'
   list_item_divider: ' [•](gray) '

fabric/src/main/java/net/william278/huskhomes/command/FabricCommand.java

@@ -130,7 +130,7 @@ private CommandUser resolveExecutor(@NotNull ServerCommandSource source) {
     public enum Type {
         HOME_COMMAND(PrivateHomeCommand::new),
         SET_HOME_COMMAND(SetHomeCommand::new),
-        HOME_LIST_COMMAND(PrivateHomeListCommand::new),
+        HOME_LIST_COMMAND(HomeListCommand::new),
         DEL_HOME_COMMAND(DelHomeCommand::new),
         EDIT_HOME_COMMAND(EditHomeCommand::new),
         PUBLIC_HOME_COMMAND(PublicHomeCommand::new),

fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java

@@ -32,10 +32,13 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.TeleportTarget;
 import net.william278.huskhomes.FabricHuskHomes;
+import net.william278.huskhomes.HuskHomes;
 import net.william278.huskhomes.position.Location;
 import net.william278.huskhomes.position.Position;
 import net.william278.huskhomes.position.World;
 import net.william278.huskhomes.teleport.TeleportationException;
+import net.william278.huskhomes.util.FabricTask;
+import net.william278.huskhomes.util.Task;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -164,6 +167,21 @@ public boolean isVanished() {
         return false;
     }
 
+    /**
+     * Handles player invulnerability after teleporting
+     */
+    @Override
+    public void handleInvulnerability() {
+        if (plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime() <= 0) {
+            return;
+        }
+        long invulnerabilityTimeInTicks = 20L * plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime();
+        player.setInvulnerable(true);
+        // Remove the invulnerability
+        plugin.runSyncDelayed(() -> player.setInvulnerable(false), invulnerabilityTimeInTicks);
+    }
+
+
     @NotNull
     private static Identifier parseIdentifier(@NotNull String channel) {
         if (channel.equals("BungeeCord")) {

sponge/src/main/java/net/william278/huskhomes/command/SpongeCommand.java

@@ -157,7 +157,7 @@ public Component usage(@NotNull CommandCause cause) {
     public enum Type {
         HOME_COMMAND(PrivateHomeCommand::new),
         SET_HOME_COMMAND(SetHomeCommand::new),
-        HOME_LIST_COMMAND(PrivateHomeListCommand::new),
+        HOME_LIST_COMMAND(HomeListCommand::new),
         DEL_HOME_COMMAND(DelHomeCommand::new),
         EDIT_HOME_COMMAND(EditHomeCommand::new),
         PUBLIC_HOME_COMMAND(PublicHomeCommand::new),

sponge/src/main/java/net/william278/huskhomes/user/SpongeUser.java

@@ -131,4 +131,18 @@ public boolean isVanished() {
         return false;
     }
 
+    /**
+     * Handles player invulnerability after teleporting
+     */
+    @Override
+    public void handleInvulnerability() {
+        if (plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime() <= 0) {
+            return;
+        }
+        long invulnerabilityTimeInTicks = 20L * plugin.getSettings().getGeneral().getTeleportInvulnerabilityTime();
+        player.invulnerable().set(true);
+        // Remove the invulnerability
+        plugin.runSyncDelayed(() -> player.invulnerable().set(true), invulnerabilityTimeInTicks);
+    }
+
 }