Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-05 18:32:28 +01:00
Code Issues Projects Releases Wiki Activity
500 Commits 17 Branches 0 Tags 229 MiB
aa689d0df0
Commit Graph

500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eoghanmc22
aa689d0df0 Merge branch 'master' of https://github.com/Minestom/Minestom 2020-07-02 17:16:46 -04:00
Eoghanmc22
f8d014ab64 fix recipes wiki.vg was wrong. 2020-07-02 17:15:31 -04:00
Felix Cravic
401fa67243 Fix issue with ghost item 2020-07-02 17:58:18 +02:00
Felix Cravic
d35bb8f434 Updated JNoise + cleanup 2020-07-02 16:04:46 +02:00
Felix Cravic
0d0674ee5d Added support for custom server brand name 2020-07-02 15:56:43 +02:00
Felix Cravic
b4f1679e42 Remove count field in WindowItemsPacket 2020-07-01 23:10:45 +02:00
Eoghanmc22
6e6bb35799 Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom 2020-07-01 16:51:49 -04:00
Felix Cravic
5d747b3eb2 Fix inventory update 2020-07-01 22:50:05 +02:00
jglrxavpok
b98232eab6 Wait for shutdown tasks to finish before returning from SchedulerManager#shutdown 2020-07-01 22:17:35 +02:00
Eoghanmc22
7cbd13a560 Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom 
 Conflicts:
	src/main/java/net/minestom/server/inventory/Inventory.java
 2020-07-01 15:55:13 -04:00
jglrxavpok
288a835a82 Add getName to get id of block 2020-07-01 21:52:47 +02:00
jglrxavpok
82c2af88a0 Actually shutdown Minestom when MinecraftServer.stopCleanly() is called 2020-07-01 21:03:53 +02:00
jglrxavpok
4fb03a8479 Added normals to Directions 2020-07-01 20:36:19 +02:00
jglrxavpok
0b23692385 Rely on methods to access ItemStack inside of Inventory, instead of a field. Allows for extensions and custom logic in child classes 2020-07-01 18:58:16 +02:00
Felix Cravic
ce06919da1 Fix Player#didCloseInventory 2020-07-01 17:25:25 +02:00
Eoghanmc22
eb9aa8b6b6 Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom 2020-07-01 10:55:44 -04:00
Felix Cravic
d96e06dfe2 Added InstanceChunkLoadEvent and InstanceChunkUnloadEvent 2020-07-01 15:51:00 +02:00
Eoghanmc22
ffe5240a8d Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom 2020-06-30 20:00:28 -04:00
Eoghanmc22
1f95cd5e23 Fix game crash on join. 2020-06-30 20:00:08 -04:00
Felix Cravic
f873f495ea Fix inventory + added our own chat parser 2020-07-01 01:17:58 +02:00
jglrxavpok
5b7e15c226 Add access to PacketWriter in NbtWriter 2020-07-01 00:48:23 +02:00
Felix Cravic
151dedca99 Fixed SerializableData#clone 2020-07-01 00:40:39 +02:00
jglrxavpok
e60efca907 y is also an int in Chunk#getData 2020-07-01 00:11:15 +02:00
Eoghanmc22
68049b3eab Merge branches 'experimental' and 'master' of https://github.com/Minestom/Minestom 2020-06-30 17:15:32 -04:00
jglrxavpok
450603cac8 Don't send tags packet to viewers 2020-06-30 21:06:06 +02:00
jglrxavpok
2303b98024 Send tags to player on connection 2020-06-30 20:38:42 +02:00
jglrxavpok
ef8c275c4d Moved chunk creation out of chunk loaders 2020-06-30 18:12:09 +02:00
jglrxavpok
1ddef81372 Customizable chunk loader for InstanceContainers 2020-06-30 18:07:47 +02:00
jglrxavpok
4ffde8feed Added isLiquid utility method in Block 2020-06-30 14:49:53 +02:00
Felix Cravic
c5b83f1054 Merge remote-tracking branch 'origin/experimental' into experimental 2020-06-30 13:00:03 +02:00
Felix Cravic
2696bead72 Cleanup 2020-06-30 12:59:37 +02:00
jglrxavpok
bf6313659e NamespaceID->Resource in Registries.java 2020-06-30 12:53:15 +02:00
Eoghanmc22
a194a3f40d Merge branch 'experimental' of https://github.com/Minestom/Minestom 2020-06-29 20:44:08 -04:00
Eoghanmc22
ba5bdf2526 Fix for needing to include repositories in sub-projects. (I think) 2020-06-29 20:42:02 -04:00
Felix Cravic
e1b9f74cf4 Optimize message sending 2020-06-30 01:25:23 +02:00
Felix Cravic
8c3289d675 Allow for RGB color 2020-06-30 01:11:48 +02:00
Eoghanmc22
3e740cf874 kick for invalid version, use disconnect after kick packet, change logging level back to info, fix problem with compression on and encryption off. 2020-06-29 18:07:40 -04:00
Eoghanmc22
a7c376a410 use new enum gen 2020-06-29 18:01:35 -04:00
Eoghanmc22
01d7ed9699 Merge branch 'master' of https://github.com/Minestom/Minestom 
 Conflicts:
	src/main/java/net/minestom/server/entity/EntityType.java
	src/main/java/net/minestom/server/instance/block/Block.java
	src/main/java/net/minestom/server/item/Enchantment.java
	src/main/java/net/minestom/server/item/Material.java
	src/main/java/net/minestom/server/particle/Particle.java
	src/main/java/net/minestom/server/registry/RegistryMain.java
	src/main/java/net/minestom/server/registry/ResourceGatherer.java
	src/main/java/net/minestom/server/sound/Sound.java
	src/main/java/net/minestom/server/stat/StatisticType.java
 2020-06-29 16:27:53 -04:00
Felix Cravic
fad0373cb2 Fix TranslatableText 2020-06-29 22:19:48 +02:00
Felix Cravic
bd3aa9881e Add support for arguments in translatable text 2020-06-29 22:17:28 +02:00
jglrxavpok
7b9c093709 Merge remote-tracking branch 'origin/block-types' 2020-06-29 21:20:22 +02:00
jglrxavpok
e2a01c1a16 Back to 1.15.2 to prepare for merge 2020-06-29 21:19:59 +02:00
jglrxavpok
8fd7c35a32 Removed useless import 2020-06-29 21:11:22 +02:00
jglrxavpok
8483752046 1.16.1 enums 2020-06-29 21:07:03 +02:00
jglrxavpok
a8e607626e Autogeneration of Biome enum 2020-06-29 20:37:48 +02:00
jglrxavpok
7c3d3f6f07 Completely removed RegistryMain 2020-06-29 20:29:50 +02:00
jglrxavpok
4902ed4c6e Autogenerated Material ready to use 2020-06-29 19:21:41 +02:00
jglrxavpok
c66742e3d3 Hardcoded useful methods for Material (missing isFood impl) 2020-06-29 19:15:27 +02:00
jglrxavpok
4414d7c298 Start of Material.java generation + refactor 2020-06-29 19:02:32 +02:00