Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-27 00:23:03 +01:00
Code Issues Projekte Releases Wiki Aktivität
1.890 Commits 23 Branches 0 Tags 87 MiB
41e0ad3e74
Commit graph

1555 Commits

Autor SHA1 Nachricht Datum
Tim203
107cd5bd5a
Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2021-03-23 01:35:02 +01:00
Camotoy
86397ef483
Chunk cache improvements (#2053) 
- Check for minimum and maximum Y values to fix stack traces
- Don't run half of the villager sleeping code unless they're actually sleeping
 2021-03-21 11:31:09 -04:00
Camotoy
10c77a3214
Fix sign color changes messing with character count (#2054) 
Color changes do not affect the maximum amount of characters allowed on a line.
 2021-03-21 11:28:19 -04:00
Camotoy
930c4c538e
Update the interactive tag when necessary (#2039) 
Update the interactive tag on entity metadata update, item slot change, and sneaking update; that way, if the tag should change, it will change.
 2021-03-18 01:11:21 -04:00
Camotoy
f827b28852
More smoothed out shield code (#2051) 
- Shield code is now down as the player is sneaking - it doesn't wait for the server to update our sneaking status
- Shield is now applied correctly when sneaking and then moving to the shield item
 2021-03-18 00:53:14 -04:00
Camotoy
b176fc7a2f
SRV improvements and improvements for GeyserConnect (#2048) 
- Individual per-player remote, port, and address
- Removal of RemoteServer class
- Do SRV lookup on startup and that's it
 2021-03-17 11:15:57 -04:00
Camotoy
3d4fff8dee
Fix sleeping on older Minecraft server versions (#2049) 
BED_POSITION is enough to trigger sleep.
 2021-03-17 10:38:56 -04:00
Camotoy
d41d8b0ebf
Fix item durability 'resetting' on 1.16.210 (#2042) 2021-03-15 14:49:44 -04:00
Camotoy
2f058e05bd
Allow dyed horse leather armor to translate (#2016) 2021-03-14 12:52:09 -04:00
Camotoy
1d8961c498
Allow GeyserWorldManager to be overwritten while still holding a cache (#2036) 2021-03-14 12:26:47 -04:00
toinouH
ba64a7a489
Update Adventure from 4.5.0 to 4.7.0 (#2037) 
* Update Adventure from 4.5.0 to 4.7.0

* Fix test failure due to changes in Adventure color mapping

Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
 2021-03-14 15:37:10 +00:00
Camotoy
e71ffa455f
Fix brewing stand fuel input 2021-03-13 23:09:37 -05:00
Camotoy
48aa586b21
More formatting fixes 2021-03-13 18:07:43 -05:00
Camotoy
1cdd66ae0b
Cleaner ItemEntry retrieval in BedrockInteractTranslator 2021-03-13 15:01:55 -05:00
Camotoy
23ab69702d
More review fixes and make beacon more reliable 2021-03-12 17:07:29 -05:00
Camotoy
d4c21bb74c
Merge branch 'server-inventory' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-12 11:51:48 -05:00
Camotoy
821e3126ea
Handful of review fixes 2021-03-12 11:51:37 -05:00
Camotoy
82ccfb1417
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-12 11:25:33 -05:00
AJ Ferguson
bba602b01e Fix loom output 2021-03-11 17:43:08 -09:00
Camotoy
09105e00b2
Fix item frame dropping on 1.16.210 (#2029) 
For whatever reason, item frames use the PlayerActionPacket in any non-creative gamemode, but creative mode keeps existing behavior. This has the benefit of fixing adventure mode item frame item dropping.
 2021-03-11 21:11:46 -05:00
Tim203
4229db0a2f
Merge remote-tracking branch 'origin/server-inventory' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2021-03-10 20:46:50 +01:00
Camotoy
e493415241
More cartography parity fixes 2021-03-10 14:43:54 -05:00
Tim203
643098e09e
Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
 2021-03-10 20:42:37 +01:00
Camotoy
370f3c18ba
Use compute for determining if a lectern if present 
Reduces having to call both containsKey and get.
 2021-03-10 13:54:09 -05:00
Camotoy
ded00dfd97
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-09 14:45:04 -05:00
Camotoy
9ae7c1de25
1.16.210 support (#2019) 
This commit implements 1.16.210 support while still keeping 1.16.100 and 1.16.210 compatibility.

Co-authored-by: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
 2021-03-09 12:51:48 -05:00
Camotoy
d80372e0b4
Also check out-of-bounds on player inventory 2021-03-08 18:17:14 -05:00
Camotoy
ffae69471d
Add protection for out-of-bounds inventory management 2021-03-08 18:13:26 -05:00
rtm516
efc7e43e02
Fix settings not displaying due to bedrock bug by delaying 1s (#2010) 
* Fix settings not displaying due to bedrock bug by delaying 1s

* Update BedrockServerSettingsRequestTranslator.java
 2021-03-08 17:00:44 -05:00
Camotoy
da11cd298c
Address requests 2021-03-08 16:57:31 -05:00
Camotoy
d19bf07b7a
Don't allocate the entire block size 2021-03-08 16:42:41 -05:00
Camotoy
3f14624d46
Fix some villager block trades being unable to stack 2021-03-08 15:53:47 -05:00
Camotoy
44e9dba759
Reject requests that are unavailable spaces; other things 2021-03-08 14:17:31 -05:00
Camotoy
7e3d51f9ad
Update mappings 2021-03-08 12:33:59 -05:00
Camotoy
f7130d2fe1
Update languages submodule (#2002) 2021-03-06 13:35:17 -05:00
Camotoy
55a1acfcb6
Fix close request desyncs with inventories of the same type, and 
- Small object optimization in DoubleChestInventoryTranslator
- Sending inventory ID of 0 for inventory translation is valid
 2021-03-06 12:24:39 -05:00
Camotoy
7fde39f247
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-06 11:09:27 -05:00
Camotoy
16e8dd0df1
Don't confirm if the inventory is the same type 2021-03-04 14:04:11 -05:00
Camotoy
ca3f9550dd
Remove unused variables; fix opening double chests quickly 2021-03-04 12:26:16 -05:00
Camotoy
f926b83b33
Fix capes of a *smaller* size throwing an error (#1998) 2021-03-04 11:32:56 -05:00
rtm516
e0e435fdc5
Fix capes being scaled wrong and invisible skins (#1940) 
* Fix capes being scaled wrong and invisible skins

* Flush old image objects

* Remove alpha workaround and fix more scaling issues

* Remove unnecessary scale

* Reduce diff

Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
 2021-03-03 18:00:29 -05:00
Tim203
cea16270c4
Fixed typo in artifactId 2021-03-03 21:49:42 +01:00
Tim203
a2d3ccfb2f
Whoops. Forgot to update Geyser to match recent global api changes 2021-03-03 19:57:52 +01:00
Camotoy
7e773c9970
Quietly handle unmappable Java items 
If vanilla can handle them, so can we.
 2021-03-02 19:10:17 -05:00
Camotoy
93726f5818
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-02 19:05:49 -05:00
Camotoy
e4e9758950
Fix logging into a server with Fabric Networking API (#1995) 
* Fix logging into a server with Fabric Networking API

Turns out we prevented the response to LoginPluginRequestPacket. Fabric API 0.28 and later will not let a client join without this response.

* Switch back to Jitpack just for Protocol to prevent weird errors

* Re-add sub protocol check

* Simplify check
 2021-03-02 19:02:34 -05:00
Camotoy
61e5784796
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-03-02 00:49:26 -05:00
SupremeMortal
88d4903fc6
Update Protocol lib and fastutil (#1990) 
* Update protocol lib and fastutil

Move away from jitpack since we store each unique snapshot build in the opencollab repo.
Also, trove hasn't existed in the network repo for quite some time so the exclusion isn't needed anymore.

* Store fastutil version in a property

* Store adventure version in a property
 2021-02-28 16:07:26 +00:00
Camotoy
e09f33c614
Clean up and fix more armor stand inconsistencies (#1988) 2021-02-27 12:19:30 -05:00
Tim203
e7eca7f7b9
Fixed reconnecting to the api 2021-02-27 13:14:40 +01:00
Camotoy
6775d88704
Handle no-NBT lecterns 2021-02-26 21:53:24 -05:00
Camotoy
f02105e9c7
Fix confirming when the server double-sends a window ID 2021-02-26 20:19:14 -05:00
Camotoy
ab9501da69
Use the inventory name always for villager inventories 
Testing not crashing on 1.8 and 1.13.2.
 2021-02-26 19:03:18 -05:00
Camotoy
6be71fc045
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-26 00:46:44 -05:00
Camotoy
acbcf4baf3
Fix shulker boxes resetting data and set all shulker boxes as valid 2021-02-25 21:51:50 -05:00
Camotoy
e1db626529
Fix closing the inventory from the server 2021-02-25 18:17:43 -05:00
Camotoy
0727008881
Villager fixes + other stuff 
- Consoles trading with villagers should work better
- Villagers closing their inventory work now
 2021-02-25 16:12:58 -05:00
Camotoy
ae3f50a79c
Firework star item translation (#1968) 
Firework stars, unsurprisingly, share some code with fireworks. This commit adds a new FireworkBaseTranslator abstract class that both firework items extend from, in order to use the explosion translation code. Firework stars also show color.
 2021-02-25 13:13:24 -05:00
Camotoy
325b8ab4d4
Fix rowing from Java to Bedrock (#1943) 
Rowing apparently broke in possibly the 1.16 update and nobody noticed until now.
 2021-02-25 13:12:25 -05:00
Camotoy
9f5a356180
Armor stand fixes (#1270) 
Armor stands now show armor if invisible. This allows both names and armor to show on an armor stand, and should allow for custom models that use armor stands to show, to an extent.
 2021-02-25 12:54:30 -05:00
Camotoy
255c7ac0d2
Revert "Add barrel as a valid single chest block" 
Barrels are a bit more complicated to lump in with chests for the time being. It *can* be fixed, but it requires workarounds.

This reverts commit 07f36affb9.
 2021-02-25 12:22:05 -05:00
Camotoy
9f1fa51cfc
Merge branch 'server-inventory' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-25 12:15:46 -05:00
AJ Ferguson
07f36affb9 Add barrel as a valid single chest block 2021-02-25 01:41:04 -09:00
AJ Ferguson
9e6402c279 Fixes 2021-02-24 20:14:01 -09:00
Tim203
66867edbc3
Fixed missing dependency 2021-02-25 02:46:34 +01:00
Tim203
c16c66b860
Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/pom.xml
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
#	connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
 2021-02-25 02:28:48 +01:00
Camotoy
f480fbfdf6
More changes to allow Geyser to cooperate better with bad internet (#1951) 2021-02-21 18:57:09 -05:00
Camotoy
2974afdce0
Small, inconsequential changes 2021-02-21 18:17:31 -05:00
Camotoy
e2df486eac
oops 2021-02-20 23:54:15 -05:00
Camotoy
f849a5b9f9
A bunch of fixes 2021-02-20 23:52:49 -05:00
David Choo
b7828267a5
Projectile Movement (#1929) 
Fixes

    #1780
    #1778
    The laggy fireballs
    Llama spit
    Shulker bullets
 2021-02-19 11:12:36 -05:00
Camotoy
605201afc0
Make changes required for Protocol 2.6.2 2021-02-17 19:39:10 -05:00
Camotoy
85b8fe2734
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-17 19:33:51 -05:00
Mark Vainomaa
c4573bb73d
HAProxy PROXY protocol support for upstream connections (#1713) 
* Ignore unknown properties on configuration subclasses

* Implement upstream PROXY protocol support
 2021-02-17 18:25:41 -05:00
Camotoy
9208943ac6
Bump Network and Netty dependencies (#1775) 2021-02-17 18:00:53 -05:00
Camotoy
d9f8e9eec2
Improve command freezing and fix up command suggestion translation (#1936) 
Merge commands with the same parameters (thanks Supreme)
    Add more suggestion types (blocks, items, entities)
    More optimizations


Co-authored-by: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
 2021-02-17 18:00:00 -05:00
bundabrg
15027c222e
Fix NPE when a TitlePacket of type TIMES is sent (#1944) 
References: https://github.com/bundabrg/GeyserReversion/issues/29

Co-authored-by: bundabrg <bundabrg@grieve.com.au>
 2021-02-17 00:58:08 -05:00
bundabrg
fc712ea892
Fix NPE in ServerEntityAnimationPacket (#1942) 
Closes: https://github.com/bundabrg/GeyserReversion/issues/41

Co-authored-by: bundabrg <bundabrg@grieve.com.au>
 2021-02-17 00:23:55 -05:00
YHDiamond
62cbdb8f5c
[ci skip] Fixed if spacing (#1941) 
Co-authored-by: yehudahrrs <47502993+yehudahrrs@users.noreply.github.com>
 2021-02-16 20:09:18 -05:00
Camotoy
22c39d285e
Make BlockInventoryHolder block strings immutable; clean up lectern unloading 2021-02-16 19:09:57 -05:00
Camotoy
72186d91f1
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-16 16:47:58 -05:00
Camotoy
e0bd5a62a7
Fix up some SpotBugs suggestions (#1911) 
This is a manual go-through of some bugs SpotBugs pointed out.
 2021-02-16 16:25:46 -05:00
Tim203
c79979e3e3
Added timestamp to BedrockData 2021-02-16 18:54:04 +01:00
Camotoy
aa47e75da6
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-15 23:49:35 -05:00
Camotoy
1f1d94aa81
Don't allow the sub-MOTD to be empty (#1933) 
As of 1.16.210.59, the sub-MOTD cannot be blank: https://bugs.mojang.com/browse/MCPE-117979

This workaround will be implemented now so the widest range of Geyser versions will properly show a ping in 1.16.210 - better an 'outdated server' message than 'unable to connect to world.'
 2021-02-15 21:41:11 -05:00
Camotoy
93a74d669d
Skin and skull fixes (#1923) 
* Skin and skull fixes

- Handle the occasional greater-than-128-px skin
- Remove unused Jackson dependency
- Update used Jackson dependency
- Handle skin downloading on another thread

* Other small touchups

* Flush after rescaling
 2021-02-15 16:36:47 -05:00
Camotoy
f2550de633
Ping/MOTD changes required for 1.16.210.59 (#1931) 2021-02-15 12:57:18 -05:00
Camotoy
ec23e409b6
Use switch statements, and change default block usage 
This is to support future changes of using multiple block translators
 2021-02-13 15:29:54 -05:00
Tim203
52ddf8c556
Moved skin uploading to the global api 2021-02-12 22:22:45 +01:00
Camotoy
ce33ca56a9
[ci skip] Formatting fixes 2021-02-12 14:43:29 -05:00
Camotoy
78337830c6
Use the real block for opening inventory when possible 2021-02-12 14:39:41 -05:00
Camotoy
98b2a0e51b
Fix NPE with MOTD (#1921) 2021-02-12 14:16:29 -05:00
toinouH
25dd651b09
Update Adventure to 4.5.0 (#1920) 2021-02-12 13:11:05 -05:00
Camotoy
aaeca23f54
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory 2021-02-10 23:53:45 -05:00
Camotoy
b16e1d6b43
Threading and ping improvements (#1870) 
- Don't schedule for setting jumping on and off if cache chunks is enabled, since we don't need to know that
- Add a new setting to disable player ping forwarding. Hopefully this helps with timeouts.
 2021-02-10 12:18:31 -05:00
Camotoy
1ec589fa35
Enable debug property in Log4J config if applicable (#1906) 
With this commit, debug messages in Netty and Protocol will now show if debug mode is enabled in the Geyser standalone config.

There is also some small tuning to the PacketTranslatorRegistry for cleanliness and maybe some minor performance.
 2021-02-08 13:30:37 -05:00
Camotoy
3140d3ced7
Allow Geyser to boot if it cannot download en_US file (#1907) 
This commit allows Geyser to start if it is unable to download Minecraft's English locale file, instead of throwing an exception that stops it.
 2021-02-07 22:57:44 -05:00
bundabrg
66fcd87ce6
Remove extra bracket from BOUYANCY_DATA (#1903) 
Co-authored-by: bundabrg <bundabrg@grieve.com.au>
 2021-02-07 21:18:20 -05:00
Camotoy
66bb162695
Use static commit of Protocol 2021-02-06 20:06:45 -05:00
Camotoy
8670172f8d
Revert "Start work on using the world block for inventories" 
Oops! Not finished yet!!

This reverts commit 454896a7ad.
 2021-02-05 11:48:12 -05:00