Commit Graph

222 Commits

Author SHA1 Message Date
github-actions
45f4a9233d Format code [skip actions] 2023-05-11 23:46:37 +00:00
KingRainbow44
5cd9d3a26d
Initialize the script loader in ResourceLoader#loadAll 2023-05-11 19:41:50 -04:00
github-actions
f9906c4492 Format code [skip actions] 2023-05-11 02:23:43 +00:00
KingRainbow44
3049cdafc1
Add icon to ItemData 2023-05-08 01:50:01 -04:00
KingRainbow44
79e4268d39
Fix usage of onMethod 2023-05-08 01:49:50 -04:00
KingRainbow44
d32f6982be
Run spotlessApply
also set line endings to native, no more line conflict errors!
2023-05-07 22:53:55 -04:00
scooterboo
c832c1cac0
Revert final's added by 15e2f3ca34 (#2144)
* Revert final's added by 15e2f3ca34

* Apply suggestions from code review

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-07 02:39:16 -04:00
KingRainbow44
2c55b5b3da
Set default value for paramStr 2023-05-03 23:54:06 -04:00
KingRainbow44
f85a7cbe59
Add alternates for quest field names without underscores 2023-05-03 23:40:18 -04:00
KingRainbow44
3df5f79ebf
Revert "Run spotlessApply"
This reverts commit d67e2d0c5e.
2023-05-03 10:48:00 -04:00
KingRainbow44
d67e2d0c5e
Run spotlessApply 2023-05-02 23:21:17 -04:00
KingRainbow44
3ffa0a7478
Remove talk executions on finish which are null 2023-05-02 21:35:42 -04:00
KingRainbow44
fdd6820a8f
Merge pull request Grasscutter-Quests#53
'Updated with how talks are handle' by `mjolsic`
2023-05-02 20:16:55 -04:00
KingRainbow44
6c654ce0c3
Properly add end quest IDs to the endQuestChapterMap 2023-05-01 22:54:25 -04:00
KingRainbow44
400a670856
Load talks from MainQuestData 2023-04-30 20:56:09 -04:00
KingRainbow44
25c72a19e0
Fix main quest data loading issue 2023-04-24 03:10:22 -04:00
KingRainbow44
486582b81c
Revert previous; fix data parsing issue 2023-04-24 02:26:00 -04:00
KingRainbow44
fb686b2afc
Add sub-quest data only in BinOutput
could fix things sometimes
2023-04-24 02:01:17 -04:00
KingRainbow44
1a8d7e901a
Apply additional data from specific main quest lines 2023-04-24 01:44:58 -04:00
KingRainbow44
e85d269518
Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194
Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
ee298235c2
Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
d8f90b26cf
Fix entity controllers not loading
elemental monuments should now work
2023-04-15 01:41:19 -04:00
KingRainbow44
2b4feba86f
Fix issue with Amber not being added
the field for an item's `useOnGain` was final!
2023-04-15 01:23:32 -04:00
KingRainbow44
f08ba95071
Remove forEach on group replacements 2023-04-14 23:56:42 -04:00
KingRainbow44
55118c802d
Load custom server resources 2023-04-14 23:27:08 -04:00
KingRainbow44
a8a78547a1
Fix level entity data loading 2023-04-14 22:59:57 -04:00
dragon
f71b29c00a
Implement a new item drops system (#2112)
* 1

* Delete .gitattributes

* implement

* Update PacketDropHintNotify.java

* Update PacketWorldChestOpenNotify.java

* Update FileUtils.java

* Update PacketDropHintNotify.java

* Update WorldDataSystem.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-04-13 22:28:54 -04:00
KingRainbow44
22fd7ab619
Fix potential NPR 2023-04-13 21:22:21 -04:00
KingRainbow44
c71386c69e
Implement quest data field: gainItems 2023-04-13 20:33:31 -04:00
KingRainbow44
60eb62fa42
Spawn the player at the scene's start position when sent to a dungeon 2023-04-12 02:34:13 -04:00
KingRainbow44
76be70d4a8
Fix grid parsing
now compatiable with Yukki's resources!
2023-04-11 02:05:38 -04:00
KingRainbow44
06cbae31fa
Fix player fields not being set
line seps r weird
2023-04-10 22:46:19 -04:00
KingRainbow44
e20c7c151b
Lint code 2023-04-09 14:50:59 -04:00
KingRainbow44
644f1b3ab9
Continue merging quests (pt. 2) 2023-04-09 14:35:45 -04:00
KingRainbow44
97ee71bcf4
Continue merging quests (pt. 1)
Finished last at: `World.java`, line `player.setAvatarsAbilityForScene(newScene);`
2023-04-09 13:25:16 -04:00
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
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
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
Thoronium
0fc578a243
Fix Cooking Compound Retrieval (#2039)
* Fix misnamed field

* Fix getter name
2023-02-02 14:48:42 +01:00
KingRainbow44
668461a6f1
Clean-Up Startup Sequence
hey i like it clean ok.. dont judge..
2022-12-30 20:31:27 -05: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
AnimeGitB
1c4d263dd2 Add Data TSJ loading, replace and update Banners 2022-11-24 23:09:55 +10:30