Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-19 17:15:24 +01:00
Code Issues Projects Releases Wiki Activity
634 Commits 18 Branches 0 Tags 230 MiB
247dfeefc8
Commit Graph

590 Commits

Author SHA1 Message Date
jglrxavpok
6b1da01795 Tags are now supported in loottables 2020-07-07 18:33:38 +02:00
jglrxavpok
53d39dbcb8 Experiment3: null check 2020-07-07 14:03:50 +02:00
jglrxavpok
dbc8cc54c1 Experiment2: Move executor service inside method 2020-07-07 14:03:03 +02:00
jglrxavpok
bd5bb2e3d9 Experiment by using MinestomThread for parallel saving 2020-07-07 13:55:43 +02:00
jglrxavpok
dfdf93bfc4 ChunkLoader can now indicate that they support parallel loading or saving 2020-07-07 13:41:55 +02:00
jglrxavpok
69654d05de Add methods for BlockAlternative and reran generators 2020-07-07 13:17:41 +02:00
jglrxavpok
9bc4915d6c Fix EOFException with ClientClickWindow 2020-07-07 00:24:46 +02:00
jglrxavpok
f8c358adcd Use ChatParser.toColoredText when loading name&lore 2020-07-06 23:55:43 +02:00
jglrxavpok
6d892efacf Save additional NBT to correct sub-compound 2020-07-06 23:50:32 +02:00
jglrxavpok
b277d7cb1a Moved NBTUtils from VanillaReimpl to core 2020-07-06 23:43:56 +02:00
jglrxavpok
84b06307c4 Item damage is an Integer 2020-07-06 23:34:22 +02:00
jglrxavpok
4f4d48df92 Remove old NBT code, use Hephaistos 2020-07-06 23:20:20 +02:00
Felix Cravic
c061e2a71f Fix FakePlayer respawn 2020-07-06 19:35:24 +02:00
Felix Cravic
85aad4f044 Support for tablist in FakePlayerOption 2020-07-06 19:31:02 +02:00
Felix Cravic
9fc8012d9d Fix player display name 2020-07-06 19:15:13 +02:00
Felix Cravic
5673f67db9 Added FakePlayerOption 2020-07-06 19:09:30 +02:00
Felix Cravic
e74c8ac9fd Changed the way to create FakePlayer 2020-07-06 16:06:31 +02:00
Felix Cravic
da48ba8fb0 Fix ItemStack#clone 2020-07-06 13:24:01 +02:00
Felix Cravic
4808567ef6 Consider HideFlags as an NBT tag 2020-07-06 12:44:02 +02:00
Felix Cravic
433703c0af Added support for item CustomModelData 2020-07-06 12:39:48 +02:00
Felix Cravic
3e9194b5ec Fix ChunkPopulator 2020-07-04 00:11:52 +02:00
Felix Cravic
2fc29037fb Give access to Chunk to ChunkPopulator 2020-07-04 00:10:08 +02:00
Felix Cravic
5460d8e6c4 Allow special color code to be false 2020-07-03 20:28:07 +02:00
Felix Cravic
2b021e26c1 Added support for special color code (reset/bold/italic/etc...) 2020-07-03 19:53:53 +02:00
Felix Cravic
87921a8788 Added ThreadProvider 2020-07-03 16:44:21 +02:00
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
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
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
Felix Cravic
18f9341c55 Add missing break statement 2020-06-29 17:32:35 +02:00
Eoghanmc22
f04e8036fc Add missing break and fix various things with the netty improvements made by WhileInside, add the disconnect during login packet currently only used for preventing multiple people with the same username from logging in when Mojang auth is enabled. 2020-06-29 11:25:10 -04:00
jglrxavpok
c9589ae526 1.16+ support and remove unused imports in generated Block enum 2020-06-29 16:41:29 +02:00
Eoghanmc22
1f56bc10fc Merge branch 'master' of https://github.com/WhileInside/Minestom 
 Conflicts:
	src/main/java/net/minestom/server/network/netty/NettyServer.java
	src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java
	src/main/java/net/minestom/server/network/player/FakePlayerConnection.java
	src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
	src/main/java/net/minestom/server/network/player/PlayerConnection.java
 2020-06-28 18:06:36 -04:00
