Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-19 10:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,965 Commits 7 Branches 22 Tags
a3970f8e4334ab68a2f8ffcd813500efd1b8b69d
Commit Graph

142 Commits

Author SHA1 Message Date
KingRainbow44
a3970f8e43 Format code 2023-04-02 21:34:07 -04:00
KingRainbow44
9fbb7fb3be Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
daa51e53b7 Copy some files from Grasscutter-Quests 
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
 2023-04-01 18:06:30 -04:00
KingRainbow44
262ee38ded Create files from Grasscutter-Quests 
these files are NOT directly compatible with Grasscutter, and require additional modifications to the codebase to work.
 2023-03-31 23:58:12 -04:00
KingRainbow44
fc05602128 Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
bbe51fb945 Add support for unit testing 
- Add argument `-testing`, which allows for a threaded console
 2023-03-31 22:13:58 -04:00
KingRainbow44
15e2f3ca34 Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
Colleiflower
516e5975e1 Add support for v3.5.0 (#2090) 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-03-31 15:13:32 -04:00
hamusuke
3ab3d5bc04 Simply implement achievement system and add achievement command (#2068) 
* Implement achievement system

* Update src/main/java/emu/grasscutter/command/commands/AchievementCommand.java

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>

* fix: redundant codes

* fix: redundant codes

* Update language files

---------

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>
 2023-02-26 00:14:27 -05:00
Lemon_miaow
11351d9866 Fixed only the issue about "BOOLEAN" occurring when importing resources. (#2028) 
* Only Fix 'Exception in thread 'main' com.google.gson.JsonSyntaxException: java.io.IOException: Invalid DynamicFloat definition - BOOLEAN' problem.

* Update ResourceLoader.java

* Modify code indentation and optimization.

* Update JsonUtils.java

* Update JsonUtils.java

* Update DynamicFloat.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-02-15 19:31:09 -05:00
KingRainbow44
668461a6f1 Clean-Up Startup Sequence 
hey i like it clean ok.. dont judge..
 2022-12-30 20:31:27 -05:00
AnimeGitB
553e22ead8 Add more explicit NoSuchFileException message for excels 2022-11-28 21:04:39 +10:30
AnimeGitB
83b84408a1 Bake banner defaults into BannerType enum, and add every historic banner 2022-11-25 23:25:22 +10:30
AnimeGitB
da3981089d Add Position JsonAdapter for [x,y,z] format 
Also add serializers for existing JsonAdapters
 2022-11-25 00:29:26 +10:30
AnimeGitB
1c4d263dd2 Add Data TSJ loading, replace and update Banners 2022-11-24 23:09:55 +10:30
AnimeGitB
35962542af Fix oversight on EnumTypeAdapterFactory 2022-11-24 01:36:58 +10:30
Luke H-W
0b5329514b 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
 2022-11-24 00:18:57 +10:30
lilmayofuksu
4ed0b90c27 Add the new keys (3.2 Support) (#1923) 
* Add the new keys

* Some improvements to the key loading system & Bump the game version
 2022-11-01 23:28:04 +01:00
BiosNod
43b7d7a383 Debug system (#1894) 
* Add build (compile) script: gradlew jar

* Move server and services log levels to ConfigContainer, ability to enable/disable show packet payload and loop packets

* Add some loop packets to known list
 2022-10-29 23:31:28 +10:30
AnimeGitB
f07ce48b24 Remove compilation warning on Language.java 2022-10-28 22:13:13 +10:30
AnimeGitB
54ad108a14 Fix edge case on FileUtils::getFilenameWithoutPath 2022-10-22 17:15:43 +10:30
Luke H-W
026ef9c51b Restore ability to run without jar (#1875) 
* Change JAR_FILE_SYSTEM to allow running from IDE without jar

* Just grab /defaults/data

* Restore FileUtils.getPathsFromResource
 2022-10-19 01:26:11 +10:30
lilmayofuksu
a4747abfc9 Add a dictionary for Encryption public keys (#1862) 2022-10-16 00:36:37 +10:30
AnimeGitB
f3a5bc16a8 Refactor handbook generation to not use naked textmap getter 2022-10-15 23:58:33 +10:30
AnimeGitB
4a5a7bd6bd Accept resource enums of form "1" 2022-10-15 22:18:54 +10:30
github-actions
025e5d3c1c Fix whitespace [skip actions] 2022-10-13 13:32:10 +00:00
AnimeGitB
4e75361ad4 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)
 2022-10-13 18:31:34 +10:30
AnimeGitB
558471237a Add DynamicFloat class 2022-10-12 21:58:39 +10:30
AnimeGitB
f801fe0305 Update GM Handbook with Spincrystal names and Monster strings 2022-10-12 16:01:22 +10:30
AnimeGitB
98ac42a6c6 Flatten language translation keys in-memory 2022-10-09 12:21:05 +10:30
Luke H-W
dd6e1bb8a3 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
 2022-10-07 23:01:08 +10:30
AnimeGitB
fbc0219cba Allow loading Resources from zip files 
Move Resources loading from String filenames to Paths
Add zip support
 2022-09-23 22:25:17 +09:30
Melledy
a90455a7a4 Add -game and -dispatch startup arguments that override the run mode in the config 2022-09-18 20:52:30 -07:00
Melledy
4eaedae0b7 Move the remaining HttpUtils function over to Router 2022-09-01 13:20:42 -07:00
Melledy
fee34c515d Clean up http server content types 2022-09-01 13:20:42 -07:00
Benj
a1c31d1779 Replace express with javalin in logger 2022-09-01 13:20:42 -07:00
Benj
b5bed6ceef Update HttpServer & AuthenticationSystem to use Javalin 2022-09-01 13:20:42 -07:00
AnimeGitB
6ee6e5c2cc Fix up some japanese references 2022-08-26 23:00:34 +09:30
AnimeGitB
9970aeb94d Consolidate random point offsets 2022-08-25 00:22:43 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
AnimeGitB
955004343f Improve translate function 
Make commands pass ints and floats instead of manually casting them to string first
 2022-08-21 20:53:37 +09:30
赵怡然
abd1e7569e 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>
 2022-08-20 23:19:59 -07:00
AnimeGitB
46223c8976 Refactor Json helper functions to JsonUtils 2022-08-11 17:59:08 +09:30
AnimeGitB
c6323e9759 Funnel all gson calls into helper functions 
Add deprecated getGsonFactory for plugin compat until 3.0
 2022-08-11 17:59:08 +09:30
Magix
3121e3e67d 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>
 2022-08-10 11:54:43 +09:30
AnimeGitB
a2cdec02af Make missing languages not throw warnings 2022-08-09 04:57:44 -07:00
AnimeGitB
9c66ba137f Unify gacha mappings generation 2022-08-09 20:59:11 +09:30
AnimeGitB
c1ff7332fe Generate handbooks on every launch, fix html docs 2022-08-09 20:59:11 +09:30
AnimeGitB
0994417261 Cache used strings from TextMaps 2022-08-09 20:59:11 +09:30