From f97ca9e9bd016a698175c56789c3c78ab8ca819c Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Mon, 1 Jun 2020 03:25:09 -0300
Subject: [PATCH] mappings

---
 src/main/java/carpet/network/ClientNetworkHandler.java | 5 -----
 src/main/java/carpet/script/CarpetExpression.java      | 2 +-
 src/main/java/carpet/script/utils/ShapeDispatcher.java | 8 --------
 src/main/java/carpet/script/utils/ShapesRenderer.java  | 2 +-
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java
index 0e881392..f155040f 100644
--- a/src/main/java/carpet/network/ClientNetworkHandler.java
+++ b/src/main/java/carpet/network/ClientNetworkHandler.java
@@ -12,11 +12,6 @@ import net.minecraft.nbt.Tag;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryKey;
-import net.minecraft.util.PacketByteBuf;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index c8ea4c9e..67395cb6 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -2697,7 +2697,7 @@ public class CarpetExpression
                 for (int i=2; i < lv.size(); i++) paramList.add(lv.get(i).evalValue(c));
                 params = ShapeDispatcher.parseParams(paramList);
             }
-            params.putIfAbsent("dim", new StringValue(cc.s.getWorld().method_27983().toString()));
+            params.putIfAbsent("dim", new StringValue(cc.s.getWorld().method_27983().getValue().toString()));
             params.putIfAbsent("duration", duration);
 
             ShapeDispatcher.ExpiringShape shape = ShapeDispatcher.create(cc, shapeType, params);
diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java
index 29e6c989..42364245 100644
--- a/src/main/java/carpet/script/utils/ShapeDispatcher.java
+++ b/src/main/java/carpet/script/utils/ShapeDispatcher.java
@@ -426,14 +426,6 @@ public class ShapeDispatcher
 
     public static class DimensionParam extends StringParam
     {
-        @Override
-        public Value validate(CarpetContext cc, Value value)
-        {
-            String dimStr = value.getString();
-            Optional<DimensionType> dimOp = Registry.DIMENSION_TYPE.getOrEmpty(new Identifier(dimStr));
-            if (!dimOp.isPresent()) throw new InternalExpressionException("Unknown dimension "+dimStr);
-            return value;
-        }
         @Override
         public boolean appliesTo(ExpiringShape shape) { return true; }
         @Override
diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java
index 7afd3957..724475af 100644
--- a/src/main/java/carpet/script/utils/ShapesRenderer.java
+++ b/src/main/java/carpet/script/utils/ShapesRenderer.java
@@ -103,7 +103,7 @@ public class ShapesRenderer
         else
         {
             RenderedShape<?> rshape = shapeFactory.apply(client, shape);
-            DimensionType dim = Registry.DIMENSION_TYPE.get(new Identifier(tag.getString("dim")));
+            RegistryKey<World> dim = RegistryKey.of(Registry.DIMENSION, new Identifier(tag.getString("dim")));
             int key = rshape.key();
             synchronized (shapes)
             {