Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-02 21:41:41 +01:00
Code Issues Projects Releases Wiki Activity
2,806 Commits 20 Branches 0 Tags 241 MiB
a15e3aef44
Commit Graph

2615 Commits

Author SHA1 Message Date
TheMode
c24cc07b7c Improve efficiency of entity chunk update 2021-04-23 10:17:42 +02:00
TheMode
9a5af9514e The acquirable api is now only for entities 2021-04-23 10:01:17 +02:00
TheMode
0a837d2714 Renamed BatchThread.java 2021-04-23 09:58:52 +02:00
TheMode
defdbea29b Added entity/player consumer for inheritance 2021-04-23 08:59:40 +02:00
TheMode
370f4c2f57 Added more options inside ThreadProvider 2021-04-22 19:33:07 +02:00
TheMode
ef6f2ac5c9 Rename few methods 2021-04-22 16:59:42 +02:00
TheMode
297652c610 Remove generic Acquirable 2021-04-22 16:38:37 +02:00
TheMode
844671daab
Merge pull request #244 from Project-Cepi/nbt-hep 
Compound and list ItemTags
 2021-04-22 16:01:48 +02:00
LeoDog896
19e55f985e Add generic NBT 2021-04-22 09:52:51 -04:00
TheMode
4b5489dba6
Merge pull request #249 from Project-Cepi/ext-meta 
Add Meta Object to Extensions
 2021-04-22 12:36:58 +02:00
ALS
14ea17ce77 Try another test 2021-04-22 01:25:29 +02:00
MrBretzel
189b8fd552
Merge pull request #3 from Minestom/master 
Update PR 3
 2021-04-21 23:54:32 +02:00
