Commit Graph

3359 Commits

Author SHA1 Message Date
TheMode
eadb32eba3 Merge branch 'master' into event-api 2021-06-14 00:17:42 +02:00
TheMode
911c983957 Merge branch 'master' into event-api
# Conflicts:
#	src/main/java/net/minestom/server/entity/Player.java
#	src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java
#	src/main/java/net/minestom/server/instance/Chunk.java
2021-06-14 00:11:41 +02:00
TheMode
adba6c3d40 WIP block loading 2021-06-14 00:07:51 +02:00
TheMode
af61c77a26
Merge pull request #319 from Minestom/resource_gatherer_java
Resource gatherer fixes
2021-06-13 14:58:49 +02:00
TheMode
6cd3952fb5
Merge pull request #316 from thiccaxe/server-list-ping-update
Updated Server List Ping
2021-06-13 14:58:05 +02:00
TheMode
b464b637a4 BlockHandler default impl 2021-06-13 13:41:01 +02:00
TheMode
c312bf59fc Revamp tag api 2021-06-13 13:38:26 +02:00
TheMode
d6a2a5b316 Added CampfireHandler demo 2021-06-12 19:17:50 +02:00
TheMode
54b6868b2e Comments 2021-06-12 16:02:35 +02:00
Matt Worzala
a84bc7be46
add stderr print 2021-06-12 09:29:00 -04:00
Matt Worzala
831dd6d610
use java home for resource gatherer. Should cause the same jdk to be used for resource gatherer and work if you dont have java in the path. 2021-06-12 09:17:18 -04:00
TheMode
e098b2a89f
Merge pull request #318 from mworzala/no_terminal_vm_arg
Add an option to start the server with no terminal
2021-06-12 15:08:09 +02:00
Matt Worzala
e5076832b1
Change to have an actual option which can be changed before startup 2021-06-12 09:07:09 -04:00
TheMode
342554cb36 Remove BlockHandler#drag 2021-06-12 15:06:52 +02:00
TheMode
ab51b50072 Use per-block handler 2021-06-12 13:57:59 +02:00
TheMode
a2bd0f7906 end line 2021-06-12 13:52:44 +02:00
TheMode
94e92741c8 Reuse chunk code 2021-06-12 13:37:37 +02:00
TheMode
1b31a81619 Fix single-section chunk packet 2021-06-12 10:46:50 +02:00
TheMode
3b14fe12a3 Proper naming for Section/Palette 2021-06-12 10:39:44 +02:00
thiccaxe
6ff5f7e93c Fix Grammar in ResponseData 2021-06-11 23:08:57 -07:00
Matt Worzala
8529249b85
Add option to start server without terminal enabled 2021-06-11 20:03:16 -04:00
thiccaxe
7641b8a75d Updated Server List Ping
Added playersHidden field to ResponseData; shows "???" in Vanilla.
Added event for ping/pong packet
2021-06-11 13:54:52 -07:00
TheMode
f95b6121fe Cleanup 2021-06-11 21:57:51 +02:00
Articdive
f3f854feaa
Fix TagsPacket 2021-06-11 21:55:30 +02:00
TheMode
9dffc7658c Added registry loader 2021-06-11 20:13:20 +02:00
TheMode
08684d075a Temporarily remove tags packet 2021-06-11 18:53:35 +02:00
TheMode
099b031875 Registry should use a JsonObject 2021-06-11 18:05:21 +02:00
TheMode
4ec59b4bc9 Temporarily fix block count 2021-06-11 17:55:47 +02:00
TheMode
9bf57b8c13 Remove unused fields 2021-06-11 17:52:52 +02:00
Articdive
1a67ab806a
Update BlockGenerator and add the 1.17 blocks. 2021-06-11 17:47:26 +02:00
TheMode
7a76040457 Cleanup 2021-06-11 17:38:45 +02:00
TheMode
7079225045 Remove BlockData.java 2021-06-11 17:33:18 +02:00
TheMode
64907ebb34 Added some properties to BlockEntry 2021-06-11 17:23:38 +02:00
TheMode
a1fac0f5cb Add Block.registry 2021-06-11 17:00:26 +02:00
TheMode
70aad159b9 Add BlockEntry 2021-06-11 16:50:37 +02:00
TheMode
70cd3891cf Added WIP Registry 2021-06-11 16:48:00 +02:00
TheMode
82eec1072c Create ProtocolObject 2021-06-11 16:45:01 +02:00
TheMode
35baf1e772 Remove unsafe prefix from Chunk#setBlock 2021-06-11 16:40:37 +02:00
TheMode
7f8120a334 Rebase 2021-06-11 16:37:07 +02:00
TheMode
457ef9df17 Merge branch 'master' into new-block-api
# Conflicts:
#	src/autogenerated/java/net/minestom/server/instance/block/Block.java
#	src/main/java/net/minestom/server/MinecraftServer.java
#	src/main/java/net/minestom/server/entity/Player.java
#	src/main/java/net/minestom/server/entity/pathfinding/PFBlockDescription.java
#	src/main/java/net/minestom/server/entity/pathfinding/PFBlockObject.java
#	src/main/java/net/minestom/server/instance/Chunk.java
#	src/main/java/net/minestom/server/instance/palette/PaletteStorage.java
#	src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java
#	src/main/java/net/minestom/server/network/packet/server/play/TagsPacket.java
2021-06-11 16:31:01 +02:00
TheMode
37f8306fb4 Use dedicated component write method 2021-06-11 16:23:07 +02:00
TheMode
0200788b22 Add dedicated method to ignore string/component size 2021-06-11 16:19:17 +02:00
TheMode
9fed96abe2
Merge pull request #307 from Minestom/1.17
1.17 Update
2021-06-11 16:08:08 +02:00
TheMode
265ae83b4d Fix tags packet 2021-06-11 16:00:14 +02:00
TheMode
72bf894162 Fix chunk packet read 2021-06-11 15:41:02 +02:00
TheMode
97d17f9b8b Fix Light & window click test 2021-06-11 15:38:46 +02:00
TheMode
88052576b3 Support for forced resource packs 2021-06-11 12:32:24 +02:00
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
78cc392007 Merge branch 'master' into event-api 2021-06-10 14:42:07 +02:00