GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge branch 'feature/1.21' of https://github.com/GeyserMC/Geyser into feature/1.21

Browse source
This commit is contained in:
Camotoy 2024-06-12 20:34:55 -04:00
commit 7314571b94
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -14,7 +14,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here! Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
### Currently supporting Minecraft Bedrock 1.20.80 - 1.21.0 and Minecraft Java 1.20.5/1.20.6 ### Currently supporting Minecraft Bedrock 1.20.80 - 1.21.0 and Minecraft Java 1.21
## Setting Up ## Setting Up
Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser. Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

2
bootstrap/mod/neoforge/src/main/resources/META-INF/neoforge.mods.toml
View file

@ -20,6 +20,6 @@ config = "geyser.mixins.json"
[[dependencies.geyser_neoforge]] [[dependencies.geyser_neoforge]]
modId="minecraft" modId="minecraft"
type="required" type="required"
versionRange="[1.20.5,1.21)" versionRange="[1.20.5,)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"

11
build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
View file

@ -110,18 +110,23 @@ afterEvaluate {
} }
dependencies { dependencies {
minecraft("com.mojang:minecraft:1.20.5") minecraft("com.mojang:minecraft:1.21-rc1")
mappings(loom.officialMojangMappings()) mappings(loom.officialMojangMappings())
} }
repositories { repositories {
// mavenLocal() // mavenLocal()
maven("https://repo.opencollab.dev/maven-releases/") maven("https://repo.opencollab.dev/main")
maven("https://repo.opencollab.dev/maven-snapshots/")
maven("https://jitpack.io") maven("https://jitpack.io")
maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://oss.sonatype.org/content/repositories/snapshots/")
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
maven("https://maven.neoforged.net/releases") maven("https://maven.neoforged.net/releases")
maven("https://prmaven.neoforged.net/NeoForge/pr1076") {
name = "Maven for 1.21 PR"
content {
includeModule("net.neoforged", "neoforge")
}
}
} }
modrinth { modrinth {

2
gradle.properties
View file

@ -7,5 +7,5 @@ org.gradle.vfs.watch=false
group=org.geysermc group=org.geysermc
id=geyser id=geyser
version=2.3.2-SNAPSHOT version=2.4.0-SNAPSHOT
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers. description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.

8
gradle/libs.versions.toml
View file

@ -28,11 +28,11 @@ commodore = "2.2"
bungeecord = "a7c6ede" bungeecord = "a7c6ede"
velocity = "3.3.0-SNAPSHOT" velocity = "3.3.0-SNAPSHOT"
viaproxy = "3.2.1" viaproxy = "3.2.1"
fabric-minecraft = "1.20.5" fabric-minecraft = "1.21-rc1"
fabric-loader = "0.15.10" fabric-loader = "0.15.11"
fabric-api = "0.97.6+1.20.5" fabric-api = "0.100.1+1.21"
fabric-permissions = "0.2-SNAPSHOT" fabric-permissions = "0.2-SNAPSHOT"
neoforge-minecraft = "20.5.0-beta" neoforge-minecraft = "21.0.0-alpha.1.21-rc1.20240611.001314"
mixin = "0.8.5" mixin = "0.8.5"
# plugin versions # plugin versions