Commit graph

162 commits

Author SHA1 Message Date
chris
4fa0bcd01b
Update Jackson (#4512)
* Update jackson

* relocate yaml on velocity
2024-03-21 19:05:41 +01:00
Kas-tle
e1e09a6ccb
Fix KQueue loading crashing macOS; Closes #4474 (#4506) 2024-03-16 08:19:09 -07:00
chris
39b05e284e
update protocol lib to resolve command crashing (#4493) 2024-03-13 12:25:30 -07:00
Kas-tle
1df63c6de8
Support Bedrock 1.20.70 (#4477)
* Support 1.20.70

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Update readme

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Use 1.20.70 mappings

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Creative lectern drops work but not survival yet

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix lectern book pickup in survival

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Add copyright notices to new files

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Temp fix for incorrect creative_items from Cloudburst/Data

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix item frame breaking in creative

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Clarify what to remove when 1.20.60 support is dropped

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Don't use dim change enum pre 1.20.70

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2024-03-11 00:29:27 -07:00
Redned
97fc2de42f
NeoForge Platform Support (#3781)
* Initial work on Forge platform

* Rework modded platforms to use a common module

* Add support for integrated worlds on modded platforms

* Fix classload errors and move mixins to shared module

* Fix Fabric mixins and check min height in mod world manager

* Add Forge command support

* Add back modrinth publishing

* Don't apply application plugin to shared mod sources

* Fix docs

* Delete unused class

* Clean up repositories

* - Update to 1.20.2
- set custom refmap name
- fixed console commands crashing the server (hasPermission now accepts CommandSourceStack instead of Player)
- Forge wants fastutil relocated, so be it

Current issues:
- ClassNotFound exceptions with classes that are clearly present

* - Fix ClassNotFound errors on Forge due to weird Classloader
- Dont relocate gson

* merge upstream

* oh no

* Bump lombok, architectury-loom

* init: neoforge 1.20.4 support

* NeoForge builds

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Archive neoforge artifacts

* transformForge -> transformNeoForge

* Neoforge boots!
* Fix mixins on neoforge
* Update build/pr file names
* Update mods.toml to new neoforge standard
* Fix refmap naming

* more fixes
- no need to include gson
- cleanup nullable/nonnull annotations
- add more info to geyser dumps on neoforge

* yeet platform executor

* yet another temp branch to figure out the runServer task

* yeet transitive dependency, that cant be right

* Attempt at getting the runServer task to work, part two

* Revert the changes for the runServer task, try and shut down the injector

* Remove spigot weird bug workaround, shut down properly
Also add a compileOnly dependency for the mod module to get rid of spammy false warnings

* Update to latest restart changes
- fix duplicate nodes crashing neoforge
- connector -> geyser in GeyserModCommandExecutor
- create command manager early to fix issues with permission gather event

* Consistent NeoForge spelling, move some dependencies to the version toml

* Add lombok to version catalogue

* Add plugins to version catalogue

* revert move to buildSrc

* Create `assets/geyser/icon.png` to reference icon from a single file on standalone/neoforge/fabric

* add fabric permissions api to libs.versions.toml

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
Co-authored-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
2024-02-23 17:58:39 +01:00
RK_01
aca368e332
Implemented ViaProxy bootstrap (#4201)
* Implemented ViaProxy bootstrap

* Applied requested changes to code

* Override indra settings to Java 17

* Removed explicit java source/target version

* Added ViaProxy artifact to build.yml

* Added ViaProxy artifact to pullrequest.yml

* Updated ViaProxy API usage

* Implemented floodgate support for ViaProxy

* Depend on stable ViaProxy release

* Initialize command manager and ping passthrough before Geyser#start

* Revert "Initialize command manager and ping passthrough before Geyser#start"

This reverts commit 39356071c4.

* Some ping passthrough improvements

* Merged code properly

* Updated ViaProxy API usage

* Implemented better command handling

* Updated ViaProxy and Geyser API usage

* Combine bootstrap and plugin into one class

* Minor code improvements

* Call Geyser shutdown on plugin disable

* Only call disable if Geyser was enabled once

* Don't send two shutdown done messages

* Use setter for enabled boolean
2024-02-19 22:25:49 +01:00
chris
19a3dc3c4b
Support Bedrock 1.20.60 (#4415)
* Start on 1.20.60 support

* fix dimension switching

* Fix custom item icons... thanks mojang

* fix custom blocks/custom skulls breaking all block mappings

* - replace 10000 with static final variable

* fix: creative items not being found

* versioned custom item registration

* fix compression level setting
* show 1.20.61 as supported
2024-02-06 20:11:17 +01:00
chris
f555dc0a92
Feature: Camera/Input locking API (#4332)
Adds API methods to control player cameras - including fancy transitions,  color fades, or simple input locks.
2024-01-31 11:21:06 +01:00
chris
710dbfc1c8
Bump mcpl to re-allow invalid block entity types (#4398) 2024-01-17 18:38:48 +01:00
chris
3288f422b1
Update ViaVersion api usage (#4386)
- Switch to fluent accessor, since the getter was removed after being deprecated for 3 years
2024-01-12 15:39:53 +01:00
chris
cdb8ab344c
bump cloudburst/netty dependencies (#4354)
* bump cloudburst's netty-transport-raknet

* bump cloudburst protocol/codec/connection bump
bump netty due CVE-2022-41881

Changes in cloudburst libs:
- uses netty 4.1.101.Final
- bumps netty-transport-raknet which fixes https://github.com/CloudburstMC/Network/pull/36, an issue where some connection attempts did not work
2023-12-20 23:48:51 +01:00
Konicai
af83e9269d
Fix (de)serialization of ClientboundExplodePacket (#4351) 2023-12-19 02:57:34 -05:00
Konicai
6e56666be2
Update spigot adapters to include 1.20.4 (#4340) 2023-12-14 21:31:51 -08:00
Konicai
a13492e0ed Final 1.20.4 cleanup 2023-12-14 21:31:14 -05:00
Konicai
4294982310 fabric: require 1.20.4 as ViaFabric doesn't support 1.20.2 2023-12-14 21:31:14 -05:00
Konicai
21a2c2332f translate trial spawners, cleanup 2023-12-14 21:31:14 -05:00
Konicai
22009054ab Crafter translation 2023-12-14 21:31:14 -05:00
Konicai
c7da8fe163 Better nullability annotations/handling for ItemStacks 2023-12-14 21:31:14 -05:00
Konicai
a89aa4e064 1.20.3: compiling protocol changes 2023-12-14 21:31:14 -05:00
chris
44174fdc04
Add 1.20.50 Bedrock support (#4296)
* Start on 1.20.50

* Add 1.20.50 block_palette.1_20_50.nbt, creative_items.1_20_50.json and runtime_item_states.1_20_50.json

* fix stone and planks mappings

* add and do something with the new SetPlayerInventoryOptionsPacket

* Add readme version bump

* Cleanup/Explain the new BedrockSetPlayerInventoryOptionsTranslator
2023-11-21 23:31:56 +01:00
chris
4ff8b7bff4
Bump mcpl to fix issues with the ClientboundLoginDisconnectPacket (#4264) 2023-11-03 17:09:34 +01:00
Konicai
647a73d9f6
Support 1.20.40 connections 2023-10-19 01:11:59 -04:00
chris
3547fab228
Fix: Bedrock clients timing out due to present Java resource packs (#4176)
* fix: auto deny Java edition resource packs

* 1.20.2 bump on Fabric

* bump mcpl

* Bump required min version in the fabric.mod.json file
2023-10-03 17:15:30 +02:00
petersv5
7d489c7354
Close threads at server shutdown (#4029)
Co-authored-by: Peter Svensson <petersv@psv.nu>
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
2023-10-01 18:15:44 -04:00
Konicai
be5b437e5f
Add spigot world adapter for 1.20.2 (#4170) 2023-10-01 15:06:57 -04:00
Konicai
71bef08ef6
Fix CustomQueryTranslator (#4169) 2023-10-01 14:41:04 -04:00
Konicai
c2cd99c829
Support Java 1.20.2 (#4112)
* Initial pass for 1.20.2, compiling
* Remove unused level events
* handle null GameProfile in ClientboundPlayerInfoUpdatePacket
* Handle level events BRUSH_BLOCK_COMPLETE and EGG_CRACK
* Account for null tag in DecoratedPotBlockEntityTranslator
* Explicitly show that 1.20.31 is supported
2023-09-29 17:14:49 -04:00
Konicai
7a28ef5c5f
Fix observer directions for 1.20.10+ (#4132) 2023-09-18 23:01:43 -04:00
Konicai
8a12878eff
Fix jackson dependency for velocity launch (#4118) 2023-09-12 10:46:27 -04:00
Konicai
9a8015e8b6
Support Bedrock 1.20.30 (#4115) 2023-09-11 22:22:50 -04:00
Konicai
f78e6dd7e7
Remove Geyser-Sponge (#4097)
See PR for details
2023-09-11 13:54:24 -04:00
basaigh
35a8e1507d
Bump MCPL to fix issues (#4086) 2023-08-27 15:41:14 -04:00
Konicai
661a9b4741
Improvements to MessageTranslator (#3803)
* Renames for clarity and refactor convertToJavaMessage
* Bump adventure, velociy. Require CharacterAndFormat in MessageTranslator
* Fix deprecations related to DummyLegacyHoverEventSerializer
* Patch serialization of ScoreComponent until Adventure 1.15.0
2023-08-17 23:07:55 -04:00
chris
ea2bac40c1
Protocol bump to fix flying issues on 1.20.10 (#4001) 2023-07-19 10:59:48 -04:00
Camotoy
c1d8009b40
Fix #3972 2023-07-12 19:23:07 -04:00
Konicai
3a0c1b788a
Support for 1.20.10 (#3961)
Co-authored-by: chris <github@onechris.mozmail.com>
Co-authored-by: RednedEpic <redned235@gmail.com>
2023-07-11 18:17:01 -05:00
Tim203
6296d4a97f
Bump Cumulus to 1.1.2 and fixed code being detected as Java 8 locally 2023-07-10 21:47:41 +02:00
Camotoy
d44e599925
Fix #3905 2023-07-04 18:06:05 -04:00
Konicai
40775149f5
NMS adapter for spigot 1.20 (#3911) 2023-06-28 00:31:03 -04:00
Tim203
b43bc3d86e
Updated protocol version for jwt changes 2023-06-27 20:09:12 +02:00
Konicai
bed7b5d10e
Bump logj4 (#3888) 2023-06-17 16:47:42 +01:00
Tim203
3d1a10db3b
Update events library to latest version 2023-06-16 22:54:21 +02:00
RednedEpic
1b0d03824a Update Protocol and RakNet 2023-06-13 22:09:00 -05:00
chris
8b8d6ddb9e
Geyser-Fabric: bump to 1.20 (#3824)
* add accesswidener, bump to 1.20

* address review

* yeet AW, use level() instead

* update modrinth version 

pls work
2023-06-08 07:15:08 -07:00
RednedEpic
13c9063368 Update to use protocol 589 and other 1.20 updates 2023-06-07 09:44:18 -05:00
Konicai
f712d4dd81 Bump Protocol and update imports of org.cloudburstmc.protocol.bedrock.data.definitions 2023-05-23 16:34:50 -04:00
Konicai
cc36b72129 Target MCPL 1.20-1-SNAPSHOT now that it is temp published 2023-05-18 01:04:21 -04:00
Konicai
5fdc4d72b5 Bump MCPL for 1.20-pre2 2023-05-17 15:33:54 -04:00
Konicai
2570a501de Target unpublished MCPL with jitpack for successful builds 2023-05-14 20:04:14 -04:00
Konicai
d9698edcc2
Fix smithing tables, but trim recipes are broken. 2023-05-13 22:42:18 -04:00
Konicai
2ec0d8c501
Compiling against MCPL 1.20
At a minimum, smithing and signs are broken
2023-05-11 21:27:46 -04:00
Camotoy
d8acb6a82c
Fix #3735 2023-05-07 16:11:49 -04:00
Camotoy
f3f30625d4
Gracefully handle invalid level event IDs
Fixes #3714
2023-05-03 11:01:31 -04:00
Camotoy
71e091c050
Fix #3730 2023-05-01 10:58:14 -04:00
Camotoy
fc95f8e509 Should fix NBT not decoding correctly 2023-05-01 09:52:11 -04:00
Valaphee The Meerkat
eee8dd46b1
Fix RakNet ping (#3722) 2023-04-30 15:52:45 -04:00
Camotoy
1f18e4fe4f
Fix #3683 2023-04-27 13:09:38 -04:00
Camotoy
56958f8fbd
Use timestamped snapshots for dependencies 2023-04-26 13:48:14 -04:00
Camotoy
abba88112a
Use all 1.19.80 Bedrock legacy codes for color downsampling
This will make RGB downsampling a bit more colorful.
2023-04-24 18:44:33 -04:00
Camotoy
0f3d5c5859 Allow fallback components to translate with arguments 2023-04-18 19:07:55 -04:00
Camotoy
11c277481f Allow fallback components to translate properly
Fixes #3660
2023-04-08 15:49:55 -04:00
Camotoy
c4f0b0225d Use static commit for Erosion 2023-04-06 13:50:18 -04:00
Camotoy
8492f1d9b9 Will probably build on the CI 2023-04-06 13:31:11 -04:00
Camotoy
d9811d08e3 Merge remote-tracking branch 'origin/master' into feature/protocol-3.0 2023-04-06 13:26:28 -04:00
Camotoy
a004fe9a31
Update Adapters to fix #3654 2023-04-01 01:32:06 -04:00
Camotoy
e2535108e6
Folia support and preparations for future changes 2023-03-30 15:44:55 -04:00
Camotoy
b695dc075d
Fix command redirection detection 2023-03-19 14:09:01 -04:00
Camotoy
b56f401688
Update MCProtocolLib to fix #3624 2023-03-19 11:24:45 -04:00
Camotoy
147618d5bc
Fix player nametags always appearing 2023-03-17 13:41:13 -04:00
Camotoy
d7c6865912
Fix #3607 2023-03-15 11:36:00 -04:00
Camotoy
03c0767965 Finish 1.19.4 support and add Bedrock 1.19.70 support 2023-03-14 15:37:57 -04:00
Camotoy
b3f1c64249 Base changes for Java 1.19.4 support 2023-03-10 20:51:51 -05:00
Redned
a72e49527d
Simplify publish logic and move to GitHub Actions (#3579)
Co-authored-by: Tim203 <mctim203@gmail.com>
Co-authored-by: rtm516 <ryantmilner@hotmail.co.uk>
2023-02-24 20:05:15 -06:00
Camotoy
406dfcb22c Fix error on 1.19.62 2023-02-16 20:01:51 -05:00
Camotoy
30277d5411 Anticipate support for the patch version of 1.19.60 2023-02-15 16:17:38 -05:00
SupremeMortal
1769f2a85c
Merge branch 'master' into feature/protocol-3.0 2023-02-14 22:09:48 +00:00
Tim203
ed36adec56
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	api/src/main/java/org/geysermc/geyser/api/GeyserApi.java
#	api/src/main/java/org/geysermc/geyser/api/command/Command.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandExecutor.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
#	api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventRegistrar.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomItemsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPostInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPreInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserShutdownEvent.java
#	api/src/main/java/org/geysermc/geyser/api/extension/Extension.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionDescription.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLoader.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLogger.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionManager.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidDescriptionException.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidExtensionException.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemOptions.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomRenderOffsets.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/network/AuthType.java
#	api/src/main/java/org/geysermc/geyser/api/network/BedrockListener.java
#	api/src/main/java/org/geysermc/geyser/api/network/RemoteServer.java
#	api/src/main/java/org/geysermc/geyser/api/util/TriState.java
#	core/build.gradle.kts
#	gradle/libs.versions.toml
#	settings.gradle.kts
2023-02-09 17:34:27 +01:00
Tim203
21885949c7
Moved the base api to a separate repo 2023-02-09 17:31:00 +01:00
Camotoy
0bba18c726
Initial support for 1.19.60 Bedrock 2023-02-05 13:29:28 -05:00
Tim203
effe046308
Merge remote-tracking branch 'origin/master' into feature/dedicated-api-repo 2023-02-04 21:25:11 +01:00
Camotoy
af5d03f5dd
Show teams in command suggestions 2023-01-25 11:05:04 -05:00
Camotoy
c928bafddd
Should fix some instances of chat not showing 2023-01-07 14:46:22 -05:00
Tim203
3ac931e11b
Moved the APIs to a dedicated repo
They can now be found at https://github.com/GeyserMC/api
2023-01-07 14:29:33 +01:00
Camotoy
7905581ec4
Fix some instances of chat not appearing 2023-01-04 16:05:12 -05:00
Camotoy
4fe9aeca40
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/protocol-3.0 2022-12-20 19:47:45 -05:00
Tim203
e4dcc07dde
Bump MCProtocolLib and PacketLib 2022-12-18 15:49:52 +01:00
Camotoy
97bedd39e2
Update MCProtocolLib to fix some commands packet decoding 2022-12-16 14:17:12 -05:00
Camotoy
f7375ed7dc
Fix chests not animating on open
Fixes #3454
2022-12-13 14:04:17 -05:00
Camotoy
7c26036906
Update adapters to support 1.19.3 and add biome command completions 2022-12-13 13:53:28 -05:00
Camotoy
57e34372d8 Update MCProtocolLib to potentially fix respawn issues 2022-12-07 22:54:43 -05:00
Camotoy
0c79732d02
Add changes from 1.19.3-rc3 2022-12-06 17:06:10 -05:00
Camotoy
f76aa71b5b
Point to stable MCProtocolLib version 2022-12-05 20:06:40 -05:00
Konicai
92aa2059d2
Merge remote-tracking branch 'upstream/master' into JE-1.19.3 2022-12-01 22:00:57 -05:00
Konicai
c7e79299b6
Improve 1.19.50 flags (#3422) 2022-11-29 16:34:09 -05:00
RednedEpic
49d3254ea9 Use new Protocol version 2022-11-28 21:29:55 -06:00
RednedEpic
8f96823048 Add support for Bedrock 1.19.50 (560) 2022-11-28 20:53:17 -06:00
Comstepr
70a8272bc2
Bump jackson-databind to 2.14.0 (#3406) 2022-11-23 20:10:04 -05:00
Konicai
759db72536
Compiling for 1.19.3 2022-11-22 17:13:59 -05:00
RednedEpic
74798d8071 Remove old network code & use manual ping 2022-10-30 17:00:08 -05:00
RednedEpic
18e7db8c30 Start on update to Protocol 3.0 2022-10-29 19:23:21 -05:00