1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2026-01-06 15:42:03 +00:00
Commit Graph

111 Commits

Author SHA1 Message Date
Tim203
298ea723b8 Remaining merge changes 2023-05-05 11:16:41 +02:00
Tim203
e0d2369482 Merge remote-tracking branch 'origin/feature/geyser-merge' into development 2023-05-05 10:30:27 +02:00
Tim203
9b58826910 Isolate Spigot platform 2023-05-04 17:17:38 +02:00
Tim203
9f30b5d456 Use version catalog and renamed build-logic to buildSrc 2023-05-03 18:31:32 +02:00
Tim203
4bc8139b07 Completed transition for Spigot & Bungee 2023-05-03 14:53:27 +02:00
Tim203
d09c98f9cb Use Micronaut HTTP client, config loading in boostrap, work on database 2023-05-03 00:51:14 +02:00
Tim203
f8fa963904 Upgraded to Gradle 8.1 2023-04-24 01:00:38 +02:00
Tim203
184389f11f Gradle 8, platform isolation, bundled libraries, work on local linking 2023-04-24 00:18:03 +02:00
Tim203
279dd8e578 Switched to ConfigUtils 2.0 2023-04-12 20:15:47 +02:00
Tim203
61b82c4f96 Initial work to switch to Micronaut instead
At the moment local linking is broken, forwarding data is broken and only Velocity has been converted.
2023-03-06 01:15:33 +01:00
Tim203
fb327e3777 Include module name in package, worked on moving to Avaje Inject 2023-03-01 13:27:32 +01:00
Tim203
07ab7ffbfa Started working on moving from Guice to Avaje Inject 2023-02-25 23:42:18 +01:00
Tim203
f2973f0fc8 Merge remote-tracking branch 'origin/development' into feature/universal-platform
# Conflicts:
#	core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
#	spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java
2023-02-22 21:54:51 +01:00
Konicai
dd37174ad3 Fix injection of LanguageManager/Slf4jFloodgate on Velocity (circular proxy) (#388) 2023-02-18 10:57:21 +01:00
Tim203
e28194ed54 Merge remote-tracking branch 'origin/development' into feature/geyser-merge
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
#	bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
#	bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java
#	core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
#	core/src/main/java/org/geysermc/floodgate/api/SimpleFloodgateApi.java
#	core/src/main/java/org/geysermc/floodgate/api/legacy/PropertyGlue.java
#	core/src/main/java/org/geysermc/floodgate/module/CommonModule.java
#	core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/SkinChannel.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinApplier.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinUploadManager.java
#	core/src/main/java/org/geysermc/floodgate/skin/SkinUploadSocket.java
#	core/src/main/java/org/geysermc/floodgate/util/Utils.java
#	spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java
#	velocity/src/main/java/org/geysermc/floodgate/util/VelocitySkinApplier.java
2022-12-30 15:29:19 +01:00
Tim203
913c85c154 Added a SkinApplyEvent that can cancel/edit the to be applied skin 2022-12-28 02:11:26 +01:00
Tim203
59c2c6daf3 Allow Floodgate to run embedded. Support Velocity's 'none' forwarding
The classes that were removed from the legacy Floodgate API have also been brought back
2022-11-10 20:25:30 +01:00
Camotoy
bc76d85d7f Proof-of-concept for Geyser-Floodgate merge 2022-11-06 21:34:29 -05:00
Tim203
1a9d07c5c9 Initial version of a universal platform 2022-09-02 11:39:44 +02:00
Alex
359484b3be SkinApplier now only applies a skin if a player doesn't already have one (#330)
* SkinApplier now only applies a skin if a player doesn't already have one

* add `hasSkin` method to SkinApplier and check for exising skins before overwriting

* remove the use of Streams and Optionals

* correct delay in SpigotSkinApplier to use ticks instead of milliseconds

* Minor changes

Co-authored-by: Tim203 <mctim203@gmail.com>
2022-08-31 19:32:20 +02:00
Tim203
0f152141a2 Switched to Hikari for MySQL 2022-08-31 03:03:42 +02:00
Tim203
eca042dc82 Simplified plugin message channel logic 2022-08-30 13:25:09 +02:00
Tim203
904c584a2a Small changes to platforms and injectors 2022-07-09 19:23:02 +02:00
Tim203
1815613be6 Removed config holder and changed a few things 2022-07-03 22:03:52 +02:00
Tim203
69aacfa91b Started using plugin messages internally. Started subcommand refactor 2022-06-19 23:00:18 +02:00
Tim203
59b37f20e4 Disable key encryption requirement for Floodgate Velocity players 2022-06-11 14:58:15 +02:00
Robin Brämer
523f28d29a Fix typos (#273)
* Fix typos

* Fix another typo

* Fix error log message (GeyserMC/Floodgate#275)

Co-authored-by: Tim203 <mctim203@gmail.com>
2022-05-15 23:49:03 +02:00
Hugo Planque
b2d2efcedd Return the value of optional and not the optional itself (#301) 2022-05-15 23:18:49 +02:00
Tim203
c10561d010 Added platform fork to metrics. Improved MC version detector in Bungee 2022-04-02 16:27:04 +02:00
Tim203
465e66df72 Added metrics and fixed relocations not applying for child projects 2022-03-21 14:41:53 +01:00
Tim203
7a9642ef6a Always change the GameProfile for Floodgate players in Velocity 2022-03-09 13:35:56 +01:00
Tim203
0e1e1b823c No longer use Adventure internally. Started working on adding Checkstyle 2022-03-05 20:02:06 +01:00
Tim203
0e055d106d Bumped Adventure. Only set empty texture when needed 2022-03-03 00:31:44 +01:00
Tim203
cb1db859ce Merge remote-tracking branch 'origin/master' into dev/2.1.1
# Conflicts:
#	spigot/pom.xml
2022-02-04 15:58:52 +01:00
Camotoy
38332db268 PMD no 2022-02-02 16:56:10 -05:00
Camotoy
c3ba9e6f73 GameProfiles are immutable on Velocity 2022-02-02 16:53:12 -05:00
Camotoy
aa0a8405c2 Fix Velocity with Mojang authentication change 2022-02-02 13:10:47 -05:00
Tim203
8f2c6d0397 Support API usage in disconnect events. Removed the login field 2022-01-25 22:14:46 +01:00
Tim203
9509d153c7 We're in 2022 now 2022-01-02 00:08:15 +01:00
Tim203
3be603a837 Re-added relocations and excluded provided dependencies 2021-12-12 22:00:58 +01:00
Tim203
919332f3af Another attempt to make publishing work 2021-12-10 23:32:49 +01:00
Tim203
11f811b656 First version of moving to gradle. No relocations etc. yet 2021-12-08 00:59:25 +01:00
Tim203
476ad4eb0f Renamed common to core 2021-12-05 22:16:32 +01:00
Tim203
6e41471790 Bump version to 2.1.0 2021-11-30 16:35:59 +01:00
Tim203
f20a13bba4 Fixed compatibility with the latest Velocity dev builds
Co-authored-by: Camotoy <20743703+camotoy@users.noreply.github.com>
2021-11-10 00:23:58 +01:00
Tim203
5161aa7259 Don't forget to send the handshake packet for Java players 2021-11-07 20:46:55 +01:00
Tim203
2d2c38e120 Moved some common data handling logic to the common module 2021-11-07 14:51:37 +01:00
Camotoy
08178f51b7 Remove time syncer checks
This check has caused more harm than good (with needing to use an external NTP source and some providers not allowing Cloudflare's NTP server), and is also a technical vulnerability in BungeeGuard. In order to exploit this, you would need to capture traffic between the Geyser server and the Floodgate instance.
2021-09-27 14:45:53 -04:00
Tim203
95a51480f0 Remove Geyser -> Bungee Floodgate data after use 2021-09-24 20:26:09 +02:00
Tim203
cc3e5f999f Don't move Bungee and Velocity 2021-09-17 13:53:14 +02:00