Commit Graph

89 Commits

Author SHA1 Message Date
Melledy
55541fa1da Add a loadReader helper function to DataLoader
Also minor name changing on a few DataLoader methods
2022-07-21 00:21:00 -07:00
Yazawazi
ae8b5e30ac Full support for both parties 2022-07-17 13:43:45 +09:30
AnimeGitB
bc2c5deb48 Add Dispatch Password authentication 2022-07-17 13:43:45 +09:30
akatatsu27
c79ca3028f Added more server debug options (#1444)
Original commits:

* Added more server debug options

* made server debug code prettier

* fixed initialization bug

* Enables logging of packets contained in UnionCmdNotify, when debug level is WHITELIST or BLACKLIST
2022-07-09 03:01:29 +09:30
GanyusLeftHorn
6338c17189 Add reliquary decomposition (aka strongbox). 2022-07-05 22:59:19 -07:00
zhaodice
2462da2ede 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>
2022-06-29 04:53:50 -07:00
KingRainbow44
f86b4bec11 Reformat 2022-06-26 13:00:23 -04:00
AnimeGitB
baafb4104c Remove GiveAll, GiveArt, GiveChar commands 2022-06-25 22:19:29 -07:00
KingRainbow44
95df9a3162 Hardcode EventType.GAME for ServerLogEvent 2022-06-24 01:22:11 -04:00
GanyusLeftHorn
63b6b805cc Bring back dungeon drops. 2022-06-21 19:49:46 -07:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
ImmuState
6e955c9fdb Implement Resin (#1257)
* Basic resin usage/refresh.

* Honor resin config, move some logic to logon.

* Add resin usage to DungeonChallenge

* Make fragile and transient resin usable.

* Get resin cost from dungeon excel.

* Add ability to unlock combine diagrams.

* Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin.

* Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin.

* Remove comment

* Check resin usage in addResin
2022-06-14 01:14:15 -07:00
lhhxxxxx
0e6ac4a827 Update default config to match the one in Koko-boya/Grasscutter_Resources 2022-05-31 02:07:18 -07:00
Melledy
184eec82b3 Limit spawn amount if too many entities are in the world
Can be controlled in the config with `sceneEntityLimit`
2022-05-30 20:06:25 -07:00
Melledy
a23b29b65a Rename excel classes 2022-05-30 20:06:25 -07:00
Akka
5a3e9bc34e Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
ImmuState
1d2fde40d5 Make energy usage configurable, and preserve current behavior as the default. 2022-05-22 12:55:55 -07:00
7c899ce1d0 Fix dataloader not getting path correctly 2022-05-20 19:32:27 -07:00
zrll_
eb54dcec0e Update FileUtils.java
fix: Error when checking files & always checking "/default/data" instead of folder
2022-05-20 05:49:28 -07:00
4Benj_
92f1a93ba2 Server Log Events (#996)
* Server Log Event

* LogEventAppender Encoder
2022-05-20 05:48:20 -07:00
ButterCookies
9125bacfce Set the maximum number of player on the server through the config.json (#1001)
* Show server status to three-party game launcher

* Set the maximum number of player on the server through the config.json

* modify the logical order and show the number of maxplayer to API /status/server

* Now even players who have token already cannot bypass the maxPlayer check
2022-05-20 05:47:47 -07:00
Melledy
1282e1388f Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
5429469852 Add error message in case data files in resources could not be found 2022-05-19 03:05:57 -07:00
Melledy
a088ea9b6b Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
Melledy
512021b234 Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
7fb26c3843 Autogenerate document files 2022-05-18 23:19:13 -07:00
Melledy
fe4e599014 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -07:00
4Benj_
f473e44611 "Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927)
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
2022-05-17 03:00:52 -07:00
Melledy
81183db104 Merge branch 'development' into dev-world-scripts 2022-05-16 22:08:28 -07:00
muhammadeko
5ddf67d9e5 add config to enable/disable console 2022-05-16 17:57:14 -07:00
line-bear
87966b9e98 Remove the extra slash while loading resources. (#893)
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
2022-05-15 23:32:03 -07:00
Akka
6dc30e4def Enable script in big world (#884)
* add docs for tower

* fix: LEAK: ByteBuf.release() was not called

* enableScriptInBigWorld

* not print log when loaded scripts from cache

* revert the change of server tick

* revert the change of server tick

* fix

* optimize the performance: lazy load & cache

* fix the refresh group

* fix NPE

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-05-15 04:19:24 -07:00
KingRainbow44
5d7edc389e Implement PR #657 2022-05-14 12:21:55 -04:00
KingRainbow44
a2ff8c8470 Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
KingRainbow44
840f4706b5 Refactor dispatch (now called HTTP) server (pt. 1) 2022-05-13 11:39:40 -04:00
KingRainbow44
a0067b664e Add JSON-related methods to Utils.java 2022-05-13 11:38:54 -04:00
AnimeGitB
f83f13204e Gacha rework
Add fallback stripping and C6 stripping
Converting banner definitions from pity vars to lerp arrays
Properly implement rates and pool smoothing
Also move reusable functions to Utils
2022-05-13 05:34:14 -07:00
Hotaru
2451d2c897 Build region_list and cur_region dynamically 2022-05-12 14:54:33 -07:00
Secretboy-SMR
9ed1bb9b94 It will use the english as default rather than tell you the value is not exist if there's no translation for currently language 2022-05-11 11:50:53 -07:00
KingRainbow44
d215035fc8 Refactor config database settings 2022-05-11 11:38:30 -04:00
Secretboy-SMR
e3fd2eaa17 Removed invalid code in getLanguageFileDescription,When the language is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale 2022-05-11 03:11:10 -07:00
Secretboy-SMR
04f6e73447 fixed language not found prompt 2022-05-11 01:18:10 -07:00
mingjun97
8ad6bda3b2 Bug fixes.
* Fix default port for the game server
* Fix the returning region info
2022-05-11 01:17:51 -07:00
KingRainbow44
812f4b372c Fix ClassDefNotFound & NullPointerException errors 2022-05-11 01:23:18 -04:00
KingRainbow44
bd9e207a8c Remove old config & migrate legacy configs 2022-05-11 00:46:49 -04:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
KingRainbow44
5d49323c37 my poor, poor, language system (Formatting refactor) 2022-05-10 20:00:47 -04:00
Secretboy
ecf028d0c6 add /language command (#780)
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate
2022-05-10 05:33:45 -07:00
Secretboy-SMR
5a37acde2b Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located
2022-05-09 23:15:58 -07:00
Melledy
06f531fe18 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00