Commit Graph

3199 Commits

Author SHA1 Message Date
RednedEpic 240f41ff03 Use Path instead of File for floodgate key file in config
...and fix related issues with the file not being found.
2020-01-26 11:22:21 -06:00
RednedEpic 989312835f Fix custom name visible flag (Closes #137) 2020-01-26 00:05:05 -06:00
RednedEpic e0f6c8a170 Fix chests and potentially other block entities 2020-01-25 23:51:29 -06:00
RednedEpic d520a5670a Merge branch 'master' into block-entities 2020-01-25 23:05:36 -06:00
Redned c4857c6a54 Merge branch 'master' into plugin 2020-01-25 23:03:47 -06:00
RednedEpic cc3cf70257 Search for key in Geyser plugin folder in plugin versions 2020-01-25 22:59:00 -06:00
Tim203 ba724bb7d6 Added the Nintendo Switch as DeviceOS 2020-01-25 13:10:58 +01:00
RednedEpic a55381faaf Add support for Minecraft 1.15.2 and fix kick with villager (Fixes #138) 2020-01-22 20:28:08 -06:00
RednedEpic 6bb478bda4 Merge branch 'master' into block-entities 2020-01-19 22:35:33 -06:00
RednedEpic ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -06:00
RednedEpic e4d65cd267 Attempt to archive all artifacts for Jenkins 2020-01-18 17:28:27 -06:00
RednedEpic 6702c59a15 Fix auth type check from merge conflict 2020-01-18 16:50:17 -06:00
RednedEpic 88fc3cf843 Fix building 2020-01-18 16:48:46 -06:00
RednedEpic 52b23950ea Merge branch 'master' into plugin (should fix building) 2020-01-18 16:46:07 -06:00
RednedEpic 5c7755b772 Shade netty into Bukkit jar 2020-01-18 16:38:40 -06:00
RednedEpic 843c7a3047 Add support for showing item in hand for entities (Closes #106) 2020-01-11 13:05:43 -06:00
Redned 9e923fd59b
Merge pull request #135 from AJ-Ferguson/submodule-fix
Fix build error caused by mappings submodule
2020-01-09 07:55:24 -06:00
AJ Ferguson 9f7cba1915 Fix build error caused by mappings submodule 2020-01-08 19:48:03 -09:00
RednedEpic dc594ee22c Update license headers
Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.
2020-01-08 21:05:42 -06:00
RednedEpic b1d93fb633 Organize entity packages a bit more 2020-01-08 20:35:00 -06:00
RednedEpic 814da2453c Implement sheep colors and shearing (Closes #126) 2020-01-08 20:26:44 -06:00
Redned 6fb819c27b
Merge pull request #134 from Tim203/geyser-identity
Added a simple way to identify Geyser players.
2020-01-08 16:15:52 -06:00
Tim203 c5205cc873 Added a simple way to identify Geyser players.
Keep in mind that using this to identify players is less secure than using Floodgate
2020-01-07 22:29:49 +01:00
AJ Ferguson 66f5ed9495 Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
2020-01-04 14:39:01 -09:00
RednedEpic 2fc591e341 Merge Floodgate changes 2020-01-03 23:58:58 -06:00
RednedEpic 0c24ffc629 Merge branch 'master' into plugin 2020-01-03 23:25:00 -06:00
RednedEpic 7d14d079ef Fix NPE with ServerInfo being null for ping passthrough 2020-01-02 12:37:30 -06:00
AJ Ferguson 8a19e35342 Update mappings submodule 2019-12-31 16:49:30 -09:00
SupremeMortal d686a009d1
Fix most block palette issues. Others are due to the mappings 2019-12-31 23:24:54 +00:00
RednedEpic 145784b18d Shade in netty with BungeeCord module 2019-12-31 17:00:06 -06:00
RednedEpic 0eb182d0da Add block value translator
You can now see chest opening/closing animations :)
2019-12-31 13:24:59 -06:00
RednedEpic a59e330db9 Add default tags for campfire block entity 2019-12-31 12:33:42 -06:00
RednedEpic da645abec4 Add support for banner block entities
Colored banners still need to be implemented. The color for banners themselves is set as part of the block entity on bedrock meanwhile in java edition its set as part of the block state.
2019-12-31 12:31:04 -06:00
RednedEpic bc2df705ef Fix campfires 2019-12-31 11:53:42 -06:00
Redned a4ad4a96bb
Merge pull request #123 from AJ-Ferguson/master
Fix compass and end credits
2019-12-30 23:01:34 -06:00
AJ Ferguson cc4cfd020e Support end credits 2019-12-30 19:26:11 -09:00
AJ Ferguson 423d02306c Fix compass 2019-12-30 19:24:21 -09:00
RednedEpic da8bd8a659 Actually fix signs and start on campfire/container translators
Since signs are not sent as block (tile) entities in chunks when it comes to later Minecraft versions, caching and sending the signs after the chunk packet has been sent was the only way to fix this. Sign data sending has intentionally been delayed in JavaUpdateTileEntityTranslator in the event that a chunk takes a long time to send and the block entity data is sent first.
2019-12-30 21:55:17 -06:00
SupremeMortal 94851ef4b8
Move all block related code into BlockTranslator
It makes more sense.
2019-12-31 00:14:38 +00:00
SupremeMortal 2e46ecf28f
Rename map and use correct ID when entering. 2019-12-30 23:37:30 +00:00
SupremeMortal 6599aefc43
Use correct ID for duplicates 2019-12-30 23:35:28 +00:00
SupremeMortal b96ef99beb
Start working on direct block mapping.
This will not work
2019-12-30 23:33:27 +00:00
Redned 8ae1c4d70a
Merge pull request #120 from AJ-Ferguson/dimension
Dimension Switching and Respawning
2019-12-30 10:57:48 -06:00
Redned 1896a21621
Update compiling instructions 2019-12-29 13:57:02 -06:00
AJ Ferguson 377a87f7e3 Fix health edge case
If the java server sent a health value between 0 and 1, the player would die in the bedrock client
2019-12-29 01:45:57 -09:00
AJ Ferguson 4153e98134 Change lighting fix method 2019-12-28 23:20:48 -09:00
AJ Ferguson c4658ecdae Small changes 2019-12-28 21:45:41 -09:00
AJ Ferguson 6635241526 Fix rare slow dimension switching 2019-12-28 21:15:12 -09:00
AJ Ferguson 782feed641 Fix lighting when reloading world 2019-12-28 18:17:00 -09:00
AJ Ferguson b2f86ec20b Rewrite dimension code
New code does not rely on pausing the thread
2019-12-28 04:35:21 -09:00