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

74 Commits

Author SHA1 Message Date
Tim203
23f4e81587 Locale method has been moved in 1.12+ 2020-11-21 17:26:10 +01:00
Tim203
70fcac9fed Fixed issues with config subclasses 2020-11-21 15:28:52 +01:00
DoctorMacc
660a35df96 Fix config/key loading, fix compilation, skin exception fixed 2020-11-21 00:09:50 -05:00
Tim203
2d78c3e536 Stopped using Jackson, initial version of Skins and fixed a few things 2020-11-21 03:15:10 +01:00
Tim203
9918864452 Forgot to upload one class 2020-10-30 00:41:53 +01:00
Tim203
d8d0917ffb Added support for Forms and changed Commands + the LanguageManager a bit 2020-10-29 20:40:15 +01:00
Tim203
c4971d5bf3 Added a translate method to the logger and changed the code style a bit 2020-10-13 20:18:55 +02:00
Tim203
e9c4433a53 Updated copyright for the remaining classes 2020-09-22 23:26:46 +02:00
Tim203
f0b9098161 Merge remote-tracking branch 'rtm/copyright-clean' into floodgate-2.0
# Conflicts:
#	common/src/main/java/org/geysermc/floodgate/platform/command/util/CommandResponseCache.java
#	common/src/main/java/org/geysermc/floodgate/util/ReflectionUtil.java
2020-09-22 22:43:32 +02:00
Tim203
14a344dde1 Inject listeners, fix language for commands and removed message caching 2020-09-22 22:34:50 +02:00
Tim203
67d63ebc40 Merge remote-tracking branch 'camo/languagesupport' into development
# Conflicts:
#	bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
#	bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
#	bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
#	common/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java
#	common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
#	common/src/main/resources/proxy-config.yml
#	pom.xml
#	spigot/src/main/java/org/geysermc/floodgate/SpigotPlatform.java
#	spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
#	velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
#	velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
2020-09-19 17:12:37 +02:00
Tim203
35d6622f8f Changed the plugin name and it can now receive RawSkins 2020-09-19 15:49:29 +02:00
Tim203
974a6d96c5 More 2.0 changes. Most important change is the switch from RSA to AES
Changing the encryption from RSA to AES will definitely break every 1.0 installation, but it had to be changed. Floodgate on a proxy like Velocity has to be able to change the Floodgate data, for example if the player is linked (and maybe later for skins as well).
2020-09-12 15:26:47 +02:00
DoctorMacc
8609ab0a78 Update submodules 2020-08-20 11:44:47 -04:00
DoctorMacc
3dbfb5dbb8 Remove duplicate translation 2020-08-20 11:44:26 -04:00
DoctorMacc
9c21545241 Prepare for skin additions 2020-08-20 11:37:40 -04:00
DoctorMacc
b6e56a653a Load languages on login 2020-08-19 15:28:53 -04:00
DoctorMacc
f217f8b298 Translate player messages 2020-08-19 15:17:00 -04:00
DoctorMacc
1125c0a24d Various changes, mostly language support 2020-08-19 10:17:11 -04:00
rtm516
9ccd05a8ed Clean copyright message and update all files 2020-07-29 15:43:00 +01:00
Tim203
f440fb76b0 Initial Floodgate 2.0 commit 2020-07-29 13:00:54 +02:00
rtm516
d44377032b Create README.md (#25)
Co-authored-by: Tim203 <mctim203@gmail.com>
2020-06-13 18:58:29 +02:00
rtm516
6b2a060035 Account link data fix (#30)
* Fixed floodgate data on bukkit

* Fixed sqlite issue

* Fixed floodgate data on bungee

* Fix velocity account linking

* Fix bungeecord passthrough uuids

* Added command aliases just incase

* Fix player not getting kicked on bukkit

* Added comments

* Fixed bungee command alias

* Fixed and changed a few things

* Fix bungee and bukkit data

* Fixes the remaining issues

Co-authored-by: Tim203 <mctim203@gmail.com>
2020-06-13 18:53:43 +02:00
Redned
755ec62124 Specify API version for Bukkit to stop legacy material loading 2020-05-23 18:59:28 -05:00
rtm516
bd0815f285 Fixed wrong artifact upload (#31) 2020-05-06 13:10:53 +02:00
Tim203
7b5a269717 Update Bungee config
Forgot to update the Bungeecord config. It now includes the new options introduced by player linking.
2020-05-04 19:55:22 +02:00
Josue Acevedo
34d510068a Pass arguments to message format (#28) 2020-05-03 21:48:44 -05:00
Tim203
465b31ad34 Merge pull request #27 from GeyserMC/feature/account-linking
Add account linking
2020-05-01 09:58:12 +02:00
RednedEpic
bd2e86cca8 Add some missing param and return tags for javadocs 2020-05-01 02:53:04 -05:00
Tim203
f294ca0c15 Fix workflow building 2020-05-01 08:57:04 +02:00
Redned
241b3468af Rename 'maven.yml' to 'pullrequest.yml' 2020-05-01 01:08:00 -05:00
Redned
af7fbfc575 Add pull request workflow 2020-05-01 00:47:38 -05:00
Tim203
4e53c214e9 Account linking 2020-04-28 10:58:33 +02:00
Tim203
fcabad6d20 Merge branch 'development' of https://github.com/GeyserMC/Floodgate into feature/account-linking 2020-04-28 10:22:47 +02:00
Heath123
44384fa925 Account linking part 1 2020-04-28 10:19:40 +02:00
dependabot[bot]
6bbbe4f350 Bump jackson-databind from 2.9.10.3 to 2.9.10.4 in /common (#22)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.3 to 2.9.10.4.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-04-23 22:06:45 +02:00
rtm516
9feeae9111 Added missing replace-spaces default config (#21)
* Added missing replace-spaces default config

* Add the replace-spaces option to Bungeecord and Velocity and enable it by default

Co-authored-by: Tim203 <mctim203@gmail.com>
2020-04-20 08:46:42 +02:00
theminecoder
38a67ee859 Add option to replace spaces in names, to allow for better handling in java plugins (#15) 2020-04-10 09:09:53 +02:00
Redned
f13071f8a7 Merge pull request #6 from GeyserMC/dependabot/maven/common/com.fasterxml.jackson.core-jackson-databind-2.9.10.3
Bump jackson-databind from 2.9.10.1 to 2.9.10.3 in /common
2020-03-30 20:07:53 -05:00
RednedEpic
86635afb8c Include the username prefix option in velocity config
Also fix some wrong wording.
2020-03-30 20:06:09 -05:00
Redned
a9d11b5494 Allow the username prefix to be empty
Some people use an authentication plugin, ultimately making the prefix useless. It's not recommended to use no prefix, but if authentication is handled by another plugin, then there is not really any harm in using it, and it opens up the opportunity for the same account to be used on bedrock and java.
2020-03-30 19:59:05 -05:00
Redned
2082a02c7e Merge pull request #14 from GeyserMC/jenkins
Add jenkins support
2020-03-27 19:42:04 -05:00
SupremeMortal
6f7d7f8a20 Setup jenkins 2020-03-28 00:26:18 +00:00
Tim203
9e1ba115de Fixes #13 2020-03-25 13:45:51 +01:00
William Johnstone
95e1a8122b Configurable username prefix (#11)
* Add configurable username prefix
2020-03-20 17:57:57 +01:00
Tim203
2904612b5a This reverts commit da18e9b9 until a solution to the bedrock client crash is found 2020-03-14 20:12:37 +01:00
Tim203
da18e9b950 Floodgate now uses identity instead of xuid 2020-03-09 21:35:01 +01:00
Tim203
73173e2e46 Merge remote-tracking branch 'origin/development' into development 2020-03-08 23:19:40 +01:00
Tim203
f0dba0e1f5 Fixes #9 and added a debug option for the bungee plugin 2020-03-08 23:18:30 +01:00
Redned
b7464e6732 Remove DeviceOS as it is now in Geyser common 2020-03-08 11:45:20 -05:00