Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-26 21:52:50 +02:00
Code Issues Projects Releases Wiki Activity
3,743 Commits 16 Branches 0 Tags 214 MiB
13b7039721
Commit Graph

3479 Commits

Author SHA1 Message Date
TheMode
fc52b502dd Use proper neg method 2021-07-09 21:04:28 +02:00
TheMode
d8b92d23ba Improve collision 2021-07-09 20:43:12 +02:00
TheMode
4f20580482 Use block position for intersection check 2021-07-09 20:25:22 +02:00
Németh Noel
0793ccefc8 remove undefined type 2021-07-09 20:13:40 +02:00
Németh Noel
d6221ab212 fix boolean order 2021-07-09 20:05:46 +02:00
Németh Noel
47a0447f12 Merge remote-tracking branch 'upstream/improvement/relative-vec' into improvement/relative-vec 2021-07-09 20:03:07 +02:00
Németh Noel
8e5d2f0dfe fix mix check 2021-07-09 19:57:59 +02:00
TheMode
f829aea534 Add entity eye height 2021-07-09 19:28:08 +02:00
TheMode
2efefe25b3 Improve RelativeVec api 2021-07-09 18:53:13 +02:00
TheMode
f9689bc1f3 Merge branch 'new-block-api' into improvement/relative-vec 2021-07-09 18:38:09 +02:00
Németh Noel
e1d1f52c3d Implement local coordinate parsing 2021-07-09 18:18:52 +02:00
TheMode
ec440f778b Remove nullable annotation 2021-07-09 17:15:28 +02:00
TheMode
b9864a1a28
Merge pull request #360 from djytw/master 
Fix extension resource load in Windows
 2021-07-09 15:44:08 +02:00
