GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-26 10:19:12 +00:00
Code Issues Releases Activity
4,282 Commits 26 Branches 0 Tags
7ac90f93290e5130a77e4d136f63f9f33aa87f21
Commit Graph

27 Commits

Author SHA1 Message Date
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
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
RK_01
1fea22d980 Implement ViaProxy client IP passthrough (#5202) 2024-12-08 21:21:12 -08:00
Camotoy
45f8baf49e Remove GeyserPluginBootstrap as it's no longer necessary 2024-09-22 13:05:33 -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
Camotoy
f113c8967e Initial advanced config 2024-08-24 18:56:15 -04:00
Camotoy
85d63dea36 Merge pull request #4954 from Konicai/feature/configurate 
Improve node ordering when updating configs
 2024-08-21 15:05:31 -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
76ca326590 Improve node ordering when updating configs 2024-08-08 21:15:47 -05:00
RK_01
86d0a47206 Fix floodgate not working with the default config (#4951) 2024-08-08 13:25:06 +02:00
Konicai
87ab51cb28 Cloud for commands (#3808) 
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
 2024-07-31 20:01:31 -05: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
2d33cfd149 Most things now use Gson for JSON 2024-06-26 01:04:19 -04:00
RK_01
edee5e7a8e Add builtin server transfer support for ViaProxy (#4723) 2024-06-10 01:43:10 +02:00
RK_01
9b776b5321 Fixed remote config being reset everytime when accessed on Geyser-ViaProxy (#4722) 2024-06-07 19:26:59 +02:00
RK_01
c3994a677b Override forward-hostname setting if ViaProxy wildcard domain handling is enabled (#4720) 2024-06-07 00:54:33 +02:00
RK_01
42a9ba617b Update ViaProxy platform (#4607) 
* Update ViaProxy API usage

* Don't reference ViaProxy API in dummy application
 2024-04-26 20:06:37 +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
RK_01
aca368e332 Implemented ViaProxy bootstrap (#4201) 
* Implemented ViaProxy bootstrap

* Applied requested changes to code

* Override indra settings to Java 17

* Removed explicit java source/target version

* Added ViaProxy artifact to build.yml

* Added ViaProxy artifact to pullrequest.yml

* Updated ViaProxy API usage

* Implemented floodgate support for ViaProxy

* Depend on stable ViaProxy release

* Initialize command manager and ping passthrough before Geyser#start

* Revert "Initialize command manager and ping passthrough before Geyser#start"

This reverts commit 39356071c4.

* Some ping passthrough improvements

* Merged code properly

* Updated ViaProxy API usage

* Implemented better command handling

* Updated ViaProxy and Geyser API usage

* Combine bootstrap and plugin into one class

* Minor code improvements

* Call Geyser shutdown on plugin disable

* Only call disable if Geyser was enabled once

* Don't send two shutdown done messages

* Use setter for enabled boolean
 2024-02-19 22:25:49 +01:00