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-03-31 13:02:35 +02:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityChallengeTrigger.java
@@ -0,0 +1,35 @@
+package emu.grasscutter.game.activity.trialavatar;
+
+import emu.grasscutter.game.activity.ActivityWatcher;
+import emu.grasscutter.game.activity.ActivityWatcherType;
+import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import java.util.stream.Stream;
+import lombok.val;
+
+@ActivityWatcherType(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE)
+public class TrialAvatarActivityChallengeTrigger extends ActivityWatcher {
+    @Override
+    protected boolean isMeet(String... param) {
+        if (param.length < 3) return false;
+
+        val handler = (TrialAvatarActivityHandler) getActivityHandler();
+        if (handler == null) return false;
+
+        val paramList = handler.getTriggerParamList();
+        if (paramList.isEmpty()) return false;
+
+        val paramCond = Stream.of(paramList.get(0).split(",")).toList();
+        return Stream.of(param).allMatch(x -> paramCond.contains(x));
+    }
+
+    @Override
+    public void trigger(PlayerActivityData playerActivityData, String... param) {
+        if (!isMeet(param)) return;
+
+        val handler = (TrialAvatarActivityHandler) getActivityHandler();
+        if (handler == null) return;
+
+        handler.setPassDungeon(playerActivityData);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarActivityHandler.java
@@ -0,0 +1,164 @@
+package emu.grasscutter.game.activity.trialavatar;
+
+import com.esotericsoftware.reflectasm.ConstructorAccess;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.RewardData;
+import emu.grasscutter.game.activity.ActivityHandler;
+import emu.grasscutter.game.activity.ActivityWatcher;
+import emu.grasscutter.game.activity.DefaultWatcher;
+import emu.grasscutter.game.activity.GameActivity;
+import emu.grasscutter.game.activity.PlayerActivityData;
+import emu.grasscutter.game.dungeons.DungeonTrialTeam;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.ActivityType;
+import emu.grasscutter.game.props.WatcherTriggerType;
+import emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo;
+import emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord.GrantReason;
+import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
+import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
+import emu.grasscutter.utils.JsonUtils;
+import java.util.*;
+import java.util.stream.*;
+import lombok.*;
+
+@GameActivity(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR)
+public class TrialAvatarActivityHandler extends ActivityHandler {
+    @Getter @Setter private int selectedTrialAvatarIndex;
+
+    @Override
+    public void onInitPlayerActivityData(PlayerActivityData playerActivityData) {
+        TrialAvatarPlayerData trialAvatarPlayerData =
+                TrialAvatarPlayerData.create(getActivityConfigItem().getScheduleId());
+
+        playerActivityData.setDetail(trialAvatarPlayerData);
+    }
+
+    @Override
+    public void onProtoBuild(
+            PlayerActivityData playerActivityData, ActivityInfo.Builder activityInfo) {
+        TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
+
+        // TODO: Apply trial avatar info.
+        // activityInfo.setTrialAvatarInfo(trialAvatarPlayerData.toProto());
+    }
+
+    @Override
+    public void initWatchers(Map<WatcherTriggerType, ConstructorAccess<?>> activityWatcherTypeMap) {
+        var watcherType = activityWatcherTypeMap.get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE);
+        ActivityWatcher watcher;
+        if (watcherType != null) {
+            watcher = (ActivityWatcher) watcherType.newInstance();
+        } else {
+            watcher = new DefaultWatcher();
+        }
+
+        watcher.setActivityHandler(this);
+        getWatchersMap()
+                .computeIfAbsent(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE, k -> new ArrayList<>());
+        getWatchersMap().get(WatcherTriggerType.TRIGGER_FINISH_CHALLENGE).add(watcher);
+    }
+
+    public TrialAvatarPlayerData getTrialAvatarPlayerData(PlayerActivityData playerActivityData) {
+        if (playerActivityData.getDetail() == null || playerActivityData.getDetail().isBlank()) {
+            onInitPlayerActivityData(playerActivityData);
+            playerActivityData.save();
+        }
+
+        return JsonUtils.decode(playerActivityData.getDetail(), TrialAvatarPlayerData.class);
+    }
+
+    public int getTrialActivityDungeonId(int trialAvatarIndexId) {
+        val data = GameData.getTrialAvatarActivityDataByAvatarIndex(trialAvatarIndexId);
+        return data != null ? data.getDungeonId() : -1;
+    }
+
+    public List<String> getTriggerParamList() {
+        val data = GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
+        return data != null ? data.getTriggerConfig().getParamList() : Collections.emptyList();
+    }
+
+    public boolean enterTrialDungeon(Player player, int trialAvatarIndexId, int enterPointId) {
+        // TODO, not sure if this will cause problem in MP, since we are entering trial activity dungeon
+        player.sendPacket(
+                new PacketScenePlayerLocationNotify(player.getScene())); // official does send this
+
+        if (!player
+                .getServer()
+                .getDungeonSystem()
+                .enterDungeon(player, enterPointId, getTrialActivityDungeonId(trialAvatarIndexId)))
+            return false;
+
+        setSelectedTrialAvatarIndex(trialAvatarIndexId);
+
+        return true;
+    }
+
+    public List<Integer> getBattleAvatarsList() {
+        val activityData =
+                GameData.getTrialAvatarActivityDataByAvatarIndex(getSelectedTrialAvatarIndex());
+        if (activityData == null || activityData.getBattleAvatarsList().isBlank()) return List.of();
+        return Stream.of(activityData.getBattleAvatarsList().split(","))
+                .map(Integer::parseInt)
+                .toList();
+    }
+
+    public DungeonTrialTeam getTrialAvatarDungeonTeam() {
+        List<Integer> battleAvatarsList = getBattleAvatarsList();
+        if (battleAvatarsList.isEmpty()) return null;
+
+        return new DungeonTrialTeam(
+                battleAvatarsList, GrantReason.GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY);
+    }
+
+    public void unsetTrialAvatarTeam(Player player) {
+        if (this.getSelectedTrialAvatarIndex() <= 0) return;
+        player.getTeamManager().removeTrialAvatar();
+        this.setSelectedTrialAvatarIndex(0);
+    }
+
+    public boolean getReward(Player player, int trialAvatarIndexId) {
+        val playerActivityData =
+                player
+                        .getActivityManager()
+                        .getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_TRIAL_AVATAR);
+
+        if (playerActivityData.isEmpty()) {
+            return false;
+        }
+
+        TrialAvatarPlayerData trialAvatarPlayerData =
+                getTrialAvatarPlayerData(playerActivityData.get());
+        TrialAvatarPlayerData.RewardInfoItem rewardInfo =
+                trialAvatarPlayerData.getRewardInfo(trialAvatarIndexId);
+        if (rewardInfo == null) return false;
+
+        RewardData rewardParam = GameData.getRewardDataMap().get(rewardInfo.getRewardId());
+        if (rewardParam == null) return false;
+
+        player
+                .getInventory()
+                .addItemParamDatas(
+                        rewardParam.getRewardItemList(), ActionReason.TrialAvatarActivityFirstPassReward);
+        rewardInfo.setReceivedReward(true);
+        playerActivityData.get().setDetail(trialAvatarPlayerData);
+        playerActivityData.get().save();
+        return true;
+    }
+
+    public void setPassDungeon(PlayerActivityData playerActivityData) {
+        TrialAvatarPlayerData trialAvatarPlayerData = getTrialAvatarPlayerData(playerActivityData);
+        TrialAvatarPlayerData.RewardInfoItem rewardInfo =
+                trialAvatarPlayerData.getRewardInfo(getSelectedTrialAvatarIndex());
+        if (rewardInfo == null) return;
+
+        rewardInfo.setPassedDungeon(true);
+        playerActivityData.setDetail(trialAvatarPlayerData);
+        playerActivityData.save();
+        Player player = Grasscutter.getGameServer().getPlayerByUid(playerActivityData.getUid());
+        player.sendPacket(
+                new PacketActivityInfoNotify(
+                        toProto(playerActivityData, player.getActivityManager().getConditionExecutor())));
+    }
+}
--- a/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java
+++ b/src/main/java/emu/grasscutter/game/activity/trialavatar/TrialAvatarPlayerData.java
@@ -0,0 +1,90 @@
+package emu.grasscutter.game.activity.trialavatar;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.common.BaseTrialActivityData;
+import emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo;
+import emu.grasscutter.net.proto.TrialAvatarActivityRewardDetailInfoOuterClass.TrialAvatarActivityRewardDetailInfo;
+import java.util.List;
+import java.util.stream.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+import lombok.val;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Builder(builderMethodName = "of")
+public class TrialAvatarPlayerData {
+    List<RewardInfoItem> rewardInfoList;
+
+    private static BaseTrialActivityData getActivityData(int scheduleId) {
+        // prefer custom data over official data
+        return GameData.getTrialAvatarActivityCustomData().isEmpty()
+                ? GameData.getTrialAvatarActivityDataMap().get(scheduleId)
+                : GameData.getTrialAvatarActivityCustomData().get(scheduleId);
+    }
+
+    public static List<Integer> getAvatarIdList(int scheduleId) {
+        val activityData = getActivityData(scheduleId);
+        return activityData != null ? activityData.getAvatarIndexIdList() : List.of();
+    }
+
+    public static List<Integer> getRewardIdList(int scheduleId) {
+        val activityData = getActivityData(scheduleId);
+        return activityData != null ? activityData.getRewardIdList() : List.of();
+    }
+
+    public static TrialAvatarPlayerData create(int scheduleId) {
+        List<Integer> avatarIds = getAvatarIdList(scheduleId);
+        List<Integer> rewardIds = getRewardIdList(scheduleId);
+        return TrialAvatarPlayerData.of()
+                .rewardInfoList(
+                        IntStream.range(0, avatarIds.size())
+                                .filter(i -> avatarIds.get(i) > 0 && rewardIds.get(i) > 0)
+                                .mapToObj(i -> RewardInfoItem.create(avatarIds.get(i), rewardIds.get(i)))
+                                .collect(Collectors.toList()))
+                .build();
+    }
+
+    public TrialAvatarActivityDetailInfo toProto() {
+        return TrialAvatarActivityDetailInfo.newBuilder()
+                .addAllRewardInfoList(getRewardInfoList().stream().map(RewardInfoItem::toProto).toList())
+                .build();
+    }
+
+    public RewardInfoItem getRewardInfo(int trialAvatarIndexId) {
+        return getRewardInfoList().stream()
+                .filter(x -> x.getTrialAvatarIndexId() == trialAvatarIndexId)
+                .findFirst()
+                .orElse(null);
+    }
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    @Builder(builderMethodName = "of")
+    public static class RewardInfoItem {
+        int trialAvatarIndexId;
+        int rewardId;
+        boolean passedDungeon;
+        boolean receivedReward;
+
+        public static RewardInfoItem create(int trialAvatarIndexId, int rewardId) {
+            return RewardInfoItem.of()
+                    .trialAvatarIndexId(trialAvatarIndexId)
+                    .rewardId(rewardId)
+                    .passedDungeon(false)
+                    .receivedReward(false)
+                    .build();
+        }
+
+        public TrialAvatarActivityRewardDetailInfo toProto() {
+            return TrialAvatarActivityRewardDetailInfo.newBuilder()
+                    .setTrialAvatarIndexId(getTrialAvatarIndexId())
+                    .setRewardId(getRewardId())
+                    .setPassedDungeon(isPassedDungeon())
+                    .setReceivedReward(isReceivedReward())
+                    .build();
+        }
+    }
+}