Németh Noel
1ac99fa44c Moved parser method to ArgumentRelativeVec.java and made the class package-private 2021-07-09 15:40:19 +02:00
Németh Noel
5992d52429 Update /setblock command 2021-07-09 15:27:36 +02:00
Németh Noel
782620466b Fix parse call 2021-07-09 15:24:32 +02:00
Németh Noel
cfad7a4145 Fix parsing 2021-07-09 15:17:35 +02:00
TheMode
0ff69503c5 Add Point#isZero 2021-07-09 12:42:36 +02:00
TheMode
95a2805723 Merge branch 'master' into new-block-api 2021-07-09 11:54:15 +02:00
TheMode
b546a873e3 Remove unnecessary cast 2021-07-09 11:23:18 +02:00
TheMode
37ab206cb1 ThreadProvider cleanup 2021-07-09 11:20:49 +02:00
Németh Noel
dff8bc61f6 add new line to end of file 2021-07-09 02:59:42 +02:00
Németh Noel
732f565489 fix number conversion 2021-07-09 02:56:34 +02:00
Németh Noel
a6b4b17279 Reduced boilerplate, RelativeVec#parse takes a parser function 2021-07-09 02:45:10 +02:00
Németh Noel
7f215ac899 Don't hardcode number count 2021-07-09 01:54:04 +02:00
Németh Noel
0f569d85f0 Fix checks 2021-07-09 01:51:08 +02:00
Németh Noel
86be5ad9c5 Simplify parsing 2021-07-09 01:34:17 +02:00
TheMode
b419ce88c1 Improve block getter performance 2021-07-09 00:42:43 +02:00
TheMode
295b3e24dd Merge branch 'master' into new-block-api 2021-07-09 00:29:31 +02:00
TheMode
e1e1ec775e Remove confusing comment 2021-07-09 00:21:41 +02:00
djytw
8f771bb867 more 2021-07-08 20:25:10 +02:00
TheMode
29b4fefb1a Remove Vector usage 2021-07-08 18:59:40 +02:00
TheMode
45d7420397 Remove most Position/BlockPosition usage 2021-07-08 18:56:40 +02:00
djytw
694d05e78a Fix resource load in Windows 2021-07-08 18:42:38 +02:00
TheMode
90ce845cdb Allow Point in setInstance 2021-07-08 18:26:26 +02:00
TheMode
c2a84c25b5 Fix RelativeVec 2021-07-08 18:15:57 +02:00
TheMode
dc89b180fb Support dynamic tick rate & prevent call from being delayed 2021-07-08 15:40:27 +02:00
TheMode
fff78cdf94 Move coordinate package 2021-07-08 13:48:28 +02:00
TheMode
ca2a2eb233 Rename with to apply 2021-07-08 13:22:04 +02:00
TheMode
30464d903d Fix position packet being sent twice 2021-07-07 19:38:43 +02:00
TheMode
faae59ff44 Remove some teleport call 2021-07-07 19:34:46 +02:00
TheMode
c9b2356a0b Fix entity chunk tracking 2021-07-07 19:20:58 +02:00
TheMode
080efa5eba Add toString impl 2021-07-07 19:04:14 +02:00
Németh Noel
ce8e14ede1 Use proper method for refreshing position 2021-07-07 18:36:24 +02:00
Németh Noel
8b35e0db9a Use remaining length when needed 2021-07-07 18:07:27 +02:00
Németh Noel
5ae26c44e1 Initial npe fix 2021-07-07 17:56:17 +02:00
TheMode
84eb0a8934 Fix build 2021-07-07 14:59:53 +02:00
TheMode
eb0f7379ea Fix intersect 2021-07-07 01:45:20 +02:00
TheMode
8a5147c994 More fixes 2021-07-07 01:32:30 +02:00
Németh Noel
6f6b15fa96 Update part of Entity.java 2021-07-07 01:06:32 +02:00
Németh Noel
4187bc0e4d Add epsilon operator 2021-07-07 00:57:47 +02:00
Németh Noel
8849b6eec8 Fix teleport packet not being sent 2021-07-06 23:44:30 +02:00
Németh Noel
f29ed48da9 update getter names 2021-07-06 23:03:01 +02:00
Németh Noel
da5abd3d4e rename getters 2021-07-06 22:59:45 +02:00
Németh Noel
65a97e5b00 Initial collision update 2021-07-06 22:26:11 +02:00
TheMode
28dca16b29 Initial position api implementation 2021-07-06 20:44:24 +02:00
LeoDog896
abace56778 Correct packet reading/writing 2021-07-06 09:54:26 -04:00
TheMode
6275154997 Public operator interfaces 2021-07-05 11:39:51 +02:00
TheMode
799dbf4a61 Point interface improvement 2021-07-05 11:38:33 +02:00
TheMode
796b6820ce Start implementing the new coordinate API 2021-07-05 09:10:03 +02:00
TheMode
aa0868f02a Merge branch 'new-position-api' into new-block-api 
# Conflicts:
#	src/test/java/demo/PlayerInit.java
 2021-07-05 08:27:49 +02:00
TheMode
579c5fd13c Fix rebase 2021-07-05 08:22:51 +02:00
TheMode
0d031d4c15 Merge branch 'master' into new-block-api 
# Conflicts:
#	src/main/java/net/minestom/server/instance/DynamicChunk.java
#	src/main/java/net/minestom/server/instance/Instance.java
#	src/main/java/net/minestom/server/instance/InstanceContainer.java
#	src/main/java/net/minestom/server/instance/SharedInstance.java
#	src/main/java/net/minestom/server/instance/block/CustomBlock.java
#	src/test/java/demo/Main.java
#	src/test/java/demo/blocks/CustomBlockSample.java
#	src/test/java/demo/blocks/UpdatableBlockDemo.java
 2021-07-05 08:21:47 +02:00
TheMode
da4acf7966 Deprecate previous coordinate classes 2021-07-05 08:18:14 +02:00
TheMode
4414baf89b Move classes & some methods 2021-07-05 08:01:43 +02:00
MrGazdag
02abb81b85
inline NotNull and add Contract annotations 2021-07-04 18:00:09 +02:00
MrGazdag
118159d354
Add rotation methods 
Adds the `rotateAroundX(double)`, `rotateAroundY(double)` and `rotateAroundZ(double)` methods
 2021-07-04 17:54:43 +02:00
