Google
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
728 Commits 7 Branches 0 Tags 53 MiB
Commit Graph

545 Commits

Author SHA1 Message Date
DoctorMacc 0521a30266 Simplify 2020-04-08 22:17:29 -04:00
DoctorMacc c393dc9f21 Initial bow support 2020-04-08 21:29:33 -04:00
rtm516 bc67675d16 Added translation of extra message parts 2020-04-09 01:30:27 +01:00
rtm516 70a71b2ee8 Updated mappings commit 2020-04-09 00:23:21 +01:00
rtm516 c61d87714b On demand downloading and loading of language files 2020-04-09 00:20:41 +01:00
DoctorMacc c41740a9fa Add entity flag for if bee has nectar 2020-04-08 17:58:07 -04:00
rtm516 2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
Redned ece1eeb451
Merge pull request #274 from rtm516/shutdown-fix 
Kick players on shutdown and fix window not closing on standalone
 2020-04-07 19:20:01 -05:00
Redned 553b72bf30
Merge pull request #289 from DoctorMacc/llama-decoration 
Add llama decoration support
 2020-04-07 19:19:20 -05:00
rtm516 8e1b5de4b0
Merge branch 'master' into shutdown-fix 2020-04-08 01:07:12 +01:00
DoctorMacc d4f23379ef Fix requested change; modify comments 2020-04-07 20:06:20 -04:00
rtm516 70975a1d36 Updated player count for ade40d5 2020-04-08 01:03:25 +01:00
DoctorMacc 20700998b1 Fix requested changes; remove unused import 2020-04-07 19:57:34 -04:00
Redned ade40d5a8b
Only add the player to the players map once 2020-04-07 18:54:58 -05:00
DoctorMacc bbf0baf948 Additional explanation comment 2020-04-07 19:40:35 -04:00
DoctorMacc 03c611224b Add llama decoration support 2020-04-07 19:38:44 -04:00
DoctorMacc 12e67d9b28 Merge branch 'master' of https://github.com/GeyserMC/Geyser into map-quick-fix 2020-04-07 18:23:22 -04:00
Redned 9bdc083963
Merge pull request #286 from DoctorMacc/trader-llamas 
Fix trader llamas not appearing; add llama metadata
 2020-04-07 15:32:41 -05:00
William Johnstone c44708cc22 Add requested changes 2020-04-07 21:22:10 +01:00
DoctorMacc 588c89ded2 Fix requested changes 2020-04-07 16:21:42 -04:00
DoctorMacc b8c1a1d0ba Fix trader llamas not appearing; show llama variant 2020-04-07 16:12:55 -04:00
William Johnstone 8cab3cce26 Add falling blocks 2020-04-07 20:45:59 +01:00
DoctorMacc 9c282d2cb8 Quick map fix 2020-04-07 13:54:08 -04:00
DoctorMacc 2d2b4704dc Potential error spam fix 2020-04-06 20:57:26 -04:00
rtm516 41e0de4484 Cleaned up language 2020-04-06 14:35:18 +01:00
rtm516 c114f49e84 Fixed player count and removed debug code 2020-04-06 14:34:45 +01:00
rtm516 d4fa651427 Made the server kick all players before we shutdown and close the window when we finish on standalone. 2020-04-06 14:33:36 +01:00
rtm516 28217adfdf Added support for numbered param replacements 2020-04-05 23:37:41 +01:00
rtm516 9a6b537e89 Removed debugging line 2020-04-05 22:49:10 +01:00
rtm516 49df48fcf0 Fixed some strings getting missed 2020-04-05 22:47:03 +01:00
rtm516 18311e3c1c Added argument parsing to serverside language processing 2020-04-05 12:19:20 +01:00
rtm516 55b2fd0259 Kick the user on incorrect login info 2020-04-05 10:42:02 +01:00
rtm516 c809ddb618 Renamed translation method and cleaned up variable declaration 2020-04-05 10:13:47 +01:00
RednedEpic 41f6d991a4 Fix improperly named bedrock packet translator 2020-04-05 00:47:04 -05:00
rtm516 845c914492 Moved loading and added default locale config option 2020-04-05 02:58:23 +01:00
rtm516 b5ce83bbe2 Missed changes 2020-04-05 02:37:39 +01:00
rtm516 7f1fb3d43c Added new locale loading system 2020-04-05 02:36:25 +01:00
MrPowerGamerBR 3094fedd54 Remove unused map info request translator 
This was used for debugging purposes, to check if the map was correctly remapped to the client because, if it wasn't, it would've returned -1 as the map ID
 2020-04-04 17:28:59 -03:00
