388 Commits

Author	SHA1	Message	Date
Benjamin Elsdon	dd42d3b027	Initial work on mail	2022-04-25 16:18:23 +08:00
Benjamin Elsdon	1e4c4f96ae	Update protos	2022-04-25 16:18:23 +08:00
Benjamin Elsdon	2e26e16d4d	Added ChangeMailStarNotify (change importance level)	2022-04-25 16:11:57 +08:00
Melledy	70ca853e5e	Merge branch 'stable' into development	2022-04-25 00:58:53 -07:00
Asnxthaony	bc3fa67408	fix indent by using smart tabs	2022-04-25 00:54:11 -07:00
Asnxthaony	25111ed907	sanity check	2022-04-25 00:54:11 -07:00
Asnxthaony	6350d83ad0	fix SetPlayerBirthdayRsp	2022-04-25 00:54:11 -07:00
Benjamin Elsdon	3a677ff6d2	Mail read notify	2022-04-25 15:41:18 +08:00
BaiSugar	1567e480e1	remove test avatar	2022-04-25 15:17:55 +08:00
Benjamin Elsdon	ffe96fe93a	Deleting mail + a bit of cleanup	2022-04-25 14:30:56 +08:00
Benjamin Elsdon	850b3d20ff	Receiving items in mail	2022-04-25 13:51:19 +08:00
Yan	0cdc6115d4	fix setting electro dmg stat	2022-04-24 17:57:42 -07:00
alangy98	dce63b0760	Revert "bugfix: portbind error when falling back to http server" ... This reverts commit c14eb2204b. the bugfix is inappropriate	2022-04-24 17:57:18 -07:00
alt3ri	5d637ed559	Added UID parameter ... Now you can delete other player's weapons with UID Usage: /clearwp [uid]	2022-04-24 17:56:49 -07:00
Yazawazi	f46650c983	add setfriendship aliases	2022-04-24 10:32:47 -07:00
Alangy	c14eb2204b	bugfix: portbind error when falling back to http server	2022-04-24 23:05:08 +08:00
BaiSugar	05c6b29831	fix	2022-04-24 22:49:33 +08:00
BaiSugar	1132c2c753	Corrected format	2022-04-24 22:46:43 +08:00
BaiSugar	5eccbc8565	Corrected format	2022-04-24 22:45:30 +08:00
BaiSugar	271f9b9ec5	Revert "Corrected format" ... This reverts commit 153593b64c.	2022-04-24 22:42:44 +08:00
BaiSugar	153593b64c	Corrected format	2022-04-24 22:38:53 +08:00
Melledy	d04a4856df	Merge pull request #180 from Yazawazi/development ... Fix the property prompt issue in fetter system	2022-04-24 07:21:34 -07:00
Melledy	146b1ebb6f	Merge pull request #167 from memetrollsXD/development ... Try to fix "No SSL cert found bind exception"	2022-04-24 07:16:05 -07:00
BaiSugar	95871abb5b	Added command to get all items	2022-04-24 21:52:50 +08:00
Benjamin Elsdon	c7096f9e49	THE MAILBOX ACTUALLY WORKS CORRECTLY NOW	2022-04-24 19:06:52 +08:00
memetrollsXD	824e2f8f55	Add .vscode to gitignore and use @fumbling644o's implementation	2022-04-24 12:24:41 +02:00
Benjamin Elsdon	b10a889d76	Java-16 compatiable mail system (whoops)	2022-04-24 18:17:08 +08:00
Benjamin Elsdon	9e81e10e64	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-24 18:01:32 +08:00
Yazawazi	a743155039	command fix too	2022-04-24 15:10:25 +08:00
Yazawazi	5ed49a27e0	Merge branch 'Grasscutters:development' into development	2022-04-24 15:03:58 +08:00
Melledy	3c9a2ba846	Merge pull request #175 from omg-xtao/suicide ... GodMode command supports playerId	2022-04-24 00:03:21 -07:00
Yazawazi	fb9f6c0bf4	Fix fetter system	2022-04-24 15:02:31 +08:00
BaiSugar	d761b50656	Added command to get all items	2022-04-24 14:01:03 +08:00
Yazawazi	232e9a470d	Player Level Reward Update Notify Support!	2022-04-24 13:22:26 +08:00
xtaodada	95411a6df3	GodMode command supports playerId	2022-04-24 11:40:10 +08:00
Yazawazi	1517c567c1	Player level reward	2022-04-24 11:25:13 +08:00
memetrollsXD	40cf40ce00	Remove last catch and init another variable as placeholder	2022-04-24 04:50:22 +02:00
memetrollsXD	47d34ebcd1	Forgot the toCharArray	2022-04-24 04:41:06 +02:00
memetrollsXD	b76dec2441	Notify user that new pw was used	2022-04-24 04:36:11 +02:00
memetrollsXD	e29b6744d4	Try to fix "No SSL cert found bind exception"	2022-04-24 04:34:17 +02:00
Melledy	bae34b8072	Merge pull request #164 from miyucchi/development ... Fix counter (Create a new account if exists issue)	2022-04-23 15:26:14 -07:00
Melledy	54ad583c67	Merge pull request #128 from memetrollsXD/development ... Use count for level for equips (dev branch)	2022-04-23 15:15:22 -07:00
Miyucchi	c4cdc97d7b	Fix counter	2022-04-24 00:10:26 +02:00
Yazawazi	523d0260d0	tp with relative coordinates	2022-04-24 05:20:59 +08:00
Yazawazi	80cb967c86	Merge branch 'Grasscutters:development' into development	2022-04-24 05:03:55 +08:00
memetrollsXD	b1508183f8	Merge branch 'Grasscutters:development' into development	2022-04-23 22:37:48 +02:00
xtaodada	00f2da10df	Add Teleport command	2022-04-24 03:10:07 +08:00
Yazawazi	9c920b139a	Name Card Done!!!!!!!!!!!	2022-04-23 23:48:06 +08:00
Benjamin Elsdon	7fd1e4dacb	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-23 23:07:38 +08:00
Benjamin Elsdon	903e02c538	Added database support for mail ... Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file	2022-04-23 23:07:18 +08:00
Yazawazi	88e1a0c555	Will	2022-04-23 22:16:59 +08:00
Yazawazi	984ee9d7ea	Merge branch 'Grasscutters:development' into development	2022-04-23 22:16:21 +08:00
memetrollsXD	5d145fb1d6	Add promoteLevel and count	2022-04-23 16:11:45 +02:00
xtaodada	d1d2be9b16	Add another way to set talent level	2022-04-23 21:13:45 +08:00
Yazawazi	45281695fe	Try to give name card	2022-04-23 21:03:29 +08:00
Yazawazi	e970fdb60a	Merge branch 'Grasscutters:development' into development	2022-04-23 19:58:17 +08:00
Melledy	690abd647e	Merge pull request #153 from TheLostTree/main ... Handle drowning	2022-04-23 04:39:02 -07:00
Melledy	f29cdd753a	Revert "Drowning packets handled"	2022-04-23 04:36:34 -07:00
TheLostTree	46aded281d	git doesnt like me	2022-04-23 03:32:08 -07:00
TheLostTree	d64044f931	drowning added	2022-04-23 03:19:33 -07:00
Jaida Wu	46f40a9012	Make some control panel happy ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-23 16:47:13 +08:00
Melledy	ea9cda21e2	Merge pull request #141 from Grasscutters/bind-failure ... Push a helpful error message to the console on bind failure	2022-04-23 01:14:51 -07:00
Jaida Wu	e38f5ca97b	Fix PlayerBirthday exception ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-23 15:39:56 +08:00
KingRainbow44	bba4a00508	Add message for bind failure (HTTP)	2022-04-23 02:20:18 -04:00
KingRainbow44	c31312416a	Implement packet send/receive events	2022-04-23 02:08:31 -04:00
KingRainbow44	c676bb9f08	Implement region events	2022-04-23 01:59:06 -04:00
KingRainbow44	8b34222ceb	Implement an event handler	2022-04-23 01:58:37 -04:00
KingRainbow44	2a6984229e	Plugin enabling & disabling	2022-04-23 01:17:35 -04:00
KingRainbow44	ec6a54ebd7	Merge origin/development into plugin-system	2022-04-23 00:55:31 -04:00
KingRainbow44	9b2e4e3fa9	Update Grasscutter for Java 16 & Plugins	2022-04-23 00:53:11 -04:00
Melledy	90c9af7257	Merge pull request #131 from Raeliana/patch-1 ... Create ClearWeaponsCommand.java	2022-04-22 21:36:52 -07:00
Melledy	473a90432f	Merge pull request #136 from miyucchi/development ... Save birthday date	2022-04-22 21:35:58 -07:00
Melledy	bdfd92e7a3	Merge pull request #127 from yarik0chka/development ... Implemented sitting	2022-04-22 21:34:36 -07:00
Magix	1933bfc95a	Add keystore password	2022-04-22 23:53:37 -04:00
Yazawazi	23481cfe0c	OpenCond for unlocking judgment	2022-04-23 10:51:22 +08:00
Yazawazi	eb57534a2a	Merge branch 'Grasscutters:development' into development	2022-04-23 10:43:27 +08:00
Melledy	17abf321a2	Merge branch 'development' into java-16	2022-04-22 19:23:32 -07:00
KingRainbow44	6243c4e6e8	Basic plugin manager	2022-04-22 21:45:44 -04:00
Miyucchi	6d53f2d6ac	Feature: SetBirthdayDate	2022-04-23 03:29:08 +02:00
Miyucchi	e2543483ff	Profile set birthday feature	2022-04-23 03:22:32 +02:00
Raeliana	f04f1ec5ce	Create ClearWeaponsCommand.java ... A command to clear unlocked and unequipped artifacts	2022-04-23 02:48:04 +03:00
Melledy	5c1f48a5aa	Merge branch 'stable' into development	2022-04-22 16:34:41 -07:00
Yazawazi	53659d2586	AvatarFetterLevelReward	2022-04-23 06:08:37 +08:00
memetrollsXD	d341e4f245	Use count for level for equips	2022-04-22 23:19:58 +02:00
PasserbyAlpha	2750d5da2d	use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o]	2022-04-23 02:28:34 +08:00
yarik0chka	266443b321	Implemented sitting	2022-04-22 23:24:51 +05:00
xtaodada	04c0e968ed	Add PublicPort field to server	2022-04-23 01:42:04 +08:00
Yazawazi	f9b5c8a9ee	command fix	2022-04-23 01:36:48 +08:00
xtaodada	26c3651cc8	Add PublicPort field to Dispatch server	2022-04-23 01:16:55 +08:00
Yazawazi	34c0c6b01b	setfetterlevel command	2022-04-22 23:46:24 +08:00
PasserbyAlpha	1b39f67032	fixed encoding problem when generating gm handbook	2022-04-22 23:11:29 +08:00
Yazawazi	9edb70d6cf	AvatarFetterLevel	2022-04-22 22:27:40 +08:00
Jaida Wu	746e16a25a	Add FrontHTTPS field to Dispatch server ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 21:25:58 +08:00
Melledy	e86932606a	Revert "Explicitly load and save UTF-8 for the handbook" ... This reverts commit fe6e9967db.	2022-04-22 05:20:02 -07:00
Melledy	db0e39bd72	Merge pull request #113 from 01101sam/patch-1 ... [typo] Fix resources folder tips	2022-04-22 04:38:04 -07:00
Melledy	08e3d7e4fb	Merge pull request #114 from alt3ri/development ... Added /talent command	2022-04-22 04:35:10 -07:00
Melledy	e4681ba5be	Merge pull request #108 from fumbling644o/development ... GM handbook: Explicitly load and save UTF-8	2022-04-22 04:33:05 -07:00
Benjamin Elsdon	0baeb32b41	Added GetMailItemReq/Rsp & PacketMailChangeNotify ... Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify. I feel like I'm about to lose my mind.	2022-04-22 19:02:05 +08:00
alt3ri	f8c31cfd96	Deleted 2 lines	2022-04-22 17:38:58 +07:00
alt3ri	1548c2a8d7	Added /talent command ... Set current character talent level by using /talent command. > /talent getid - Gets current character talent ID > /talent set <talent ID> <level> - Sets current character's talent level	2022-04-22 17:28:52 +07:00
Sam	21f82519cf	[typo-upd] Add missing folder	2022-04-22 17:43:06 +08:00
Sam	9715c1d646	[typo] Fix resources folder tips	2022-04-22 17:36:24 +08:00
Benjamin Elsdon	1c6a5d4835	Initial work on mail	2022-04-22 15:52:31 +08:00
Benjamin Elsdon	af4086b4d9	Update protos	2022-04-22 15:24:23 +08:00
fumbling	fe6e9967db	Explicitly load and save UTF-8 for the handbook ... This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.	2022-04-22 02:32:27 -04:00
Magix	e76b60d7c7	Merge pull request #94 from Yazawazi/development ... Try to show characters' stories and voices	2022-04-21 23:12:02 -04:00
Yazawazi	d37543beaf	cache fetters	2022-04-22 10:39:25 +08:00
fumbling	91b685586e	Morphia call fixes; add @Entity to more classes ... 1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo. 2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.	2022-04-21 22:19:47 -04:00
fengyuecanzhu	fd42dd558f	change fhp to heal	2022-04-22 08:45:46 +08:00
Yazawazi	cb043e0644	no more NullPointerException pls	2022-04-22 08:30:02 +08:00
fengyuecanzhu	85fd060561	remove revive command	2022-04-22 08:26:48 +08:00
fengyuecanzhu	a47655db7a	add fullfp command	2022-04-22 08:08:47 +08:00
Yazawazi	1c6aa32cea	ee, forget to change variables when copying from local	2022-04-22 07:49:35 +08:00
Yazawazi	a3f528ede0	typo	2022-04-22 07:42:17 +08:00
Yazawazi	6b8b6b4899	fetter try	2022-04-22 07:37:25 +08:00
Melledy	a05f8270ab	Merge pull request #74 from 4Benj/development ... Server run modes and multi-server dispatch support	2022-04-21 15:06:57 -07:00
Melledy	eb44fc88c4	Refactor Revive Command + fix syntax error ... No idea how I missed the syntax error while reviewing	2022-04-21 14:47:04 -07:00
Melledy	18707f9309	Merge branch 'development' into account-fix	2022-04-21 14:46:07 -07:00
Melledy	d19d80fa4e	Save config everytime you load so the new options show up	2022-04-21 14:44:55 -07:00
Melledy	860e28e56a	Merge pull request #88 from alt3ri/development ... Added /revive command	2022-04-21 14:05:09 -07:00
Melledy	dca137a93e	Fix account dupe key error after selecting starting character	2022-04-21 14:02:17 -07:00
alt3ri	96a252f9dd	Added /revive command ... Now it's more convenient to revive character without food :>	2022-04-22 02:28:52 +07:00
Melledy	a93398a18b	Merge pull request #86 from alt3ri/patch-7 ... Fix typo	2022-04-21 11:47:30 -07:00
Melledy	29fe983f67	Merge pull request #84 from yarik0chka/development ... Add a changing weather id	2022-04-21 11:47:13 -07:00
Yazawazi	a01783ef3c	Teleport Small Fix	2022-04-22 02:23:02 +08:00
alt3ri	2cc8d48fde	Fix typo ... "When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760) Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)	2022-04-22 00:54:06 +07:00
yarik0chka	38c0c9eb7c	Add a changing weather id	2022-04-21 22:21:24 +05:00
Benjamin Elsdon	ff6958ed1f	Forgot a dispatch prefix on error while merging	2022-04-22 01:15:05 +08:00
Benjamin Elsdon	96da53b5fb	Merge remote-tracking branch 'upstream/development' into development	2022-04-22 01:04:03 +08:00
Melledy	6863600865	Merge pull request #78 from MlgmXyysd/dispatch-refactor ... Refact dispatch server	2022-04-21 09:03:53 -07:00
Jaida Wu	68deff0c95	Listens to all addresses by default ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:03 +08:00
Jaida Wu	aacd261206	Add dispatch server log prefix ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:02 +08:00
Jaida Wu	b0d2d29b1c	Add some log to dispatch server ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:00 +08:00
Jaida Wu	2df8625b24	Fallback to HTTP if no SSL cert ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:01:59 +08:00
Jaida Wu	a1567895fa	Refact code ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:01:54 +08:00
Melledy	686aed2cd4	Merge pull request #77 from xmplay/patch-1 ... bring back the jade chamber and other old scene tags	2022-04-21 09:01:43 -07:00
Melledy	781448518d	Merge pull request #79 from zamlty/development ... Fix artifact & weapon generation by give command	2022-04-21 09:00:30 -07:00
Benjamin Elsdon	66b5ed8a83	Should probably remove this as well...	2022-04-21 23:04:02 +08:00
Benjamin Elsdon	72355dd3c5	Removed class left over from testing	2022-04-21 23:00:36 +08:00
Jaida Wu	dee3105763	Add list command ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-21 22:55:32 +08:00
Benjamin Elsdon	63e008cbcf	DatabaseManager clean up	2022-04-21 22:50:06 +08:00
Benjamin Elsdon	a36f29cdf1	Fixed null pointer exception in game only mode ... PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.	2022-04-21 22:38:01 +08:00
zamlty	1d54084317	Fix artifact & weapon generation by give command	2022-04-21 22:21:39 +08:00
xmplay	66c956d10e	bring back the jade chamber and other old scene tags	2022-04-21 15:04:47 +01:00
Jaida Wu	65e0799e79	Drop independent log server ... Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-21 21:41:30 +08:00
Benjamin Elsdon	585187bebe	Fixed null pointer exception in hybrid mode.	2022-04-21 19:20:49 +08:00
Benjamin Elsdon	e97e124460	Merge branch 'development' of https://github.com/Melledy/Grasscutter into development	2022-04-21 18:11:51 +08:00
Benjamin Elsdon	6a091b254c	Multi-server dispatch support and server run modes	2022-04-21 18:04:00 +08:00
Melledy	56415b7fbc	Merge pull request #70 from Grasscutters/dev-fixes ... Dev fixes	2022-04-21 00:31:01 -07:00
Melledy	3a0997bb5a	Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players	2022-04-21 00:29:06 -07:00