MrBretzel
8047a203cb Possible fix a when storage location is closed an re opened 2021-04-21 23:53:47 +02:00
TheMode
09c22b4e49 ArgumentWord restrictions are case sensitive (because of brigadier) 2021-04-21 22:29:54 +02:00
TheMode
86faa435f7 Added SingleThreadProvider 2021-04-21 18:33:51 +02:00
TheMode
dba368d16f Thread count should depend on the processor count 2021-04-21 17:14:40 +02:00
TheMode
15b116a770 Remove unnecessary try-catch 2021-04-21 14:39:28 +02:00
TheMode
9660ee30fb More line ending 2021-04-21 14:35:35 +02:00
TheMode
5b1784fa39 Fix line ending 2021-04-21 14:34:16 +02:00
TheMode
8f6e0240eb added new #tryAcquire method with a return value instead of consumer 2021-04-21 14:32:42 +02:00
TheMode
72002a3d75 Wait monitoring should always be enabled 2021-04-21 11:37:53 +02:00
TheMode
224a1f57b4 #currentEntities documentation 2021-04-21 11:31:56 +02:00
TheMode
73dee1fb1a Better abstraction 2021-04-21 11:27:49 +02:00
TheMode
470cc09767 Merge branch 'master' into acquirable 2021-04-20 22:19:42 +02:00
TheMode
75da093475 Shift click code cleanup 2021-04-20 22:10:04 +02:00
TheMode
2aba4c49f6 Change stresstest to profile per-instance thread 2021-04-20 10:18:48 +02:00
themode
c91d957fe4 Merge branch 'master' into acquirable 2021-04-20 09:50:28 +02:00
TheMode
3fa89737d9 Reduce tick buffer copy overhead 2021-04-20 08:54:33 +02:00
TheMode
66513025c7 Fix thread safety with inventory click, add Internal annotation 2021-04-20 07:32:53 +02:00
TheMode
359d18e8a5 Remove unused class 2021-04-20 07:30:09 +02:00
TheMode
5390cd14f0 Simplify double click handling 2021-04-20 07:29:01 +02:00
TheMode
e9b5779b24 Simplify shift click handling, fix click processor ignoring non-air slot 2021-04-20 06:41:55 +02:00
TheMode
1daaeda63f Temporary fix for shift click 2021-04-19 20:09:42 +02:00
TheMode
d8e28ad73a Remove unnecessary volatile, fix acquisition from threads other than the tick ones 2021-04-19 15:25:19 +02:00
TheMode
321d185ffe use a ReentrantLock instead of guava monitor 2021-04-19 11:57:42 +02:00
TheMode
562927ee44 Added comment 2021-04-19 08:53:54 +02:00
TheMode
44b22ce1f1 Reduce monitor acquisition 2021-04-19 08:51:44 +02:00
TheMode
a6b1749e9e Added max refresh time 2021-04-19 08:17:00 +02:00
TheMode
1f08f5dc34 Use a parallel stream 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-04-19 07:42:48 +02:00
TheMode
07471a8b5b Fix acquisition of newly instantiated entities 2021-04-18 17:31:50 +02:00
TheMode
e00b3a6fba Fix build 2021-04-18 16:56:17 +02:00
TheMode
bd9cab5805 Remove AcquirableImpl.java, more comment 2021-04-18 16:50:06 +02:00
TheMode
e63dbf28db Cleanup 2021-04-18 16:38:00 +02:00
TheMode
e342dd2b70 Merge branch 'master' into acquirable 2021-04-18 15:23:09 +02:00
TheMode
1dbd3078c3 Fix incremental thread refresh 2021-04-18 11:53:38 +02:00
TheMode
92f30070db Implement incremental chunk thread refresh 2021-04-18 11:28:28 +02:00
TheMode
6357eb6329 Use shared instance to do not run out of memory 2021-04-18 10:57:16 +02:00
TheMode
2df5484e1a Dynamic chunk thread change 2021-04-18 06:43:51 +02:00
TheMode
e9f13d0a82 WIP dynamic chunk thread change 2021-04-18 06:29:44 +02:00
TheMode
6b5f755bfd Allow null nbt, remove NBTUtils.loadItem 2021-04-18 04:44:16 +02:00
TheMode
cb34d34799 ArgumentItemStack cleanup 2021-04-18 04:35:11 +02:00
TheMode
1d2a647efa Fix tickBuffer refCnt 2021-04-18 03:35:41 +02:00
TheMode
2e4a443bec Use multiple instances in the demo server 2021-04-18 02:35:17 +02:00
TheMode
2c1084d97b Use hashcode 2021-04-18 02:22:35 +02:00
TheMode
7dd6aa2360 Separate PerChunkThreadProvider from PerInstanceThreadProvider, support arbitrary ThreadProvider#findThread number 2021-04-18 01:55:35 +02:00
TheMode
dd88a14b90 Remove unused class 2021-04-18 00:19:57 +02:00
TheMode
f0607f776a Remove unused class 2021-04-18 00:08:13 +02:00
TheMode
eb63681c37 better comment 2021-04-18 00:00:02 +02:00
TheMode
8123e839ec Improve acquisition performance, fix current thread lock not being occupied 2021-04-17 23:51:23 +02:00
LeoDog896
ee590e8325 Add meta 2021-04-17 15:00:52 -04:00
TheMode
23664292de Simplify acquisition, reduce overhead 2021-04-17 14:22:47 +02:00
TheMode
a5df2376cf Improve performance 2021-04-17 03:00:34 +02:00
TheMode
3b7353300d Acquisition rework 2021-04-17 02:50:33 +02:00
TheMode
8f3ee93191 Use literal as the default argument when generating a syntax 2021-04-16 21:51:33 +02:00
TheMode
be0c425dfc Merge branch 'master' into acquirable 2021-04-16 02:36:46 +02:00
TheMode
502ec22b92 Reduce synchronization overhead when writing tick buffer 2021-04-16 01:52:46 +02:00
TheMode
bc04534290 Use a while loop to detect deadlocks 2021-04-15 22:56:09 +02:00
TheMode
4f05887f32 Send time packet on login 2021-04-15 21:03:21 +02:00
Eoghanmc22
1bb5c7e89b fix deadlock 2021-04-15 14:23:18 -04:00
TheMode
2045ce5743 Override AcquirableCollection#forEach 2021-04-15 10:06:34 +02:00
TheMode
b5add32ad6 Added AcquirableCollection + waiting time monitor 2021-04-15 09:51:37 +02:00
TheMode
56cc33fcfa Merge branch 'master' into acquirable 2021-04-15 09:13:20 +02:00
TheMode
e17ce94241 Fix build for real 2021-04-15 08:21:24 +02:00
TheMode
232e4b8a28 Fix build 2021-04-15 08:10:32 +02:00
TheMode
5cb4be26ff Try to close the terminal when shutting down the server 2021-04-15 08:07:17 +02:00
TheMode
b066b6029a
Merge pull request #223 from thiccaxe/master 
Add events for STATUS packets.
 2021-04-15 07:10:32 +02:00