MrPowerGamerBR de37046466 Add map item translators 2020-04-04 17:23:02 -03:00
rtm516 c1e00e3614 Moved to json file lang mapping 2020-04-04 19:39:14 +01:00
rtm516 7298e2ff3f Added a few more lang string translations 2020-04-04 17:44:41 +01:00
rtm516 65277dc82a Added java -> bedrock lang conversions 2020-04-04 17:25:38 +01:00
RednedEpic 54fe7989cf Nitpicks 2020-04-04 02:08:50 -05:00
RednedEpic b6c2592b5c Add missing import 2020-04-04 02:08:23 -05:00
Redned ddf2f471ea
Merge branch 'master' into chunk-fix 2020-04-04 02:00:18 -05:00
RednedEpic 786f137e28 Add support for team prefixes, suffixes, and colors (Fixes #150) 2020-04-04 01:27:34 -05:00
RednedEpic 9b487d7d03 Fix combat by sending the animate packet after damage (Closes #260) 2020-04-03 17:20:14 -05:00
RednedEpic 03e11df58b Fix null potion type message in console (Addresses #227) 2020-03-26 23:29:16 -05:00
RednedEpic 5222232e72 Add rest of fixes for operator bug 2020-03-26 23:00:52 -05:00
Redned bb601daf26
Merge pull request #239 from e3ndr/master 
Make translators annotation based.
 2020-03-25 01:01:37 -05:00
Ender f8407eeb5a Add requested changes to PR 2020-03-25 00:55:09 -05:00
Ender bbf6683bd8 Make all translators annotation based 2020-03-23 23:24:17 -05:00
Ender 13a58dc825 Begin making translators annotation based 
Also, rename TranslatorsInit to Translators; makes alot more sense.
 2020-03-23 23:03:33 -05:00
DoctorMacc a821312f7e
Add switch for dealing with ChatColor.NONE 
In-game chat uses ChatColor.NONE for handling reset of text.
 2020-03-23 15:13:45 -04:00
Tim203 8b824cccf7
Added VR as InputMode (fixes #219) 2020-03-19 12:51:14 +01:00
RednedEpic 0a3a4a9ee1 Merge remote-tracking branch 'origin/master' 2020-03-18 16:10:45 -05:00
Redned 62b183a387 Update bedrock protocol lib and remove trove 2020-03-18 16:10:28 -05:00
Ender 1f8a2c5765 Make the passthrough motd display correctly on clients 
Before: https://i.e3ndr.xyz/?i=W63C
After: https://i.e3ndr.xyz/?i=SGKS
 2020-03-17 17:55:11 -05:00
RednedEpic 51050e3868 Merge remote-tracking branch 'origin/master' 2020-03-17 11:43:28 -05:00
RednedEpic 21dc2e8362 Add Geyser reload command and commands for platforms (Closes #141) 2020-03-17 11:43:09 -05:00
RednedEpic 16c9317a36 Fix flickering sky if time is too high (Closes #200) 
This was caused because the max int size is 2,147,483,647, which is what Minecraft: Bedrock Edition uses in the time packet. In Minecraft: Java Edition, a long is used which has a max length of 9,223,372,036,854,775,807, thus causing the sky to bug out.

This commit uses the modulus operator with the max time value per-day of 24,000 to retrieve the remainder.
 2020-03-15 13:20:55 -05:00
RednedEpic e203cfd4a7 Move back to XUID for Floodgate 
The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4.
 2020-03-14 14:03:44 -05:00
RednedEpic 105ce2b3b5 Add effect translations 2020-03-10 19:40:51 -05:00
Tim203 37d377b483
Floodgate now uses identity instead of xuid 2020-03-09 21:32:19 +01:00
RednedEpic acc30f2432 Move DeviceOS to common module 2020-03-08 11:45:00 -05:00
RednedEpic 9e203d48aa Fix running Geyser commands ingame 2020-03-06 19:37:35 -06:00
RednedEpic 0e355c1a95 Fix natural creeper explosion animation not showing up 2020-03-06 19:27:12 -06:00
RednedEpic 7bd53c95c3 Work on a lot more entity flags 2020-03-06 17:29:11 -06:00
RednedEpic e4c2f79bc5 Fix a couple minor entity bugs 2020-03-06 15:56:48 -06:00
RednedEpic 119f35b690 Fix chat getting cut off (Closes #188) 2020-03-06 15:44:49 -06:00
AJ Ferguson f71c70224b Only translate full chunks 2020-03-05 17:55:22 -09:00
AJ Ferguson eaf45ff6f7 Fix chunk view position bugs on some servers 2020-03-05 16:26:36 -09:00
AJ Ferguson 223e94a31d Revert non-full chunk fix 
This fix causes far too much lag on big non-full chunk updates
 2020-03-05 10:45:50 -09:00
RednedEpic 1670c77672 Only allow console to shut down Geyser with a command 2020-03-04 20:44:42 -06:00
RednedEpic 936cbad67d Get log4j2 working and fix commands 2020-03-04 20:35:23 -06:00
RednedEpic e52a461a73 Attempt to get log4j2 working 2020-03-01 10:48:49 -06:00
RednedEpic f9a1656b8e Merge remote-tracking branch 'origin/plugin' into plugin 2020-02-26 19:31:45 -06:00
RednedEpic 2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
Tim203 b97fa2b1c8 Added a response to the PluginMessage packet in the Login state 2020-02-26 23:53:26 +01:00
RednedEpic 09e4bbd8ca Make sure scale is not null when setting armor stand as baby 
If it's null, it's invisible.
 2020-02-25 19:52:27 -06:00
RednedEpic 4c87a13e25 Snap height only if on ground 
(Original commit 2dc6ab453f931ac2083a6d142e963beb0a101b94)
 2020-02-25 19:36:36 -06:00
RednedEpic f5bc328737 Merge branch 'master' into feature/new-protocol-lib 2020-02-25 18:54:31 -06:00
RednedEpic f0e01ab1c9 Fix getting stuck in wall bug 
Due to java doubles being somewhat more "precise" and bedrock positions being sent in floats instead, this caused bedrock players to get stuck in blocks when jumping or running near them in a certain way, thus causing the server to try and correct their position, potentially flagging anticheats and causing the server to print a "moved wrongly" message in console.

See: https://stackoverflow.com/questions/322749/retain-precision-with-double-in-java
 2020-02-25 18:50:09 -06:00
RednedEpic 1af4d71bd1 Remove extra height added to position when server corrects movement 
This should fix the bug where you can "climb" up blocks. Although this doesn't fix the random spasm the client gets, it should prevent players from climbing up blocks (and getting stuck in them), thus preventing anticheats from going crazy.
 2020-02-24 20:04:18 -06:00
Redned b41d66dd19
Set can climb for entity back to true 
This has nothing to do with the bug where players can "climb" up blocks, but rather disabling this feature disables the ability to climb up vines and ladders. This commit reverts that.
 2020-02-23 18:02:54 -06:00
Redned 35ed1ec916
Merge pull request #156 from AJ-Ferguson/chunk-fix 
Chunk fixes
 2020-02-23 14:38:20 -06:00
RednedEpic 720f69d913 Set can climb for entity to false 2020-02-16 14:07:40 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
RednedEpic f87ff70369 Update to NukkitX Protocol Lib 2.5.1 2020-02-16 13:07:35 -06:00
RednedEpic 9ffec0021c Fix movement bugs *and* allow for teleportation 2020-02-16 12:40:54 -06:00
OnlyBMan 18a50d4e3e Fix baby armorstands showing even when invisible 2020-02-15 21:35:05 -05:00
RednedEpic f52684f0dd Fix teleportation 2020-02-15 19:06:18 -06:00
RednedEpic ee85abf34c Fix player movement not being visible, movement bugs and laggy entities 
(Addresses #74, #109)
 2020-02-15 17:39:34 -06:00
AJ Ferguson 2d0a584106 Fix swimming 2020-02-15 01:18:41 -09:00
RednedEpic e6d166d4d4 Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:58:53 -06:00
RednedEpic 4bb34cdcce Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:57:28 -06:00
RednedEpic 4186715083 Update to NukkitX Protocol Lib 2.5.0 release 2020-02-14 17:39:26 -06:00
RednedEpic bf90b803ca Fix interact and attack in interact translator 2020-02-14 17:27:08 -06:00
AJ Ferguson 35bf1b455e Fix new player entity data getting lost while loading skin 2020-02-13 17:45:15 -09:00
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 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 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