Commit Graph

75 Commits

  • Improve Platforms (#2275)
    * Improve Platforms
    
    * add this.
  • 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>
  • TSJ and TSV parsing (#1962)
    * Deserialization support for tsv files
    
    * Benchmarking
    
    * Apparently moving the setter out of the lambda fixed the setAccessible issue
    
    * Thread it
    
    * Use AllArgsConstructor instead of field reflection
    
    * Clean up AllArgsConstructor TSV deserialization
    
    * Refactor TsvUtils
    
    * Remove AllArgsConstructors from Excels
    
    * Set field accessible
    
    * [WIP] TSJ improvements
    
    * [WIP] More TSV stuff
    
    * [WIP] More TSV stuff
    
    * Working TSV parser (slow)
    
    * Load Excels in TSJ > JSON > TSV priority
  • [BREAKING] Item Usage Overhaul
    -De-hardcode elemental orb values
    -De-hardcode exp items
    -Change ShopChest format (temporary, drop system overhaul will replace it entirely)
    -Food healing actually uses Ability data for real HP amounts
  • Refactor GameData, remove deprecated getGsonFactory
    - Fix day-of-week dungeons
    - AvatarSkill max level enforcement from excels
    - Partial fix to bonus levels (need packet on talent update)
  • Move Data, Plugin, Script, Packet access from Strings to Paths (#1839)
    * Move Data, Plugin, Script, Packet access from Strings to Paths
    - No longer dump default Data files to folder on launch
    - Allow Scripts to be loaded from Resources zip
    - Lay groundwork for Plugins to be loaded from zip
  • Allow loading Resources from zip files
    Move Resources loading from String filenames to Paths
    Add zip support
  • fixed gadget hp properties and invincibility handling (#1773)
    * fixed gadget hp properties and invincibility handling
    
    * Allow killing of hp locked entities, if the damage is higher then the hp
    
    Co-authored-by: hartie95 <mail@hartie95.de>
  • fix serenitea pot (#1726)
    * partial fix of serenitea pot
    
    * fix serenitea pot
  • Fix QuestEncryptionKeys Path (#1696)
    * Fix QuestEncryptionKeys Path
    
    * Load resources QuestEncryptionKeys
  • Blossom Implement (#1606)
    * Blossom!
    
    * rename
    
    * delete SpawnBlossomEntry.java
    
    * use MAP
    
    * use List
    
    * use LIST
    
    * use List
    
    * useCondensedResin
    
    * useCondensedResin
    
    * fix build
    
    * enhance
    
    * fix bug
    
    * REMOVE BOSS
    
    * fix condensed resin
    
    * fix condensed resin
    
    * use POSITIVE_INFINITY
    
    * use RewardPreviewData
    
    * fix build
    
    * fix resources
    
    * add BLOSSOM_MONSTER_FIGHTING_VOLUME
    
    * edit monster score
    
    * edit monster score
    
    * fix bug
    
    * fix bug
    
    * improve logic
    
    * fix monsters level
    
    * Deleted comment blocks
    
    * nitpick
    
    * Fix compilation problems
    
    * nitpick
    
    * Refactor + nitpick
    
    * Clean up overall diff to develop
    
    * Clean up other usage of condensed resin
    
    * Clean up overall diff to develop
    
    * Lombokify Scene.java
    
    * Missed an odd getter name
    
    * Unhardcode reward previews
    
    * EDIT NAME
    
    * remove leyline 1
    
    * remove leyline 2
    
    * Update BlossomManager.java
    
    Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
  • Funnel all gson calls into helper functions
    Add deprecated getGsonFactory for plugin compat until 3.0
  • Handle Unlocking of Waypoints and Statues (#1608)
    Original commits:
    
    * Add necessary protos for scene point/area unlocking.
    
    * Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.
    
    * Handle unlocking of waypoints.
    
    * Add primo rewards for waypoint unlock.
    
    * Statue unlocking.
    
    * Add statue quest on player login.
    
    * I forgor to add an unlock command.
    
    * Give EXP as reward, fire quest trigger, make EXP UI show up.
  • Introduce a new arguments parser (#1629)
    Original commits:
    
    * Clean-up
    
    * Introduce a new application arguments parser & handler
    
    * Clean-up and deprecate `Tools#getLanguageOption`
    
    * Fix `-debug` and `-debugall` parameters
    
    * found this while debugging, ...why
    
    * Remove deprecated parameters
    
    * Invoke startup argument parser before handbook generation
    
    * Move command map instantiation to `Grasscutter `(prevent making 3 instances on startup)
    
    * Ensure \n at EOF
    
    Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
  • Change loading quest keys from info to debug.
    Please for the love of god use `debug` for information not important to the enduser when starting the server.
  • Add a loadReader helper function to DataLoader
    Also minor name changing on a few DataLoader methods
  • Block loader (sort and merge gadgets into different blocks) (#1517)
    Original commits:
    
    * block loader
    * fix
    * fix
    * fix foolish bug
    * add scales
    * rename
    * set to 600
    * nitpick
    
    Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
  • Big World Resources Collection Implement (#1368)
    * init
    
    * init
    
    * init
    
    * revoke
    
    * fix error
    
    * mining support
    
    * mining support
    
    * Roks endurance support
    
    * Roks endurance support
    
    * Timed refresh
    
    * upgrade resource data
    
    * Timed refresh support
    
    * remove null gadget
    
    * Coordination
    
    * full synchronized
    
    * oh no, my math teacher will hit me!
    
    * synchronized onInteract
    
    * remove break;
    
    * supply re-spawn time , thanks to @wl23333
    
    * Clean up and integrate collection spawns into SpawnDataEntries
    
    Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>