TheMode
aef05893e1 Fix high CPU usage on startup 2021-04-15 04:11:52 +02:00
TheMode
f4ee5505ca Fix tick thread not being properly terminated 2021-04-15 04:06:55 +02:00
TheMode
b3a548287a Improve thread safety 2021-04-15 03:53:18 +02:00
TheMode
2b79e91295 Add comment + todo 2021-04-15 03:38:27 +02:00
TheMode
bd3e4e2f0a Added Acquirable#currentEntities 2021-04-15 03:08:19 +02:00
TheMode
11b1bbea2e Update entities thread 2021-04-15 01:44:08 +02:00
LeoDog896
c41c202589 Deepclone and cast 2021-04-14 18:19:07 -04:00
LeoDog896
7eb13de433 Compound and list tags 2021-04-14 18:12:41 -04:00
TheMode
fec36d4706 Run thread directly 2021-04-14 22:48:13 +02:00
TheMode
73cdfed5ce Merge branch 'master' into acquirable 2021-04-14 22:29:55 +02:00
TheMode
250907df6c Return constant empty set if the chunk is not loaded 2021-04-14 22:29:38 +02:00
TheMode
7dc0387ecf Add a way to find the current threadid of a chunk 2021-04-14 22:22:46 +02:00
TheMode
79f0d97664 Cleanup tick preparation 2021-04-14 21:41:14 +02:00
TheMode
a55ea6d0c2 WIP per-chunk thread 2021-04-14 21:29:37 +02:00
TheMode
356150847e Per-chunk batch management 2021-04-14 20:32:02 +02:00
TheMode
9b8dd6e768 Merge branch 'master' into acquirable 
# Conflicts:
#	src/main/java/net/minestom/server/thread/ThreadProvider.java
 2021-04-14 20:13:26 +02:00
TheMode
ccab205a54 Initial acquirable API commit 2021-04-14 20:12:56 +02:00
TheMode
c1b278f4b9 Fix merge, remove unnecessary methods (for now) 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-04-14 20:09:49 +02:00
TheMode
683a6d35fa Merge branch 'master' into tickable 
# Conflicts:
#	src/main/java/net/minestom/server/entity/Entity.java
#	src/main/java/net/minestom/server/instance/DynamicChunk.java
#	src/main/java/net/minestom/server/instance/Instance.java
 2021-04-14 20:06:35 +02:00