Eoghanmc22
061db7c8de Add some vanilla placement rules, add a scheduleNextTick method for instances and entities, make changes to BlockPlacementRule, make BlockFace its own class. 2020-06-28 17:11:40 -04:00
artem
53410c737a getVarIntSize optimization, Compression, LegacyPing 2020-06-29 01:07:48 +05:00
artem
9502511095 Mark classes to delete 2020-06-28 23:36:19 +05:00
artem
f8dceb51b4 TCP_NODELAY 2020-06-28 23:31:45 +05:00
artem
6a6309377f Epoll support (optimization for linux) 2020-06-28 23:29:36 +05:00
Eoghanmc22
7d59347873 Hotfix 2020-06-26 18:55:41 -04:00
Eoghanmc22
37b5484775 Minor optimizations to mojang auth. 2020-06-25 19:40:33 -04:00
Eoghanmc22
b80da2f097 basic 1.16.1 support 2020-06-25 15:05:58 -04:00
Eoghanmc22
8e26447f9a Merge branch 'master' of https://github.com/Minestom/Minestom 2020-06-23 17:02:29 -04:00
Felix Cravic
2db810bafa Added legacy message support 2020-06-23 22:46:22 +02:00
Eoghanmc22
e203d9c45a Merge branch 'master' of https://github.com/Minestom/Minestom 
 Conflicts:
	build.gradle
	src/main/java/net/minestom/server/entity/Player.java
 2020-06-23 16:03:21 -04:00
Eoghanmc22
7ac90cff24 init 2020-06-23 15:58:31 -04:00
jglrxavpok
290d922e3a Replacing old Block enum with autogenerated Block enum 2020-06-23 18:35:23 +02:00
jglrxavpok
60e1b856c7 Merge remote-tracking branch 'origin/master' into block-types 2020-06-23 18:18:12 +02:00
jglrxavpok
f79cfa8d87 Merge branch 'tags' 2020-06-23 18:17:35 +02:00
jglrxavpok
4111c728df Basic implementation of tags 2020-06-23 18:17:02 +02:00
Felix Cravic
19fc90e764 Fixed Held packet + replaced the short by a byte 2020-06-23 18:09:01 +02:00
Felix Cravic
b47efa35ca Added PlayerChangeHeldSlotEvent 2020-06-23 17:50:43 +02:00
Felix Cravic
9dfb9b657b Added CommandSender#isPlayer and CommandSender#isConsole 2020-06-23 17:25:46 +02:00
Felix Cravic
6ccd31e7fe Fix Chat.COLOR_CHAR 2020-06-23 00:34:49 +02:00
Felix Cravic
f892213e8c Added a new Chat API 2020-06-22 23:25:00 +02:00
jglrxavpok
0a05a81de9 Generate subclasses to avoid 64kb JVM bytecode size limit in methods 2020-06-22 21:27:12 +02:00
Eoghanmc22
c31b962ed8 fix imports 2020-06-21 19:25:50 -04:00
Eoghanmc22
0335f04135 Merge branch 'master' of https://github.com/Minestom/Minestom 2020-06-21 18:59:40 -04:00
Eoghanmc22
77b99e8223 Merge with latest Minestorm 2020-06-21 18:57:53 -04:00
Felix Cravic
37440c51cf Added CommandSender#isPlayer and CommandSender#isConsole 2020-06-22 00:48:12 +02:00
Eoghanmc22
42276efc49 Added optional Mojang auth and UUIDs support (MojangAuth.init()), added support for skin layers, and made everywhere have max lighting. 2020-06-21 18:04:19 -04:00
Felix Cravic
889b1fe095 Renamed PlayerInteractEvent to PlayerEntityInteractEvent 2020-06-21 23:44:20 +02:00
jglrxavpok
62db9d9c26 Added alternatives (block states) and block entity information to generated Block enum 2020-06-21 23:03:40 +02:00
Felix Cravic
92cf598f13 Merge remote-tracking branch 'origin/master' 2020-06-21 22:12:24 +02:00
Felix Cravic
72234ac706 Added PlayerPreLoginEvent 2020-06-21 22:11:56 +02:00
jglrxavpok
fcc0f5e035 Merge remote-tracking branch 'origin/master' into block-types 2020-06-21 22:07:38 +02:00
jglrxavpok
754568d336 Comment out unused code in SimpleCommand 2020-06-21 22:05:30 +02:00
Felix Cravic
eba5c5ae3a Added CommandSender and ConsoleSender 2020-06-21 14:01:03 +02:00
Felix Cravic
5837b59a41 Give the player username to the UUID provider 2020-06-20 19:07:34 +02:00
jglrxavpok
abf999a4d9 Beginnings of automatic Block code generation 2020-06-19 11:29:09 +02:00
Felix Cravic
ac758e4acb Update demo entity 2020-06-18 23:09:42 +02:00
Felix Cravic
f585b3df86 Some comments 2020-06-03 15:17:34 +02:00
Felix Cravic
2ee93bd7cb Fixed EntityItemMergeEvent constructor 2020-06-02 14:55:18 +02:00
Felix Cravic
bd08676525 Added EntityItemMergeEvent#setResult 2020-06-02 14:54:33 +02:00
Felix Cravic
0da78193c5 Code cleanup 2020-06-02 14:43:31 +02:00
Felix Cravic
50373505b3 Remove entities other than players when unloading a chunk 2020-06-02 00:03:03 +02:00
Felix Cravic
895a4fd4bd Fixed instance switch while unloading chunk 2020-06-01 23:55:11 +02:00
Felix Cravic
b7b334645f Added InstanceContainer#saveInstance to save its SerializableData + its uniqueId 2020-06-01 22:11:47 +02:00
Felix Cravic
cb743bc7d5 NbtWriter cleanup 2020-06-01 18:57:16 +02:00
Felix Cravic
45e8ba2f03 Added EventHandler#removeEventCallback 2020-06-01 17:11:43 +02:00
Felix Cravic
b1e86adb23 Allow ItemEntity#getMergeUpdateOption to be null 2020-06-01 02:18:24 +02:00
Felix Cravic
7e20278dd9 Fix deadlock with ItemEntity + added ItemEntity#getMergeUpdateOption to mitigate CPU usage increase 2020-06-01 00:51:31 +02:00
Felix Cravic
ea034701f8 Added PlayerSetItemStackEvent#setSlot + some checks 2020-05-31 21:37:40 +02:00
Felix Cravic
633d02222a Added PlayerAddItemStackEvent and PlayerSetItemStackEvent 2020-05-31 21:30:46 +02:00
Felix Cravic
7128844563 Resource pack cleanup 2020-05-31 20:09:42 +02:00
Felix Cravic
c17aba4ac7 Added Player#setResourcePack + PlayerResourcePackStatusEvent 2020-05-31 19:53:59 +02:00
TheMode
ce89963240
Merge pull request #8 from programmerpony/home-linux 
Check home directory for Minecraft files on Linux
 2020-05-31 19:14:24 +02:00
