Update mod to include Fishing related features

* Add Fishing Islands to reportable places
* Add a hotkey to copy a fishing spot and its perks

Author: derNiklaas

README.md

@@ -8,9 +8,10 @@ You need Minecraft 1.21.1 and at least [Noxesium 2.3.1](https://modrinth.com/mod
 
 ### Usage
 
-This mod adds the ``/buildbug`` command and two hotkeys, the first hotkey (default ``U``) is used to quickly gather
+This mod adds the ``/buildbug`` command and three hotkeys, the first hotkey (default ``U``) is used to quickly gather
 information about your location.
 The second hotkey (default ``I``) is used to quickly generate a /bugreport.
+The third hotkey (default ``J``) is used to copy a fishing spot (including its perks) to the clipboard.
 
 - ``/buildbug`` - Prints out location information, same as the hotkey.
 - ``/buildbug config clipboard <true/false>`` (default: ``false``) - If set to true, automatically copies

gradle.properties

@@ -7,7 +7,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.5
 fabric_kotlin_version=1.11.0+kotlin.2.0.0
 fabric_api_version=0.105.0+1.21.1
-mod_version=1.13
+mod_version=1.14.0
 noxesium_version=2.3.1
 adventure_version=5.14.1
 cloud_version=2.0.0-beta.7

src/main/kotlin/de/derniklaas/buildbugs/BugCreator.kt

@@ -5,7 +5,9 @@ import de.derniklaas.buildbugs.utils.ServerState
 import de.derniklaas.buildbugs.utils.Utils
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.util.Clipboard
+import net.minecraft.entity.decoration.DisplayEntity
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Box
 
 object BugCreator {
 
@@ -43,17 +45,66 @@ object BugCreator {
         Utils.sendMiniMessage(
             "<click:copy_to_clipboard:'${
                 discordMessage.replace(
-                    "'",
-                    "\\\'"
+                    "'", "\\\'"
                 )
             }'>$minecraftMessage <yellow><bold>[CLICK TO COPY]</bold></yellow></click>", true
         )
 
         if (BuildBugsClientEntrypoint.config.copyToClipboard) {
-            setClipboard(client, discordMessage)
+            setClipboard(discordMessage)
         }
     }
 
+    fun shareFishingSpot() {
+        val client = MinecraftClient.getInstance()
+        val server = client.currentServerEntry ?: return
+        val player = client.player ?: return
+
+        // Check if the player is connected to a server
+        if (server.isLocal) {
+            Utils.sendErrorMessage("You are not connected to a server.")
+            return
+        }
+
+        // Check if the player is connected to a MCC related server
+        if (!Utils.isOnMCCServer()) {
+            Utils.sendErrorMessage("You are not connected to a MCC related server.")
+            return
+        }
+
+        // Get the "area" of the player
+        val area = gameState.getFancyName()
+        val blockPos = player.blockPos
+        val map = gameState.mapName
+
+        val box = Box.of(blockPos.toCenterPos(), 12.0, 12.0, 12.0)
+        val entities = player.world.getOtherEntities(null, box) { entity ->
+            entity is DisplayEntity.TextDisplayEntity
+        }
+
+        if (entities.isNotEmpty()) {
+            val textDisplay = entities.first() as DisplayEntity.TextDisplayEntity
+            val text = textDisplay.data!!.text.asTruncatedString(Int.MAX_VALUE)
+
+            val perks = text.split("\n").filter { it.contains("+") }.map { "+" + it.split("+")[1] }.joinToString(", ")
+            if (perks.isNotEmpty()) {
+                val minecraftMessage = getCopyMessage(area, map, blockPos).trim() + " $perks"
+                Utils.sendMiniMessage(
+                    "<click:copy_to_clipboard:'${
+                        minecraftMessage.replace(
+                            "'", "\\\'"
+                        )
+                    }'>$minecraftMessage <yellow><bold>[CLICK TO COPY]</bold></yellow></click>", true
+                )
+                if (BuildBugsClientEntrypoint.config.copyToClipboard) {
+                    setClipboard(minecraftMessage)
+                }
+                return
+            }
+        }
+        Utils.sendErrorMessage("Could not find a fishing spot.")
+    }
+
     /**
      * Updates [gameState] when a new packet is received.
      */