TheMode
dc5b764732 Inventory id generation cleanup 2021-04-14 07:25:51 +02:00
TheMode
97f2f3f06c Fix inventory id overflow 2021-04-14 05:03:37 +02:00
TheMode
c57e35c58a Add completable future return to AsyncUtils 2021-04-14 04:06:41 +02:00
TheMode
7d574317dc ClientCloseWindowPacket window id is a byte, not a var int 2021-04-14 02:00:19 +02:00
TheMode
b68c30423c Add BinaryWriter#write(ByteBuf) 2021-04-14 01:40:21 +02:00
TheMode
a3f1235df4 Stacking rule should be defaulted to vanilla if null 2021-04-13 23:15:51 +02:00
TheMode
6ba336ee73 Added hand inside eat events 2021-04-13 22:59:40 +02:00
TheMode
a55ae4d048 Cache unmodifiable players set, remove print 2021-04-13 21:39:42 +02:00
TheMode
49944fb651 Keep StackingRule across builders 2021-04-13 09:24:37 +02:00
TheMode
58a532ac03 Annotate ItemStackBuilder#stackingRule with Beta 2021-04-13 09:19:39 +02:00
TheMode
70b97951e4 Added setter for StackingRule 2021-04-13 05:50:11 +02:00
TheMode
fed4e6897a Fix FireworkEffect byte reading 2021-04-13 04:14:32 +02:00
TheMode
61d2ef2f06 Fix ItemStack#fromNBT 2021-04-13 03:45:01 +02:00
TheMode
508659fd30 Fix potential race condition 2021-04-13 03:29:55 +02:00
TheMode
2b74d7697c Added ItemStack#fromNBT 2021-04-13 03:27:51 +02:00
TheMode
32430882a5 ItemStack is final 2021-04-13 03:10:04 +02:00
TheMode
3b8ed1df32 Add api status annotations 2021-04-13 02:21:03 +02:00
TheMode
56439a2330 Merge branch 'master' into jline 2021-04-13 02:18:10 +02:00
TheMode
1b98a65869 Get entities from all instances when none is specified in an entity query 2021-04-13 02:08:09 +02:00
TheMode
20c947650f Clear command cache after unregistering a command 2021-04-12 22:45:45 +02:00
TheMode
cdaef2b4f0 Remove LivingEntity outdated TODO 2021-04-12 19:56:40 +02:00
TheMode
2755add8df Fix item tags not being saved when going through a builder 2021-04-12 17:11:28 +02:00
TheMode
1e99810451 Inventory title can be raw string 2021-04-12 16:42:57 +02:00
TheMode
6b165c7692 Fix MapMeta not being a provider 2021-04-12 16:29:15 +02:00
TheMode
2531161964 Fix drag click 2021-04-12 16:27:12 +02:00
TheMode
0fea9b39a2 Return AIR if the amount is 0 or below 2021-04-12 09:11:08 +02:00
TheMode
adfb487140 Fix entity currentChunk being null 2021-04-12 04:50:45 +02:00
TheMode
4932262750 Use chunk instead of instance to check if an entity is on ground 2021-04-12 04:45:11 +02:00
TheMode
bd90de0df2 Remove unnecessary string concat 2021-04-12 04:27:36 +02:00
TheMode
f98bfe702c Print tick time on header 2021-04-12 04:12:21 +02:00
TheMode
0ff9e3e435 Remove debug print 2021-04-12 04:05:18 +02:00
TheMode
8f6a651bda Added StackingRule#apply with unary operator for amount 2021-04-12 01:27:33 +02:00
TheMode
aac32420de Annotation cleanup 2021-04-12 01:07:05 +02:00
TheMode
bba9c70586 Fix merge 2021-04-12 00:45:37 +02:00
TheMode
1d5262caf2 Merge branch 'master' into item-api 
# Conflicts:
#	src/test/java/demo/PlayerInit.java
 2021-04-12 00:44:47 +02:00
TheMode
7e3035709f Annotation, fix cursor item not being cleared 2021-04-12 00:42:32 +02:00
TheMode
8e9d7098e5 Allow custom transaction type, simplify inventory superclasses 2021-04-12 00:33:27 +02:00
TheMode
ecb77fc847 Rename FillOption to TransactionOption 2021-04-12 00:07:38 +02:00
TheMode
1100aa98a5 Annotation & comment 2021-04-12 00:04:40 +02:00
TheMode
17fcd23c77 Fix condition, add documentation 2021-04-11 23:52:12 +02:00
TheMode
d86a733b79 WIP FillOption 2021-04-11 23:43:35 +02:00
TheMode
db8f071633 Cleanup, make PingPlayer immutable 2021-04-11 20:46:48 +02:00
TheMode
9f3b7d4ca8
Update FakePlayerConnection.java 2021-04-11 20:32:09 +02:00
thiccaxe
fadbe39494 Getters for fields in HandshakeData 2021-04-11 10:46:09 -07:00
thiccaxe
c451d46ce0 document ServerListPingEvent 2021-04-11 10:30:47 -07:00
TheMode
c7cd8c332a Rename meta package to metadata to limit breaking changes 2021-04-11 19:13:50 +02:00
TheMode
df20670ce8 Use AIR as default in CrossbowMeta instead of null 2021-04-11 17:12:28 +02:00
TheMode
ea3aedd76f ItemMeta#getOrDefault annotation 2021-04-11 17:05:32 +02:00
TheMode
792dd9787f Remove ItemStore API until a stable solution is found 2021-04-11 17:01:05 +02:00
TheMode
f7bf7c1321
Merge pull request #204 from kezz/send-packets-to-audience 
Add util method to send a packet to an audience
 2021-04-11 15:29:04 +02:00
TheMode
34a7c68e16
Merge pull request #237 from Minestom/update_structure_packet 
Add update structure block packet
 2021-04-11 15:26:19 +02:00
TheMode
2fadf1da94 Added varargs equivalent for canPlace/Destroy 2021-04-11 15:01:43 +02:00
TheMode
3b37987f15 Remove dead line 2021-04-11 14:55:27 +02:00
Matt Worzala
1f27f2e6cd
provide default location 2021-04-11 00:46:04 -04:00
Matt Worzala
11146186cc
add update structure block packet 2021-04-11 00:37:00 -04:00