Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java

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

@@ -14,6 +14,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.World;
@@ -52,22 +53,26 @@ public class ShapesRenderer
         RegistryKey<World> dimensionType = iWorld.method_27983();
         if (shapes.get(dimensionType).isEmpty()) return;
         long currentTime = client.world.getTime();
+        RenderSystem.disableTexture();
         RenderSystem.enableDepthTest();
+        RenderSystem.depthFunc(515);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         //RenderSystem.blendFuncSeparate(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE, GlStateManager.SrcFactor.ONE, GlStateManager.DstFactor.ZERO);
-        RenderSystem.shadeModel(7425);
+        //RenderSystem.shadeModel(7425);
+        RenderSystem.shadeModel(GL11.GL_FLAT);
         RenderSystem.enableAlphaTest();
         RenderSystem.defaultAlphaFunc();
-        Entity entity = this.client.gameRenderer.getCamera().getFocusedEntity();
+        //RenderSystem.alphaFunc(GL11.GL_GREATER, 0.005F);
+        RenderSystem.disableCull();
+        RenderSystem.disableLighting();
+        RenderSystem.depthMask(false);
+        //RenderSystem.polygonOffset(-3f, -3f);
+        //RenderSystem.enablePolygonOffset();
+        //Entity entity = this.client.gameRenderer.getCamera().getFocusedEntity();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuffer();
-        double d = 0.0D - cameraY;
-        double e = 256.0D - cameraY;
-        RenderSystem.disableTexture();
-        //RenderSystem.disableBlend();
-        double f = (double)(entity.chunkX << 4) - cameraX;
-        double g = (double)(entity.chunkZ << 4) - cameraZ;
+
         // render
         synchronized (shapes)
         {
@@ -75,22 +80,30 @@ public class ShapesRenderer
                     entry -> entry.getValue().isExpired(currentTime)
             );
             shapes.get(dimensionType).values().forEach(
-                    s -> s.render(tessellator, bufferBuilder, (float) cameraX, (float) cameraY, (float) cameraZ)
+                    s ->
+                    {
+                        if ( s.shouldRender(dimensionType)) s.render2pass(tessellator, bufferBuilder, (float) cameraX, (float) cameraY, (float) cameraZ);
+                    }
             );
+            //lines
             shapes.get(dimensionType).values().forEach(
-                    s -> s.render2pass(tessellator, bufferBuilder, (float) cameraX, (float) cameraY, (float) cameraZ)
+
+                    s -> {
+                        if ( s.shouldRender(dimensionType)) s.render(tessellator, bufferBuilder, (float) cameraX, (float) cameraY, (float) cameraZ);
+                    }
             );
         }
-
+        RenderSystem.enableCull();
+        RenderSystem.depthMask(true);
         RenderSystem.lineWidth(1.0F);
         RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
         RenderSystem.enableTexture();
         RenderSystem.shadeModel(7424);
     }
 
     public void addShape(CompoundTag tag)
     {
-        //CarpetSettings.LOG.error("Received tag: "+tag.asString());
         ShapeDispatcher.ExpiringShape shape = ShapeDispatcher.fromTag(tag);
         if (shape == null) return;
         BiFunction<MinecraftClient, ShapeDispatcher.ExpiringShape, RenderedShape<? extends ShapeDispatcher.ExpiringShape >> shapeFactory;
@@ -130,6 +143,7 @@ public class ShapesRenderer
     public abstract static class RenderedShape<T extends ShapeDispatcher.ExpiringShape>
     {
         protected T shape;
+        protected MinecraftClient client;
         long expiryTick;
         float renderEpsilon = 0;
         public abstract void render(Tessellator tessellator, BufferBuilder builder, float cx, float cy, float cz );
@@ -139,6 +153,7 @@ public class ShapesRenderer
             this.shape = shape;
             expiryTick = client.world.getTime()+shape.getExpiry();
             renderEpsilon = (2+((float)shape.key())/Integer.MAX_VALUE)/1000;
+            this.client = client;
         }
 
         public boolean isExpired(long currentTick)
@@ -149,6 +164,20 @@ public class ShapesRenderer
         {
             return shape.key();
         };
+        public boolean shouldRender(DimensionType dim)
+        {
+            if (shape.followEntity <=0 ) return true;
+            if (client.world == null) return false;
+            if (client.world.dimension.getType() != dim) return false;
+            if (client.world.getEntityById(shape.followEntity) == null) return false;
+            return true;
+        }
+        protected Vec3d relativiseRender(float x, float y, float z)
+        {
+            if (shape.followEntity <= 0) return new Vec3d(x,y,z);
+            Entity e = client.world.getEntityById(shape.followEntity);
+            return shape.toAbsolute(e, x, y, z);
+        }
     }
 
     public static class RenderedBox extends RenderedShape<ShapeDispatcher.Box>
