GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-22 00:09:32 +00:00
Code Issues Releases Activity
2,293 Commits 26 Branches 0 Tags
c200e3e6fa78bdd577ea4830cbaf51a07d0e24d7
Commit Graph

74 Commits

Author SHA1 Message Date
Tim203
c18404cb52 Updated to global api v2 2021-11-07 15:42:55 +01:00
Tim203
7bf4040308 Added new news types 2021-07-05 15:42:42 +02:00
Tim203
acc3a8222a Check if item is active and added global items 2021-06-08 12:53:00 +02:00
Tim203
68cd2eb4f1 Moved Floodgate dump info to one class 2021-06-08 10:12:52 +02:00
Konicai
632f84fcf8 Merge pull request #2095 
* Add floodgate git properties to dump

* Merge remote-tracking branch 'upstream/floodgate-2.0' into floodgate-2.0

* Modify the dump to not break anything

* name changes to floodgate info in dump

* small adjustment to DumpInfo.java

* Merge remote-tracking branch 'upstream/floodgate-2.0' into floodgate-2.0

* remove duplicate import statements

* Update mappings
 2021-06-06 16:59:47 +02:00
Tim203
ab8ce77cf0 Some small changes 2021-06-06 01:05:22 +02:00
Tim203
01492647fc Some small changes 2021-06-06 01:05:05 +02:00
Tim203
50b51f5f57 Added the initial version of news 2021-06-05 23:12:33 +02:00
Tim203
934fc12b16 Warn if we were unable to check if the system clock is accurate 2021-05-26 20:20:59 +02:00
Tim203
cfa2805e00 Make sure that the time we use is always the same across servers 2021-05-26 01:55:58 +02:00
Tim203
11b10e2857 Allow skin uploader to log messages instead of closing the connection 2021-04-17 17:39:08 +02:00
Tim203
21c8a389e3 Fixed an issue with forwarding player links 2021-04-03 19:50:35 +02:00
Tim203
23c3db28ef Another attempt to fix key generation 2021-04-03 19:49:44 +02:00
Tim203
a5a849c059 Use a better name to indicate Windows 2021-04-01 00:57:47 +02:00
Tim203
5c12dc8e15 Don't use a blocking algorithm for generating keys on unix-like systems 
This should fix GeyserMC/Floodgate#125
 2021-04-01 00:42:20 +02:00
Tim203
0832e7d65c Fixes issue when both Geyser and Floodgate are on the same server 2021-02-25 20:55:00 +01:00
Tim203
c79979e3e3 Added timestamp to BedrockData 2021-02-16 18:54:04 +01:00
Tim203
52ddf8c556 Moved skin uploading to the global api 2021-02-12 22:22:45 +01:00
Tim203
ad7ffabb6d Make the identifier more unique 2021-01-24 01:29:47 +01:00
Tim203
ce2734d3b9 Allow BedrockData and LinkedPlayer cloning 2021-01-12 20:55:11 +01:00
Tim203
5ad495ce97 Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	common/src/main/java/org/geysermc/common/window/CustomFormBuilder.java
#	common/src/main/java/org/geysermc/common/window/CustomFormWindow.java
#	common/src/main/java/org/geysermc/common/window/FormWindow.java
#	common/src/main/java/org/geysermc/common/window/ModalFormWindow.java
#	common/src/main/java/org/geysermc/common/window/SimpleFormWindow.java
#	common/src/main/java/org/geysermc/common/window/button/FormButton.java
#	common/src/main/java/org/geysermc/common/window/button/FormImage.java
#	common/src/main/java/org/geysermc/common/window/component/DropdownComponent.java
#	common/src/main/java/org/geysermc/common/window/component/InputComponent.java
#	common/src/main/java/org/geysermc/common/window/component/SliderComponent.java
#	common/src/main/java/org/geysermc/common/window/component/StepSliderComponent.java
#	common/src/main/java/org/geysermc/common/window/component/ToggleComponent.java
#	common/src/main/java/org/geysermc/common/window/response/CustomFormResponse.java
#	common/src/main/java/org/geysermc/common/window/response/ModalFormResponse.java
#	common/src/main/java/org/geysermc/common/window/response/SimpleFormResponse.java
#	common/src/main/java/org/geysermc/floodgate/util/EncryptionUtil.java
#	connector/src/main/java/org/geysermc/connector/network/session/cache/WindowCache.java
 2021-01-04 13:37:58 +01:00
