Point submodules at canonical Gitea repositories

Fix raw TextComponent metadata showing in chat messages

.gitattributes

@@ -0,0 +1 @@
+.gitea/CODEOWNERS linguist-detectable=false

.gitea/CODEOWNERS

@@ -0,0 +1,3 @@
+# Pull requests request review from the eligible staff team(s).
+# One approval from either an Admin or Developer satisfies branch protection.
+*   @trueog/Admins @trueog/Developers

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libs/Utilities-OG"]
 	path = libs/Utilities-OG
-	url = https://github.com/true-og/Utilities-OG
+	url = https://git.trueog.net/trueog/Utilities-OG

README.md

@@ -1,7 +1,6 @@
-# Shop Search AddOn For QuickShop
-### Version: 2.0.5.4-SNAPSHOT
+# QSFindItemAddOn-OG
 
-An unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
+A 1.19.4 fork of QSFindItemAddOn, an unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
 Adds a `/find` command in game for searching through all the shops on the server.
 
 ![MC](https://img.shields.io/badge/Minecraft-Java%20Edition:%201.16.5%20--%201.20.1-brightgreen)

build.gradle.kts

@@ -97,7 +97,7 @@ dependencies {
     compileOnly("com.github.true-og.OpenInv:openinvapi:a85e8ebc28")
     compileOnly("org.maxgamer:QuickShop:5.1.2.5-SNAPSHOT") { isTransitive = false }
     implementation("io.papermc:paperlib:1.0.7")
-    compileOnly("net.essentialsx:EssentialsX:2.19.4") { isTransitive = false }
+    compileOnly("net.essentialsx:EssentialsX:2.21.0") { isTransitive = false }
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.8") { // Import WorldGuard API.
         exclude(group = "com.google.code.findbugs", module = "annotations")
         exclude(group = "net.java.truecommons", module = "truecommons-logging")

src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java

@@ -7,12 +7,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.World;
 
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import net.kyori.adventure.text.TextComponent;
-import net.trueog.utilitiesog.UtilitiesOG;
 
 public class ConfigProvider {
 
-    public final TextComponent PLUGIN_PREFIX = UtilitiesOG.trueogColorize(ConfigSetup.get().getString("plugin-prefix"));
+    public final String PLUGIN_PREFIX = ConfigSetup.get().getString("plugin-prefix");
     public final List<String> FIND_ITEM_COMMAND_ALIAS = (List<String>) ConfigSetup.get()
             .getList("find-item-command.command-alias");
     public final String FIND_ITEM_TO_BUY_AUTOCOMPLETE = ConfigSetup.get()

src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java

@@ -21,12 +21,12 @@ public class EssentialsXPlugin {
 
     public static void setup() {
 
-        if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
+        if (Bukkit.getPluginManager().isPluginEnabled("Essentials-OG")) {
 
-            essAPI = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials");
+            essAPI = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials-OG");
             if (essAPI != null) {
 
-                LoggerUtils.logInfo("Found Essentials");
+                LoggerUtils.logInfo("Found Essentials-OG...");
 
             }
 
@@ -54,7 +54,6 @@ public class EssentialsXPlugin {
 
     public static void updateAllWarps() {
 
-        LoggerUtils.logInfo("Updating Essentials warps list...");
         if (essAPI.isEnabled()) {
 
             Collection<String> allWarps = EssentialsXPlugin.getAPI().getWarps().getList();
@@ -76,8 +75,6 @@ public class EssentialsXPlugin {
 
         }
 
-        LoggerUtils.logInfo("Update complete! Found " + getAllWarps().size() + " warps.");
-
     }
 
 }

src/main/java/io/myzticbean/finditemaddon/FindItemAddOnOG.java

@@ -447,9 +447,10 @@ public final class FindItemAddOnOG extends JavaPlugin {
 
             if (args.length == 1) {
 
-                return partialMatches(args[0], Arrays.asList(getSubCommandName(sellSubCmd), getSubCommandName(buySubCmd),
-                        getSubCommandName(hideShopSubCmd), getSubCommandName(revealShopSubCmd), "sell", "buy", "hide",
-                        "reveal", "help", "hideshop", "revealshop"));
+                return partialMatches(args[0],
+                        Arrays.asList(getSubCommandName(sellSubCmd), getSubCommandName(buySubCmd),
+                                getSubCommandName(hideShopSubCmd), getSubCommandName(revealShopSubCmd), "sell", "buy",
+                                "hide", "reveal", "help", "hideshop", "revealshop"));
 
             }
 

src/main/resources/config.yml

@@ -68,12 +68,17 @@ shop-gui-next-button-custom-model-data: ''
 shop-gui-goto-first-page-button-custom-model-data: ''
 shop-gui-goto-last-page-button-custom-model-data: ''
 shop-gui-close-button-custom-model-data: ''
-shop-navigation-first-page-alert-message: '&cYou are already on first page!'
-shop-navigation-last-page-alert-message: '&cYou are already on last page!'
+shop-navigation-first-page-alert-message: '&cYou are already on the first page!'
+shop-navigation-last-page-alert-message: '&cYou are already on the last page!'
 shop-player-visit-cooldown-in-minutes: 5
 ignore-empty-chests: true
 blacklisted-worlds:
-- world_number_1
-- world_number_2
+- "HB1-hub"
+- "SP1-hub"
+- "Shake_It"
+- "Ancient_Plateau"
+
+# Enabling this will spam your console with logs from the plugin
+# Set this to true only for debugging purposes
 debug-mode: false
 config-version: 13

src/main/resources/sample-config.yml

@@ -148,8 +148,8 @@ shop-gui-goto-first-page-button-custom-model-data: ""
 shop-gui-goto-last-page-button-custom-model-data: ""
 
 # Alert shown when player is already on first/last page and clicks back/next button
-shop-navigation-first-page-alert-message: "&cYou are already on first page!"
-shop-navigation-last-page-alert-message: "&cYou are already on last page!"
+shop-navigation-first-page-alert-message: "&cYou are already on the first page!"
+shop-navigation-last-page-alert-message: "&cYou are already on the last page!"
 
 # Specify (in minutes) how long the plugin will wait before incrementing the player
 # shop visit when teleporting to it from Search GUI
@@ -160,8 +160,10 @@ ignore-empty-chests: true
 
 # When fetching shops, the below worlds will be ignored
 blacklisted-worlds:
-  - "world_number_1"
-  - "world_number_2"
+  - "HB1-hub"
+  - "SP1-hub"
+  - "Shake_It"
+  - "Ancient_Plateau"
 
 # Enabling this will spam your console with logs from the plugin
 # Set this to true only for debugging purposes