Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync: Floodgate -> Connect #15

Closed
wants to merge 66 commits into from
Closed

Sync: Floodgate -> Connect #15

wants to merge 66 commits into from

Conversation

robinbraemer
Copy link
Member

No description provided.

Tim203 and others added 30 commits June 19, 2022 23:00
…inding

# Conflicts:
#	core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
…one (GeyserMC#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>
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
…serMC#365)

Instead of aplying only when the player has a skin apply only when it doesn't have a skin
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
Konicai and others added 28 commits February 18, 2023 10:57
* 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>
* 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 (GeyserMC#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 (GeyserMC#362)

* Close all skin sockets on shutdown (GeyserMC#363)

* Only apply skin when someone doesn't have a skin applied already (GeyserMC#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 (GeyserMC#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 (GeyserMC#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 (GeyserMC#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 (GeyserMC#387)

* Only attempt publishing if running in GeyserMC/Floodgate

* Also restrict the discord notification

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

* Made various changes to the build action

* Update maven deploy location

* Relocate MySQL database extension dependencies

* Shutdown metrics on platform shutdown (GeyserMC#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>
Co-Authored-By: Camotoy <20743703+Camotoy@users.noreply.github.com>
* 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>
* Jank Fix for GeyserMC#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>
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants