OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-28 07:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Geyser-Fabric: bump to 1.20 (#3824)

Browse source 
* add accesswidener, bump to 1.20

* address review

* yeet AW, use level() instead

* update modrinth version 

pls work
This commit is contained in:
chris 2023-06-08 16:15:08 +02:00 committed by GitHub
parent f3cc93c94e
commit 8b8d6ddb9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap/fabric/build.gradle.kts
View file

@ -104,11 +104,11 @@ modrinth {
syncBodyFrom.set(rootProject.file("README.md").readText()) syncBodyFrom.set(rootProject.file("README.md").readText())
uploadFile.set(tasks.getByPath("remapJar")) uploadFile.set(tasks.getByPath("remapJar"))
gameVersions.addAll("1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4") gameVersions.addAll("1.20")
loaders.add("fabric") loaders.add("fabric")
dependencies { dependencies {
required.project("fabric-api") required.project("fabric-api")
} }
} }

6
bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/world/GeyserFabricWorldManager.java
View file

@ -72,7 +72,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
return; return;
} }
LevelChunk chunk = player.getLevel().getChunk(x, z); LevelChunk chunk = player.level().getChunk(x, z);
final int chunkBlockX = x << 4; final int chunkBlockX = x << 4;
final int chunkBlockZ = z << 4; final int chunkBlockZ = z << 4;
for (int i = 0; i < blockEntityInfos.size(); i++) { for (int i = 0; i < blockEntityInfos.size(); i++) {
@ -92,7 +92,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
return; return;
} }
BlockEntity blockEntity = player.level.getBlockEntity(new BlockPos(x, y, z)); BlockEntity blockEntity = player.level().getBlockEntity(new BlockPos(x, y, z));
sendLecternData(session, blockEntity, false); sendLecternData(session, blockEntity, false);
}); });
} }
@ -166,7 +166,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
BlockPos pos = new BlockPos(x, y, z); BlockPos pos = new BlockPos(x, y, z);
// Don't create a new block entity if invalid // Don't create a new block entity if invalid
BlockEntity blockEntity = player.level.getChunkAt(pos).getBlockEntity(pos); BlockEntity blockEntity = player.level().getChunkAt(pos).getBlockEntity(pos);
if (blockEntity instanceof BannerBlockEntity banner) { if (blockEntity instanceof BannerBlockEntity banner) {
// Potentially exposes other NBT data? But we need to get the NBT data for the banner patterns *and* // Potentially exposes other NBT data? But we need to get the NBT data for the banner patterns *and*
// the banner might have a custom name, both of which a Java client knows and caches // the banner might have a custom name, both of which a Java client knows and caches

4
bootstrap/fabric/src/main/resources/fabric.mod.json
View file

@ -23,9 +23,9 @@
"geyser-fabric.mixins.json" "geyser-fabric.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.8", "fabricloader": ">=0.14.21",
"fabric": "*", "fabric": "*",
"minecraft": ">=1.19", "minecraft": ">=1.20",
"fabric-permissions-api-v0": "*" "fabric-permissions-api-v0": "*"
} }
} }

6
gradle/libs.versions.toml
View file

@ -28,9 +28,9 @@ commodore = "2.2"
bungeecord = "a7c6ede" bungeecord = "a7c6ede"
velocity = "3.0.0" velocity = "3.0.0"
sponge = "8.0.0" sponge = "8.0.0"
fabric-minecraft = "1.19.1" fabric-minecraft = "1.20"
fabric-loader = "0.14.8" fabric-loader = "0.14.21"
fabric-api = "0.58.5+1.19.1" fabric-api = "0.83.0+1.20"
[libraries] [libraries]
base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" } base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }