actually make rendering work well i think

DenizenScript · acikek · Oct 19, 2022 · Oct 19, 2022 · Dec 3, 2022 · Dec 4, 2022
commit 3280c051d4a6afb694d8e5eb447747addd319720
diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,8 @@ repositories {
 		name = "CottonMC"
 		url = "https://server.bbkr.space/artifactory/libs-release"
 	}
+
+	maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
 }
 
 dependencies {
@@ -39,6 +41,8 @@ dependencies {
 
 	implementation include("com.denizenscript:denizencore:${project.denizencore_version}")
 	implementation include("org.yaml:snakeyaml:${project.snakeyaml_version}")
+
+	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}")
 }
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,4 @@ fabric_version=0.69.1+1.19.3
 libgui_version=6.5.0+1.19.3
 denizencore_version=1.90.2-SNAPSHOT
 snakeyaml_version=1.33
+devauth_version=1.1.0
diff --git a/src/main/java/com/denizenscript/clientizen/mixin/render/EntityRenderDispatcherMixin.java b/src/main/java/com/denizenscript/clientizen/mixin/render/EntityRenderDispatcherMixin.java
@@ -12,11 +12,11 @@
 @Mixin(EntityRenderDispatcher.class)
 public class EntityRenderDispatcherMixin {
 
-	/*@Inject(method = "shouldRender", at = @At("HEAD"), cancellable = true)
-	private static <E extends Entity> void clientizen$cancelRenderIfAttached(
+	@Inject(method = "shouldRender", at = @At("HEAD"), cancellable = true)
+	private <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())) {
+		if (AttachCommand.attachedEntities.contains(entity.getUuid())) {
 			cir.setReturnValue(false);
 		}
-	}*/
+	}
 }
diff --git a/src/main/java/com/denizenscript/clientizen/mixin/render/EntityRendererMixin.java b/src/main/java/com/denizenscript/clientizen/mixin/render/EntityRendererMixin.java
@@ -1,26 +1,38 @@
 package com.denizenscript.clientizen.mixin.render;
 
+import com.denizenscript.clientizen.render.ClientizenAttachedEntityFeatureRenderer;
 import com.denizenscript.clientizen.scripts.commands.AttachCommand;
 import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.client.render.entity.feature.FeatureRenderer;
+import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(EntityRenderer.class)
-public class EntityRendererMixin<T extends Entity> {
+@Mixin(LivingEntityRenderer.class)
+public abstract class EntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
 
-	/*@Inject(method = "<init>", at = @At("TAIL"))
-	private void clientizen$addAttachFeatureRenderer(EntityRendererFactory.Context ctx, CallbackInfo ci) {
-		add
-	}*/
+	@Shadow
+	public abstract boolean addFeature(FeatureRenderer<T, M> feature);
+
+	@Inject(method = "<init>", at = @At("TAIL"))
+	private void clientizen$addAttachFeatureRenderer(EntityRendererFactory.Context ctx, EntityModel<T> model, float shadowRadius, CallbackInfo ci) {
+		LivingEntityRenderer<T, M> renderer = (LivingEntityRenderer<T, M>) (Object) this;
+		addFeature(new ClientizenAttachedEntityFeatureRenderer<>(renderer));
+	}
 
-	@Inject(method = "getPositionOffset", cancellable = true, at = @At("HEAD"))
+	/*@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()));
+			cir.setReturnValue(AttachCommand.attachedEntities.get(entity.getUuid()).getEntity().getLerpedPos(tickDelta).subtract(entity.getLerpedPos(tickDelta)));
 		}
-	}
+	}*/
 }
diff --git a/...ain/java/com/denizenscript/clientizen/render/ClientizenAttachedEntityFeatureRenderer.java b/...ain/java/com/denizenscript/clientizen/render/ClientizenAttachedEntityFeatureRenderer.java
@@ -1,20 +1,38 @@
 package com.denizenscript.clientizen.render;
 
+import com.denizenscript.clientizen.objects.EntityTag;
+import com.denizenscript.clientizen.scripts.commands.AttachCommand;
+import net.minecraft.client.MinecraftClient;
 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;
+import net.minecraft.util.math.Vec3d;
 
-public class ClientizenAttachedEntityFeatureRenderer extends FeatureRenderer<Entity, EntityModel<Entity>> {
+import java.util.List;
 
-	public ClientizenAttachedEntityFeatureRenderer(FeatureRendererContext<Entity, EntityModel<Entity>> context) {
+public class ClientizenAttachedEntityFeatureRenderer<T extends Entity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
+
+	public ClientizenAttachedEntityFeatureRenderer(FeatureRendererContext<T, M> 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) {
-
+	public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
+		List<EntityTag> attached = AttachCommand.attachMap.get(entity.getUuid());
+		if (attached == null) {
+			return;
+		}
+		for (EntityTag entityTag : attached) {
+			//System.out.println(entityTag);
+			matrices.push();
+			matrices.scale(1, -1, 1);
+			// Empty vector = the client player's center position more or less
+			Vec3d pos = MinecraftClient.getInstance().player.getPos().subtract(entity.getPos());
+			MinecraftClient.getInstance().getEntityRenderDispatcher().render(entityTag.entity, pos.x, pos.y, pos.z, entityTag.entity.getYaw(tickDelta), tickDelta, matrices, vertexConsumers, light);
+			matrices.pop();
+		}
 	}
 }
diff --git a/src/main/java/com/denizenscript/clientizen/scripts/commands/AttachCommand.java b/src/main/java/com/denizenscript/clientizen/scripts/commands/AttachCommand.java
@@ -10,14 +10,12 @@
 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;
+import java.util.*;
 
 public class AttachCommand extends AbstractCommand {
 
-	public static Map<UUID, EntityTag> attachedEntities = new HashMap<>();
+	public static Map<UUID, List<EntityTag>> attachMap = new HashMap<>();
+	public static List<UUID> attachedEntities = new ArrayList<>();
 
 	public AttachCommand() {
 		setName("attach");
@@ -34,13 +32,15 @@ public static void autoExecute(ScriptEntry scriptEntry,
 		if (!cancel && toEntity == null) {
 			throw new InvalidArgumentsRuntimeException("Must specify an entity to attach to");
 		}
-		for (EntityTag attachingEntity : attachingEntities.filter(EntityTag.class, scriptEntry.context)) {
-			if (cancel) {
-				attachedEntities.remove(attachingEntity.uuid);
-			}
-			else {
-				attachedEntities.put(attachingEntity.uuid, toEntity);
-			}
+		List<EntityTag> attaching = attachingEntities.filter(EntityTag.class, scriptEntry.context);
+		if (attachMap.containsKey(toEntity.uuid)) {
+			attachMap.get(toEntity.uuid).addAll(attaching);
+		}
+		else {
+			attachMap.put(toEntity.uuid, attaching);
+		}
+		for (EntityTag entityTag : attaching) {
+			attachedEntities.add(entityTag.uuid);
 		}
 	}
 }
diff --git a/src/main/resources/clientizen.accesswidener b/src/main/resources/clientizen.accesswidener
@@ -1,3 +1,5 @@
 accessWidener v2 named
 
 accessible method net/minecraft/client/world/ClientWorld getEntityLookup ()Lnet/minecraft/world/entity/EntityLookup;
+
+accessible method net/minecraft/client/render/entity/LivingEntityRenderer addFeature (Lnet/minecraft/client/render/entity/feature/FeatureRenderer;)Z