Attach + EntityTag beginnings

build.gradle

@@ -10,6 +10,10 @@ archivesBaseName = project.archives_base_name
 version = project.version
 group = project.maven_group
 
+loom {
+	accessWidenerPath = file("src/main/resources/clientizen.accesswidener")
+}
+
 repositories {
 	mavenCentral()
 	maven {

src/main/java/com/denizenscript/clientizen/mixin/render/EntityRenderDispatcherMixin.java

@@ -0,0 +1,22 @@
+package com.denizenscript.clientizen.mixin.render;
+
+import com.denizenscript.clientizen.scripts.commands.AttachCommand;
+import net.minecraft.client.render.Frustum;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EntityRenderDispatcher.class)
+public class EntityRenderDispatcherMixin {
+
+	/*@Inject(method = "shouldRender", at = @At("HEAD"), cancellable = true)
+	private static <E extends Entity> void clientizen$cancelRenderIfAttached(
+			E entity, Frustum frustum, double x, double y, double z, CallbackInfoReturnable<Boolean> cir) {
+		if (AttachCommand.attachedEntities.containsKey(entity.getUuid())) {
+			cir.setReturnValue(false);
+		}
+	}*/
+}

src/main/java/com/denizenscript/clientizen/mixin/render/EntityRendererMixin.java

@@ -0,0 +1,26 @@
+package com.denizenscript.clientizen.mixin.render;
+
+import com.denizenscript.clientizen.scripts.commands.AttachCommand;
+import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.Vec3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EntityRenderer.class)
+public class EntityRendererMixin<T extends Entity> {
+
+	/*@Inject(method = "<init>", at = @At("TAIL"))
+	private void clientizen$addAttachFeatureRenderer(EntityRendererFactory.Context ctx, CallbackInfo ci) {
+		add
+	}*/
+
+	@Inject(method = "getPositionOffset", cancellable = true, at = @At("HEAD"))
+	private void clientizen$getAttachedOffset(T entity, float tickDelta, CallbackInfoReturnable<Vec3d> cir) {
+		if (AttachCommand.attachedEntities.containsKey(entity.getUuid())) {
+			cir.setReturnValue(AttachCommand.attachedEntities.get(entity.getUuid()).getEntity().getPos().subtract(entity.getPos()));
+		}
+	}
+}

src/main/java/com/denizenscript/clientizen/render/ClientizenAttachedEntityFeatureRenderer.java

@@ -0,0 +1,20 @@
+package com.denizenscript.clientizen.render;
+
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.feature.FeatureRenderer;
+import net.minecraft.client.render.entity.feature.FeatureRendererContext;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
+
+public class ClientizenAttachedEntityFeatureRenderer extends FeatureRenderer<Entity, EntityModel<Entity>> {
+
+	public ClientizenAttachedEntityFeatureRenderer(FeatureRendererContext<Entity, EntityModel<Entity>> context) {
+		super(context);
+	}
+
+	@Override
+	public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Entity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
+
+	}
+}

src/main/java/com/denizenscript/clientizen/scripts/commands/AttachCommand.java

@@ -0,0 +1,40 @@
+package com.denizenscript.clientizen.scripts.commands;
+
+import com.denizenscript.clientizen.tags.EntityTag;
+import com.denizenscript.denizencore.scripts.ScriptEntry;
+import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
+import com.denizenscript.denizencore.scripts.commands.generator.ArgLinear;
+import com.denizenscript.denizencore.scripts.commands.generator.ArgName;
+import com.denizenscript.denizencore.scripts.commands.generator.ArgPrefixed;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class AttachCommand extends AbstractCommand {
+
+	public static Map<UUID, EntityTag> attachedEntities = new HashMap<>();
+
+	public AttachCommand() {
+		setName("attach");
+		setSyntax("attach [<entity>|...] [to:<entity>] (cancel)");
+		setRequiredArguments(2, 2);
+		isProcedural = false;
+		autoCompile();
+	}
+
+	public static void autoExecute(ScriptEntry scriptEntry,
+								   @ArgLinear @ArgName("entities") List<EntityTag> attachingEntities,
+								   @ArgPrefixed @ArgName("to") EntityTag entity,
+								   @ArgName("cancel") boolean cancel) {
+		for (EntityTag attachingEntity : attachingEntities) {
+			if (cancel) {
+				attachedEntities.remove(attachingEntity.uuid);
+			}
+			else {
+				attachedEntities.put(attachingEntity.uuid, entity);
+			}
+		}
+	}
+}

src/main/java/com/denizenscript/clientizen/scripts/commands/ClientizenCommandRegistry.java

