GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-04 15:31:36 +00:00
Code Issues Releases Activity
4,549 Commits 27 Branches 0 Tags
d045508aae06daced61fe4e76e0e934caa68e0a4
Commit Graph

187 Commits

Author SHA1 Message Date
onebeastchris
d045508aae Merge remote-tracking branch 'upstream/master' into configurate 
# Conflicts:
#	bootstrap/mod/neoforge/build.gradle.kts
#	bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
#	core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
 2025-10-15 19:01:50 +02:00
onebeastchris
826b4b4e48 Indicate 1.21.112/1.21.113 support, track server platform types in bstats metrics 2025-10-12 13:34:29 +02:00
onebeastchris
61d7dc0a17 Fix: Bedrock update notifications config option being ignored on Geyser-Fabric / Geyser-NeoForge 2025-09-25 19:30:53 +02:00
onebeastchris
50588b51ff Back to one config file 2025-08-26 16:34:59 +02:00
onebeastchris
d101c010d8 Merge remote-tracking branch 'upstream/master' into feature/configurate 
# Conflicts:
#	bootstrap/bungeecord/build.gradle.kts
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/mod/neoforge/build.gradle.kts
#	bootstrap/spigot/build.gradle.kts
#	bootstrap/velocity/build.gradle.kts
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/command/CommandRegistry.java
#	core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.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/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSessionAdapter.java
#	core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java
#	core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
#	gradle/libs.versions.toml
 2025-08-26 16:14:45 +02:00
onebeastchris
df4bb4f1c1 Update netty & mcpl dependencies 
Fixes https://github.com/GeyserMC/Geyser/issues/5375, https://github.com/GeyserMC/Geyser/issues/5301, fixes https://github.com/GeyserMC/Geyser/issues/5050
 2025-07-25 20:04:39 +02:00
