1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-27 18:59:17 +00:00
Commit Graph

299 Commits

Author SHA1 Message Date
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
onebeastchris
eb73ed8fc5 Fix issues with paper ping passthrough 2025-04-22 15:53:27 +02: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
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
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
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
abf14e6ef9 Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
#	gradle/libs.versions.toml
2024-12-05 18:51:22 +08:00
Alex
2019e53bad Feature: Accurate Java packet ticking (#5121)
* Use proposed mcpl ticking PR

* Remove more not needed overrides

* Bump mcpl

* Fix missing import

* Bump mcpl

* Switch to official version

---------

Co-authored-by: chris <github@onechris.mozmail.com>
2024-12-05 18:35:03 +08:00
chris
d2051c2242 Various small fixes - update cloudburst/protocol dependency, remove "temporary" log info spamming (#5186) 2024-12-05 01:11:03 +08:00
onebeastchris
db246ffb3b Update Properties/Blocks, re-include neoforge, target 1.21.4 release 2024-12-04 01:28:29 +08:00
onebeastchris
48ae28432e More changes - remove getPickItemComponents in WorldManager, separate additional and base component 2024-12-02 02:23:02 +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
ee43ef8369 Disable the plugin if we failed to load on Spigot (#4960) 2024-08-13 01:45:25 +02: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
chris
ee0b34e490 Indicate 1.21.1 Java support
- Indicate 1.21.1 support on modrinth/in the README.md

- Add all supported versions of Geyser-Spigot to modrinth (#4952)
2024-08-09 02:15:08 +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
29f8e294ad New config used in core 2024-07-06 19:16:08 -04:00
Camotoy
add02cadd7 GeyserCustomSkullConfiguration uses Configurate 2024-06-26 21:49:26 -04:00
Camotoy
360350d44e Work around older Gson versions without record support 2024-06-26 12:49:42 -04:00
Camotoy
528de86340 Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate 2024-06-24 16:31:43 -04:00
Camotoy
2c47330509 Use integrated world managers for decorated pot animation 2024-06-19 15:52:54 -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
Camotoy
10bf4eeb4e Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate 2024-06-15 12:48:59 -04:00
onebeastchris
b1d319bb7e Add Spigot 1.21 world adapter 2024-06-15 18:39:09 +02:00
onebeastchris
09c0ada502 Catch Throwable when trying to load world adapter 2024-06-13 23:06:56 -04:00
onebeastchris
b6653acc29 Catch Throwable when trying to load world adapter 2024-06-13 19:53:47 +02:00
onebeastchris
aaad10b8c9 Merge remote-tracking branch 'upstream/master' into dev 2024-06-03 20:54:10 +02:00
chris
63c84bc25b Yeet lectern cache (#4695)
* attempt to yeet lectern cache

* yeet lecternutils usage

* properly update lecterns

* yeet accidental diff
2024-05-29 00:39:39 -04: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
Camotoy
25e7debe9f Start implementing Configurate config system 2024-05-23 19:57:22 -04:00
Camotoy
db166ad8de Small optimizations and BlockStateValues reduction 2024-05-20 21:26:01 -04:00
Camotoy
1e9dbaf38b Here is the Spigot change 2024-05-18 16:54:42 -04:00
Camotoy
a439f3e3d7 Fix compilation for Spigot 2024-05-17 21:14:59 -04:00
Camotoy
cbaa9cd2a0 Block refactory 2024-05-16 23:12:06 -04:00
Camotoy
9bca012194 Bump Erosion 2024-05-15 15:31:02 -04:00
onebeastchris
255835438d viaversion 4.10.0 compat, indicate 1.20.6 support on modrinth 2024-04-30 21:59:38 +02:00