@@ -6,8 +6,9 @@
 public class ClientizenCommandRegistry {
 
 	public static void registerCommands() {
-		registerCommand(NarrateCommand.class);
+		registerCommand(AttachCommand.class);
 		registerCommand(GuiCommand.class);
+		registerCommand(NarrateCommand.class);
 		registerCommand(ServerEventCommand.class);
 	}
 

src/main/java/com/denizenscript/clientizen/tags/ClientTagBase.java

@@ -0,0 +1,34 @@
+package com.denizenscript.clientizen.tags;
+
+import com.denizenscript.denizencore.objects.core.ListTag;
+import com.denizenscript.denizencore.tags.PseudoObjectTagBase;
+import com.denizenscript.denizencore.tags.TagManager;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.Entity;
+
+public class ClientTagBase extends PseudoObjectTagBase<ClientTagBase> {
+
+	public static ClientTagBase instance;
+
+	public static void register() {
+		instance = new ClientTagBase();
+		TagManager.registerStaticTagBaseHandler(ClientTagBase.class, "client", t -> instance);
+	}
+
+	@Override
+	public void registerTags() {
+
+		tagProcessor.registerTag(ListTag.class, "loaded_entities", (attribute, object) -> {
+			ListTag list = new ListTag();
+			for (Entity entity : MinecraftClient.getInstance().world.getEntities()) {
+				list.addObject(new EntityTag(entity));
+			}
+			return list;
+		});
+
+		tagProcessor.registerTag(EntityTag.class, "target", (attribute, object) -> {
+			System.out.println(MinecraftClient.getInstance().targetedEntity);
+			return new EntityTag(MinecraftClient.getInstance().targetedEntity);
+		});
+	}
+}

src/main/java/com/denizenscript/clientizen/tags/ClientizenTagRegistry.java

@@ -1,8 +1,14 @@
 package com.denizenscript.clientizen.tags;
 
+import com.denizenscript.denizencore.objects.ObjectFetcher;
+import com.denizenscript.denizencore.objects.ObjectType;
+
 public class ClientizenTagRegistry {
 
-	public static void registerTagHandlers() {
+	public static ObjectType<EntityTag> TYPE_ENTITY;
 
+	public static void registerTagHandlers() {
+		ClientTagBase.register();
+		TYPE_ENTITY = ObjectFetcher.registerWithObjectFetcher(EntityTag.class, EntityTag.tagProcessor).setAsNOtherCode().generateBaseTag();
 	}
 }

src/main/java/com/denizenscript/clientizen/tags/EntityTag.java

@@ -0,0 +1,80 @@
+package com.denizenscript.clientizen.tags;
+
+import com.denizenscript.denizencore.objects.Fetchable;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ElementTag;
+import com.denizenscript.denizencore.tags.ObjectTagProcessor;
+import com.denizenscript.denizencore.tags.TagContext;
+import com.denizenscript.denizencore.utilities.debugging.Debug;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.Entity;
+
+import java.util.UUID;
+
+public class EntityTag implements ObjectTag {
+
+	public UUID uuid;
+
+	public EntityTag(UUID uuid) {
+		this.uuid = uuid;
+	}
+
+	public EntityTag(Entity entity) {
+		this(entity.getUuid());
+	}
+
+	@Fetchable("e")
+	public static EntityTag valueOf(String string, TagContext tagContext) {
+		if (string == null) {
+			return null;
+		}
+		if (string.startsWith("e@")) {
+			return new EntityTag(UUID.fromString(string.substring(2)));
+		}
+		if (tagContext == null || tagContext.showErrors()) {
+			Debug.log("valueOf EntityTag returning null: " + string);
+		}
+		return null;
+	}
+
+	public Entity getEntity() {
+		return MinecraftClient.getInstance().world.getEntityLookup().get(uuid);
+	}
+
+	public static ObjectTagProcessor<EntityTag> tagProcessor = new ObjectTagProcessor<>();
+
+	public static void registerTags() {
+
+		tagProcessor.registerTag(ElementTag.class, "entity_type", (attribute, object) -> {
+			return new ElementTag(object.getEntity().getType().getUntranslatedName(), true);
+		});
+	}
+
+	private String prefix = "Entity";
+
+	@Override
+	public String getPrefix() {
+		return prefix;
+	}
+
+	@Override
+	public boolean isUnique() {
+		return true;
+	}
+
+	@Override
+	public String identify() {
+		return "e@" + uuid;
+	}
+
+	@Override
+	public String identifySimple() {
+		return identify();
+	}
+
+	@Override
+	public ObjectTag setPrefix(String prefix) {
+		this.prefix = prefix;
+		return this;
+	}
+}

src/main/resources/clientizen.accesswidener

@@ -0,0 +1,3 @@
+accessWidener v2 named
+
+accessible method net/minecraft/client/world/ClientWorld getEntityLookup ()Lnet/minecraft/world/entity/EntityLookup;

src/main/resources/clientizen.mixins.json

@@ -6,7 +6,9 @@
   "mixins": [],
   "client": [
     "KeyBindingMixin",
-    "MinecraftClientMixin"
+    "MinecraftClientMixin",
+    "render.EntityRenderDispatcherMixin",
+    "render.EntityRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

@@ -23,6 +23,7 @@
   "mixins": [
     "clientizen.mixins.json"
   ],
+  "accessWidener": "clientizen.accesswidener",
   "depends": {
     "fabricloader": ">=0.14.9",
     "fabric-api": "*",