1
0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-28 19:19:15 +00:00
Commit Graph

138 Commits

Author SHA1 Message Date
Tim203
f25673dcaa Updated a few dependencies and made it easier to run on Geyser 2023-09-30 17:43:03 +02:00
Tim203
c1d618767b Started using the new Floodgate data structure 2023-08-23 20:58:38 +02:00
Tim203
16360a3bd6 Updated Gradle, Micronaut and fixed Folia detection 2023-08-13 23:59:18 +02:00
Tim203
711cfa6b01 Updated Cumulus, Events & base-api 2023-07-10 23:35:31 +02:00
Tim203
01497ba86c Introduced connectionByPlatformIdentifier, removed guava usage 2023-06-25 16:00:48 +02:00
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
e6daddbec5 Isolate Bungee platform 2023-05-04 19:55:22 +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
94aa4c267a Fixed building 2023-05-03 11:36:27 +02:00
Tim203
b759f0b493 Merge remote-tracking branch 'origin/master' into feature/micronaut-inject
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
#	bungee/build.gradle.kts
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
#	database/mysql/build.gradle.kts
#	spigot/src/main/java/org/geysermc/floodgate/spigot/pluginmessage/SpigotSkinApplier.java
#	spigot/src/main/resources/plugin.yml
2023-05-03 11:26:05 +02:00
Tim203
279dd8e578 Switched to ConfigUtils 2.0 2023-04-12 20:15:47 +02:00
Tim203
f0a20aa967 Support changes introduced in a recent BungeeCord commit 2023-03-28 14:41:41 +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
Tim203
6d79fb6a98 Fixed building and some small other changes 2022-12-30 16:26:41 +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
eca042dc82 Simplified plugin message channel logic 2022-08-30 13:25:09 +02:00
Tim203
7e930afcef Fixed a circular dependency issue when a locale couldn't be found 2022-08-30 11:54:26 +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
a7a6366ec1 Patch for people who updated to 2.2 early, and fixed previous push.
The config updater didn't re-add the quotes that strings with special characters (or no characters) should have, which resulted in the usernamePrefix becoming invalid or null. While this has been fixed for people that use the config updater with the latest version, people that already updated can't update again, and would have to edit the config manually.
2022-06-11 15:39:12 +02:00
Tim203
af4030ac12 Re-added support for BungeeCord 1.18
Metrics showed that more than 33% of the BungeeCord platform users still use a 1.18.x version
2022-06-11 14:12:13 +02:00
Tim203
5d5713ed9e Fixed BungeeCord 1.19 support
Since everyone generally updates their proxy this doesn't provide backwards compatibility with BungeeCord versions that don't support 1.19 clients.
2022-06-08 21:50:51 +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
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
Tim203
8beed574e5 Fix BungeeCord with Mojang authentication change 2022-02-02 20:45:42 +01: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
Camotoy
a57bd24216 Relocate Guice on Spigot and BungeeCord 2021-11-19 09:10:22 -05: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
Camotoy
32d5720083 Fix send-floodgate-data with no Bungee forwarding and fix #201 2021-09-24 16:10:15 -04:00