Commit Graph

1516 Commits

Author SHA1 Message Date
KingRainbow44
8f468ed0c9
Add basis of the content panel
- Home buttons
- Implement sidebar
- Add home title
2023-04-03 23:39:45 -04:00
KingRainbow44
9bb87ff60d
Scaffold class-based React + Tailwind project
now configured with TypeScript aliases!
2023-04-03 22:33:53 -04:00
KingRainbow44
c0c60b5e4e
Scaffold vite-react project 2023-04-03 22:23:03 -04:00
KingRainbow44
95e1d77b65
Merge branch 'fixmail' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/game/mail/Mail.java
#	src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
#	src/main/java/emu/grasscutter/utils/Utils.java
2023-04-02 21:30:52 -04:00
KingRainbow44
90fb606f68
Simplify the mail handler 2023-04-02 21:23:02 -04:00
ハムスケ ハム
ddafeb9ed3 fix: mail 2023-04-03 00:18:48 +09:00
KingRainbow44
e636fda14f
Run Spotless on src/test 2023-03-31 22:34:19 -04:00
KingRainbow44
6d9a81ba1c
Run Spotless on src/generated 2023-03-31 22:32:25 -04:00
KingRainbow44
fc05602128
Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
877937bfbb
Create a basic test for Grasscutter's HTTP server 2023-03-31 22:15:28 -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
yzr
cf4cd80010
Fix delombok package not exists error with proto generated files (#2083)
Fix javadoc & suppress no comments warning
Fix terminal interaction in IDEA
Update lombok onMethod to JDK8 version
Some code reformat
2023-03-31 02:16:32 -04:00
Xotak
5f011b477b
Update fr-FR.json (#2084) 2023-03-26 20:10:59 -04:00
TotallyNotOndre
8d09b8833c
Update ru-RU.json (#2081) 2023-03-12 21:10:01 -04:00
rwx9032
fdaa487b2a
Add support for the Chinese client (#2076)
* Add CNREL support

* Improve logic

* Maintain spacing

* Remove language keys & switch to debug

* Improve Format
2023-03-12 00:51:21 -05: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
hamusuke
51479e2abd
fix: incorrect Japanese word order (#2072) 2023-02-26 00:11:26 -05:00
Thoronium
b209d91947
Add home resource gain (#2064) 2023-02-23 23:22:25 -05:00
hamusuke
220c23b960
feat: change game time (#2061)
* feat: change game time

* Update proto names
2023-02-23 23:21:44 -05:00
Thoronium
a078b5ae28
Fix particle generation (#2066) 2023-02-23 23:20:57 -05:00
Thoronium
9a67f93ee8
Update missed files (#2060) 2023-02-20 13:46:32 -05:00
yeyeye
71a1e31d37
update gc 3.4 (#2041)
* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo
2023-02-18 22:18:27 -05:00
ERthereal
39b4aa1387
Fix in-game display text (#2049) 2023-02-15 19:33:32 -05:00
Thoronium
1b2210f5a7
Improved satiation (#2055)
* Natural satiation decreasing
Graphic showing satiation when eating (usually)

* Reworking values to match original

* Little fixes

* Satiation bar matches real values
Revival correctly updates bar

* Greatly simplify handling
Some fixes

* Inline variables
Add TODO for bug

* Satiation works correctly
Finally it all works as intended

* Remove unnecessary packets

* Improve satiation reduction handling
2023-02-15 19:32:59 -05:00
Thoronium
b4b8f1ec38
Fix climb jump stamina (#2056)
* Fix climb jump stamina

* Update StaminaManager.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-02-15 19:32:11 -05:00
Thoronium
d1c7ced0ef
Fix load order (#2057) 2023-02-15 19:31:33 -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
Thoronium
1a50cccb38
Fix goal (#2052) 2023-02-09 17:12:01 +01:00
ZanyRain
3b29ba032e
Some fix about scene script and quest (#2029)
* [ScriptLib] Query player when not get entity from scene

* Fix NPE when doing quests

* Add QUEST_CONTENT_SKILL trigger

Q353 need it

* Add some missing fields that contain in scene scripts

* Add a lua table serializer implement with jackson

This do not replace the original one,it is useful when debug

* Fix point_array type error

* feat: fix space
2023-02-09 17:10:07 +01:00
Thoronium
ab5b49b7c5
Teapot Implementations & Fixes (#2032)
* Add realm switching
Fix realm unlock items

* Implement exiting teapot

* Implement home level rewards

* Fix small issues

* Fix call issue

* Add 'seen unlock' packets

* Fix Sumeru Main House bricking accounts
This is only for the house, not the full realm

* Fixed realm 5

Main house needs to be placed manually for Sumeru realm (module 5) as the resources for defaults in Sumeru realm are missing. Sumeru main house cannot be exited from the door, issue due to the same missing res.

* Fix Grass main house bricking accounts

* Remove references

* Formatting change (web editor)

* Whitespace & Formatting

* Whitespace

* Make 'seen' status persistent

* Fix misnamed field

* Revert "Fix misnamed field"

This reverts commit 21ef404e14.

* Implement gaining trust (realm exp)

Add gaining trust by crafting
Add gaining trust via `/give`
Show trust in djinn menu

* Interior check for prevScene

* Correct positions & rotations

Return to front of main house when exiting from inside

* Update HandlerBackMyWorldReq.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2023-02-09 17:00:16 +01:00
Thoronium
0fc578a243
Fix Cooking Compound Retrieval (#2039)
* Fix misnamed field

* Fix getter name
2023-02-02 14:48:42 +01:00
ghjbvvgh
8a5a6ab83e
Unlock hidden points (#2016) 2023-01-11 00:28:00 +01:00
KingRainbow44
668461a6f1
Clean-Up Startup Sequence
hey i like it clean ok.. dont judge..
2022-12-30 20:31:27 -05:00
ZanyRain
fe80290bed
Output the handbook based off the client language (#1993) 2022-12-26 20:09:21 +01:00
Simplxs
92fbaa8670
Update gc to 3.3 (#1981)
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2022-12-23 22:12:02 +01:00
유여름
8b83dbf58c
Update Korean translation (#1977)
* updated ko-KR.json

Update Korean translation

* Update ko-KR.json
2022-12-11 01:22:34 +10:30
Tesutarin
e73984bd41
Update CHS translation (#1965) 2022-12-02 10:25:15 +10:30
AnimeGitB
553e22ead8 Add more explicit NoSuchFileException message for excels 2022-11-28 21:04:39 +10:30
AnimeGitB
5878cb6f8d Accidentally left recent banner on test string 2022-11-26 16:50:56 +10:30
AnimeGitB
100d08ec5d Fix up pity tallies for new BannerTypes
Also fixes Beginner banner using Standard pity.
2022-11-26 02:03:11 +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
ad502a8568 Finally enforce deprecation of ancient Banners.json fields
Also add costItemId10 column so people know it exists, and removeC6FromPool column because it's a cool setting nobody knows about.
2022-11-24 23:56:13 +10:30
AnimeGitB
f6c84fdfbf Forgot about a 5star character that was added to the standard pool 2022-11-24 23:17:10 +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
Xotak
46b0c7cf93
Work on French localization (#1958)
* Work on French localization

* Apply suggestions from code review
2022-11-22 20:48:39 +10:30