24w05a

src/main/java/carpet/script/utils/ParticleParser.java

@@ -3,9 +3,8 @@ package carpet.script.utils;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.ParticleArgument;
-import net.minecraft.core.HolderLookup;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleType;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;
@@ -15,7 +14,7 @@ public class ParticleParser
 {
     private static final Map<String, ParticleOptions> particleCache = new HashMap<>(); // we reset this on reloads, but probably need something better
 
-    private static ParticleOptions parseParticle(String name, HolderLookup<ParticleType<?>> lookup)
+    private static ParticleOptions parseParticle(String name, RegistryAccess lookup)
     {
         try
         {
@@ -28,7 +27,7 @@ public class ParticleParser
     }
 
     @Nullable
-    public static ParticleOptions getEffect(@Nullable String name, HolderLookup<ParticleType<?>> lookup)
+    public static ParticleOptions getEffect(@Nullable String name, RegistryAccess lookup)
     {
         if (name == null)
         {

src/main/java/carpet/script/utils/ShapeDispatcher.java

@@ -185,7 +185,7 @@ public class ShapeDispatcher
     {
         try
         {
-            return ParticleParser.getEffect(name, regs.lookupOrThrow(Registries.PARTICLE_TYPE));
+            return ParticleParser.getEffect(name, regs);
         }
         catch (IllegalArgumentException e)
         {

src/main/java/carpet/script/utils/ShapesRenderer.java

@@ -54,6 +54,8 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Matrix4f;
+import org.joml.Matrix4fStack;
 
 public class ShapesRenderer
 {
@@ -110,9 +112,12 @@ public class ShapesRenderer
         labels = new HashMap<>();
     }
 
-    public void render(PoseStack matrices, Camera camera, float partialTick)
+    public void render(Matrix4f modelViewMatrix, Camera camera, float partialTick)
     {
         Runnable token = Carpet.startProfilerSection("Scarpet client");
+        // posestack is not needed anymore - left as TODO to cleanup later
+        PoseStack matrices = new PoseStack();
+
         //Camera camera = this.client.gameRenderer.getCamera();
         ClientLevel iWorld = this.client.level;
         ResourceKey<Level> dimensionType = iWorld.dimension();
@@ -151,9 +156,9 @@ public class ShapesRenderer
             shapes.get(dimensionType).long2ObjectEntrySet().removeIf(
                     entry -> entry.getValue().isExpired(currentTime)
             );
-            PoseStack matrixStack = RenderSystem.getModelViewStack();
-            matrixStack.pushPose();
-            matrixStack.mulPoseMatrix(matrices.last().pose());
+            Matrix4fStack matrixStack = RenderSystem.getModelViewStack();
+            matrixStack.pushMatrix();
+            matrixStack.mul(matrices.last().pose());
             RenderSystem.applyModelViewMatrix();
 
             // lines
@@ -173,7 +178,7 @@ public class ShapesRenderer
                 }
             });
             RenderSystem.lineWidth(1.0F);
-            matrixStack.popPose();
+            matrixStack.popMatrix();
             RenderSystem.applyModelViewMatrix();
 
         }
@@ -428,7 +433,7 @@ public class ShapesRenderer
                             BlockEntity.setLevel(client.level);
                             if (shape.blockEntity != null)
                             {
-                                BlockEntity.load(shape.blockEntity);
+                                BlockEntity.load(shape.blockEntity, client.level.registryAccess());
                             }
                         }
                     }