1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-24 01:09:30 +00:00
Commit Graph

666 Commits

Author SHA1 Message Date
onebeastchris
d748d826d1 Merge remote-tracking branch 'upstream/master' into feature/configurate
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
2025-11-03 14:40:38 +01:00
chris
77d1dcaeec Configurate: Sectionification (#5904)
* Init: config sections

* Start on adding tests, move migrations over to ConfigMigrations class

* Get rid of auth section again, rename that one config option, fix mtu migration

* Move custom skulls config options to the bottom of the gameplay settings

* Add more tests
2025-11-03 14:30:48 +01:00
onebeastchris
6ad1105ed6 Bump netty, re-enable adaptive allocator 2025-10-20 15:13:19 +02:00
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
2dfe846a40 Indicate 1.21.9/1.21.10 support on modrinth, update cloud command library 2025-10-12 14:34:43 +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
7b7bdd7f73 Component hashing changes, bump mcpl 2025-10-08 21:37:26 +02:00
onebeastchris
66b3fe8057 Bump neoforge dependency 2025-10-05 14:42:33 +02:00
onebeastchris
c8c035d664 Small api event cleanup, fix neoforge to-do's 2025-10-04 00:14:59 +02:00
Aurorawr
14892a2ece Add native Mojmaps to Compression and Login Finish packet (#5875) 2025-10-03 23:00:47 +01:00
Eclipse
3612d9cf9b Update/fix bootstraps, target new mappings 2025-09-30 17:39:41 +00:00
Eclipse
bdabf6b20e Fix build 2025-09-30 13:35:58 +00: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
chris
e2ae101419 Resolve "not in event loop" issue on Geyser-Velocity with use-direct-connection enabled (#5720) 2025-08-15 23:38:42 +03:00
onebeastchris
ca99ab7b1b Fix: Build issues for Geyser-Fabric and Geyser-NeoForge
resolves: https://github.com/GeyserMC/Geyser/issues/5718
how did this work until now? we'll never know
2025-07-26 01:13:25 +02:00
onebeastchris
461acb62a9 Fix: Geyser-Spigot modrinth publishing 2025-07-25 22:03:23 +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
onebeastchris
17bd368c9d Actually remove PlayerLoginEvent usage, resolve incorrect waypoint color reading
Fixes https://github.com/GeyserMC/Geyser/issues/5669, fixes https://github.com/GeyserMC/Geyser/issues/5636
2025-07-12 21:53:52 +02:00
onebeastchris
34e7dc96a2 Remove PlayerLoginEvent usage on Geyser-Spigot 2025-07-11 03:16:18 +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
Eclipse
92d12bf7bc Fix block by Java key lookup (#5637)
* Fix block by Java key lookup, optimise hardcoded lookup a bit, clarify Javadocs

* Rename the registry too
2025-07-01 12:33:37 +00:00
onebeastchris
d3683b970a Remove outdated code for .50/.60, fix bug with reloading geyser on standalone 2025-06-23 21:16:11 +02:00
Eclipse
3286e884ae Address reviews 2025-06-18 17:06:54 +00:00
Eclipse
c29b20d23a Update/fix bootstraps and build 2025-06-17 18:55:55 +00: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
7b55ade516 Fix: Allow using custom config file on Standalone, add relocation comment 2025-04-26 01:23:29 +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
onebeastchris
eb73ed8fc5 Fix issues with paper ping passthrough 2025-04-22 15:53:27 +02:00
Camotoy
b0212ec8b9 Temporary workaround to allow Velocity builds with Netty 4.2 to operate 2025-04-09 20:48:13 -04:00
Eclipse
59b0be8985 Reintroduce player place null check in BlockPlaceMixin (#5465) 2025-04-07 16:49:17 +02:00
onebeastchris
db0576099b Indicate 1.21.71 support in readme 2025-04-01 19:01:07 +02:00
onebeastchris
6ca2a2391d Drop Bedrock 1.21.40 support 2025-04-01 00:22:50 +02:00
chris
2b5369ff8b Attempt to resolve 1.21.70 inventory issues (#5443)
* Inventory translators are now part of inventories, try fixing inventory reusing, use NetworkStackLatency hack

* Add debug, re-add force open hack

* don't log to info

* fix debug npe

* Don't set setPending when opening pending inventories, add more delay to re-opening rejected inventories

* Use inventory#getTranslator to hopefully avoid translator/inventory desync

* Minor cleanup

* Update core/src/main/java/org/geysermc/geyser/GeyserLogger.java

* Reuse inventories whenever possible, prevent bedrock inventory id conflicts

* Fix debug logging with arguments, don't attempt to re-use inventory that's currently closing

* Some documentation, include pending inventories in re-use check

* "bad html entity"

* add wayyyy more debugging to container reusing checks

* yeet java id check

* Fixes related to hacky plugins that spam open screen packets

* no clue how this slipped by

* Don't reuse real blocks, yeet Inventory#isDelayed
2025-03-31 21:36:19 +02:00
Eclipse
a2d5aab2f1 Fix mixin 2025-03-28 10:45:39 +00:00
chris
69329f2cad Feature: Resource Pack API additions - ResourcePackOptions and a GeyserDefineResourcePacksEvent (#4978) 2025-03-25 15:49:18 +01:00
onebeastchris
32ada15d04 fix build 2025-02-28 20:15:49 +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
97cc876311 Fix missing console logs with Geyser-Standalone gui present (#5376)
* Fix missing console logs with gui present

* Properly redirect stdout & stderr & also redirect JUL
2025-02-26 09:52:02 +01:00
Alex
5f0611ff0f Switch all ping passthroughs to json to avoid parsing warning (#5363) 2025-02-25 22:33:10 +01:00
Alex
07be402563 Add run tasks and remove useless variables (#5362)
* Add run tasks and remove useless variables

The benefit of run tasks is that proxies like velocity can be prototyped on without using standalone or a GUI. Thus simplifying the prototyping/fixing process.

* Drop runwaterfall
2025-02-22 12:31:37 +01:00
Camotoy
ecc10d6560 Update direct connection/compression disabler for newest BungeeCord
Fixes #5348
2025-02-16 15:18:55 -05:00
Alex
613718a52d Implement session restructure mcpl PR, fix disconnect messages in configuration stage (#5196)
* Implement session restructure mcpl PR

* Bump mcpl

* Update mcpl api usage

* Update MCPL to release, fix https://github.com/GeyserMC/Geyser/issues/5281 (1daf036f57)

* Use correct mcpl dependency

* apparently 1.21.4-1 doesn't exist? back to snapshots then

---------

Co-authored-by: onebeastchris <github@onechris.mozmail.com>
2025-01-18 13:53:09 +01:00
Eclipse
1267b2e5ab Update fabric.mod.json to new fabric api mod id (#5272) 2025-01-09 21:53:01 +01:00
Alex
f1ed841e07 Add support for rcon console command senders (#5261)
RemoteConsoleCommandSender does not inherit ConsoleCommandSender, so we gotta handle it explicitly.
2025-01-04 14:28:54 +01: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
onebeastchris
06a9b2866e Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4 2024-12-10 20:43:54 +08:00