Commit Graph

372 Commits

Author SHA1 Message Date
AJ Ferguson fa7324e1f5 Add support for offhand 2020-02-13 17:45:14 -09:00
AJ Ferguson b18b83fd9a Fix armor not showing if partially armored 2020-02-13 17:45:14 -09:00
AJ Ferguson 276a8d6485 Fix hotbar slot changing when the player's hand is updated
The default value is 0.
-1 seems to leave the selected hotbar slot unchanged.
2020-02-13 17:45:14 -09:00
AJ Ferguson 7f194b2d54 Increase render distance instead of chunkpublisher radius 2020-02-11 13:42:02 -09:00
AJ Ferguson 3615ec2b90 Fix ChunkPosition 2020-02-10 18:24:09 -09:00
AJ Ferguson 9008036ee4 Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-10 17:38:56 -09: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
RednedEpic e8a1e0dae1 Add velocity platform support 2020-02-08 13:43:50 -06:00
AJ Ferguson 516fc51162 Small changes 2020-02-05 20:23:06 -09:00
AJ Ferguson e4ab4b336c Chunk fixes 2020-02-05 19:32:33 -09:00
AJ Ferguson e0a1435d51 Send confirmation packet when spawning
Fixes some chunk bugs
2020-02-05 19:23:08 -09:00
AJ Ferguson 13f198845c Fix bugs when rapidly switching dimensions 2020-02-05 19:21:09 -09: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
RednedEpic 4f461bf374 Start on converting to the new NukkitX protocol library updates 2020-02-05 18:55:34 -06:00
AJ Ferguson 3e4fd618e5
Fix offline auth bug
Handled in GeyserSession#connect
2020-01-28 23:28:23 -09:00
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
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 ed322029f3 Update hybrid mode reference to 'floodgate' in config.yml 2020-01-18 17:53:56 -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
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
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
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
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
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
Redned 97d8b8db68
Merge pull request #115 from AJ-Ferguson/master
Block states and fix waterlogged blocks
2019-12-23 12:03:15 -06:00
LegacyGamerHD 1f7b8ba5d5 Update Nukkit Protocol Library to 1.14 (#117)
* Update nukkit protocolib to 1.14

* Fixes

* Remove debug
2019-12-23 11:47:31 -06:00
OnlyBMan efd5bae13b Fix baby animal sizes
This should fix most baby animal sizes including Rabbits and their adult sizes!
2019-12-22 12:35:22 -05:00
AJ Ferguson 776d4c6585 Optimize waterlogged check 2019-12-22 00:32:49 -09:00
AJ Ferguson a4279d1f34 Fix bubble columns 2019-12-21 14:14:20 -09:00
RednedEpic b70edac3cc Update Geyser help command message on startup 2019-12-21 16:19:32 -06:00
RednedEpic 70fd9867f5 Add Sponge platform bootstrap 2019-12-21 16:18:34 -06:00
RednedEpic 1fbbb87689 Add PlatformType enum and add bStats platform chart 2019-12-21 11:53:19 -06:00
RednedEpic 0960ab2365 Close bedrock server upon shutdown 2019-12-21 11:38:45 -06:00
RednedEpic e38322a3ec Nuke plugin API
https://media.giphy.com/media/oe33xf3B50fsc/giphy.gif
2019-12-21 11:35:48 -06:00
RednedEpic d062e36fae Merge branch 'master' into plugin 2019-12-21 10:05:21 -06:00
AJ Ferguson d06f963b67 Block states and fix waterlogged blocks 2019-12-20 20:05:20 -09:00
RednedEpic 49caffc73e Remove comment in AgeableEntity as it no longer true
This was due to the wrong entity IDs in MCProtocolLib, which have since been patched.
2019-12-18 20:53:30 -06:00
Redned 42ac37fe40
Merge pull request #112 from OnlyBMan/master
Update SkinProvider.java
2019-12-18 20:43:32 -06:00
Tim203 64b04330c3 Added the player his IP to the transferable data 2019-12-17 23:27:29 +01:00
OnlyBMan afab21695a Update SkinProvider.java
Remove duplicate code
2019-12-16 22:26:35 -05:00
OnlyBMan 203b3b9d46 Update SkinProvider.java
Instead of calling the scale method 3 times, just used a cached scaled image
2019-12-15 19:24:00 -05:00
OnlyBMan 16950bf8f2 Update SkinProvider.java
Fix OptiFine capes and downscales banner capes so they work on PE too.
2019-12-14 21:12:12 -05:00
RednedEpic 76e80df94c Add trader llama entity 2019-12-14 11:40:04 -06:00
RednedEpic 3cc2d4775e Update bedrock assets
1.14 blocks are still somewhat buggy and break with the latest runtime_block_states file, so the old one is being used for the time being. Bedrock players should have no problems joining java servers in 1.15, but new blocks won't show up for now.
2019-12-10 21:01:56 -06:00
RednedEpic bb4dfeadf6 Update item and block mappings for 1.15 2019-12-10 20:42:51 -06:00
RednedEpic 8aaf411473 Add bee EntityType 2019-12-10 19:07:52 -06:00
RednedEpic f0e02aad32 Initial 1.14 Bedrock support 2019-12-10 19:06:18 -06:00
Tim203 9527709c59 Merge branch 'master' of https://github.com/GeyserMC/Geyser
 Conflicts:
	common/pom.xml
	connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
2019-12-10 20:52:42 +01:00
RednedEpic 5e8a3d2ca9 Add support for 1.15-pre6
Merely just a protocol change, nothing new has been implemented (such as bees) and won't be until bedrock 1.14 is released.
2019-12-09 20:19:09 -06:00
Redned 374436172a
Merge pull request #104 from GeyserMC/pr/pom-cleanup
General pom cleanup
2019-12-06 08:36:35 -06:00
Redned 30717a227a
Merge pull request #103 from AJ-Ferguson/master
Slightly improve movement
2019-12-06 08:35:30 -06:00
SupremeMortal f5923d8e2e
General pom cleanup. 2019-12-06 11:02:31 +00:00
AJ Ferguson fd95b8b36a Slightly improve movement
A lot more work is needed to fix movement.
2019-12-05 21:54:29 -09:00
RednedEpic 855a253894 Add cat entity 2019-12-04 22:42:20 -06:00
RednedEpic 6f5fc4c85c Fix JNI overlap with BungeeCord module 2019-12-04 18:56:51 -06:00
SupremeMortal 6e8a0847b4
Fix typo from protocol lib 2019-12-04 18:13:49 +00:00
RednedEpic 83d943e426 Only set variant for actual horses (Fixes #99) 2019-12-03 18:49:13 -06:00
RednedEpic fe6b0e8afa Update mappings submodule 2019-12-03 18:43:52 -06:00
RednedEpic 3e7e34dfb9 Move command reader into standalone module 2019-12-01 18:28:36 -06:00
RednedEpic 1c2ef99a54 Separate bootstrap and allow for Geyser to run on Bukkit (Addresses #54) 2019-12-01 15:16:52 -06:00
RednedEpic 2c10274fc3 Break entities into separate classes and add equipment translator
This should make the process of translating entity metadata a whole lot easier and more organized. Future features involving entities and checking if they're capable of doing certain things should also be much easier now.
2019-11-30 18:19:03 -06:00
RednedEpic cd17dc5f4c Use FastUtil over Trove for maps/collections to reduce memory usage
This should significantly decrease the amount of RAM being used by Geyser. Previously it was using 300mb - 400mb on average. This has dropped it down to 80mb - 120mb. Ideally I'd like to decrease this value further, but that will require some more work.
2019-11-30 13:26:51 -06:00
Tim203 f1b19fc04e Little changes 2019-11-30 19:10:29 +01:00
Tim203 1c48279a9f Little changes 2019-11-30 18:38:09 +01:00
Tim203 b12256bc1e Changed a method name 2019-11-30 15:32:13 +01:00
Tim203 7d645fbf16 First Flootgate commit 2019-11-30 13:34:45 +01:00
RednedEpic c91e8e1958 Update mappings to use new submodule 2019-11-29 20:34:51 -06:00