diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index a0bac5ea..717784c7 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -3162,6 +3162,9 @@ Available shapes: * `to` - other end of the line, same format as `from` * Optional attributes: * `width` - line thickness, defaults to 2.0pt + * `follow` - entity, or player name. Shape will follow an entity instead of being static. + Follow attribute requires all positional arguments to be relative to the entity and disallow + of using entity or block as position markers. You must specify positions as a triple. * `'box'` - draws a box with corners in specified points * Required attributes: diff --git a/docs/scarpet/api/Auxiliary.md b/docs/scarpet/api/Auxiliary.md index 90860cc9..37fd8323 100644 --- a/docs/scarpet/api/Auxiliary.md +++ b/docs/scarpet/api/Auxiliary.md @@ -68,6 +68,9 @@ Available shapes: * `to` - other end of the line, same format as `from` * Optional attributes: * `width` - line thickness, defaults to 2.0pt + * `follow` - entity, or player name. Shape will follow an entity instead of being static. + Follow attribute requires all positional arguments to be relative to the entity and disallow + of using entity or block as position markers. You must specify positions as a triple. * `'box'` - draws a box with corners in specified points * Required attributes: diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java index 28a8943e..b636bafe 100644 --- a/src/main/java/carpet/script/utils/ShapeDispatcher.java +++ b/src/main/java/carpet/script/utils/ShapeDispatcher.java @@ -109,7 +109,7 @@ public class ShapeDispatcher userParams.keySet().forEach(key -> { Param param = Param.coders.get(key); if (param==null) throw new InternalExpressionException("Unknown feature for shape: "+key); - userParams.put(key, param.validate(cc, userParams.get(key))); + userParams.put(key, param.validate(userParams, cc, userParams.get(key))); }); Function,ExpiringShape> factory = ExpiringShape.shapeProviders.get(shapeType); if (factory == null) throw new InternalExpressionException("Unknown shape: "+shapeType); @@ -174,6 +174,9 @@ public class ShapeDispatcher protected int color; protected int duration = 0; private int key; + protected int followEntity; + protected DimensionType entityDimension; + protected ExpiringShape() { } @@ -212,8 +215,19 @@ public class ShapeDispatcher this.b = (float)(color >> 8 & 0xFF) / 255.0F; this.a = (float)(color & 0xFF) / 255.0F; key = 0; + followEntity = -1; + entityDimension = null; + if (options.containsKey("follow")) + { + followEntity = NumericValue.asNumber(options.getOrDefault("follow", optional.get("follow"))).getInt(); + entityDimension = Registry.DIMENSION_TYPE.get(new Identifier(options.get("dim").getString())); + } } public int getExpiry() { return duration; } + public Vec3d toAbsolute(Entity e, float x, float y, float z) + { + return e.getPos().add(x,y,z); + } public abstract Consumer alternative(); public int key() { @@ -225,13 +239,15 @@ public class ShapeDispatcher { int hash = 17; hash = 31*hash + color; + hash = 31*hash + followEntity; return hash; } // list of params that need to be there private final Set required = ImmutableSet.of("duration", "shape", "dim"); private final Map optional = ImmutableMap.of( "color", new NumericValue(-1), - "player", Value.NULL + "player", Value.NULL, + "follow", new NumericValue(-1) ); protected Set requiredParams() {return required;} // list of params that can be there, with defaults @@ -281,13 +297,26 @@ public class ShapeDispatcher @Override public Consumer alternative() { + String particleName = String.format(Locale.ROOT , "dust %.1f %.1f %.1f 1.0", r, g, b); ParticleEffect particle = getParticleData(particleName); double dx = x1-x2; double dy = y1-y2; double dz = z1-z2; double density = Math.max(2.0, Math.sqrt(dx*dx+dy*dy+dz*dz) /50) / (a+0.1); - return p -> mesh(Collections.singletonList(p), particle, density, x1, y1, z1, x2, y2, z2); + return p -> + { + if (followEntity == -1) + { + mesh(Collections.singletonList(p), particle, density, x1, y1, z1, x2, y2, z2); + return; + } + Entity e = p.getServer().getWorld(entityDimension).getEntityById(followEntity); + if (e == null) return; + Vec3d rel1 = toAbsolute(e, x1, y1, z1); + Vec3d rel2 = toAbsolute(e, x2, y2, z2); + mesh(Collections.singletonList(p), particle, density, rel1.x, rel1.y, rel1.z, rel2.x, rel2.y, rel2.z); + }; } @Override @@ -371,7 +400,20 @@ public class ShapeDispatcher double dy = y1-y2; double dz = z1-z2; double density = Math.max(2.0, Math.sqrt(dx*dx+dy*dy+dz*dz) /50) / (a+0.1); - return p -> drawParticleLine(Collections.singletonList(p), particle, pos1, pos2, density); + return p -> + { + if (followEntity == -1) + { + drawParticleLine(Collections.singletonList(p), particle, pos1, pos2, density); + return; + } + + Entity e = p.getServer().getWorld(entityDimension).getEntityById(followEntity); + if (e == null) return; + Vec3d rel1 = toAbsolute(e, x1, y1, z1); + Vec3d rel2 = toAbsolute(e, x2, y2, z2); + drawParticleLine(Collections.singletonList(p), particle, rel1, rel2, density); + }; } @Override @@ -449,15 +491,32 @@ public class ShapeDispatcher int partno = Math.min(1000,20*subdivisions); Random rand = p.world.getRandom(); ServerWorld world = p.getServerWorld(); + + float ccx, ccy, ccz; + if (followEntity == -1) + { + ccx = cx; ccy = cy; ccz = cz; + } + else + { + Entity e = p.getServer().getWorld(entityDimension).getEntityById(followEntity); + if (e == null) return; + Vec3d rel1 = toAbsolute(e, cx, cy, cz); + ccx = (float)rel1.x; ccy = (float)rel1.y; ccz = (float)rel1.z; + } + for (int i=0; i options, CarpetContext cc, Value value); // makes sure the value is proper boolean appliesTo(ExpiringShape shape); // check if applies to the shape String identify(); } @@ -519,7 +582,7 @@ public class ShapeDispatcher public Tag toTag(Value value) { return null; } @Override - public Value validate(CarpetContext cc, Value value) + public Value validate(Map options, CarpetContext cc, Value value) { ServerPlayerEntity player = EntityValue.getPlayerByValue(cc.s.getMinecraftServer(), value); if (player == null) @@ -538,15 +601,13 @@ public class ShapeDispatcher { @Override public Tag toTag(Value value) { return StringTag.of(value.getString()); } - @Override - public Value validate(CarpetContext cc, Value value) { return value; } public static Value decode(Tag tag) { return new StringValue(tag.asString()); } } public static class DimensionParam extends StringParam { @Override - public Value validate(CarpetContext cc, Value value) + public Value validate(Map options, CarpetContext cc, Value value) { String dimStr = value.getString(); Optional dimOp = Registry.DIMENSION_TYPE.getOrEmpty(new Identifier(dimStr)); @@ -561,7 +622,7 @@ public class ShapeDispatcher public static class ShapeParam extends StringParam { @Override - public Value validate(CarpetContext cc, Value value) + public Value validate(Map options, CarpetContext cc, Value value) { String shape = value.getString(); if (!ExpiringShape.shapeProviders.containsKey(shape)) @@ -576,7 +637,7 @@ public class ShapeDispatcher public static abstract class NumericParam implements Param { @Override - public Value validate(CarpetContext cc, Value value) + public Value validate(Map options, CarpetContext cc, Value value) { if (!(value instanceof NumericValue)) throw new InternalExpressionException("'" + identify() + "' needs to be a number"); @@ -585,9 +646,9 @@ public class ShapeDispatcher } public static abstract class PositiveParam extends NumericParam { - @Override public Value validate(CarpetContext cc, Value value) + @Override public Value validate(Map options, CarpetContext cc, Value value) { - Value ret = super.validate(cc, value); + Value ret = super.validate(options, cc, value); if (((NumericValue)ret).getDouble()<=0) throw new InternalExpressionException("'"+identify()+"' should be positive"); return ret; } @@ -628,10 +689,12 @@ public class ShapeDispatcher public abstract String identify(); @Override - public Value validate(CarpetContext cc, Value value) + public Value validate(Map options, CarpetContext cc, Value value) { if (value instanceof BlockValue) { + if (options.containsKey("follow")) + throw new InternalExpressionException(identify()+" parameter cannot use blocks as positions for relative positioning due to 'follow' attribute being present"); BlockPos pos = ((BlockValue) value).getPos(); int offset = roundsUpForBlocks()?1:0; return ListValue.of( @@ -653,6 +716,8 @@ public class ShapeDispatcher } if (value instanceof EntityValue) { + if (options.containsKey("follow")) + throw new InternalExpressionException(identify()+" parameter cannot use entity as positions for relative positioning due to 'follow' attribute being present"); Entity e = ((EntityValue) value).getEntity(); return ListValue.of( new NumericValue(e.getX()), @@ -745,6 +810,35 @@ public class ShapeDispatcher @Override public String identify() { return "level"; } } + public abstract static class EntityParam implements Param + { + + @Override + public Tag toTag(Value value) + { + return IntTag.of(NumericValue.asNumber(value).getInt()); + } + + @Override + public Value validate(Map options, CarpetContext cc, Value value) + { + if (value instanceof EntityValue) return new NumericValue(((EntityValue) value).getEntity().getEntityId()); + ServerPlayerEntity player = EntityValue.getPlayerByValue(cc.s.getMinecraftServer(), value); + if (player == null) + throw new InternalExpressionException(identify()+" parameter needs to represent an entity or player"); + return new NumericValue(player.getEntityId()); + } + + @Override + public boolean appliesTo(ExpiringShape shape) { return true; } + + public static Value decode(Tag tag) { return new NumericValue(((IntTag)tag).getInt()); } + } + public static class FollowParam extends EntityParam + { + @Override + public String identify() { return "follow"; } + } diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java index a9e610f3..0567ef08 100644 --- a/src/main/java/carpet/script/utils/ShapesRenderer.java +++ b/src/main/java/carpet/script/utils/ShapesRenderer.java @@ -9,9 +9,11 @@ import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; +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.world.IWorld; import net.minecraft.world.dimension.DimensionType; @@ -76,11 +78,17 @@ public class ShapesRenderer entry -> entry.getValue().isExpired(currentTime) ); shapes.get(dimensionType).values().forEach( - s -> s.render2pass(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.render(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(); @@ -133,6 +141,7 @@ public class ShapesRenderer public abstract static class RenderedShape { 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 ); @@ -142,6 +151,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) @@ -152,6 +162,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 @@ -166,10 +190,12 @@ public class ShapesRenderer 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 ); } @@ -177,15 +203,17 @@ public class ShapesRenderer 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 @@ -197,10 +225,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 ); } @@ -216,9 +246,11 @@ public class ShapesRenderer 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); } @@ -226,9 +258,10 @@ public class ShapesRenderer 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, - 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.fr, shape.fg, shape.fb, shape.fa); } @@ -240,6 +273,7 @@ public class ShapesRenderer builder.begin(GL11.GL_LINES, VertexFormats.POSITION_COLOR); // 3 builder.vertex(x1, y1, z1).color(red1, grn1, blu1, alpha).next(); builder.vertex(x2, y2, z2).color(red1, grn1, blu1, alpha).next(); + 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) @@ -312,14 +346,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); @@ -327,14 +363,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); @@ -350,16 +386,18 @@ 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 < 359.99f; 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++) { - float theta = i * pihalf; - float thetaprime = (i + step) * pihalf; + float theta = i * step; + float thetaprime = theta+step; builder.begin(GL11.GL_QUAD_STRIP, VertexFormats.POSITION_COLOR); - for (float j = 0f; j < 179.9f; j += step) + for (int j = 0; j <= num_steps180; j++) { - float phi = j * pihalf; + 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);