1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-03 22:16:31 +00:00
Commit Graph

48 Commits

Author SHA1 Message Date
rtm516
846e0b5ce0 Fix trailing formatting characters causing OOB (#5990)
* Fix trailing formatting characters causing OOB

* Fix typo
2025-11-20 15:05:19 +01:00
Camotoy
765128ce42 Switch config system to Configurate (#5010)
* Start implementing Configurate config system

* More development

* Start migrating to Gson only

* Progress

* Update usage of WebUtils

* Most things now use Gson for JSON

* Allow tests to succeed by using new Gson version

* Use slightly cleaner version for Version deserializer

* Work around older Gson versions without record support

* GeyserCustomSkullConfiguration uses Configurate

* Fix regression in properties get

* New config used in core

* The configuration is gone. Long live the config.

* More changes and migrations away from Jackson

* Improve node ordering when updating configs

* typo

* Better check for ignoring non-configurate configs for considering comment moving

* Ensure metrics UUID is valid

* Initial advanced config

* Remove Jackson; finish config value placements

* Remove duplicate relocate declarations

* Let annotations work

* Renaming to PluginSpecific

* Use global bStats config where possible

* Fix test

* Re-introduce asterisk behavior in configs

* Remove GeyserPluginBootstrap as it's no longer necessary

* Remove old config.yml file

* Update Xbox achievement comment

* Apply suggestions from code review

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

* No need to remove values anymore

* Fix: disable bstats relocation on platforms where it is not needed

* ensure it builds

* Update custom unavailable slot comment

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

* Update cooldown image

* Logger message for direct-compression still being enabled

* oops

* More explicit RuntimeException message

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

* Constant for 'system' locale

* Better config JSON encoding (something is broken with Cloudflare; we'll figure it out

* Fix broadcast port default

* Add this file too

* Update configurate branch

* fix build

* Fix: Allow using custom config file on Standalone, add relocation comment

* Move config loading to GeyserBootstrap interface

* 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>

* Back to one config file

* Some minor touchups

* 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

* Rename and migrate proxy-protocol-whitelisted-ips to haproxy-protocol-whitelisted-ips

* Add automatic downloading of the GeyserOptionalPack

* Revert "Add automatic downloading of the GeyserOptionalPack"

This reverts commit 65b96208fb.

* Add more invalid config tests

* Warn about emote-offhand-workaround removal

* Add automatic loading of the GeyserOptionalPack (feature/configurate) (#5964)

* Add automatic downloading of the GeyserOptionalPack

* Warn about including the OptionalPack from extensions when Geyser is already including it instead of throwing.

* Copy optional pack instead of downloading

---------

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

* Remove unused variable

* Start warning users not running Java 21

* Update tests, temporarily remove NumericRanges test

* Remove duplicate advanced section from Geyser dump

* Address some "reviews"

* yeet md5 hash from geyser dump

* Add info about number of resource packs / amount of mappings into Geyser dump

* Re-enable invalid config loading test

* Fix: allow-custom-skulls migration

* Fix test

* Add "enable-emotes" configuration option

* Rename "emotes-enabled" to "show-emotes"

* Only enable integrated pack when optional pack isn't present

* Update integrated pack

* Exclude jackson annotations, remove leftover debug print

* Remove one-time config migration warnings as we don't have access to the logger at that stage

* Throw more detailed descriptive error when loading resource packs from the "packs" folder, add another legacy config test

* Fix NeoForge's fun module conflict

* Re-add warning about moved functionality, fix Geyser-ViaProxy

This reverts commit fbadfa574a.

* oops

* Move GeyserLegacyPingPassthrough to separate thread to avoid Standalone command locking issues

---------

Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
Co-authored-by: chris <github@onechris.mozmail.com>
Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>
Co-authored-by: Aurora <auroranova8756@gmail.com>
2025-11-18 17:55:12 +01:00
onebeastchris
dc5fc8f54c Fix https://github.com/GeyserMC/Geyser/issues/5767, make it build
Removing the test is fine, since deserializeOr was introduced to fix the NPE
2025-08-18 16:21:28 +03:00
onebeastchris
facae0926e Merge remote-tracking branch 'upstream/master' into feature/1.21.6
# Conflicts:
#	README.md
#	core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
#	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/java/org/geysermc/geyser/session/cache/tags/GeyserHolderSet.java
#	core/src/main/resources/bedrock/entity_identifiers.dat
#	gradle.properties
2025-06-17 17:42:57 +02:00
Eclipse
ce155df5dd Fix tests 2025-06-14 12:51:02 +00:00
BugTeaON
bf53c54e6f Escape curly braces correctly in translation strings; remove default empty translation fallback in the text component (#5559)
* Escape curly braces correctly in translation strings

* Default translation fallback should not appear in the text component

* Only left braces need to be escaped

* Some adjustments

* Move the escapeBraces method to the MessageTranslator class

* Improve code readability

* Use complied static Pattern instead of Pattern.matches

* Improve some code comments

* Use regular expression complelety to escape braces instead of the inefficient, low-readablity escapeBraces method

* Add some tests about escaping curly braces in translatable strings

* Check instance availability to avoid exception during testing
2025-06-08 01:54:08 +02:00
rtm516
150e991da3 Fix bedrock resetting colors on newline (#5311)
* Set color codes after newline

* Cleanup

* Fix and add new test

* Update MessageTranslator.java

* Correct the asset for test
2025-04-11 13:40:57 +02:00
onebeastchris
dbf701feb1 Merchant changes, implement splash_potion entity type, some xp orb fixes 2025-03-28 21:16:03 +01:00
Eclipse
e78b6b431e Fix test 2025-03-25 20:49:33 +00:00
Eclipse
85f1a60753 Changes to variants:
- All entity variants in rc1 are sent as int IDs by java, holders are no longer used
- Fixed reading of mooshroom variants
- Temperature animal variants now look a lot cleaner

It builds!
2025-03-25 17:08:19 +01:00
onebeastchris
acb858f0ab Initial 1.21.5 changes 2025-03-25 17:08:09 +01:00
chris
69329f2cad Feature: Resource Pack API additions - ResourcePackOptions and a GeyserDefineResourcePacksEvent (#4978) 2025-03-25 15:49:18 +01:00
Tim203
512c68a883 The team should still be used when there is a score display name (#5415) 2025-03-18 22:02:29 +01:00
onebeastchris
ebaaed7542 fix test 2025-02-19 14:46:46 +01:00
onebeastchris
4a88117753 Update to latest MCPL changes, fix issues with the force-player-inventory workaround 2025-02-19 14:27:22 +01:00
Alex
5836dabcda Use mcpl staticify PR (#5284)
* Use mcpl staticify PR

* Fix missing generic arg

* Update libs.versions.toml
2025-01-21 16:11:09 +01:00
onebeastchris
d53a1a5cc4 Start on 1.21.4 support 2024-11-30 14:11:20 +08:00
Camotoy
4588f341ec Fix test 2024-10-30 20:40:34 -04:00
Tim203
74b25ea3a5 Use deferred where needed instead of a load method on all registries (#5112)
* Use deferred where needed instead of a load method on all registries

* We don't have to load the registries, they're now safe to use for tests

* Renamed the deferred registries
2024-10-30 10:41:00 +01:00
Tim203
d6d19b02b2 Fix #5089 and don't auto-load Registries (#5093)
* Fix #5089 and made Registries instance based

* Instead of using instance based Registries, manually initialize them

* Address review

* Commit this too pls
2024-10-27 22:53:56 +01:00
Tim203
123c5cc5d8 Check whether the entity definition has a type
Fixes #5078
2024-10-10 14:18:35 +02:00
Tim203
521df04ed9 Fix experience orbs after the scoreboard rework
Fixes #5075
2024-10-09 11:49:24 +02:00
Tim203
ef4acb121f Scoreboard rework (#4947)
* Initial version of the great scoreboard rework

* Fixed some issues and added some initial tests

* Addressed review

* Added CubeCraft's scoreboard as a test, and fixed a discovered bug

* Removed var usage for primitives and String, removed star imports
2024-10-08 19:26:46 +02:00
Camotoy
d85549c38d BlockMapping is removed 2024-05-19 20:24:19 -04:00
Camotoy
b29e0d9d10 Move MCProtocolLib to dev - package ID change 2024-04-24 16:39:35 -04:00
Konicai
661a9b4741 Improvements to MessageTranslator (#3803)
* Renames for clarity and refactor convertToJavaMessage
* Bump adventure, velociy. Require CharacterAndFormat in MessageTranslator
* Fix deprecations related to DummyLegacyHoverEventSerializer
* Patch serialization of ScoreComponent until Adventure 1.15.0
2023-08-17 23:07:55 -04:00
Konicai
b344e21f7f Fix loading contents keys of encrypted resource packs (#3925) 2023-06-29 12:22:13 +01:00
chris
903e61f1a3 Exposing resourcepack loading to api (#3696)
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
Co-authored-by: RednedEpic <redned235@gmail.com>
2023-06-16 20:39:53 -05:00
Konicai
f712d4dd81 Bump Protocol and update imports of org.cloudburstmc.protocol.bedrock.data.definitions 2023-05-23 16:34:50 -04:00
basaigh
d4ffecb500 Fix the RGB downgrade chat test. (#3697)
Co-authored-by: D3ATHBRINGER13 <53559772+D3ATHBRINGER13@users.noreply.github.com>
2023-04-26 12:25:56 -04:00
Camotoy
214d3d241d Commment out this test; am lazy and don't want to fix it 2023-04-24 23:53:44 -04:00
Camotoy
a62595aaa4 AAAA 2023-04-06 14:43:07 -04:00
Camotoy
adb37c96e9 Just disable this test... it's going to be complicated to get this to work 2023-04-06 14:38:50 -04:00
Camotoy
80ac3f3d08 Test fix attempt two 2023-04-06 14:07:12 -04:00
Camotoy
a315d04b35 Test fix 2023-04-06 14:03:21 -04:00
Camotoy
d9811d08e3 Merge remote-tracking branch 'origin/master' into feature/protocol-3.0 2023-04-06 13:26:28 -04:00
Redned
a72e49527d Simplify publish logic and move to GitHub Actions (#3579)
Co-authored-by: Tim203 <mctim203@gmail.com>
Co-authored-by: rtm516 <ryantmilner@hotmail.co.uk>
2023-02-24 20:05:15 -06:00
Camotoy
3f4ed67597 Add Item classes to partially replace ItemMapping. Part 1? 2022-12-29 15:10:40 -05: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
Kevin Ludwig
7dc2ca35d6 Fully strip formatting from chat and commands (#3417) 2022-11-28 12:46:07 -05:00
RednedEpic
18e7db8c30 Start on update to Protocol 3.0 2022-10-29 19:23:21 -05:00
Camotoy
0e07991edf Changes as I was randomly staring at the code 2022-10-17 23:36:46 -04:00
Camotoy
8bf8b22d6b Fix some regressions in custom item handling 2022-10-12 17:21:58 -04:00
Camotoy
f59e33d749 Fix behavior of matching custom item predicates
Huge thanks to Kastle for helping me disect this behavior.

- The Unbreakable NBT tag is not the only source for determining if an item should be treated as unbreakable. The damage NBT is also taken into account.
- Custom item options must be processed in an ascending order.
- Multiple conditions may be necessary for an item to be selected.
- Conditions do not have to be exact. See the comments in CustomItemTranslator for an explanation.
- Added a test so we don't break this behavior in the future.
2022-10-10 15:40:07 -04:00
Tim203
3251d9010c We're in 2022 now 2022-01-01 20:03:05 +01:00
RednedEpic
2c663e0ee5 The Great Refactor Part 3 - Entire project restructure 2021-11-20 17:29:46 -06:00
RednedEpic
3f5cb29ee0 The Great Refactor Part 2 - org.geysermc.connector -> org.geysermc.geyser 2021-11-20 15:34:30 -06:00
RednedEpic
0b5009b415 The Great Refactor Part 1 - connector -> core 2021-11-20 13:56:40 -06:00