Merge unstable into development (#2173)

* Remove more scene synchronized * Fix worktop options not appearing * Format code [skip actions] * Fix delay with server tasks * Format code [skip actions] * Fully fix fairy clock (#2146) * Fix scene transition * fully fix fairy clock * Re-add call to `Player#updatePlayerGameTime` * Format code [skip actions] * Initialize the script loader in `ResourceLoader#loadAll` * Fix region removal checking * Format code [skip actions] * Use Lombok's `EqualsAndHashCode` for comparing scene regions * Format code [skip actions] * Move 'invalid gather object' to `trace` * Add more information to the 'unknown condition handler' message * Move invalid ability action to trace * Make `KcpTunnel` public * Validate the NPC being talked to * Format code [skip actions] * NPCs are not spawned server side; change logic to handle it * Format code [skip actions] * unload scene when there are no players (#2147) * unload scene when there are no players * Update src/main/java/emu/grasscutter/game/world/Scene.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Check if a command should be copied or HTTP should be used * Lint Code [skip actions] * Fix character names rendering incorrectly * Add basic troubleshooting command * Implement handbook teleporting also a few formatting changes and sort data by logical sense * Fix listener `ConcurrentModificationException` issue * Add color change to `Join the Community!` * Lint Code [skip actions] * Make clickable buttons appear clickable * Remove 'Mechanicus' entities from the list of entities * Format code [skip actions] * Fix going back returning a blank screen * Implement entity spawning * Add setting level to entity card * Add support for 'plain text' mode * Make descriptions of objects scrollable * Lint Code [skip actions] * Format code [skip actions] * Change the way existing hooks work * Format code [skip actions] * Upgrade Javalin to 5.5.0 & Fix project warnings * Upgrade logging libraries * Fix gacha mappings static file issue * Add temporary backwards compatability for `ServerHelper` * Format code [skip actions] * Remove artifact signatures from VCS * Fix forge queue data protocol definition * Run `spotlessApply` * Format code [skip actions] * Download data required for building artifacts * Add call for Facebook logins * Add the wiki page as a submodule * Format code [skip actions] * Update translation (#2150) * Update translation * Update translation * Separate the dispatch and game servers (pt. 1) gacha is still broken, handbook still needs to be done * Format code [skip actions] * Separate the dispatch and game servers (pt. 2) this commit fixes the gacha page * Add description for '/troubleshoot' * Set default avatar talent level to 10 * Separate the dispatch and game servers (pt. 3) implement handbook across servers! * Format code [skip actions] * Update GitHub Actions to use 'download-file' over 'wget' * Gm handbook lmao (#2149) * Fix font issue * Fix avatars * Fix text overflow in commands * Fix virtualized lists and items page 😭😭 * magix why 💀 * use hover style in all minicards * button * remove console.log * lint * Add icons * magix asked * Fix overflow padding issue * Fix achievement text overflow * remove icons from repo * Change command icon * Add the wiki page as a submodule * total magix moment * fix text overflow in commands * Fix discord button * Make text scale on Minicard * import icons and font from another source * Add hover effects to siebar buttons * move font and readme to submodule repo * Make data folder a submodule * import icons and font from data submodule * Update README.md * total magix moment * magix moment v2 * submodule change * Import `.webp` files * Resize `HomeButton` * Fix 'Copy Command' reappearing after changing pages --------- Co-authored-by: KingRainbow44 <kobedo11@gmail.com> * Lint Code [skip actions] * Download data for the build, not for the lint * format imports this is really just to see if build handbook works kek * Implement proper handbook authentication (pt. 1) * Implement proper handbook authentication (pt. 2) * Format code [skip actions] * Add quest data dumping for the handbook * Change colors to fit _something suitable_ * Format code [skip actions] * Fix force pushing to branches after linting * Fix logic of `SetPlayerPropReq` * Move more group loading to `trace` * Add handbook IP authentication in hybrid mode * Fix player level up not displaying on the client properly * Format code [skip actions] * Fix game time locking * Format code [skip actions] * Update player properties * Format code [skip actions] * Move `warn`s for groups to `debug` * Fix player pausing * Move more logs to `trace` * Use `removeItemById` for deleting items via quests * Clean up logger more * Pause in-game time when the world is paused * Format code [skip actions] * More player property documentation * Multi-threaded resource loading * Format code [skip actions] * Add quest widgets * Add quests page (basic impl.) * Add/fix colors also fix tailwind * Remove banned packets client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted * Re-add `BeginCameraSceneLookNotify` * Fix being unable to attack (#2157) * Add `PlayerOpenChestEvent` * Add methods to get players from the server * Add static methods to register an event handler * Add `PlayerEnterDungeonEvent` * Remove legacy documentation from `PlayerMoveEvent` * Add `PlayerChatEvent` * Add defaults to `Position` * Clean up `.utils` * Revert `Multi-threaded resource loading` * Fix changing target UID when talking to the server * Lint Code [skip actions] * Format code [skip actions] * fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. * Format code [skip actions] * Partially fix Chasing Shadows (#2159) * Partially fix Chasing Shadows * Go ahead and move it before the return before Magix tells me to. * Format code [skip actions] * Bring back period lol (#2160) * Disable SNI for the HTTPS server * Add `EntityCreationEvent` * Add initial startup message this is so the server appears like its preparing to start * Format code [skip actions] * Enable debug mode for plugin loggers if enabled for the primary logger * Add documentation about `WorldAreaConfigData` * Make more fields in excels accessible * Remove deprecated fields from `GetShopRsp` * Run `spotlessApply` on definitions * Add `PlayerEnterAreaEvent` * Optimize event calls * Fix event invokes * Format code [skip actions] * Remove manual autofinish for main quests. (#2162) * Add world areas to the textmap cache * Format code [skip actions] * Don't overdefine variables in extended classes (#2163) * Add dumper for world areas * Format code [skip actions] * instantiate personalLineList (#2165) * Fix protocol definitions thank you Nazrin! (+ hiro for raw definitions) * Fix the background color leaking from the character widget * Change HTML spacing to 2 spaces * Implement hiding widgets * Change scrollbar to a vibrant color * Add _some_ scaling to the home buttons and its text * Build the handbook with Gradle * Fix the 'finer details' with the handbook UI * Lint Code [skip actions] * Fix target destination for the Gradle-built handbook * Implement fetching a player across servers & Add a chainable JsonObject useful for plugins! might be used in grasscutter eventually * Fix GitHub actions * Fix event calling & canceling * Run `spotlessApply` * Rename fields (might be wrong) * Add/update all/more protocol definitions * Add/update all/more protocol definitions * Remove outdated packet * Fix protocol definitions * Format code [skip actions] * Implement some lua variables for less console spam (#2172) * Implement some lua variables for less console spam * Add GetHostQuestState This fixes some chapter 3 stuff. * Format code [skip actions] * Fix merge import * Format code [skip actions] * Fully fix fairy clock for real this time (#2167) * Fully fix fairy clock For real this time * Make it so relogging keeps the time lock state. * Refactor out questLockTime * Per Hartie, the client packet needs to be changed too * Update src/main/java/emu/grasscutter/game/world/World.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java * Remove all code not needed to get clock working --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Implement a proper ability system (#2166) * Apply fix `21dec2fe` * Apply fix `89d01d5f` * Apply fix `d900f154` this one was already implemented; updated to use call from previous commit * Ability changing commit TODO: change info to debug * Remove use of deprecated methods/fields * Temp commit v2 (Adding LoseHP and some fixes) * Oopsie * Probably fix monster battle * Fix issue with reflecting into fields * Fix some things * Fix ability names for 3.6 resources * Improve logging --------- Co-authored-by: StartForKiller <jesussanz2003@gmail.com> * Format code [skip actions] * Add system for sending messages between servers * Format some code * Remove protocol definitions from Spotless * Default debug to false; enable with `-debug` * Implement completely useless global value copying * HACK: Return the avatar which holds the weapon when the weapon is referred to by ID * Add properties to `AbilityModifier` * Change the way HTML is served after authentication * Use thread executors to speed up the database loading process * Format code [skip actions] * Add system for setting handbook address and port * Lint Code [skip actions] * Format code [skip actions] * Fix game-related data not saving * Format code [skip actions] * Fix handbook server details * Lint Code [skip actions] * Format code [skip actions] * Use the headers provided by a context to get the IP address should acknowledge #1975 * Format code [skip actions] * Move more logs to `trace` * Format code [skip actions] * more trace * Fix something and implement weapon entities * Format code [skip actions] * Fix `EntityWeapon` * Remove deprecated API & Fix resource checking * Fix unnecessary warning for first-time setup * Implement handbook request limiting * Format code [skip actions] * Fix new avatar weapons being null * Format code [skip actions] * Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met * Load activity config on server startup * Require plugins to specify an API version and match with the server * Add default open state ignore list * Format code [skip actions] * Quick fix for questing, needs more investigation This would make the questing work again * Remove existing hack for 35303 * Fix ignored open states from being set * Format code [skip actions] * fix the stupidest bug ive ever seen * Optimize player kicking on server close * Format code [skip actions] * Re-add hack to fix 35303 * Update GitHub actions * Format code [skip actions] * Potentially fix issues with regions * Download additional handbook data * Revert "Potentially fix issues with regions" This reverts commit 84e3823695. --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: scooterboo <lewasite@yahoo.com> Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com> Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2026-06-11 16:43:38 +08:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
@@ -0,0 +1,234 @@
+package emu.grasscutter.utils.objects.text;
+
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Builder;
+import lombok.Data;
+
+/* Text style container. */
+@Builder
+@Data
+public final class Style {
+    private static final Map<Character, String> unity = new HashMap<>();
+    private static final Map<Character, String> ansi = new HashMap<>();
+
+    static {
+        // Add the Minecraft color codes to the color map.
+        unity.put('0', "#000000"); // Black
+        unity.put('1', "#0000AA"); // Dark Blue
+        unity.put('2', "#00AA00"); // Dark Green
+        unity.put('3', "#00AAAA"); // Dark Aqua
+        unity.put('4', "#AA0000"); // Dark Red
+        unity.put('5', "#AA00AA"); // Dark Purple
+        unity.put('6', "#FFAA00"); // Gold
+        unity.put('7', "#AAAAAA"); // Gray
+        unity.put('8', "#555555"); // Dark Gray
+        unity.put('9', "#5555FF"); // Blue
+        unity.put('a', "#55FF55"); // Green
+        unity.put('b', "#55FFFF"); // Aqua
+        unity.put('c', "#FF5555"); // Red
+        unity.put('d', "#FF55FF"); // Light Purple
+        unity.put('e', "#FFFF55"); // Yellow
+        unity.put('f', "#FFFFFF"); // White
+
+        ansi.put('0', "\u001B[30m"); // Black
+        ansi.put('1', "\u001B[34m"); // Dark Blue
+        ansi.put('2', "\u001B[32m"); // Dark Green
+        ansi.put('3', "\u001B[36m"); // Dark Aqua
+        ansi.put('4', "\u001B[31m"); // Dark Red
+        ansi.put('5', "\u001B[35m"); // Dark Purple
+        ansi.put('6', "\u001B[33m"); // Gold
+        ansi.put('7', "\u001B[37m"); // Gray
+        ansi.put('8', "\u001B[90m"); // Dark Gray
+        ansi.put('9', "\u001B[94m"); // Blue
+        ansi.put('a', "\u001B[92m"); // Green
+        ansi.put('b', "\u001B[96m"); // Aqua
+        ansi.put('c', "\u001B[91m"); // Red
+        ansi.put('d', "\u001B[95m"); // Light Purple
+        ansi.put('e', "\u001B[93m"); // Yellow
+        ansi.put('f', "\u001B[97m"); // White
+    }
+
+    @Builder.Default private int size = -1; // Unity only.
+    @Builder.Default private boolean bold = false; // Unity only.
+    @Builder.Default private boolean italic = false; // Unity only.
+
+    @Builder.Default private Color color = null;
+
+    /**
+     * Replaces detected sequences of &color with the specified text.
+     *
+     * @param input The input text.
+     * @return The replaced text.
+     */
+    private String replaceUnity(String input) {
+        // Thanks ChatGPT! (from ChatGPT)
+        // Check if the input string is null or empty
+        if (input == null || input.isEmpty()) {
+            return "";
+        }
+
+        var output = new StringBuilder();
+        var i = 0;
+        while (i < input.length()) {
+            var c = input.charAt(i);
+            if (c == '&') {
+                // Check if the Minecraft color code is valid
+                if (i + 1 < input.length() && unity.containsKey(input.charAt(i + 1))) {
+                    // Append the Unity color code
+                    output.append("<color=").append(unity.get(input.charAt(i + 1))).append(">");
+
+                    // Move the index past the Minecraft color code
+                    i += 2;
+
+                    // Find the end of the color code span
+                    var end = input.indexOf('&', i);
+                    if (end == -1) {
+                        end = input.length();
+                    }
+
+                    // Append the text within the color code span
+                    output.append(input, i, end);
+
+                    // Append the closing tag for the Unity color code
+                    output.append("</color>");
+
+                    // Move the index to the end of the color code span
+                    i = end;
+                } else {
+                    // Invalid Minecraft color code, treat it as regular text
+                    output.append(c);
+                    i++;
+                }
+            } else {
+                // Append regular text
+                output.append(c);
+                i++;
+            }
+        }
+
+        return output.toString();
+    }
+
+    /**
+     * Replaces detected sequences of &color with the specified text.
+     *
+     * @param input The input text.
+     * @return The replaced text.
+     */
+    private String replaceTerminal(String input) {
+        // Check if the input string is null or empty
+        if (input == null || input.isEmpty()) {
+            return "";
+        }
+
+        var output = new StringBuilder();
+        var i = 0;
+        while (i < input.length()) {
+            var c = input.charAt(i);
+            if (c == '&') {
+                // Check if the Minecraft color code is valid
+                if (i + 1 < input.length() && ansi.containsKey(input.charAt(i + 1))) {
+                    // Append the ANSI escape code
+                    output.append(ansi.get(input.charAt(i + 1)));
+
+                    // Move the index past the Minecraft color code
+                    i += 2;
+
+                    // Find the end of the color code span
+                    var end = input.indexOf('&', i);
+                    if (end == -1) {
+                        end = input.length();
+                    }
+
+                    // Append the text within the color code span
+                    output.append(input, i, end);
+
+                    // Reset the color back to default
+                    output.append("\u001B[0m");
+
+                    // Move the index to the end of the color code span
+                    i = end;
+                } else {
+                    // Invalid Minecraft color code, treat it as regular text
+                    output.append(c);
+                    i++;
+                }
+            } else {
+                // Append regular text
+                output.append(c);
+                i++;
+            }
+        }
+
+        return output.toString();
+    }
+
+    /**
+     * Wraps the text in the style. Formatted for Unity clients.
+     *
+     * @param text The text to wrap.
+     * @return The wrapped text.
+     */
+    public String toUnity(String text) {
+        var builder = new StringBuilder();
+
+        // Set the size.
+        if (this.size != -1) {
+            builder.append("<size=").append(this.size).append(">");
+        }
+
+        // Set the color.
+        if (this.color != null) {
+            builder
+                    .append("<color=")
+                    .append(
+                            String.format(
+                                    "#%02x%02x%02x",
+                                    this.color.getRed(), this.color.getGreen(), this.color.getBlue()))
+                    .append(">");
+        }
+
+        // Set the boldness.
+        if (this.bold) builder.append("<b>");
+        // Set the italicness.
+        if (this.italic) builder.append("<i>");
+
+        // Append the text.
+        builder.append(this.replaceUnity(text));
+
+        // Close the tags.
+        if (this.italic) builder.append("</i>");
+        if (this.bold) builder.append("</b>");
+        if (this.color != null) builder.append("</color>");
+        if (this.size != -1) builder.append("</size>");
+
+        return builder.toString();
+    }
+
+    /**
+     * Wraps the text in the style. Formatted for terminal clients.
+     *
+     * @param text The text to wrap.
+     * @return The wrapped text.
+     */
+    public String toTerminal(String text) {
+        // Check for color.
+        if (this.color == null) return this.replaceTerminal(text);
+
+        // Convert the color to an ANSI color.
+        var ansiColor =
+                this.color.getRed() > 127
+                        ? this.color.getGreen() > 127
+                                ? this.color.getBlue() > 127 ? 15 : 11
+                                : this.color.getBlue() > 127 ? 13 : 9
+                        : this.color.getGreen() > 127
+                                ? this.color.getBlue() > 127 ? 14 : 10
+                                : this.color.getBlue() > 127 ? 12 : 8;
+
+        // Return the text with the ANSI color.
+        // Reset the color at the end.
+        return "\u001B[38;5;" + ansiColor + "m" + this.replaceTerminal(text) + "\u001B[0m";
+    }
+}