@@ -88,8 +139,8 @@ object BugCreator {
     /**
      * Sets the content of the Clipboard to [text].
      */
-    fun setClipboard(client: MinecraftClient, text: String) {
-        clipboard.setClipboard(client.window.handle, text)
+    fun setClipboard(text: String) {
+        clipboard.setClipboard(MinecraftClient.getInstance().window.handle, text)
         Utils.sendMiniMessage("<i>Copied </i>${if (BuildBugsClientEntrypoint.config.debugMode) "<green>${text.trim()}</green> " else ""}<i>to clipboard.</i>")
     }
 

src/main/kotlin/de/derniklaas/buildbugs/BuildBugsClientEntrypoint.kt

@@ -40,10 +40,22 @@ class BuildBugsClientEntrypoint : ClientModInitializer {
             )
         )
 
+        val shareFishingSpotKeybinding = KeyBindingHelper.registerKeyBinding(
+            KeyBinding(
+                "key.buildbugs.share_fishing_spot",
+                InputUtil.Type.KEYSYM,
+                GLFW.GLFW_KEY_J,
+                "category.buildbugs"
+            )
+        )
+
         ClientTickEvents.END_CLIENT_TICK.register {
             if (reportKeybinding.wasPressed()) {
                 BugCreator.report()
             }
+            if (shareFishingSpotKeybinding.wasPressed()) {
+                BugCreator.shareFishingSpot()
+            }
             if (bugreportKeybinding.wasPressed()) {
                 if (!Utils.isOnMCCServer()) {
                     Utils.sendErrorMessage("You are not connected to a MCC related server.")

src/main/kotlin/de/derniklaas/buildbugs/Constants.kt

@@ -12,6 +12,22 @@ object Constants {
     const val ROCKET_SPLEEF_RUSH = "rocket-spleef"
     const val LIMBO = "limbo"
 
+    /* Fishing Islands & Grottos */
+    const val VERDANT_WOODS = "temperate_1"
+    const val FLORAL_FOREST = "temperate_2"
+    const val DARK_GROVE = "temperate_3"
+    const val SUNKEN_SWAMP = "temperate_grotto"
+
+    const val TROPICAL_OVERGROWTH = "tropical_1"
+    const val CORAL_SHORES = "tropical_2"
+    const val TWISTED_SWAMP = "tropical_3"
+    const val MIRRORED_OASIS = "tropical_grotto"
+
+    const val ANCIENT_SANDS = "barren_1"
+    const val BLAZING_CANYON = "barren_2"
+    const val ASHEN_WASTES = "barren_3"
+    const val VOLCANIC_SPRINGS = "barren_grotto"
+
     /* Event Types */
     const val HUB = "hub"
     const val ACE_RACE = "ace-race"

src/main/kotlin/de/derniklaas/buildbugs/mixin/ChatMixin.kt

@@ -3,7 +3,6 @@ package de.derniklaas.buildbugs.mixin
 import de.derniklaas.buildbugs.BugCreator
 import de.derniklaas.buildbugs.Constants
 import de.derniklaas.buildbugs.utils.Utils
-import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.hud.ChatHud
 import net.minecraft.text.ClickEvent
 import net.minecraft.text.Text
@@ -22,16 +21,15 @@ abstract class ChatMixin {
 
         message.style.clickEvent?.let {
             if (it.action == ClickEvent.Action.COPY_TO_CLIPBOARD && it.value.startsWith(Constants.BUG_REPORT_URL)) {
-                BugCreator.setClipboard(MinecraftClient.getInstance(), it.value)
+                BugCreator.setClipboard(it.value)
             }
         }
         message.siblings.forEach {
             it.style.clickEvent?.let { event ->
                 if (event.action == ClickEvent.Action.COPY_TO_CLIPBOARD && event.value.startsWith(Constants.BUG_REPORT_URL)) {
-                    BugCreator.setClipboard(MinecraftClient.getInstance(), event.value)
+                    BugCreator.setClipboard(event.value)
                 }
             }
-
         }
     }
 }

src/main/kotlin/de/derniklaas/buildbugs/mixin/InGameHudMixin.kt

@@ -3,7 +3,6 @@ package de.derniklaas.buildbugs.mixin
 import de.derniklaas.buildbugs.BugCreator
 import de.derniklaas.buildbugs.Constants
 import de.derniklaas.buildbugs.utils.Utils
-import java.util.Optional
 import net.minecraft.client.gui.hud.InGameHud
 import net.minecraft.text.Text
 import org.spongepowered.asm.mixin.Mixin
@@ -31,11 +30,11 @@ abstract class InGameHudMixin {
         // Only check titles in Parkour Warrior
         if (BugCreator.gameState.serverType != Constants.PARKOUR_WARRIOR) return
 
-        // Check if the first element matches the regex defined above
-        val start = title.content.toString()
-        if (!leapRegex.containsMatchIn(start)) return
+        val courseTitle = title.asTruncatedString(Int.MAX_VALUE)
+        if (!leapRegex.containsMatchIn(courseTitle)) return
 
-        val name = title.siblings.first().content.visit { Optional.of(it) }.get()
+        // Extract the name from the title
+        val name = courseTitle.split("] ")[1]
 
         Utils.sendDebugMessage("Found course segment <green>$name</green>.")
         BugCreator.updateMap(name)

src/main/kotlin/de/derniklaas/buildbugs/utils/ServerState.kt

@@ -24,9 +24,23 @@ data class ServerState(
      */
     fun getFancyName(type: String = this.serverType): String = when (type) {
         Constants.LOBBY -> {
-            if (subType == "main") "Main Lobby"
-            else if (type == subType) "Lobby Lobby?"
-            else "${getFancyName(subType)} Lobby"
+            if(type == this.subType) "Lobby Lobby?"
+            when(subType) {
+                "main" -> "Main Lobby"
+                Constants.VERDANT_WOODS -> "Verdant Woods"
+                Constants.FLORAL_FOREST -> "Floral Forest"
+                Constants.DARK_GROVE -> "Dark Grove"
+                Constants.SUNKEN_SWAMP -> "Sunken Swamp"
+                Constants.TROPICAL_OVERGROWTH -> "Tropical Overgrowth"
+                Constants.CORAL_SHORES -> "Coral Shores"
+                Constants.TWISTED_SWAMP -> "Twisted Swamp"
+                Constants.MIRRORED_OASIS -> "Mirrored Oasis"
+                Constants.ANCIENT_SANDS -> "Ancient Sands"
+                Constants.BLAZING_CANYON -> "Blazing Canyon"
+                Constants.ASHEN_WASTES -> "Ashen Wastes"
+                Constants.VOLCANIC_SPRINGS -> "Volcanic Springs"
+                else -> "${getFancyName(subType)} Lobby"
+            }
         }
 
         // Game modes

src/main/resources/assets/buildbugs/lang/en_us.json

@@ -1,6 +1,6 @@
 {
   "key.buildbugs.report": "Generate a build bug report",
   "key.buildbugs.bugreport": "Generate a /bugreport",
-  "key.buildbugs.debug": "Toggle debug mode",
+  "key.buildbugs.share_fishing_spot": "Share fishing spot",
   "category.buildbugs": "#build-bugs"
 }