From 0b22359f8c1c5d98523b5001f7dd13f708d03455 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 31 May 2020 03:18:40 -0300 Subject: [PATCH] mappings --- .../CustomPayloadC2SPacketInterface.java | 2 +- .../mixins/CustomPayloadC2SPacketMixin.java | 2 +- .../carpet/network/ClientNetworkHandler.java | 9 +++++--- .../carpet/network/ServerNetworkHandler.java | 3 ++- .../java/carpet/script/CarpetExpression.java | 4 ++-- .../carpet/script/utils/ShapeDispatcher.java | 7 ++++--- .../carpet/script/utils/ShapesRenderer.java | 21 ++++++++++--------- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/carpet/fakes/CustomPayloadC2SPacketInterface.java b/src/main/java/carpet/fakes/CustomPayloadC2SPacketInterface.java index baa636e7..c1262598 100644 --- a/src/main/java/carpet/fakes/CustomPayloadC2SPacketInterface.java +++ b/src/main/java/carpet/fakes/CustomPayloadC2SPacketInterface.java @@ -1,7 +1,7 @@ package carpet.fakes; import net.minecraft.util.Identifier; -import net.minecraft.util.PacketByteBuf; +import net.minecraft.network.PacketByteBuf; public interface CustomPayloadC2SPacketInterface { diff --git a/src/main/java/carpet/mixins/CustomPayloadC2SPacketMixin.java b/src/main/java/carpet/mixins/CustomPayloadC2SPacketMixin.java index 0465c72e..cd2f3082 100644 --- a/src/main/java/carpet/mixins/CustomPayloadC2SPacketMixin.java +++ b/src/main/java/carpet/mixins/CustomPayloadC2SPacketMixin.java @@ -1,9 +1,9 @@ package carpet.mixins; import carpet.fakes.CustomPayloadC2SPacketInterface; +import net.minecraft.network.PacketByteBuf; import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; import net.minecraft.util.Identifier; -import net.minecraft.util.PacketByteBuf; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index 7c1336c3..c921f520 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -9,9 +9,12 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.nbt.AbstractNumberTag; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; +import net.minecraft.network.PacketByteBuf; import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; -import net.minecraft.util.PacketByteBuf; -import net.minecraft.world.dimension.DimensionType; + +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; import java.util.HashMap; import java.util.Map; @@ -42,7 +45,7 @@ public class ClientNetworkHandler CompoundTag boxData = (CompoundTag)t; CarpetClient.shapes.addShape( boxData.getString("type"), - DimensionType.byRawId(boxData.getInt("dim")), + RegistryKey.of(Registry.DIMENSION, new Identifier(boxData.getString("dim"))), boxData ); } diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index b609dd7d..dfef0a22 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -7,9 +7,10 @@ import carpet.settings.ParsedRule; import io.netty.buffer.Unpooled; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; +import net.minecraft.network.PacketByteBuf; import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.PacketByteBuf; + import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 820da7c4..87bedd49 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2710,7 +2710,7 @@ public class CarpetExpression } ShapeDispatcher.sendShape( (player==null)?cc.s.getWorld().getPlayers():Collections.singletonList(player), - cc.s.getWorld().getDimension().getType(), + cc.s.getWorld().method_27983(), new ShapeDispatcher.Box(duration, from.vec, to.vec, color) ); return LazyValue.TRUE; @@ -2756,7 +2756,7 @@ public class CarpetExpression } ShapeDispatcher.sendShape( (player==null)?cc.s.getWorld().getPlayers():Collections.singletonList(player), - cc.s.getWorld().getDimension().getType(), + cc.s.getWorld().method_27983(), new ShapeDispatcher.Line(duration, from.vec, to.vec, color) ); return LazyValue.TRUE; diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java index 4a6c8c7c..1fce68ef 100644 --- a/src/main/java/carpet/script/utils/ShapeDispatcher.java +++ b/src/main/java/carpet/script/utils/ShapeDispatcher.java @@ -11,7 +11,8 @@ import net.minecraft.particle.ParticleEffect; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.dimension.DimensionType; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; import java.util.Collections; import java.util.HashMap; @@ -26,7 +27,7 @@ public class ShapeDispatcher { private static final Map particleCache = new HashMap<>(); - public static void sendShape(List players, DimensionType dim, ExpiringShape shape) + public static void sendShape(List players, RegistryKey dim, ExpiringShape shape) { Consumer alternative = null; CompoundTag tag = null; @@ -35,7 +36,7 @@ public class ShapeDispatcher if (ServerNetworkHandler.validCarpetPlayers.contains(player)) { if (tag == null) tag = shape.toTag(); - tag.putInt("dim", dim.getRawId()); + tag.putString("dim", dim.getValue().toString()); ServerNetworkHandler.sendCustomCommand(player,"renderShape", tag); } else diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java index 99de0c31..3ba18df1 100644 --- a/src/main/java/carpet/script/utils/ShapesRenderer.java +++ b/src/main/java/carpet/script/utils/ShapesRenderer.java @@ -5,11 +5,12 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.Matrix4f; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.util.math.Matrix4f; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.IWorld; -import net.minecraft.world.dimension.DimensionType; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; import java.util.ArrayList; import java.util.HashMap; @@ -20,7 +21,7 @@ import java.util.function.BiFunction; public class ShapesRenderer { - private final Map>> shapes; + private final Map, List>> shapes; private MinecraftClient client; private Map>> renderedShapes @@ -34,16 +35,16 @@ public class ShapesRenderer { this.client = minecraftClient; shapes = new HashMap<>(); - shapes.put(DimensionType.OVERWORLD, new ArrayList<>()); - shapes.put(DimensionType.THE_NETHER, new ArrayList<>()); - shapes.put(DimensionType.THE_END, new ArrayList<>()); + shapes.put(World.field_25179, new ArrayList<>()); + shapes.put(World.field_25180, new ArrayList<>()); + shapes.put(World.field_25181, new ArrayList<>()); } public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, double cameraX, double cameraY, double cameraZ) { //Camera camera = this.client.gameRenderer.getCamera(); - IWorld iWorld = this.client.world; - DimensionType dimensionType = iWorld.getDimension().getType(); + ClientWorld iWorld = this.client.world; + RegistryKey dimensionType = iWorld.method_27983(); if (shapes.get(dimensionType).isEmpty()) return; //BlockPos blockPos = new BlockPos(camera.getPos().x, 0.0D, camera.getPos().z); VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getLines()); @@ -60,7 +61,7 @@ public class ShapesRenderer } } } - public void addShape(String type, DimensionType dim, CompoundTag tag) + public void addShape(String type, RegistryKey dim, CompoundTag tag) { BiFunction> shapeFactory; shapeFactory = renderedShapes.get(type);