GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-27 10:49:13 +00:00
Code Issues Releases Activity
407 Commits 8 Branches 0 Tags
cab9190853b3bf8d0a5ffc8b926b25e449b45c29
Commit Graph

87 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
b308ef2216 Merge remote-tracking branch 'origin/development' into feature/platform-isolation 2023-05-04 22:53:04 +02:00
Tim203
efe1c53429 Use ConfigUtils' AP 2023-05-04 13:42:42 +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
dc3a6e84c3 Small changes 2023-05-03 11:15:53 +02:00
Tim203
d09c98f9cb Use Micronaut HTTP client, config loading in boostrap, work on database 2023-05-03 00:51:14 +02:00
Tim203
184389f11f Gradle 8, platform isolation, bundled libraries, work on local linking 2023-04-24 00:18:03 +02:00
Tim203
ef7251b933 Delete old config template files 2023-04-12 20:33:08 +02:00
Tim203
279dd8e578 Switched to ConfigUtils 2.0 2023-04-12 20:15:47 +02:00
Tim203
3a7e77e9cf Initial work on loading libraries on runtime 2023-03-24 00:27:13 +01:00
Tim203
015966ae24 Started working on moving local linking to Micronaut Data 2023-03-12 12:39:32 +01: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
5e70a0c8aa Replace null with "null" 2023-03-02 21:05:12 +01:00
Tim203
d572ec97fd Store forms in a synchronized map 2023-03-01 13:33:22 +01:00
Tim203
fb327e3777 Include module name in package, worked on moving to Avaje Inject 2023-03-01 13:27:32 +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
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
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
da97a0f073 Add branch name when not master, simplify publish, use GitHub Actions 
And updated Gradle
 2023-02-12 11:35:32 +01:00
Tim203
1f5f2e501a Allow it to build 2023-02-11 12:58:57 +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
f44319c968 Merge remote-tracking branch 'origin/feature/weak-references' into development 2022-12-29 00:32:33 +01:00
Tim203
0c4b953cdb Use a common ScheduledThreadPool and make the player map concurrent 2022-12-28 13:24:42 +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
c84dd0cae5 Use newSetFromMap 2022-12-27 12:05:47 +01:00
Tim203
e502e0019f Use weak references for injected Netty channels 2022-12-27 01:08:02 +01:00
Tim203
2c92e3e215 Remove Blossom and use templates 2022-12-12 02:02:43 +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
Tim203
ee82c80c47 Moved the common Floodgate classes to Floodgate. Revert renaming api 2022-11-09 01:51:45 +01:00
Tim203
d3705bfd31 Fixed building Floodgate and added a version subcommand 2022-11-08 19:30:39 +01:00
Camotoy
bc76d85d7f Proof-of-concept for Geyser-Floodgate merge 2022-11-06 21:34:29 -05:00
mastermc05
dafb5e4b58 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
 2022-11-04 11:36:28 +01:00
Konicai
c2b887f5a7 Close all skin sockets on shutdown (#363) 2022-10-27 21:12:07 +02:00
Tim203
1a9d07c5c9 Initial version of a universal platform 2022-09-02 11:39:44 +02:00
Tim203
bc1a98c31a News needs a scheduled executor 2022-09-02 09:54:38 +02:00
Tim203
1a6aa3199d Updated to the latest events version. Share a thread pool 2022-08-31 20:54:28 +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
7e930afcef Fixed a circular dependency issue when a locale couldn't be found 2022-08-30 11:54:26 +02:00
Tim203
13aec4e083 Merge remote-tracking branch 'origin/development' into feature/auto-binding 
# Conflicts:
#	core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
 2022-08-30 09:27:15 +02:00
Tim203
e990f2b948 Switched event library 2022-08-13 22:59:52 +02:00
Tim203
4eb60abe07 Added auto-binding 2022-07-12 14:02:36 +02:00
Tim203
41de3673a7 Changed how post-enable messages work internally + minor other changes 2022-07-11 11:13:37 +02:00