GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity
461 commits 19 branches 0 tags 84 MiB
Commit graph

461 commits

This branch
This branch
All branches
Author SHA1 Message Date
AJ Ferguson
bf1835e691 Fix Block IDs 
Quick fix. Might have a different method for getting block IDs in the future
 2020-02-12 22:29:44 -09:00
AJ Ferguson
b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-12 21:58:09 -09:00
Redned
b99568dc28
Merge pull request #122 from GeyserMC/feature/direct-block-mapping 
Direct Block Mapping
 2020-02-10 19:29:45 -06:00
SupremeMortal
c70cf0bb47
Make biomes tag final 2020-02-09 22:55:07 +00:00
SupremeMortal
f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping 
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2020-02-09 22:53:57 +00:00
SupremeMortal
9594b42523
Add waterlogging support 2020-02-09 22:06:22 +00:00
SupremeMortal
c9f33f8344
Pull in new submodule changes 2020-02-09 21:22:39 +00:00
Redned
a6aef4ad42
Update README.md 2020-02-09 14:45:38 -06:00
Redned
b2d3ae5d64 Merge pull request #155 from OnlyBMan/biomes 
Add biomes
 2020-02-09 14:45:18 -06:00
OnlyBMan
0bb18d26b0 Load biome definitions only once instead of everytime a new player joins 2020-02-05 22:02:23 -05:00
OnlyBMan
4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
RednedEpic
0cf574ddcb Merge branch 'master' into feature/direct-block-mapping 2020-02-05 18:59:20 -06:00
AJ Ferguson
3d61b3ce28 Bump OpenNBT lib to 1.4-SNAPSHOT 
This fixes the NPE when sending an ItemStack with a null NBT tag.
This also fixes some item movement bugs on pure vanilla servers.
 2020-01-30 23:15:18 -09:00
AJ Ferguson
1a9aa4255f Some refactoring and bug fixes 
Still much to do.
Inventory desyncing when crafting will be fixed soon.
 2020-01-30 16:05:57 -09:00
AJ Ferguson
5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
RednedEpic
989312835f Fix custom name visible flag (Closes #137) 2020-01-26 00:05:05 -06: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
ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -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
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
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
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
AJ Ferguson
8efeb3fe25 Fix exception when removing all entities 2019-12-27 03:03:12 -09:00
AJ Ferguson
cc0b3293bf Start fixing dimension switching and respawning 2019-12-27 02:29:46 -09:00
Redned
2ed492edb8
Merge pull request #116 from OnlyBMan/master 
Fix baby animal sizes
 2019-12-24 17:08:50 -06:00
OnlyBMan
0f70ad087c Added scaling for Zombies, Villagers, and Armor Stands 
Fixed code a bit and added support for new mobs.
 2019-12-24 11:07:36 -05:00
AJ Ferguson
46205600dd Fix block ids 2019-12-23 17:00:31 -09:00
AJ Ferguson
8061e2d76d Merge remote-tracking branch 'remotes/upstream/master' into inventory 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
 2019-12-23 16:58:59 -09:00