Commit Graph

101 Commits

Author SHA1 Message Date
RednedEpic 02cda38259 Merge remote-tracking branch 'origin/master' into feature/extensions-gradle 2022-03-19 20:48:14 -05:00
Konicai 87d70be10d
Register `floodgate:transfer` plugin channel (#2896)
* Register floodgate:transfer channel

* Don't warn on unknown channel
2022-03-19 19:56:34 -05:00
Camotoy 65b68087b8
Bump Geyser to 2.0.2 and Java to 1.18.2 2022-02-28 10:07:45 -05:00
RednedEpic 6321ecc166 Initial move to gradle 2022-02-27 16:38:55 -06:00
Camotoy e73a4efe60
Fix build; bump to 2.0.1-SNAPSHOT 2022-02-07 12:38:28 -05:00
Tim203 3251d9010c
We're in 2022 now 2022-01-01 20:03:05 +01:00
Tim203 091664e000
Removed time checker and added a header version system 2021-11-30 16:32:44 +01:00
Tim203 c0d605dd77
Initial changes 2021-11-30 00:33:53 +01:00
Camotoy b2d1212359 Bump Geyser to version 2.0.0-SNAPSHOT 2021-11-24 10:14:27 -05:00
Tim203 c18404cb52
Updated to global api v2 2021-11-07 15:42:55 +01:00
Camotoy bc0cfde8f9
Set the minimum Java version to 16; drop Bedrock 1.17.0 (#2477) 2021-09-10 14:10:56 -04:00
Camotoy b9541505af
Bump version to try and fix deploying; other nitpicks 2021-08-30 13:55:01 -04:00
Redned f7ef90278b
Implement a new registry system (#2306)
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2021-07-12 21:19:40 -04:00
Tim203 7bf4040308
Added new news types 2021-07-05 15:42:42 +02:00
Camotoy b2ef059aed
Merge branch 'feature/1.17' of https://github.com/GeyserMC/Geyser into feature/1.17 2021-06-08 08:57:50 -04:00
Camotoy 511cfd1ae8
Update Geyser version to 1.4.0-SNAPSHOT 2021-06-08 08:55:56 -04: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 644ece124f
Bumped Geyser version to 1.3.0-SNAPSHOT 2021-03-23 01:49:08 +01: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
Camotoy 123b074cc7
Update to Bedrock 1.16.100 (#1552)
* Initial work on 1.16.100 - currently crashes the client

* Update runtime item states

* Use new Bedrock runtime IDs

Bedrock now hardcodes block runtime IDs in alphabetical order of the identifiers. This commit updates Geyser to accomodate.

- Remove runtime_block_states.dat and replace it with blockpalette.nbt
- Calculate the block runtime ID based on the order of the block palette
- Separate BlockTranslator.AIR into Bedrock and Java values
- Update the second layer of chunks to use air when not waterlogged
- Don't send item palette for now, as that's what crashes the game (will look into for v415)
- Other misc. changes

* Improve second layer chunk translation

* v415 support

- Add a message warning people they are on a beta version of Geyser

* Update to protocol v417

There are still some mappings changes that need to be gone through.

* Update runtime item states and clean up item frames

* Future-proof enchanment table

* Update for v418

* Update to v419

* Apply proper air ID to waterlogged chunk layer

* Fix missing import

* Remove beta warning

* Update mappings

* Manually patch runtime_item_states and send the ITEMS registry

* Update README

* Disable grindstone and smithing inventories (since they're broken)

* Use artifactory jenkins plugin (#1548)

* Use artifactory jenkins plugin

* Bump version to 1.2.0-SNAPSHOT

Co-authored-by: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
2020-11-17 11:03:12 -06: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