From bca8c2bb3c70422859a27cddd39827c0a27445b3 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 10 Jun 2020 01:51:26 -0300
Subject: [PATCH] fix

---
 .../carpet/mixins/WorldRenderer_scarpetRenderMixin.java   | 2 +-
 src/main/java/carpet/script/utils/ShapeDispatcher.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java b/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
index df777e69..32783ad9 100644
--- a/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
+++ b/src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
@@ -8,8 +8,8 @@ import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.client.util.math.Matrix4f;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java
index 2ee015f3..d8970fd3 100644
--- a/src/main/java/carpet/script/utils/ShapeDispatcher.java
+++ b/src/main/java/carpet/script/utils/ShapeDispatcher.java
@@ -88,7 +88,7 @@ public class ShapeDispatcher
             for (int i=2; i < lv.size(); i++) paramList.add(lv.get(i));
             params = ShapeDispatcher.parseParams(paramList);
         }
-        params.putIfAbsent("dim", new StringValue(cc.s.getWorld().getDimension().getType().toString()));
+        params.putIfAbsent("dim", new StringValue(cc.s.getWorld().getRegistryKey().getValue().toString()));
         params.putIfAbsent("duration", duration);
 
         if (params.containsKey("player"))
@@ -413,7 +413,7 @@ public class ShapeDispatcher
             double density = Math.max(2.0, from.distanceTo(to) /50) / (a+0.1);
             return p ->
             {
-                if (p.dimension == shapeDimension)
+                if (p.world.getRegistryKey() == shapeDimension)
                 {
                     particleMesh(
                             Collections.singletonList(p),
@@ -498,7 +498,7 @@ public class ShapeDispatcher
 
             return p ->
             {
-                if (p.dimension == shapeDimension) drawParticleLine(
+                if (p.world.getRegistryKey() == shapeDimension) drawParticleLine(
                         Collections.singletonList(p),
                         particle,
                         relativiseRender(p.getServerWorld(), from, 0),
@@ -555,7 +555,7 @@ public class ShapeDispatcher
         @Override
         public Consumer<ServerPlayerEntity> alternative() { return p ->
         {
-            if (p.dimension != shapeDimension) return;
+            if (p.world.getRegistryKey() != shapeDimension) return;
             String particleName = String.format(Locale.ROOT , "dust %.1f %.1f %.1f 1.0", r, g, b);
             ParticleEffect particle = getParticleData(particleName);
             int partno = Math.min(1000,20*subdivisions);