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

397 Commits

Author SHA1 Message Date
chris
4404c15f1a Allow Floodgate-Fabric to provide it's own TemplateReader (#507) 2024-05-08 17:15:44 +02:00
chris
41c42ed3bb Update cloud (#505) 2024-05-06 12:04:58 +02:00
Tim203
a44e3a5df8 Fixed an oversight that resulted in old versions not working 2024-04-29 08:29:24 +02:00
chris
7a5530596d Feature: Cloud 2.0, publishing setup fixes (#496)
* - Update to cloud 2.0
- bump floodgate version to 2.2.3
- fix publishing setup - don't publish shadow jars, ensure api/core artifacts aren't shaded jars

* - update bstats
- fix alias -> description

* tiny cleanup, fix whitelisting bedrock players when the linked java account is online (and shares the same name)

* Update build process

* Ensure BUILD_JSON env is init

* Fallback to GH run number

* update guice to 6.0.0 to be compatible with java 21

* update languages module

* Support 1.20.5 spigot, update languages module, update Bungee dependency so the project builds

* remove codemc repo, update cloud-paper to snapshot build for 1.20.5 support

---------

Co-authored-by: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
2024-04-28 22:36:17 +02:00
Tim203
0fa00a85ad Support Paper's lack of CraftBukkit relocation 2024-04-28 20:25:43 +02:00
Kas-tle
58d71cb8eb Fix Publishing to the Downloads API (#499)
* Update build process

* Ensure BUILD_JSON env is init

* Fallback to GH run number

* Use tmp file for metadata.json

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2024-04-28 07:18:35 -07:00
chris
851ed5adc0 Support 1.20.5 spigot, update languages module, update Bungee dependency so the project builds (#498) 2024-04-28 01:01:30 +02:00
Tim203
7f38765010 Made the debug addon a bit more dumb 2024-02-18 15:36:44 +01:00
rtm516
2886a71480 Remove mention of maven in PR build (#482) 2024-01-28 22:52:16 +00:00
rtm516
19391fa253 Update Geyser version (#481)
* Update Geyser version
* Update Versions.kt
2024-01-28 22:51:20 +00:00
Tim203
94eabd7015 Add support for latest Velocity changes 2024-01-18 22:40:56 +01:00
Tim203
2876c57768 We no longer use Jenkins 2023-12-30 21:22:59 +01:00
Tim203
921d706c1e Made Floodgate compatible with latest Spigot changes 2023-12-30 21:19:29 +01:00
Tim203
71acc6c0f4 Backport a similar fix for 1.20.2 profile properties 2023-10-13 17:15:17 +02:00
Kas-tle
f9b427fcdf Maybe fix empty profile issue (#458)
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2023-10-10 11:51:34 -07:00
Hidey Boi
7b889180e0 Fix spigot whitelist command on newer Paper versions (#456)
* Jank Fix for #444

* Move Scheduler to WhitelistUtils

Also stopped using the Bukkit scheduler and am now scheduling via SpigotVersionSpecificMethods.maybeSchedule

* Move setWhitelist to WhitelistUtils

Includes requested formatting changes.

* switch from runnables to using an lambda expression

* Made lambda a single line

---------

Co-authored-by: Hidey Boi <HideyBoi@users.noreply.github.com>
2023-10-10 11:22:20 -07:00
Kas-tle
26c11bdede 1.20.2 Support (#449)
* Spigot 1.20.2

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Oops

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* 1.20.2 velocity (#1)

* 1.20.2 Velocity

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Archive build artifacts

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix typo in velocity-plugin.json

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix formatting and apply codestyle to eclipse

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Ignore changes to core base prefs

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Proper ignore

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Remove buildship prefs

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Formatting

Signed-off-by: GitHub <noreply@github.com>

* Formatting

Signed-off-by: GitHub <noreply@github.com>

* Properly build PRs

* Formatting + remove artifacts

Signed-off-by: GitHub <noreply@github.com>

* Throw IllegalStateException

Signed-off-by: GitHub <noreply@github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>
2023-09-26 19:36:02 +02:00
Tim203
492be77ad9 Fixed an error during shutdown 2023-08-17 11:35:12 +02:00
Tim203
9c79df6fb7 Bump Geyser, Cumulus, Events versions to fix an issue with Events 2023-08-15 19:00:58 +02:00
Tim203
d1f3aae56c Backported Folia detection fix 2023-08-14 01:04:02 +02:00
Tim203
227858930d Relocate SnakeYAML 2023-06-09 18:32:31 +02:00
Tim203
e23f1b2659 Jitpack why... 2023-05-27 14:16:08 +02:00
Tim203
202a30aae6 Fixed GitHub Action run numbers and updated download url 2023-05-27 13:40:58 +02:00
Konicai
1b9042eacf Bump bungeecord-proxy commit version (#409) 2023-05-09 22:42:53 -05:00
byteful
2702bc3e83 Check IS_FOLIA silently (#400) 2023-03-31 16:44:17 -04:00
Camotoy
104cbdd51b Use Java 17 to compile 2023-03-31 13:28:18 -04:00
Tim203
3c0e30bff7 Folia support
Co-Authored-By: Camotoy <20743703+Camotoy@users.noreply.github.com>
2023-03-31 13:14:37 -04:00
Tim203
f0a20aa967 Support changes introduced in a recent BungeeCord commit 2023-03-28 14:41:41 +02:00
rtm516
65e4de4e7a Update downloads api publishing steps 2023-03-19 17:12:31 +00:00
Tim203
089b9a7e90 Another attempt 2023-03-01 20:27:12 +01:00
Tim203
8b002e2b9f Attempt to fix publishing to the Downloads API 2023-03-01 20:23:52 +01:00
Tim203
82cfaa8858 Merge pull request #397 from GeyserMC/development
* Started using plugin messages internally. Started subcommand refactor

* Removed config holder and changed a few things

* Small changes to platforms and injectors

* Changed how post-enable messages work internally + minor other changes

* Deprecate handshake handlers and player properties

* Added auto-binding

* Switched event library

* Fixed a circular dependency issue when a locale couldn't be found

* Simplified plugin message channel logic

* Switched to Hikari for MySQL

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

* Updated to the latest events version. Share a thread pool

* News needs a scheduled executor

* Bumped version to 2.1.1 and publish entire java component

* Fix checking for existing skins on Spigot (#362)

* Close all skin sockets on shutdown (#363)

* Only apply skin when someone doesn't have a skin applied already (#365)

Instead of aplying only when the player has a skin apply only when it doesn't have a skin

* Use UTF-8 for language files (#366)

Languages like ru_RU don't work because they have specific characters, and your files are encoded in UTF-8, but it reads them as ISO 8859-1

* Fixed building Floodgate and added a version subcommand

* Remove Blossom and use templates

* Use weak references for injected Netty channels

* Use newSetFromMap

* Added a SkinApplyEvent that can cancel/edit the to be applied skin

* Use a common ScheduledThreadPool and make the player map concurrent

* Don't try to remove all injector references

* Add branch name when not master, simplify publish, use GitHub Actions

And updated Gradle

* Remove Jenkinsfile

* Retrieve version from gradle.properties

* Let's see if the setup-java action's cache is helpful & fixed building

* Add publishing to downloads site (#385)

* Add publishing to downloads site

* Only publish to Downloads API when branch is master and status success

---------

Co-authored-by: Tim203 <mctim203@gmail.com>

* Notify Discord after building & fixed building

* Temporarily restore Jenkinsfile to give people time to switch

* Localize floodgate.core.not_linked (#383)

* Localize floodgate.core.not_linked

* Update languages submodule

* not_linked string has changed slightly

---------

Co-authored-by: Tim203 <mctim203@gmail.com>

* Update bstats dependency

* Only publish and notify Discord on push if running inside this repository (#387)

* Only attempt publishing if running in GeyserMC/Floodgate

* Also restrict the discord notification

* Fix injection of LanguageManager/Slf4jFloodgate on Velocity (circular proxy) (#388)

* Made various changes to the build action

* Update maven deploy location

* Relocate MySQL database extension dependencies

* Shutdown metrics on platform shutdown (#386)

* Shutdown metrics on platorm shutdown

* Listen to event instead of hardcoding it

* Annotate Metrics as a Listener

* Use temporary bStats fork to properly shutdown bStats

* Use bstats-base dependency (instead of the whole project I guess?)

* Formatting change

---------

Co-authored-by: Tim203 <mctim203@gmail.com>

---------

Co-authored-by: Alex <me@teamplayer.io>
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
Co-authored-by: mastermc05 <63639746+mastermc05@users.noreply.github.com>
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
2023-03-01 13:37:05 +01:00
Tim203
d572ec97fd Store forms in a synchronized map 2023-03-01 13:33:22 +01:00
Konicai
2230f2a6d3 Shutdown metrics on platform shutdown (#386)
* Shutdown metrics on platorm shutdown

* Listen to event instead of hardcoding it

* Annotate Metrics as a Listener

* Use temporary bStats fork to properly shutdown bStats

* Use bstats-base dependency (instead of the whole project I guess?)

* Formatting change

---------

Co-authored-by: Tim203 <mctim203@gmail.com>
2023-02-27 00:48:49 +01:00
Tim203
9512528b35 Relocate MySQL database extension dependencies 2023-02-27 00:40:36 +01:00
Tim203
e4a2080299 Update maven deploy location 2023-02-26 01:18:34 +01:00
Tim203
846b60627f Made various changes to the build action 2023-02-26 01:12:18 +01:00
Konicai
dd37174ad3 Fix injection of LanguageManager/Slf4jFloodgate on Velocity (circular proxy) (#388) 2023-02-18 10:57:21 +01:00
Konicai
cfd28e8feb Only publish and notify Discord on push if running inside this repository (#387)
* Only attempt publishing if running in GeyserMC/Floodgate

* Also restrict the discord notification
2023-02-18 10:46:44 +01:00
Tim203
82d27bedc8 Update bstats dependency 2023-02-14 00:38:43 +01:00
Konicai
38442bc748 Localize floodgate.core.not_linked (#383)
* Localize floodgate.core.not_linked

* Update languages submodule

* not_linked string has changed slightly

---------

Co-authored-by: Tim203 <mctim203@gmail.com>
2023-02-13 23:18:34 +01:00
Tim203
64cb16b72a Temporarily restore Jenkinsfile to give people time to switch 2023-02-13 22:23:36 +01:00
Tim203
d7e35ae035 Notify Discord after building & fixed building 2023-02-13 22:04:54 +01:00
rtm516
64b1d9c108 Add publishing to downloads site (#385)
* Add publishing to downloads site

* Only publish to Downloads API when branch is master and status success

---------

Co-authored-by: Tim203 <mctim203@gmail.com>
2023-02-13 22:01:37 +01:00
Tim203
7ea41b2648 Let's see if the setup-java action's cache is helpful & fixed building 2023-02-13 21:55:42 +01:00
Tim203
b1f1a2be93 Retrieve version from gradle.properties 2023-02-13 21:49:28 +01:00
Tim203
4f8a83c0df Remove Jenkinsfile 2023-02-12 11:36:03 +01:00
Tim203
da97a0f073 Add branch name when not master, simplify publish, use GitHub Actions
And updated Gradle
2023-02-12 11:35:32 +01:00
Tim203
f44319c968 Merge remote-tracking branch 'origin/feature/weak-references' into development 2022-12-29 00:32:33 +01:00
Tim203
eb8989b400 Don't try to remove all injector references 2022-12-29 00:31:48 +01:00