Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 20:05:19 +00:00
Code Issues Projects Releases Wiki Activity
1,966 Commits 7 Branches 22 Tags 133 MiB
ea91bf9eb7
Commit Graph

1966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thoronium
ea91bf9eb7
Fix switched fields (#2098) 2023-04-05 21:27:24 -04:00
KingRainbow44
a3970f8e43
Format code 2023-04-02 21:34:07 -04:00
KingRainbow44
b03870ab48
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
#	src/main/java/emu/grasscutter/utils/Utils.java
 2023-04-02 21:33:33 -04:00
hamusuke
9181d1cbfd
fix: mail system (#2096) 
* fix: mail

* Simplify the mail handler

---------

Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-04-02 21:32:30 -04:00
KingRainbow44
b2c9e8de3e
Merge branch 'unstable' into unstable-quests 2023-04-02 21:31:39 -04:00
KingRainbow44
d77ded560a
Merge branch 'development' into unstable 2023-04-02 21:31:00 -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
KingRainbow44
8b4471ee54
Check if the scene has a config 2023-04-02 20:42:12 -04:00
Lê Huy Giang
27a9ded4bc
Update README_vi-VN.md (#2094) 
* Fix `#Building` anchor

Fixed `vi-VN`, `ja-JP` & `NL`'s `#Building` anchor

* Update `README_vi-VN.md`

Updated `README_VI-VN.md` for better translation
 2023-04-02 20:41:01 -04:00
ハムスケ ハム
ddafeb9ed3 fix: mail 2023-04-03 00:18:48 +09:00
KingRainbow44
9fbb7fb3be
Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
772532515e
Comment-out unknown packet handlers/encoders 
These are mostly related to the teapot, music game, and custom teams
 2023-04-01 20:00:08 -04:00
KingRainbow44
3e6aa79eb8
Add additional protocol classes 
Using `gc-quest-fix`
 2023-04-01 19:54:11 -04:00
KingRainbow44
29956421f0
Fix existing protocol classes 
Using `gc-quest-fix`
 2023-04-01 19:53:46 -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
86aad96125
Add task for gradle test 2023-03-31 23:37:50 -04:00
KingRainbow44
c8288d1446
Add the improved KCP library 2023-03-31 23:37:25 -04: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
99822b0e22
Remove reflowLongStrings 
Causes an issue with Spotless!
 2023-03-31 22:25:47 -04:00
KingRainbow44
877937bfbb
Create a basic test for Grasscutter's HTTP server 2023-03-31 22:15:28 -04:00
KingRainbow44
2081087c76
Format build.gradle and add dependency for JUnit tests 2023-03-31 22:14:56 -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
31465c0172
Force Git to use LF for line separation 2023-03-31 17:19:46 -04:00
KingRainbow44
15e2f3ca34
Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
KingRainbow44
5bf5fb07a2
Move scripts away from the root directory 2023-03-31 17:05:12 -04:00
Lê Huy Giang
4a6ff4721c
Fix #Building anchor (#2092) 
Fixed `vi-VN`, `ja-JP` & `NL`'s `#Building` anchor
 2023-03-31 16:23:58 -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
KingRainbow44
922f7bca51
Move alternate language README.mds to readme/ 
additionally: fix `id-ID` & `vi-VN`'s `#Building` anchor
 2023-03-31 14:43:53 -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
Lê Huy Giang
88d8310e7e
Add vi-VN readme (#2091) 
* Added vi-VN readme

* Added redirect vn readme to all
 2023-03-31 02:15:36 -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
thecutefinder
fd60e66182
linux 
not gnu/linux smh
 2023-03-12 00:49:59 -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