Camotoy
186d94917a Update copyright to 2021 (#1772) 
* Update copyright to 2021

Free commit!

* These don't need a copyright

* Don't downgrade the mappings
 2021-01-01 10:10:36 -05:00
Tim203
9fbf7047a1 Fixed a NoSuchMethodError 2020-12-31 17:18:39 +01:00
Tim203
d6c2507bb5 Fixed some bugs 2020-12-20 17:34:46 +01:00
Tim203
2f1acb1e6f Separate method for Base64 length calc. Added offset method in RawSkin 2020-12-19 22:45:34 +01:00
Tim203
45596a87a9 Use Cumulus as form library 2020-12-10 22:57:48 +01:00
Tim203
f7d2378845 Added Floodgate to GeyserDump 2020-12-01 23:17:54 +01:00
Tim203
deae3d566d Updated DeviceOs 2020-12-01 19:54:51 +01:00
Tim203
e583abffdf Split Forms into an Api and an implementation 2020-11-26 23:00:43 +01:00
Tim203
8b811b43fb Fixed mistake in LinkedPlayer 2020-11-21 02:48:15 +01:00
Tim203
b8f398aa3c Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
 2020-11-18 19:45:25 +01:00
Tim203
7e3a736f20 Register Floodgate payload, updated Statistics, smaller jar, fixed bugs 
Quite a lot of changes, but I was too lazy to split them in different commits (and they'll be squashed later anyway):
* Floodgate plugin message channels are now registered (because Spigot requires that, and I guess it's better practice)
* Updated the Statistics form to match the new Forms API
* The common jar is now much smaller, because Jackson isn't needed anymore in the common module
* Fixed some bugs in Forms where empty fields would lead to excluding them in the serialization (making Bedrock complain)
And a few other things, like a new boolean in RawSkin saying if the Skin is an Alex or Steve model.
 2020-11-18 19:40:23 +01:00
RednedEpic
981ac3bf11 Move PlatformType to common module 2020-11-14 17:49:56 -06:00
Tim203
36419e5931 Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	common/src/main/java/org/geysermc/common/window/CustomFormWindow.java
#	common/src/main/java/org/geysermc/common/window/SimpleFormWindow.java
#	connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
 2020-10-30 01:25:52 +01:00
Tim203
dc8fb46428 Manually solve some merge issues 2020-10-30 01:14:34 +01:00
Tim203
c9102348de First version of the Forms rewrite 
The next version will split the implementation from the api
 2020-10-30 00:58:17 +01:00
rtm516
c30cb78e74 Add statistics menu (#1424) 
* Add statistics menu

* Changed back button text

* Add check to make sure the player requested the statistics display

* Better item translation support; misc changes

* Clean up session getting?

* Remove extra debug that is likely unnecessary

* Remove unused function

* Update languages submodule

* Clean up javadoc comment

* Fix typo

Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
Co-authored-by: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
 2020-10-24 23:33:49 +01:00
Tim203
7fbc401dfa Added RawSkins, Toppings and renamed the Floodgate plugin name 2020-09-19 14:21:54 +02:00
Tim203
bb20b14e4c Merge remote-tracking branch 'fork/floodgate-2.0' into floodgate-2.0 
# Conflicts:
#	common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
#	common/src/main/java/org/geysermc/floodgate/util/EncryptionUtil.java
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
 2020-09-12 15:57:16 +02:00
Tim203
2997760521 Switch Floodgate encryption from RSA to AES 2020-09-12 15:29:18 +02:00
DoctorMacc
ec87344a77 Initial skin support 2020-08-19 23:13:05 -04:00
DoctorMacc
bf6f6fddb2 Merge branch 'master' of https://github.com/GeyserMC/Geyser into floodgate-2.0 2020-08-18 10:21:57 -04:00
rtm516
b10e5d5af3 Clean copyright message and update all files (#1053) 2020-07-30 15:10:15 -05:00
Tim203
35d8edd15e Floodgate 2.0 update 2020-07-29 12:53:00 +02:00
Tim203
8f763dfc5f Move common stuff used only by connector and bootstrap to connector 2020-06-28 00:27:00 +02:00
rtm516
7743f6d718 Add dump command (#808) 
* Add dump command
Adds a command to collect and dump infomation about the Geyser install and bootstrap and submit it to a dumps site.

* Finalize URL; misc. fixes; add 'architecture' param

Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
 2020-06-27 11:36:48 -04:00
DoctorMacc
427f4ef83d Merge master into Spigot rename 2020-06-21 16:21:47 -04:00
rtm516
38ee19a32a Fix toggle component json generation (#777) 2020-06-18 00:03:52 +01:00
rtm516
0d6c3309e2 Fix form images (#771) 2020-06-13 19:01:58 -05:00
DoctorMacc
cae888eac9 Include PlatformType.java 2020-05-26 10:17:52 -04:00