@@ -162,28 +191,31 @@ public class ShapesRenderer
         @Override
         public void render(Tessellator tessellator, BufferBuilder bufferBuilder, float cx, float cy, float cz)
         {
+            if (shape.a == 0.0) return;
+            Vec3d v1 = relativiseRender(shape.x1, shape.y1, shape.z1);
+            Vec3d v2 = relativiseRender(shape.x2, shape.y2, shape.z2);
             RenderSystem.lineWidth(shape.lineWidth);
-
             drawBoxWireGLLines(tessellator, bufferBuilder,
-                    shape.x1 - cx-renderEpsilon, shape.y1 - cy-renderEpsilon, shape.z1 - cz-renderEpsilon,
-                    shape.x2 - cx+renderEpsilon, shape.y2 - cy+renderEpsilon, shape.z2 - cz+renderEpsilon,
+                    (float)v1.x-cx-renderEpsilon, (float)v1.y-cy-renderEpsilon, (float)v1.z-cz-renderEpsilon,
+                    (float)v2.x-cx+renderEpsilon, (float)v2.y-cy+renderEpsilon, (float)v2.z-cz+renderEpsilon,
                     shape.r, shape.g, shape.b, shape.a, shape.r, shape.g, shape.b
             );
-            tessellator.draw();
         }
         @Override
         public void render2pass(Tessellator tessellator, BufferBuilder bufferBuilder, float cx, float cy, float cz)
         {
             if (shape.fa == 0.0) return;
+            Vec3d v1 = relativiseRender(shape.x1, shape.y1, shape.z1);
+            Vec3d v2 = relativiseRender(shape.x2, shape.y2, shape.z2);
             RenderSystem.lineWidth(1.0F);
-
             drawBoxFaces(tessellator, bufferBuilder,
-                    shape.x1-cx-renderEpsilon, shape.y1-cy-renderEpsilon, shape.z1-cz-renderEpsilon,
-                    shape.x2-cx+renderEpsilon, shape.y2-cy+renderEpsilon, shape.z2-cz+renderEpsilon,
+                    (float)v1.x-cx-renderEpsilon, (float)v1.y-cy-renderEpsilon, (float)v1.z-cz-renderEpsilon,
+                    (float)v2.x-cx+renderEpsilon, (float)v2.y-cy+renderEpsilon, (float)v2.z-cz+renderEpsilon,
                     shape.fr, shape.fg, shape.fb, shape.fa
             );
 
         }
+
     }
 
     public static class RenderedLine extends RenderedShape<ShapeDispatcher.Line>
@@ -195,10 +227,12 @@ public class ShapesRenderer
         @Override
         public void render(Tessellator tessellator, BufferBuilder bufferBuilder, float cx, float cy, float cz)
         {
+            Vec3d v1 = relativiseRender(shape.x1, shape.y1, shape.z1);
+            Vec3d v2 = relativiseRender(shape.x2, shape.y2, shape.z2);
             RenderSystem.lineWidth(shape.lineWidth);
             drawLine(tessellator, bufferBuilder,
-                    shape.x1-cx-renderEpsilon, shape.y1-cy-renderEpsilon, shape.z1-cz-renderEpsilon,
-                    shape.x2-cx+renderEpsilon, shape.y2-cy+renderEpsilon, shape.z2-cz+renderEpsilon,
+                    (float)v1.x-cx-renderEpsilon, (float)v1.y-cy-renderEpsilon, (float)v1.z-cz-renderEpsilon,
+                    (float)v2.x-cx+renderEpsilon, (float)v2.y-cy+renderEpsilon, (float)v2.z-cz+renderEpsilon,
                     shape.r, shape.g, shape.b, shape.a
             );
         }
