From 3fe27e8aab4ead528b38979d01c26a03a33990d2 Mon Sep 17 00:00:00 2001
From: Pyrbu <pyrmcserver@gmail.com>
Date: Wed, 1 Nov 2023 16:25:27 +0100
Subject: [PATCH] fix \n bug & some hovers

---
 .../main/java/lol/pyr/znpcsplus/util/FileUtil.java  |  8 +++++---
 .../src/main/resources/messages/root-hover/skin.txt | 13 +++++++++++++
 .../main/resources/messages/root-hover/teleport.txt |  6 ++++++
 .../main/resources/messages/root-hover/toggle.txt   |  6 ++++++
 .../src/main/resources/messages/root-hover/type.txt |  6 ++++++
 .../resources/messages/storage-hover/import.txt     |  6 ++++++
 .../resources/messages/storage-hover/reload.txt     |  5 +++++
 .../main/resources/messages/storage-hover/save.txt  |  4 ++++
 8 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/FileUtil.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/FileUtil.java
index 47cb5a1..1bf3197 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/util/FileUtil.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/FileUtil.java
@@ -3,17 +3,19 @@ package lol.pyr.znpcsplus.util;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class FileUtil {
     public static String dumpReaderAsString(Reader reader) {
         BufferedReader bReader = new BufferedReader(reader);
         try {
-            StringBuilder sb = new StringBuilder();
+            List<String> lines = new ArrayList<>();
             String line;
             while ((line = bReader.readLine()) != null) {
-                sb.append(line).append("\n");
+                lines.add(line);
             }
-            return sb.toString();
+            return String.join("\n", lines);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/plugin/src/main/resources/messages/root-hover/skin.txt b/plugin/src/main/resources/messages/root-hover/skin.txt
index e69de29..8e6f756 100644
--- a/plugin/src/main/resources/messages/root-hover/skin.txt
+++ b/plugin/src/main/resources/messages/root-hover/skin.txt
@@ -0,0 +1,13 @@
+<gray>Examples:
+ <gold>* <yellow>/npc skin <gold>cool_npc1 static Notch
+ <gold>* <yellow>/npc skin <gold>my_npc mirror
+ <gold>* <yellow>/npc skin <gold>12 dynamic %leaderboard_mining_top_1%
+ <gold>* <yellow>/npc skin <gold>npc1234 url classic https://s.namemc.com/i/5d5eb6d84b57ea29.png
+
+<gray>Skin Types:
+ <gold>* <yellow>Static <gray>- Only fetch the skin once and save the skin data
+ <gold>* <yellow>Mirror <gray>- Copy the skin of the player who is viewing the npc
+ <gold>* <yellow>Dynamic <gray>- Fetch the skin whenever the npc comes into viewing distance (supports placeholders)
+ <gold>* <yellow>Url <gray>- Fetch the skin from an url to a raw skin file, this works like static
+
+<gray>Command used to change the skin of an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/teleport.txt b/plugin/src/main/resources/messages/root-hover/teleport.txt
index e69de29..4e33f62 100644
--- a/plugin/src/main/resources/messages/root-hover/teleport.txt
+++ b/plugin/src/main/resources/messages/root-hover/teleport.txt
@@ -0,0 +1,6 @@
+<gray>Examples:
+ <gold>* <yellow>/npc teleport <gold>cool_npc1
+ <gold>* <yellow>/npc teleport <gold>my_npc
+ <gold>* <yellow>/npc teleport <gold>12
+
+<gray>Command used to teleport yourself to an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/toggle.txt b/plugin/src/main/resources/messages/root-hover/toggle.txt
index e69de29..21bb7ad 100644
--- a/plugin/src/main/resources/messages/root-hover/toggle.txt
+++ b/plugin/src/main/resources/messages/root-hover/toggle.txt
@@ -0,0 +1,6 @@
+<gray>Examples:
+ <gold>* <yellow>/npc toggle <gold>cool_npc1
+ <gold>* <yellow>/npc toggle <gold>my_npc
+ <gold>* <yellow>/npc toggle <gold>12
+
+<gray>Command used to enable or disable an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/type.txt b/plugin/src/main/resources/messages/root-hover/type.txt
index e69de29..90a123a 100644
--- a/plugin/src/main/resources/messages/root-hover/type.txt
+++ b/plugin/src/main/resources/messages/root-hover/type.txt
@@ -0,0 +1,6 @@
+<gray>Examples:
+ <gold>* <yellow>/npc type <gold>cool_npc1 zombie
+ <gold>* <yellow>/npc type <gold>my_npc skeleton
+ <gold>* <yellow>/npc type <gold>12 creeper
+
+<gray>Command used to change the type of an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/import.txt b/plugin/src/main/resources/messages/storage-hover/import.txt
index e69de29..ac114a5 100644
--- a/plugin/src/main/resources/messages/storage-hover/import.txt
+++ b/plugin/src/main/resources/messages/storage-hover/import.txt
@@ -0,0 +1,6 @@
+<gray>Examples:
+ <gold>* <yellow>/npc storage import <gold>znpcs
+ <gold>* <yellow>/npc storage import <gold>znpcsplus_legacy
+ <gold>* <yellow>/npc storage import <gold>citizens
+
+<gray>Command used to import npcs from a different npc plugin
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/reload.txt b/plugin/src/main/resources/messages/storage-hover/reload.txt
index e69de29..ab56365 100644
--- a/plugin/src/main/resources/messages/storage-hover/reload.txt
+++ b/plugin/src/main/resources/messages/storage-hover/reload.txt
@@ -0,0 +1,5 @@
+<gray>Examples:
+ <gold>* <yellow>/npc storage reload
+
+<gray>Command used to re-load all npcs from storage
+<red>Warning: This command will delete all unsaved changes to npcs
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/save.txt b/plugin/src/main/resources/messages/storage-hover/save.txt
index e69de29..40faf0a 100644
--- a/plugin/src/main/resources/messages/storage-hover/save.txt
+++ b/plugin/src/main/resources/messages/storage-hover/save.txt
@@ -0,0 +1,4 @@
+<gray>Examples:
+ <gold>* <yellow>/npc storage save
+
+<gray>Command used to save the currently loaded npcs to storage
\ No newline at end of file