programmerpony
ab3578b84d Check home directory for Minecraft files on Linux 2020-05-31 12:50:35 -04:00
Felix Cravic
00143078e3 Added PlayerSkin#fromUuid and PlayerSkin#fromUsername 2020-05-31 18:07:09 +02:00
Felix Cravic
f8758d2933 Added LivingEntity#swingMainHand and LivingEntity#swingOffHand 2020-05-31 16:14:27 +02:00
Felix Cravic
eed946e948 Cleanup 2020-05-31 15:52:56 +02:00
Felix Cravic
30ef05183e Added more synchronization at death + added listener for teleport and window confirmation to remove warning 2020-05-31 00:39:56 +02:00
Felix Cravic
1bcd0c474f Added event comments 2020-05-30 22:32:12 +02:00
Felix Cravic
edb6db428e sync equipments only to the viewer to update instead of all 2020-05-30 21:56:12 +02:00
Felix Cravic
f887f21493 Cleanup with the ADD_PLAYER method 2020-05-30 19:51:45 +02:00
Felix Cravic
7ce6f7ada1 Added Player#setSkin and PlayerSkinInitEvent to modify it at initialization 2020-05-30 19:47:47 +02:00
Felix Cravic
1343a66681 Added player in inventory events + comments 2020-05-30 14:58:00 +02:00
Felix Cravic
3940eacde8 Attribute optimization + comments 2020-05-30 01:39:52 +02:00
Felix Cravic
407bdd8ea7 Remove the previous NBT library 2020-05-30 00:25:07 +02:00
Felix Cravic
639629ccf6 Added a small nbt utils package 2020-05-30 00:01:38 +02:00
Felix Cravic
1c3099f61a Entity & Player comments 2020-05-29 23:17:14 +02:00
Felix Cravic
18a1e0b29b Added EntityPigZombie metadata + itemstack synchronization 2020-05-29 21:30:42 +02:00
Felix Cravic
27b0238705 Fixed ResourceGatherer on Mac OS 2020-05-29 20:44:03 +02:00
Felix Cravic
49723fbe7d Fixed ItemStack#isSimilar 2020-05-29 20:24:39 +02:00
Felix Cravic
6543f17d4c Remove useless synchronization blocks and fix Inventory#addItemStack 2020-05-29 19:41:08 +02:00
Felix Cravic
b0ccb91c31 More entity + added boundingboxes 2020-05-29 18:56:42 +02:00
Felix Cravic
29aae491d1 Minor optimizations 2020-05-29 17:20:30 +02:00
Felix Cravic
589079f8f6 Updated netty + fix network crash 2020-05-29 15:31:11 +02:00