Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-11-16 04:50:07 +01:00
Code Issues Projekte Releases Wiki Aktivität
3.677 Commits 22 Branches 0 Tags 98 MiB
9f32ba81b1
Commit graph

149 Commits

Autor SHA1 Nachricht Datum
Tim203
9f32ba81b1
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge 
# Conflicts:
#	bootstrap/bungeecord/base/build.gradle.kts
#	bootstrap/spigot/base/build.gradle.kts
#	bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java
#	bootstrap/velocity/base/build.gradle.kts
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
#	core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
#	gradle.properties
#	gradle/libs.versions.toml
#	settings.gradle.kts
 2024-05-09 18:04:56 +02:00
AJ Ferguson
0a261f1d9d
Update MCPL and MCAuthLib (#4645) 
* Update MCPL and MCAuthLib

* Bump MCPL
 2024-05-06 21:40:32 -04:00
AJ Ferguson
8addcadb71
Bump MCPL to increase NBT max depth (#4639) 2024-05-05 02:24:28 -04:00
AJ Ferguson
b8fe71a8bc
Bump MCPL to fix ClientboundExplodePacket (#4635) 2024-05-04 01:06:59 -04:00
basaigh
9d299ee83b
Fix particle reading issues (#4631) 2024-05-03 07:29:15 -07:00
basaigh
a39cd65537
Fix velocity ping passthrough (#4626) 2024-05-03 13:53:47 +02:00
Camotoy
efda13421f
Merge branch 'master' into feature/1.20.5 2024-05-02 12:58:46 -04:00
Camotoy
abb1d7d9e9
Indicate Java 1.20.6 support 2024-04-30 18:50:41 -04:00
onebeastchris
51cbbba47c Merge remote-tracking branch 'upstream/feature/1.20.5' into feature/1.20.5 2024-04-30 21:48:41 +02:00
onebeastchris
dd745b901f move to paper-adapters 2024-04-30 20:48:10 +02:00
AJ Ferguson
dacacc6df8 Anvil renaming 2024-04-30 04:48:15 -04:00
AJ Ferguson
e97bbcc483 Potion effect colors 2024-04-28 02:10:20 -04:00
Camotoy
2fa7585db3 Switch to Cloudburst NBT only 2024-04-26 21:44:59 -04:00
RK_01
42a9ba617b
Update ViaProxy platform (#4607) 
* Update ViaProxy API usage

* Don't reference ViaProxy API in dummy application
 2024-04-26 20:06:37 +02:00
Camotoy
b29e0d9d10
Move MCProtocolLib to dev - package ID change 2024-04-24 16:39:35 -04:00
onebeastchris
687d299ff5
target 1.20.5 release, build neoforge again 2024-04-24 16:26:59 -04:00
Camotoy
d105dadf62
Update for release. STILL NOT READY YET THOUGH 2024-04-24 16:26:59 -04:00
onebeastchris
c48428daf0
init: pick item component change 2024-04-24 16:26:58 -04:00
Camotoy
c34f0f2c3b
Update for latest MCProtocolLib 2024-04-24 16:26:58 -04:00
basaigh
dac5f69d47
Bump mcpl 2024-04-24 16:26:58 -04:00
basaigh
48164e93c7
Bump mcpl to fix item deserialization 2024-04-24 16:26:58 -04:00
basaigh
94e533ea7c
Fix tags and attributes 2024-04-24 16:26:57 -04:00
basaigh
6d8021f155
Update the non-item parts (#4586) 
* Update the non-item parts

* Add MaceItem

* Fix registry data loading
 2024-04-24 16:26:57 -04:00
Kas-tle
3fa7952936
1.20.80 Support and Protocol Changes (#4561) 
* Make evil more harder

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

* Deregister more unused packets

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

* Add more unused packets

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

* Pin protocol to 68dc192

* Correction

* Update Protocol

* More kicking

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

* stop reading when there is no item to read (#9)

* Bump protocol

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

* 1.20.80

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

* Remove unused postinitchannel GeyserServerInitializer

* Pull protocol jitpack from cloudburst again

* Actually builds

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

* Bump protocol to fix BossEventPacket & EmotePacket

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

* Add remove before merge comment

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

* Bump protocol to fix BlockEntityDataPacket and ignore serverbound BossEventPacket

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

* Bump protocol & add more illegal/ignored packets

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

* Remove deprecated packet

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

* Ignore ClientCacheStatusPacket instead of disallow

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

* Define static serializers

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

* Less static class nonsense more correct order

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

* Remove unused import

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

* Bump protocol

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

* Move codec processing to CodecProcessor

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

* Falsify recipe symetry assumption

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

* Update Protocol for 2 wrong packet IDs & 5 wrong directions

* Jitpack protocol from Geyser repo

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Co-authored-by: chris <github@onechris.mozmail.com>
 2024-04-23 09:16:18 -07:00
chris
94f664ad8d
Fix: Properly check whether the so_reuseport socket option is available (#4579) 
* Try to properly check if so_reuseport is available

* io_uring "support"

* comment out io_uring, for now

* Make IO_uring opt-in via `-DGeyser.io_uring=true` flag

* dont include io_uring

* oops - bungee 

editing on mobile is hard

* oops - spigot

* oops - velocity

* properly exclude all io_uring on all platforms except standalone

---------

Co-authored-by: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
 2024-04-19 11:50:40 +02:00
Kas-tle
5151c25e1a
Support RakNet Cookies (#4554) 
* Support cookies

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

* Use cloudburst upstream raknet

* Comment out mavenLocal()

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
 2024-04-16 20:52:46 -07:00
chris
a24f684123
Update to Gradle 8.7, bump loom to 1.6 (#4565) 
* Update to Gradle 8.6, bump loom to 1.6

* update to gradle 8.7
 2024-04-14 00:16:26 +02:00
Kas-tle
c9ca4c82f7
Allow configuration of RakNet limits (#4532) 
* Allow configuration of RakNet limits

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

* Validate packet limiter system properties

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-31 21:42:31 -07:00
Kas-tle
b469904951
Update Raknet (#4529) 2024-03-30 03:27:55 -07:00
Redned
7da3afef60
Update RakNet 2024-03-29 12:25:57 +00:00
Kas-tle
f1828419d6
Update raknet (#4528) 2024-03-28 17:28:49 -07:00
chris
4fa0bcd01b
Update Jackson (#4512) 
* Update jackson

* relocate yaml on velocity
 2024-03-21 19:05:41 +01:00
Tim203
120b367a41
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
 2024-03-18 16:38:52 +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
Tim203
9748763097
Fixed remaining merge issues 2024-02-25 22:25:44 +01:00
Tim203
a4681ca77c
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java
#	build-logic/build.gradle.kts
#	build.gradle.kts
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	settings.gradle.kts
 2024-02-25 20:12:43 +01:00
Tim203
d44b523acb
Isolated Velocity 2024-02-25 20:00:03 +01: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
Tim203
c8fd024e4a
Merge remote-tracking branch 'origin/master' into feature/floodgate-merge 
# Conflicts:
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
#	bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
#	bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/floodgate/FloodgateModule.java
#	common/src/main/java/org/geysermc/floodgate/crypto/AesKeyProducer.java
#	common/src/main/java/org/geysermc/floodgate/crypto/FloodgateCipher.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsItem.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsItemMessage.java
#	common/src/main/java/org/geysermc/floodgate/news/NewsType.java
#	common/src/main/java/org/geysermc/floodgate/news/data/BuildSpecificData.java
#	common/src/main/java/org/geysermc/floodgate/news/data/ConfigSpecificData.java
#	common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
#	common/src/main/java/org/geysermc/floodgate/util/LinkedPlayer.java
#	common/src/main/java/org/geysermc/floodgate/util/WebsocketEventType.java
#	core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/floodgate/FloodgateProvider.java
#	core/src/main/java/org/geysermc/geyser/floodgate/GeyserLoadStage.java
#	core/src/main/java/org/geysermc/geyser/floodgate/NoFloodgateProvider.java
#	core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
#	gradle.properties
 2024-02-18 16:37:26 +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