TheMode
1a55644c5e Merge branch 'master' into new-position-api 2021-07-04 17:40:18 +02:00
MrGazdag
6cba2cb7c7
Fix Vector rotation 
The Vector class' rotateAround methods were modifying the used variables during the rotation, which should not be the case. Bukkit's similar Vector class manages to do this correctly.
 2021-07-04 17:18:17 +02:00
TheMode
fe1bfaee93
Merge pull request #346 from Kebab11noel/fix/issue-258 
Deprecate `UpdateOption`
 2021-07-04 13:37:15 +02:00
TheMode
0f98877b95 documentation 2021-07-04 12:10:52 +02:00
TheMode
677ec61f74
Merge pull request #338 from Moulberry/master 
Changes to Hologram API
 2021-07-04 08:12:07 +02:00
BuildTools
323fcbe114 Remove MarkerHologram class, add parameter to Hologram constructor 2021-07-04 14:04:55 +08:00
BuildTools
6a2846a9c6 Check whether entityMeta is an instanceof ArmorStandMeta, instead of checking entity type 2021-07-04 13:58:57 +08:00
jglrxavpok
18771386c0 Slightly less restrictive package protection in MinestomRootClassLoader. 
Should fix issue with Configurate not loading.
 2021-07-03 18:52:21 +02:00
Németh Noel
cd65085df2 Use Duration 2021-07-03 15:29:28 +02:00
Németh Noel
b012ffbff3 Use Duration 2021-07-03 15:27:23 +02:00
Németh Noel
67860d5afb Use Duration 2021-07-03 15:25:41 +02:00
Németh Noel
6a27a9d932 Update javadoc 2021-07-03 15:05:14 +02:00
Németh Noel
1e390d5efb Add alternative to GLFWCapableBuffer#setupRenderLoop that takes Duration instead of amount and unit 2021-07-03 15:02:43 +02:00
Németh Noel
34d2d5892e Remove unnecessary util method 2021-07-03 14:57:45 +02:00
Németh Noel
39dd5bfbf9 Removed duplicated code 2021-07-03 14:56:22 +02:00
Németh Noel
663e53c875 Add alternative to LivingEntity#setFireDamagePeriod that takes Duration 2021-07-03 14:52:51 +02:00
Németh Noel
efb450ce50 Simplify conversion logic and only use java.time 2021-07-03 14:45:31 +02:00
Németh Noel
3f1c433c94 Removed unnecessary deprecations 2021-07-03 14:41:57 +02:00
TheMode
5954988498 Use constructors in preparation for jdk16 records 2021-07-03 07:42:56 +02:00
TheMode
a729846eae Remove getter redirection 2021-07-03 07:26:41 +02:00
TheMode
de51970965 Experimental inverse batch option 2021-07-03 06:42:06 +02:00
TheMode
7fcd4039cb Add batch option to do not send chunk packet 2021-07-03 05:45:55 +02:00
TheMode
10aeb32b45 Merge branch 'master' into new-block-api 2021-07-03 04:24:01 +02:00
TheMode
11860040fa Allow points inside some vec methods 2021-07-03 03:25:53 +02:00
TheMode
061b6091e9 Make Pos & Vec proper classes (in the future record then primitive) 2021-07-03 03:07:18 +02:00
TheMode
dd1bf74837 Add missing annotation 2021-07-03 02:45:17 +02:00
TheMode
75ee08821f
Merge pull request #347 from GreenpixDev/master 
Fix automatic component translation
 2021-07-03 02:43:43 +02:00