chris
7ac90f9329 Add and rename some config options, add section notes (#5390) 
* Add and rename some config options, add section notes

* adjust message

* Update core/src/main/java/org/geysermc/geyser/command/defaults/ConnectionTestCommand.java

Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>

* Update core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java

Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>

* Update ConfigLoader.java

* Update AdvancedConfig.java

* clarify that we're talking about the HAProxy protocol

* rename config option to use-haproxy-protocol

* remove ominous warning sign on xbox auth warning

* adjust wording

---------

Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>
 2025-07-11 02:19:43 +02:00
chris
7c47459609 Resolve memory usage issues related to Netty 4.2 update (#5536) 
* More proper workaround for direct connection using Netty 4.2

* Add check for outdated Velocity

* BungeeCord support for Netty 4.2

* Use pooled allocator

* Small cleanup: only one allocator system property check, pin comment to static commit

* Set allocator type on Standalone using netty system property

* Don't mess with allocator, both BungeeCord and Velocity set it globally

* Temporarily remove io_uring support

In order to support io_uring transport after the 4.2 update, we'd need to separately handle 4.1 and 4.2 event loop group creation

* Add compileOnly netty io_uring dependency for Geyser-BungeeCord

* Exclude old incubator io_uring dependency on geyser-standalone

---------

Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
 2025-05-22 17:43:02 +02:00
onebeastchris
20e02b99c2 Move config loading to GeyserBootstrap interface 2025-04-26 02:12:10 +02:00
onebeastchris
aaee12e082 Merge remote-tracking branch 'upstream/master' into feature/configurate 
# Conflicts:
#	bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyLogger.java
#	build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
#	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/pack/GeyserResourcePackManifest.java
#	core/src/main/java/org/geysermc/geyser/registry/loader/SoundRegistryLoader.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
#	gradle/libs.versions.toml
 2025-04-26 01:08:15 +02:00
chris
69329f2cad Feature: Resource Pack API additions - ResourcePackOptions and a GeyserDefineResourcePacksEvent (#4978) 2025-03-25 15:49:18 +01:00
onebeastchris
42f135f85b Merge remote-tracking branch 'upstream/master' into feature/configurate 
# Conflicts:
#	bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java
#	bootstrap/viaproxy/src/main/java/org/geysermc/geyser/platform/viaproxy/GeyserViaProxyPlugin.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/CreativeItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/resources/mappings
 2025-02-27 19:31:05 +01:00
Alex
5f0611ff0f Switch all ping passthroughs to json to avoid parsing warning (#5363) 2025-02-25 22:33:10 +01:00
Camotoy
ecc10d6560 Update direct connection/compression disabler for newest BungeeCord 
Fixes #5348
 2025-02-16 15:18:55 -05:00
onebeastchris
5b90b114b5 Remove unneeded code in CodecProcessor, make Bungee version checker automatically check for the required version 2024-12-11 01:28:30 +08:00
onebeastchris
94d77b403b Add some code comments, update BungeeCord version check 2024-12-10 23:13:32 +08:00
Camotoy
45f8baf49e Remove GeyserPluginBootstrap as it's no longer necessary 2024-09-22 13:05:33 -04:00
Camotoy
1271505c26 Use global bStats config where possible 2024-09-12 15:36:42 -04:00
Camotoy
a6c21b1f00 Let annotations work 2024-09-09 20:07:18 -04:00
Camotoy
a2e9e702b3 Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate 2024-09-09 18:10:29 -04:00
Konicai
f8884568ee Gradle: avoid cross-configuration and enable configuration-on-demand (#5012) 2024-09-03 00:54:50 -04:00
Konicai
1ab3f1f2e0 Improve command registration timing on Velocity/BungeeCord (#5013) 2024-09-01 15:34:53 -04:00
Camotoy
f40cbca900 Remove duplicate relocate declarations 2024-09-01 14:46:26 -04:00
Camotoy
f113c8967e Initial advanced config 2024-08-24 18:56:15 -04:00
Camotoy
f7a677ec67 Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate 2024-08-21 01:59:36 -04:00
chris
d3ea65196b Feature: Detect incorrect proxy setups (#4941) 
* Feature: Detect & warn about incorrect proxy setups on Spigot platforms

* Properly disable Geyser if we failed to load
 2024-08-11 00:50:27 +02:00
Konicai
87ab51cb28 Cloud for commands (#3808) 
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
 2024-07-31 20:01:31 -05:00
masel.io
677a56cf6c Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (#4858) 
* fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* fix: Use Geyser Logger instead of Bungee Logger

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* Fix typo

Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>

* chore: Add ip suppression if configured

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* Remove empty line

Co-authored-by: chris <github@onechris.mozmail.com>

* Remove empty line

Co-authored-by: chris <github@onechris.mozmail.com>

---------

Signed-off-by: ByteExceptionM <git@byteexception.eu>
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
Co-authored-by: chris <github@onechris.mozmail.com>
 2024-07-16 11:23:30 +02:00
Camotoy
ab4cc97b38 More changes and migrations away from Jackson 2024-07-09 12:26:27 -04:00
Camotoy
c095c276ef The configuration is gone. Long live the config. 2024-07-06 22:49:28 -04:00
Camotoy
29f8e294ad New config used in core 2024-07-06 19:16:08 -04:00
chris
77fa37ff82 Fix: readme not being synched to modrinth, publish spigot/bungee/velocity variants to modrinth (#4761) 
* Fix: readme not being synched to modrinth

* use new build_number system env var

* also upload bungee/spigot/velocity

* change name

* undo debug mode, oops
 2024-06-17 21:31:54 +02:00
onebeastchris
a5ecee73ef Update Bungee warning for outdated proxy checks 2024-06-13 20:12:45 +02:00
chris
0fcf0f9b4f Update Bungee version check, create logger earlier (#4697) 
* use the logger where possible instead of system.out.print

* make loggers final

* yeet unused constructors

* velocity is more complicated
 2024-05-28 17:23:19 +02:00
chris
94f664ad8d Fix: Properly check whether the so_reuseport socket option is available (#4579) 
* Try to properly check if so_reuseport is available

* io_uring "support"

* comment out io_uring, for now

* Make IO_uring opt-in via `-DGeyser.io_uring=true` flag

* dont include io_uring

* oops - bungee 

editing on mobile is hard

* oops - spigot

* oops - velocity

* properly exclude all io_uring on all platforms except standalone

---------

Co-authored-by: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
 2024-04-19 11:50:40 +02:00
chris
867cf6da05 Feature: JiJ dependencies on modded platforms (#4502) 
* Use JiJ inclusion for Fabric/NeoForge to prevent mod conflicts. Further: Don't publish shadow jars to maven.

* Shade and relocate dependencies that don't conform to SemVer on Fabric

* Shade/Relocate dependencies on Fabric to avoid version warnings

* Use relocate function from the build-logic plugin
 2024-03-19 23:05:30 +01:00
chris
6a51d8298f Feature: Rework startup logic (#4377) 
* This makes `geyser reload` work the same across all platforms. For example, it ensures that we reload the config to the greatest extent possible (with the exception of compression/injection settings). Additionally, this clears up issues where Extensions were previously disabled during reloading - instead, the new Pre and Post reload events allow extensions to reload whatever necessary on their own.
 2024-02-14 12:50:50 +01:00
Konicai
a13492e0ed Final 1.20.4 cleanup 2023-12-14 21:31:14 -05: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
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
Camotoy
4e0cc92e93 Address #4281 2023-11-11 13:26:28 -05:00
chris
644082ae84 Fix /geyser reload on Velocity (#4258) 
* Fix /geyser reload on Velocity 

* No need to create/init a new injector on Velocity

* No need to warn about "abnormally long startup" on Bungee when we're reloading. And, as on velocity, no need to re-inject
 2023-11-03 17:16:09 +01:00
chris
b17f4a46f4 Update outdated proxy message to check for 1.20.2, remove floodgate 1.0 checks (#4204) 2023-10-09 18:20:18 +02:00
rtm516
f272ed9383 Move PlatformType to API and expose it for extensions (#3798) 
* Move PlatformType to API and expose it for extensions

* Move to a record
 2023-06-17 02:56:50 +01:00
Kas-tle
f3cc93c94e Relocate org.yaml for bungee and spigot (#3820) 
* Relocate org.yaml

* Spigot did the same for yaml sadly
 2023-06-07 13:22:36 -05:00
Camotoy
c8afd3436d Fix Floodgate autodetection 2023-04-26 21:11:26 -04:00
Tim203
7c1100b830 Fixed auto-setting auth-type to Floodgate 2023-04-26 18:53:03 +02:00
Julian Vennen
f39e689b83 Implement System properties to set the udp port and address #3597 (#3689) 
* System property stuff

* Add geyserUdpPort/Address system properties as overrides for pluginUdpPort/Address

* Fix formatting for if-else statements

---------

Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
 2023-04-22 21:33:23 -04:00
Camotoy
9656caf4cb Merge branch 'compression' into dev 2022-12-18 13:21:07 -05:00
Camotoy
95ebdb8ebf Update BungeeCord version check 2022-12-07 11:59:20 -05:00