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-05-25 04:39:51 +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,259 @@
+package emu.grasscutter.game;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.server.packet.send.PacketAddNoGachaAvatarCardNotify;
+import emu.grasscutter.utils.objects.HandbookBody.*;
+import java.util.Objects;
+
+/** Commands executed by the handbook. */
+public interface HandbookActions {
+    /**
+     * Checks if the player is authenticated.
+     *
+     * @param player The player.
+     * @param token The player's unique session token.
+     * @return True if the player is authenticated.
+     */
+    static boolean isAuthenticated(Player player, String token) {
+        // Check properties.
+        if (player == null || token == null) return false;
+        // Compare the session key and token.
+        return player.getSessionKey().equals(token);
+    }
+
+    /**
+     * Grants an avatar to the player.
+     *
+     * @param request The request object.
+     * @return The response object.
+     */
+    static Response grantAvatar(GrantAvatar request) {
+        // Validate the request.
+        if (request.getPlayer() == null || request.getAvatar() == null) {
+            return Response.builder().status(400).message("Invalid request.").build();
+        }
+
+        try {
+            // Parse the requested player.
+            var playerId = Integer.parseInt(request.getPlayer());
+            var player = Grasscutter.getGameServer().getPlayerByUid(playerId);
+
+            // Parse the requested avatar.
+            var avatarId = Integer.parseInt(request.getAvatar());
+            var avatarData = GameData.getAvatarDataMap().get(avatarId);
+
+            // Validate the request.
+            if (player == null) {
+                return Response.builder().status(1).message("Player not found.").build();
+            }
+            if (!HandbookActions.isAuthenticated(player, request.getPlayerToken())) {
+                return Response.builder().status(1).message("Player not authorized.").build();
+            }
+            if (avatarData == null) {
+                return Response.builder().status(400).message("Invalid avatar ID.").build();
+            }
+
+            // Create the new avatar.
+            var avatar = new Avatar(avatarData);
+            avatar.setLevel(request.getLevel());
+            avatar.setPromoteLevel(Avatar.getMinPromoteLevel(avatar.getLevel()));
+            Objects.requireNonNull(avatar.getSkillDepot())
+                    .getSkillsAndEnergySkill()
+                    .forEach(id -> avatar.setSkillLevel(id, request.getTalentLevels()));
+            avatar.forceConstellationLevel(request.getConstellations());
+            avatar.recalcStats(true);
+            avatar.save();
+
+            // Add the avatar.
+            player.addAvatar(avatar);
+            player.sendPacket(new PacketAddNoGachaAvatarCardNotify(avatar, ActionReason.Gm));
+            return Response.builder().status(200).message("Avatar granted.").build();
+        } catch (NumberFormatException ignored) {
+            return Response.builder().status(500).message("Invalid player UID or avatar ID.").build();
+        } catch (Exception exception) {
+            Grasscutter.getLogger().debug("A handbook command error occurred.", exception);
+            return Response.builder()
+                    .status(500)
+                    .message("An error occurred while granting the avatar.")
+                    .build();
+        }
+    }
+
+    /**
+     * Gives an item to the player.
+     *
+     * @param request The request object.
+     * @return The response object.
+     */
+    static Response giveItem(GiveItem request) {
+        // Validate the request.
+        if (request.getPlayer() == null || request.getItem() == null) {
+            return Response.builder().status(400).message("Invalid request.").build();
+        }
+
+        try {
+            // Parse the requested player.
+            var playerId = Integer.parseInt(request.getPlayer());
+            var player = Grasscutter.getGameServer().getPlayerByUid(playerId);
+
+            // Parse the requested item.
+            var itemId = Integer.parseInt(request.getItem());
+            var itemData = GameData.getItemDataMap().get(itemId);
+
+            // Validate the request.
+            if (player == null) {
+                return Response.builder().status(1).message("Player not found.").build();
+            }
+            if (!HandbookActions.isAuthenticated(player, request.getPlayerToken())) {
+                return Response.builder().status(1).message("Player not authorized.").build();
+            }
+            if (itemData == null) {
+                return Response.builder().status(400).message("Invalid player UID or item ID.").build();
+            }
+
+            // Add the item to the player's inventory.
+            var amount = request.getAmount();
+            if (amount > Integer.MAX_VALUE) {
+                // Calculate the amount of times we need to add the item.
+                var times = Math.floor((double) amount / Integer.MAX_VALUE);
+                amount = amount % Integer.MAX_VALUE;
+
+                // Add the item the amount of times we need to.
+                for (var i = 0; i < times; i++) {
+                    var itemStack = new GameItem(itemData, Integer.MAX_VALUE);
+                    player.getInventory().addItem(itemStack, ActionReason.Gm);
+                }
+            }
+
+            // Create the item stack and add it to the player's inventory.
+            var itemStack = new GameItem(itemData, (int) amount);
+            player.getInventory().addItem(itemStack, ActionReason.Gm);
+
+            return Response.builder().status(200).message("Item granted.").build();
+        } catch (NumberFormatException ignored) {
+            return Response.builder().status(500).message("Invalid player UID or item ID.").build();
+        } catch (Exception exception) {
+            Grasscutter.getLogger().debug("A handbook command error occurred.", exception);
+            return Response.builder()
+                    .status(500)
+                    .message("An error occurred while granting the item.")
+                    .build();
+        }
+    }
+
+    /**
+     * Teleports the player to a location.
+     *
+     * @param request The request object.
+     * @return The response object.
+     */
+    static Response teleportTo(TeleportTo request) {
+        // Validate the request.
+        if (request.getPlayer() == null || request.getScene() == null) {
+            return Response.builder().status(400).message("Invalid request.").build();
+        }
+
+        try {
+            // Parse the requested player.
+            var playerId = Integer.parseInt(request.getPlayer());
+            var player = Grasscutter.getGameServer().getPlayerByUid(playerId);
+
+            // Parse the requested scene.
+            var sceneId = Integer.parseInt(request.getScene());
+
+            // Validate the request.
+            if (player == null) {
+                return Response.builder().status(1).message("Player not found.").build();
+            }
+            if (!HandbookActions.isAuthenticated(player, request.getPlayerToken())) {
+                return Response.builder().status(1).message("Player not authorized.").build();
+            }
+
+            // Find the scene in the player's world.
+            var scene = player.getWorld().getSceneById(sceneId);
+            if (scene == null) {
+                return Response.builder().status(400).message("Invalid scene ID.").build();
+            }
+
+            // Resolve the correct teleport position.
+            var position = scene.getDefaultLocation(player);
+            var rotation = scene.getDefaultRotation(player);
+            // Teleport the player.
+            scene.getWorld().transferPlayerToScene(player, scene.getId(), position);
+            player.getRotation().set(rotation);
+
+            return Response.builder().status(200).message("Player teleported.").build();
+        } catch (NumberFormatException ignored) {
+            return Response.builder().status(400).message("Invalid player UID or scene ID.").build();
+        } catch (Exception exception) {
+            Grasscutter.getLogger().debug("A handbook command error occurred.", exception);
+            return Response.builder()
+                    .status(500)
+                    .message("An error occurred while teleporting to the scene.")
+                    .build();
+        }
+    }
+
+    /**
+     * Spawns an entity(s) in the player's world.
+     *
+     * @param request The request object.
+     * @return The response object.
+     */
+    static Response spawnEntity(SpawnEntity request) {
+        // Validate the request.
+        if (request.getPlayer() == null || request.getEntity() == null) {
+            return Response.builder().status(400).message("Invalid request.").build();
+        }
+
+        try {
+            // Parse the requested player.
+            var playerId = Integer.parseInt(request.getPlayer());
+            var player = Grasscutter.getGameServer().getPlayerByUid(playerId);
+
+            // Parse the requested entity.
+            var entityId = Integer.parseInt(request.getEntity());
+            var entityData = GameData.getMonsterDataMap().get(entityId);
+
+            // Validate the request.
+            if (player == null) {
+                return Response.builder().status(1).message("Player not found.").build();
+            }
+            if (!HandbookActions.isAuthenticated(player, request.getPlayerToken())) {
+                return Response.builder().status(1).message("Player not authorized.").build();
+            }
+            if (entityData == null) {
+                return Response.builder().status(400).message("Invalid entity ID.").build();
+            }
+
+            // Validate request properties.
+            var scene = player.getScene();
+            var level = request.getLevel();
+            if (scene == null || level > 200 || level < 1) {
+                return Response.builder().status(400).message("Invalid scene or level.").build();
+            }
+
+            // Create the entity.
+            for (var i = 1; i <= request.getAmount(); i++) {
+                var entity = new EntityMonster(scene, entityData, player.getPosition(), level);
+                scene.addEntity(entity);
+            }
+
+            return Response.builder().status(200).message("Entity(s) spawned.").build();
+        } catch (NumberFormatException ignored) {
+            return Response.builder().status(400).message("Invalid player UID or entity ID.").build();
+        } catch (Exception exception) {
+            Grasscutter.getLogger().debug("A handbook command error occurred.", exception);
+            return Response.builder()
+                    .status(500)
+                    .message("An error occurred while teleporting to the scene.")
+                    .build();
+        }
+    }
+}