@@ -213,12 +247,26 @@ public class ShapesRenderer
         @Override
         public void render(Tessellator tessellator, BufferBuilder bufferBuilder, float cx, float cy, float cz)
         {
+            if (shape.a == 0.0) return;
+            Vec3d vc = relativiseRender(shape.cx, shape.cy, shape.cz);
+
             RenderSystem.lineWidth(shape.lineWidth);
             drawSphereWireframe(tessellator, bufferBuilder,
-                    shape.cx-cx-renderEpsilon, shape.cy-cy-renderEpsilon, shape.cz-cz-renderEpsilon,
+                    (float)vc.x-cx-renderEpsilon, (float)vc.y-cy-renderEpsilon, (float)vc.z-cz-renderEpsilon,
                     shape.radius, shape.subdivisions,
                     shape.r, shape.g, shape.b, shape.a);
         }
+        @Override
+        public void render2pass(Tessellator tessellator, BufferBuilder bufferBuilder, float cx, float cy, float cz)
+        {
+            if (shape.fa == 0.0) return;
+            Vec3d vc = relativiseRender(shape.cx, shape.cy, shape.cz);
+            RenderSystem.lineWidth(1.0f);
+            drawSphereFaces(tessellator, bufferBuilder,
+                    (float)vc.x-cx-renderEpsilon, (float)vc.y-cy-renderEpsilon, (float)vc.z-cz-renderEpsilon,
+                    shape.radius, shape.subdivisions,
+                    shape.fr, shape.fg, shape.fb, shape.fa);
+        }
     }
 
     // some raw shit
@@ -230,7 +278,8 @@ public class ShapesRenderer
         tessellator.draw();
     }
 
-    public static void drawBoxWireGLLines(Tessellator tessellator, BufferBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2, float red1, float grn1, float blu1, float alpha, float red2, float grn2, float blu2) {
+    public static void drawBoxWireGLLines(Tessellator tessellator, BufferBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2, float red1, float grn1, float blu1, float alpha, float red2, float grn2, float blu2)
+    {
         builder.begin(GL11.GL_LINES, VertexFormats.POSITION_COLOR); // 3
         builder.vertex(x1, y1, z1).color(red1, grn2, blu2, alpha).next();
         builder.vertex(x2, y1, z1).color(red1, grn2, blu2, alpha).next();
@@ -256,24 +305,26 @@ public class ShapesRenderer
         builder.vertex(x2, y2, z2).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y2, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y2, z2).color(red1, grn1, blu1, alpha).next();
+        tessellator.draw();
     }
 
-    public static void drawBoxFaces(Tessellator tessellator, BufferBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2, float red1, float grn1, float blu1, float alpha) {
-        builder.begin(GL11.GL_QUADS, VertexFormats.POSITION_COLOR); // 3
+    public static void drawBoxFaces(Tessellator tessellator, BufferBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2, float red1, float grn1, float blu1, float alpha)
+    {
+        builder.begin(GL11.GL_QUADS, VertexFormats.POSITION_COLOR);
         builder.vertex(x1, y1, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y1, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y2, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x1, y2, z1).color(red1, grn1, blu1, alpha).next();
 
         builder.vertex(x1, y1, z2).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x2, y1, z2).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x2, y2, z2).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x1, y2, z2).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x2, y2, z2).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x2, y1, z2).color(red1, grn1, blu1, alpha).next();
 
         builder.vertex(x1, y1, z1).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x1, y1, z2).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x1, y2, z2).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x1, y2, z1).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x1, y2, z2).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x1, y1, z2).color(red1, grn1, blu1, alpha).next();
 
         builder.vertex(x2, y1, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y1, z2).color(red1, grn1, blu1, alpha).next();