TheMode
f44fd0af8c Make Pos an interface 2021-07-03 02:43:09 +02:00
TheMode
0f869f3cf2 Add lengthSquared & #eq 2021-07-03 02:24:45 +02:00
Németh Noel
3e0486cfd3 Added #setFireForDuration(Duration) 2021-07-02 19:58:59 +02:00
Németh Noel
cda5860440 Use a more logical way to convert to milliseconds 2021-07-02 19:47:15 +02:00
Németh Noel
075dab79c9 Use ChronoUnit instead of TimeUnit 2021-07-02 19:35:19 +02:00
Németh Noel
a5f2705118 Fix hasUpdate check 2021-07-01 15:16:10 +02:00
Németh Noel
157eb6357a Deprecated net.minestom.server.entity.ItemEntity.setPickupDelay(long, java.time.temporal.TemporalUnit) 2021-07-01 15:08:31 +02:00
Németh Noel
bcc1132ed7 Deprecated net.minestom.server.entity.Entity.scheduleRemove(long, java.time.temporal.TemporalUnit) 2021-07-01 15:03:16 +02:00
TheMode
5969ec1709 Merge branch 'master' into new-block-api 
# Conflicts:
#	src/main/java/net/minestom/server/item/ItemMetaBuilder.java
 2021-07-01 02:22:20 +02:00
TheMode
2e8b3477bf Improve tick scheduling 2021-07-01 00:34:58 +02:00
TheMode
997e35459e Do not use the thread as blocker 2021-06-30 23:34:21 +02:00
Németh Noel
fdf7153986 Flip ?: null check 2021-06-30 22:28:54 +02:00
Németh Noel
059565b397 Flip ?: null checks 2021-06-30 22:25:24 +02:00
Németh Noel
ec4d24b9a8 Add null check 2021-06-30 22:14:58 +02:00
Németh Noel
a5a370783d Removed redundant check 2021-06-30 22:00:05 +02:00
Greenpix
bc768c32af Fix automatic component translation 
Removed modifier "final" from the field "AUTOMATIC_COMPONENT_TRANSLATION" in MinestomAdventure.java
 2021-06-30 19:34:51 +07:00
Németh Noel
92cbc4727c Fix javadoc and optimize imports 2021-06-30 13:37:37 +02:00
Németh Noel
373ef90535 Fix javadoc 2021-06-30 13:36:26 +02:00
Németh Noel
c683acaf6e Fix PotionMeta.java 2021-06-30 13:26:45 +02:00
Németh Noel
d735ba5fff Fix missing Deprecated annotation 2021-06-30 13:25:24 +02:00
Németh Noel
7ff5173e03 Fix PingPacket.java 2021-06-30 13:23:32 +02:00
Németh Noel
ba2dcaac43 Deprecate TimeUnit#TICK instead of removing 2021-06-30 13:22:46 +02:00
Németh Noel
f9c9b4c1eb Fix old usage of TimeUnit 2021-06-30 13:20:02 +02:00
Németh Noel
ca78305d40 Fix OpenToLAN.java 2021-06-30 13:19:03 +02:00
Németh Noel
c9dd06ba20 Simplified millis calculation 2021-06-30 13:10:22 +02:00
Németh Noel
01dfe2f48d Replaced ChronoUnit with TimeUnit for consistency 2021-06-30 13:05:52 +02:00
Németh Noel
c037ea9d84 Replaced Tick and ChronoUnit with TimeUnit for consistency 2021-06-30 13:04:59 +02:00
Németh Noel
117bcb467a Replaced Tick and ChronoUnit with TimeUnit for consistency 2021-06-30 13:02:42 +02:00
Németh Noel
b0af01ee89 Updated multiple files 2021-06-30 12:59:38 +02:00
Németh Noel
8bd54dd300 Updated GLFWCapableBuffer.java 2021-06-30 12:52:41 +02:00
Németh Noel
b8441a0fd7 Updated TaskBuilder.java 2021-06-30 12:51:20 +02:00
Németh Noel
f4b761c50c Made TimeUnit constructor private 2021-06-30 12:48:42 +02:00
Németh Noel
779e6bd22e Added TimeUnit#getMillis method 2021-06-30 12:45:37 +02:00
TheMode
58dd927afb Add Interpolation interface 2021-06-30 06:03:29 +02:00
TheMode
2f7ba7e514 Reuse equals code 2021-06-30 03:14:18 +02:00
TheMode
408134bd63 Remove unused constructor 2021-06-30 02:58:05 +02:00
TheMode
2eaef3bf64 Add equals/hashCode/toString implementation for Vec 2021-06-30 02:26:29 +02:00
TheMode
c859a8e148 More final 2021-06-30 02:19:11 +02:00
TheMode
34e2f4d022 cleanup 2021-06-30 02:10:56 +02:00
Németh Noel
aaa3b91424 Updated multiple files 2021-06-30 01:54:11 +02:00
TheMode
b93f1a57cd Create more Vec implementations 2021-06-30 01:53:01 +02:00
TheMode
c42b494a62 Add shortcuts for math with a single value vector 2021-06-30 01:46:20 +02:00
Németh Noel
25183973dc Updated Instance.java 2021-06-30 01:46:03 +02:00
Németh Noel
2c9f0c5e67 Updated ClientPingServerEvent.java 2021-06-30 01:42:54 +02:00
Németh Noel
6a4de332a6 Updated RangedAttackGoal.java 2021-06-30 01:35:33 +02:00
Németh Noel
68b94674d0 Updated MeleeAttackGoal.java 2021-06-30 01:34:27 +02:00
Németh Noel
b8b8a40a99 Updated CombinedAttackGoal.java 2021-06-30 01:33:13 +02:00
Németh Noel
7e82c02536 Updated Player.java 2021-06-30 01:31:09 +02:00
Németh Noel
56017b90e2 Updated ItemEntity.java 2021-06-30 01:29:02 +02:00
Németh Noel
6db9ba63f4 Updated EntityFireEvent.java 2021-06-30 01:20:52 +02:00
TheMode
156e89e490 Add Component title constructor for inventory types 2021-06-30 01:19:17 +02:00
Németh Noel
d522730cd7 Updated FollowTargetGoal.java 2021-06-30 01:15:54 +02:00
Németh Noel
30abfce554 Updated Cooldown.java 2021-06-30 01:07:38 +02:00
Németh Noel
580509c420 Added UpdateOption#toDuration method 2021-06-30 01:05:20 +02:00
Németh Noel
67dc8bf996 Updated Entity.java 2021-06-30 00:59:26 +02:00
Németh Noel
0c849c005b Optimized imports of LivingEntity.java 2021-06-30 00:52:16 +02:00
Németh Noel
384c556caf Updated LivingEntity.java 2021-06-30 00:51:22 +02:00
Németh Noel
58bae20f10 Updated Main.java 2021-06-30 00:47:57 +02:00
Németh Noel
7f9737d866 Updated UpdateOption.java so it doesn't break with the TimeUnit.java change 2021-06-30 00:46:08 +02:00
Németh Noel
7b126f5d13 Updated BenchmarkManager.java 2021-06-30 00:32:06 +02:00
Németh Noel
e23b65c2df Updated OpenToLANConfig.java 2021-06-30 00:29:44 +02:00
Németh Noel
ff4bb20a04 Repurpose TimeUnit.java 2021-06-30 00:14:26 +02:00
Németh Noel
4b04539086 Included Tick.java from PR#205 with slight modifications 2021-06-29 23:44:19 +02:00
Németh Noel
5e731e5ba9 Updated EntityFireEvent.java 2021-06-29 23:04:25 +02:00
Németh Noel
ab80ffcd0e Updated ArgumentTime.java 2021-06-29 22:38:37 +02:00
Németh Noel
0a4166faf2 Made duration final 2021-06-29 22:25:32 +02:00
Németh Noel
b98abe8dd5 Updated Cooldown.java 2021-06-29 22:24:34 +02:00
Németh Noel
8f906d80d0 Added tick as a TemporalUnit 2021-06-29 22:22:30 +02:00
Németh Noel
7e82edcbd9 Marked classes deprecated for removal 2021-06-29 22:21:30 +02:00
TheMode
95e69c6f53 Remove float cast 2021-06-29 21:14:27 +02:00
TheMode
fda7b8cda1 Add boring math methods 2021-06-29 20:15:37 +02:00
TheMode
f8a9664fd9 Merge branch 'master' into new-position-api 2021-06-29 20:10:52 +02:00
TheMode
dab17f44d5 Add unary operators 2021-06-29 19:59:38 +02:00
TheMode
f8d1f8e067 Add unary operators 2021-06-29 06:40:15 +02:00
TheMode
6cc7ae5b23 Add unary operators 2021-06-29 04:11:02 +02:00
TheMode
43ac1c53e3 Add block position conversion 2021-06-29 00:08:56 +02:00
TheMode
fbb8c1a819
Merge pull request #344 from Kebab11noel/fix/gravity 
Fix gravity
 2021-06-29 00:08:40 +02:00
