Skip to content

Commit 49c67fd

Browse files
committed
Add fabric backport
1 parent 76ebe60 commit 49c67fd

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

implementations/fabric/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ plugins {
88
}
99

1010
val supportedMinecraftVersions = listOf(
11-
"1.21.9", "1.21.10"
11+
"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"
1212
)
1313

1414
val minecraftVersion = supportedMinecraftVersions.first()
1515
val yarnMappings = "${minecraftVersion}+build.1"
16-
val fabricLoaderVersion = "0.17.2"
17-
val fabricApiVersion = "0.133.14+${minecraftVersion}"
16+
val fabricLoaderVersion = "0.17.3"
17+
val fabricApiVersion = "0.83.0+${minecraftVersion}"
1818

1919
val shadowInclude: Configuration by configurations.creating
2020
configurations.api.get().extendsFrom(shadowInclude)

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import com.flowpowered.math.vector.Vector3d;
2828
import com.google.gson.JsonElement;
29-
import com.mojang.serialization.JsonOps;
3029
import de.bluecolored.bluemap.common.commands.TextFormat;
3130
import de.bluecolored.bluemap.common.serverinterface.CommandSource;
3231
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
@@ -35,7 +34,6 @@
3534
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
3635
import net.minecraft.server.command.ServerCommandSource;
3736
import net.minecraft.text.Text;
38-
import net.minecraft.text.TextCodecs;
3937
import net.minecraft.util.math.Vec3d;
4038

4139
import java.util.Optional;
@@ -56,7 +54,7 @@ public void sendMessage(Component text) {
5654
text = Component.newline().append(text).appendNewline();
5755

5856
JsonElement textJson = GsonComponentSerializer.gson().serializeToTree(text.compact());
59-
Text minecraftText = TextCodecs.CODEC.parse(JsonOps.INSTANCE, textJson).getOrThrow();
57+
Text minecraftText = net.minecraft.text.Text.Serializer.fromJson(textJson);
6058
delegate.sendMessage(minecraftText);
6159
}
6260

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
4242
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
4343
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
44-
import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
4544
import net.minecraft.SharedConstants;
4645
import net.minecraft.registry.RegistryKey;
4746
import net.minecraft.registry.RegistryKeys;
@@ -138,7 +137,7 @@ public void onInitialize() {
138137

139138
@Override
140139
public String getMinecraftVersion() {
141-
return SharedConstants.getGameVersion().comp_4024();
140+
return SharedConstants.getGameVersion().getId();
142141
}
143142

144143
@Override

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ private void update(ServerPlayerEntity player) {
143143

144144
this.name = Text.of(player.getName().getString());
145145

146-
Vec3d pos = player.getEntityPos();
146+
Vec3d pos = player.getPos();
147147
this.position = new Vector3d(pos.getX(), pos.getY(), pos.getZ());
148148
this.rotation = new Vector3d(player.getPitch(), player.getHeadYaw(), 0);
149149
this.sneaking = player.isSneaking();
150150

151-
net.minecraft.server.world.ServerWorld world = player.getEntityWorld();
151+
net.minecraft.server.world.ServerWorld world = player.getServerWorld();
152152

153153
this.skyLight = world.getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());
154154
this.blockLight = world.getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricWorld.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public FabricWorld(net.minecraft.server.world.ServerWorld delegate) {
4747
this.delegate = new WeakReference<>(delegate);
4848

4949
MinecraftServer server = delegate.getServer();
50-
this.worldFolder = delegate.getServer().getRunDirectory()
50+
this.worldFolder = delegate.getServer().getRunDirectory().toPath()
5151
.resolve(server.getSavePath(WorldSavePath.ROOT));
5252

5353
Identifier id = delegate.getRegistryKey().getValue();

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include(":core")
2323
include(":common")
2424

2525
implementation("cli")
26-
//implementation("fabric")
26+
implementation("fabric")
2727
implementation("forge")
2828
//implementation("neoforge")
2929
//implementation("paper")

0 commit comments

Comments
 (0)