TheMode
|
f31639c45c
|
Fix rebase
|
2021-06-10 16:12:42 +02:00 |
|
TheMode
|
14879636f1
|
Merge branch 'master' into new-block-api
# Conflicts:
# .gitignore
# build.gradle
# code-generators/build.gradle
# code-generators/src/main/java/net/minestom/codegen/Generators.java
# code-generators/src/main/java/net/minestom/codegen/MinestomCodeGenerator.java
# code-generators/src/main/java/net/minestom/codegen/blocks/BlockGenerator.java
# gradle.properties
# src/autogenerated/java/net/minestom/server/instance/block/Block.java
# src/autogenerated/java/net/minestom/server/registry/Registries.java
# src/generators/java/net/minestom/codegen/AllGenerators.java
# src/generators/java/net/minestom/codegen/RegistriesGenerator.java
# src/generators/java/net/minestom/codegen/items/ItemEnumGenerator.java
# src/main/java/net/minestom/server/entity/Player.java
|
2021-06-10 16:05:19 +02:00 |
|
TheMode
|
ad7b01fb9a
|
Added NettyServer#getServerChannel
|
2021-06-09 20:36:27 +02:00 |
|
TheMode
|
82a351492b
|
Merge pull request #305 from stefvanschie/master
Changing item drag events
|
2021-06-09 18:12:08 +02:00 |
|
stefvanschie
|
99855a3ea7
|
Allow for cancelling at start and end of drag
|
2021-06-08 21:27:34 +02:00 |
|
stefvanschie
|
ddbd621535
|
Change dragging events
Now fires a start dragging, then a dragging for each slot and then an end dragging.
|
2021-06-08 19:55:11 +02:00 |
|
stefvanschie
|
cd319b047c
|
Merge branch 'Minestom:master' into master
|
2021-06-08 19:52:50 +02:00 |
|
TheMode
|
73abe7a4d7
|
Merge pull request #313 from Minestom/fix-potion-ids
Fix potion effect IDs.
|
2021-06-07 19:37:06 +02:00 |
|
Articdive
|
b0a991773a
|
Make sure we stay in the potion ID range.
|
2021-06-07 17:36:29 +02:00 |
|
Articdive
|
a24c08ead9
|
Fix potion effect IDs.
|
2021-06-07 17:23:31 +02:00 |
|
TheMode
|
1aa9343dfc
|
Merge pull request #311 from Minestom/fix-data
Remove git submodule and gradle copy task.
|
2021-06-06 15:08:16 +02:00 |
|
Articdive
|
b52752653b
|
Fix jitpack build (hopefully)
|
2021-06-06 14:54:01 +02:00 |
|
Articdive
|
9165e19c30
|
Remove git submodule and gradle copy task.
|
2021-06-06 14:22:32 +02:00 |
|
TheMode
|
3e73ec5646
|
Properly unescape displayname & lore
|
2021-06-06 14:21:25 +02:00 |
|
TheMode
|
aee429add3
|
Merge pull request #309 from Minestom/new-data-preperation-1.17
Use minestom-data to generate our enums.
|
2021-06-06 10:44:59 +02:00 |
|
Articdive
|
d000684963
|
Merge remote-tracking branch 'upstream/new-data-preperation-1.17' into new-data-1.17
|
2021-06-06 08:26:45 +02:00 |
|
Articdive
|
d66240d7f3
|
Add a small failsafe for entity metadata.
|
2021-06-06 08:26:16 +02:00 |
|
TheMode
|
cec08fae1f
|
Replace target string only once
|
2021-06-06 06:35:19 +02:00 |
|
TheMode
|
641ca02120
|
Formatting
|
2021-06-06 04:48:43 +02:00 |
|
TheMode
|
5085f8fa58
|
Fix build
|
2021-06-06 04:26:45 +02:00 |
|
TheMode
|
5d8ed5041f
|
Use AtomicReferenceFieldUpdater to update the tick context
|
2021-06-04 22:30:35 +02:00 |
|
Articdive
|
3cefbc2627
|
Copy data from submodule into resources.
|
2021-06-04 15:19:01 +02:00 |
|
Articdive
|
4dda011c1f
|
Replace prismarine-data submodule with minestom-data submodule
|
2021-06-04 15:13:29 +02:00 |
|
Articdive
|
8445898663
|
Remove jang lang import.
|
2021-06-04 08:51:40 +02:00 |
|
Articdive
|
c2fd4ace93
|
Attempt to reduce diff in states.
|
2021-06-04 08:49:01 +02:00 |
|
Articdive
|
be649146ed
|
Remove states that only had 1 state.
|
2021-06-04 08:36:22 +02:00 |
|
TheMode
|
03ff75f685
|
Merge pull request #304 from Bloepiloepi/food-fix
Food animation fix
|
2021-06-03 19:17:49 +02:00 |
|
Articdive
|
993fc231b2
|
Use correct folder in .gitignore
|
2021-06-03 12:17:58 +02:00 |
|
Articdive
|
105f2fdc7e
|
Use minestom-data to generate our enums.
|
2021-06-03 12:11:42 +02:00 |
|
TheMode
|
da7bed78ae
|
Merge pull request #308 from Project-Cepi/update-option-scheduling
Convenience toMilliseconds, add UpdateOption methods to TaskBuilder
|
2021-06-02 11:31:05 +02:00 |
|
LeoDog896
|
f68054d564
|
Convenience toMilliseconds, add UpdateOption methods
|
2021-06-01 11:29:40 -04:00 |
|
TheMode
|
c105fcc339
|
Wait 20 ticks before removing player from the tablist
|
2021-05-31 21:01:28 +02:00 |
|
TheMode
|
6764d040c3
|
Fix FakePlayer not being removed from the tablist
|
2021-05-31 20:49:33 +02:00 |
|
TheMode
|
63bff29838
|
Compute block properties for arguments
|
2021-05-31 00:00:23 +02:00 |
|
TheMode
|
8b0991139d
|
WIP property retrieval
|
2021-05-30 23:37:22 +02:00 |
|
TheMode
|
52d0ef7f53
|
Send trade packet for every new viewer
|
2021-05-30 16:39:09 +02:00 |
|
TheMode
|
c080750a88
|
Fix trade index in VillagerInventory
|
2021-05-30 16:33:02 +02:00 |
|
TheMode
|
5a485a3aab
|
Added block handler destroy/place listener
|
2021-05-29 01:05:12 +02:00 |
|
TheMode
|
e62a837bf0
|
Added custom block drag support
|
2021-05-29 00:58:40 +02:00 |
|
TheMode
|
ba892ced05
|
Added BlockHandler#handleContact
|
2021-05-29 00:55:24 +02:00 |
|
TheMode
|
d937660cf8
|
Improve Block interface
|
2021-05-29 00:34:01 +02:00 |
|
TheMode
|
e0d54f5958
|
Store handler & nbt inside DynamicChunk
|
2021-05-29 00:07:22 +02:00 |
|
Stef van Schie
|
cb4ce09d85
|
Remove deprecated click types
|
2021-05-28 20:24:02 +02:00 |
|
TheMode
|
ffca5eea00
|
Added ItemStack#withTag
|
2021-05-28 17:05:14 +02:00 |
|
TheMode
|
d4fc6a094a
|
Make ItemStack TagReadable
|
2021-05-28 17:00:48 +02:00 |
|
TheMode
|
9a1062b028
|
Simplify Tag#defaultValue
|
2021-05-28 16:21:54 +02:00 |
|
TheMode
|
60c1b2c4e9
|
Change Tag#Custom to only affect an external compound, allow tag mapping
|
2021-05-28 16:19:58 +02:00 |
|
TheMode
|
cb8ad02c0d
|
Replace BlockModifier.java to BlockSetter & BlockGetter
|
2021-05-28 15:11:55 +02:00 |
|
TheMode
|
41f769b8b2
|
Rename #getBlockId to #getId
|
2021-05-28 14:35:55 +02:00 |
|
TheMode
|
58df9a9ba8
|
Use a BiPredicate for block comparison
|
2021-05-28 14:34:24 +02:00 |
|