TheMode
5dfecce5d5 Cleanup 2021-06-28 23:31:01 +02:00
TheMode
790e99bce3 Simplify synchronization 2021-06-28 23:27:12 +02:00
Németh Noel
f6425d9fb2 Reduce the visibility of Entity#initializeDefaultGravity 2021-06-28 21:58:59 +02:00
Németh Noel
796d296f0d Removed terminal velocity 2021-06-28 19:24:53 +02:00
Németh Noel
13779aabde Fix knockback 2021-06-28 19:23:36 +02:00
Németh Noel
1ea526aa89 Fix gravity acceleration 2021-06-27 23:29:28 +02:00
Németh Noel
1afd4b4328 Use knockback method 2021-06-27 23:09:23 +02:00
Németh Noel
6c60c4d0fc Implement knockback 2021-06-27 23:05:54 +02:00
Németh Noel
17aa606037 Added javadoc to gravity related fields 2021-06-27 22:48:58 +02:00
Németh Noel
811531da70 Remove unit conversion 2021-06-27 22:45:05 +02:00
Németh Noel
adf0e06888 Changed gravity calculation 2021-06-27 22:44:04 +02:00
Németh Noel
e66fc2d200 Removed usages of Entity#setGravity 2021-06-27 22:32:56 +02:00
Németh Noel
b900d0e73d Introduced Entity#initializeDefaultGravity method 2021-06-27 22:29:25 +02:00
TheMode
018a9263ee Remove all direct volatile reads 2021-06-27 17:41:07 +02:00
TheMode
e772aace71 Initial reusable meta builder 2021-06-27 17:36:37 +02:00
TheMode
a29f5f1274 Add static parse for ArgumentBlockState 2021-06-27 17:05:57 +02:00
TheMode
e95cc4d295 Merge branch 'master' into new-block-api 2021-06-27 16:17:26 +02:00
TheMode
edaec0cb6d Fix double click inside player inventory 2021-06-27 05:44:24 +02:00
TheMode
b541ef4a74 Simplify block implementation 2021-06-26 20:23:56 +02:00
TheMode
4f4afbbe6d Merge branch 'master' into new-block-api 
# Conflicts:
#	src/main/java/net/minestom/server/instance/Chunk.java
#	src/main/java/net/minestom/server/instance/Instance.java
 2021-06-26 20:09:47 +02:00
TheMode
fbf8ddefce Add Tag#SNBT write support 2021-06-26 19:52:35 +02:00
TheMode
5ddfff22f2 Add Tag#NBT write support 2021-06-26 19:44:35 +02:00
BuildTools
efbb2b6338 Marker Armor Stands no longer prevent block placement 2021-06-26 19:47:29 +08:00
BuildTools
eb4d29628e Create MarkerHologram.java, modify Hologram.java to support subclasses overriding metadata easily 2021-06-26 19:39:53 +08:00
TheMode
bf44625730 Add experimental tags 2021-06-26 05:08:33 +02:00
TheMode
60042effba Merge remote-tracking branch 'origin/master' 2021-06-26 00:31:13 +02:00
TheMode
76bec54254 Add more TagHandler implementations 2021-06-26 00:31:04 +02:00
TheMode
3c04da9ae9 Add dummy block handler 2021-06-25 19:10:41 +02:00
TheMode
74073f13b5 Use classes instead of interfaces for BlockHandler type 2021-06-25 19:00:50 +02:00