@@ -281,9 +332,9 @@ public class ShapesRenderer
         builder.vertex(x2, y2, z1).color(red1, grn1, blu1, alpha).next();
 
         builder.vertex(x1, y1, z1).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x2, y1, z1).color(red1, grn1, blu1, alpha).next();
-        builder.vertex(x2, y1, z2).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x1, y1, z2).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x2, y1, z2).color(red1, grn1, blu1, alpha).next();
+        builder.vertex(x2, y1, z1).color(red1, grn1, blu1, alpha).next();
 
         builder.vertex(x1, y2, z1).color(red1, grn1, blu1, alpha).next();
         builder.vertex(x2, y2, z1).color(red1, grn1, blu1, alpha).next();
@@ -297,14 +348,16 @@ public class ShapesRenderer
                                            float r, int subd,
                                            float red, float grn, float blu, float alpha)
     {
-        float pihalf = (float)(Math.PI / 180.0f);
-        float step = 180f / (subd/2);
-        for (float i = 0f; i <= 360.0f; i+=step)
+        float step = (float)Math.PI / (subd/2);
+        int num_steps180 = (int)(Math.PI / step)+1;
+        int num_steps360 = (int)(2*Math.PI / step);
+        for (int i = 0; i <= num_steps360; i++)
         {
             builder.begin(GL11.GL_LINE_STRIP, VertexFormats.POSITION_COLOR);
-            float theta = i * pihalf;
-            for (float j = 0f; j <= 180.0f; j+=step) {
-                float phi = j * pihalf;
+            float theta = step * i ;
+            for (int j = 0; j <= num_steps180; j++)
+            {
+                float phi = step * j ;
                 float x = r * MathHelper.sin(phi) * MathHelper.cos(theta);
                 float z = r * MathHelper.sin(phi) * MathHelper.sin(theta);
                 float y = r * MathHelper.cos(phi);
@@ -312,14 +365,14 @@ public class ShapesRenderer
             }
             tessellator.draw();
         }
-        for (float j = 0f; j <= 180.0f; j+=step)
+        for (int j = 0; j <= num_steps180; j++)
         {
             builder.begin(GL11.GL_LINE_LOOP, VertexFormats.POSITION_COLOR);
-            float phi = j * pihalf;
+            float phi = step * j ;
 
-            for (float i = 0f; i <= 360.0f; i+=step)
+            for (int i = 0; i <= num_steps360; i++)
             {
-                float theta = i * pihalf;
+                float theta = step * i;
                 float x = r * MathHelper.sin(phi) * MathHelper.cos(theta);
                 float z = r * MathHelper.sin(phi) * MathHelper.sin(theta);
                 float y = r * MathHelper.cos(phi);
@@ -329,4 +382,33 @@ public class ShapesRenderer
         }
 
     }
+
+    public static void drawSphereFaces(Tessellator tessellator, BufferBuilder builder,
+                                           float cx, float cy, float cz,
+                                           float r, int subd,
+                                           float red, float grn, float blu, float alpha)
+    {
+
+        float step = (float)Math.PI / (subd/2);
+        int num_steps180 = (int)(Math.PI / step)+1;
+        int num_steps360 = (int)(2*Math.PI / step);
+        for (int i = 0; i <= num_steps360; i++)
+        {
+            float theta = i * step;
+            float thetaprime = theta+step;
+            builder.begin(GL11.GL_QUAD_STRIP, VertexFormats.POSITION_COLOR);
+            for (int j = 0; j <= num_steps180; j++)
+            {
+                float phi = j * step;
+                float x = r * MathHelper.sin(phi) * MathHelper.cos(theta);
+                float z = r * MathHelper.sin(phi) * MathHelper.sin(theta);
+                float y = r * MathHelper.cos(phi);
+                float xp = r * MathHelper.sin(phi) * MathHelper.cos(thetaprime);
+                float zp = r * MathHelper.sin(phi) * MathHelper.sin(thetaprime);
+                builder.vertex(x + cx, y + cy, z + cz).color(red, grn, blu, alpha).next();
+                builder.vertex(xp + cx, y + cy, zp + cz).color(red, grn, blu, alpha).next();
+            }
+            tessellator.draw();
+        }
+    }
 }