GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity
3,537 Commits 13 Branches 0 Tags 90 MiB
Commit Graph

40 Commits

Author SHA1 Message Date
Tim203 120b367a41
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
 2024-03-18 16:38:52 +01:00
chris c3d4277ae6
More error-robust kernel version parsing (#4496) 
* should resolve https://github.com/GeyserMC/Geyser/issues/4492

* Use regex to parse version

* yeet debug

* Only log the throwable message
 2024-03-15 13:52:34 +01:00
Tim203 c8fd024e4a
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
#	bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java
#	common/src/main/java/org/geysermc/floodgate/crypto/AesKeyProducer.java
#	common/src/main/java/org/geysermc/floodgate/crypto/FloodgateCipher.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsItem.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsItemMessage.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsType.java
#	common/src/main/java/org/geysermc/floodgate/news/data/BuildSpecificData.java
#	common/src/main/java/org/geysermc/floodgate/news/data/ConfigSpecificData.java
#	common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
#	common/src/main/java/org/geysermc/floodgate/util/LinkedPlayer.java
#	common/src/main/java/org/geysermc/floodgate/util/WebsocketEventType.java
#	core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/floodgate/FloodgateProvider.java
#	core/src/main/java/org/geysermc/geyser/floodgate/GeyserLoadStage.java
#	core/src/main/java/org/geysermc/geyser/floodgate/NoFloodgateProvider.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	gradle.properties
 2024-02-18 16:37:26 +01:00
千飞夏 226a4bb151
Use multiple channels at startup, fix the occasional issue of all pla… (#4329) 
* Use multiple channels at startup, fix the occasional issue of all players getting disconnected.

* Standardized shutdown periods and refactored network handlers for improved consistency.

* tiny fix

* Let's use the system property

---------

Co-authored-by: chris <github@onechris.mozmail.com>
 2024-02-02 16:25:50 +01:00
chris 61b3ffd0de
Feature: Allow setting a different port in the motd (#4293) 
* Allow changing the broadcasted port using a system property. This may be needed if the port Geyser runs on & the port Bedrock players connect on do not match - e.g. due to port forwarding/different routing.

* initial stab at making the broadcast port an (unsafe) config option

* Automatically set broadcast port to be the bind port unless manually overridden

* Warn about broadcast port mismatch

* Use 0 instead of -1 as indicator to broadcast the port geyser is running on
 2024-01-24 22:28:03 +01:00
chris 95d65350e4
Project wide syntax/annotation cleanup (#4238) 
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
 2023-12-05 18:54:42 -05:00
chris 118e769976
Fix issues with empty MOTDs - fallback to configured MOTD (#4259) 
* Fix issues with empty MOTDs - fallback to configured MOTD

---------

Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
 2023-11-14 00:33:34 +01:00
Konicai bb6a1ec40a
Simply pingpassthrough logic, add fabric ping passthrough (#3930) 
* Check if PingPassthrough is null
* Remove QueryPacketHandler
* Fabric ping passthrough
 2023-11-13 18:17:40 -05:00
chris 450e3b61fe
Bring back accidentally removed MTU option (#4229) 2023-10-20 20:14:16 +02:00
Tim203 dab61ac41a
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
 2023-10-12 21:10:01 +02:00
Tim203 cdd0f9a75e
We don't have to add handshake data when Floodgate is integrated 2023-10-12 19:54:22 +02:00
petersv5 7d489c7354
Close threads at server shutdown (#4029) 
Co-authored-by: Peter Svensson <petersv@psv.nu>
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
 2023-10-01 18:15:44 -04:00
Tim203 a894ce9824
Updated Gradle to 8.3 and made Geyser work with latest Floodgate 2023-09-30 19:41:35 +02:00
Tim203 05eb054559
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 2023-09-24 10:44:56 +02:00
chris 0d5cb51d5f
Make `geyser connectiontest` command more foolproof (#3951) 
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
 2023-09-05 23:16:44 -04:00
DeveloperDragon 50d3945477
Fix/proxy protocol missing message (#3898) 
* Show proxy protocol ip for debug message

* Make sure that first message that contains proxy protocol also gets sent. This caused issues with serverlists and console players
 2023-06-20 08:28:31 -05:00
7man7LMYT 9b264e6374
Add GeyserBedrockPingEvent (#3715) 2023-05-09 23:50:38 -04:00
Tim203 6ca53f5bf3
Merge remote-tracking branch 'origin/feature/floodgate-merge' 
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
#	bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
#	bootstrap/sponge/src/main/java/org/geysermc/geyser/platform/sponge/GeyserSpongePlugin.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
#	core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
#	core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockNetworkStackLatencyTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaBlockUpdateTranslator.java
#	gradle/libs.versions.toml
 2023-05-05 12:09:20 +02:00
Camotoy 5e5d5f3e43
Fix Javadocs 2023-05-02 13:21:17 -04:00
Camotoy f457d953fc
Fix proxy protocol support for Bedrock 
Fixes #3703
 2023-05-02 13:17:25 -04:00
Valaphee The Meerkat eee8dd46b1
Fix RakNet ping (#3722) 2023-04-30 15:52:45 -04:00
Camotoy c8afd3436d Fix Floodgate autodetection 2023-04-26 21:11:26 -04:00
RednedEpic 5ea88a8cf1 Untested HAProxy support 2023-04-08 19:44:01 -05:00
RednedEpic be48b83c28 Fix connection request handler 2023-04-08 19:01:42 -05:00
Camotoy b6113dfd31 Optimizations and regression fix 2023-04-06 21:47:37 -04:00
Camotoy 8083f70435 KQueue no longer needs to be shaded in on Spigot/Fabric 2023-04-06 19:54:22 -04:00
Camotoy 4fe9aeca40
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/protocol-3.0 2022-12-20 19:47:45 -05:00
Camotoy 1c49036e3a
Proof-of-concept for Geyser-Floodgate merge 2022-11-06 21:32:55 -05:00
RednedEpic 74798d8071 Remove old network code & use manual ping 2022-10-30 17:00:08 -05:00
RednedEpic 86ebfbbc6e Set datagram type from EventLoops 2022-10-29 22:42:38 -05:00
RednedEpic a133308f51 It compiles! 2022-10-29 22:02:11 -05:00
RednedEpic 18e7db8c30 Start on update to Protocol 3.0 2022-10-29 19:23:21 -05:00
ImDaBigBoss 4e2f74481b Updated to 1.19 2022-06-08 14:09:14 +02:00
Camotoy 09fb6bf3ba
Fix direct connection and ensure connecting doesn't block 2022-06-05 18:38:29 -04:00
RednedEpic bcc68ee4b5 Update to latest MCPL changes 2022-06-05 13:12:36 -05:00
Tim203 3251d9010c
We're in 2022 now 2022-01-01 20:03:05 +01:00
Camotoy d8254cb0b2 Update for PacketLib changes 2021-11-24 19:42:55 -05:00
Camotoy 64799b11b4 Update to latest PacketLib change 2021-11-24 11:27:44 -05:00
Camotoy 966c2155ad
API: change player class to Connection 2021-11-22 14:52:26 -05:00
RednedEpic 2c663e0ee5 The Great Refactor Part 3 - Entire project restructure 2021-11-20 17:29:46 -06:00