Remove :concern: trinkets mixins

- Equipping multiple of the same Trinkets is now allowed
- Fully custom FeatureRenderer

src/main/java/artifacts/client/render/ArtifactFeatureRenderer.java

@@ -0,0 +1,43 @@
+package artifacts.client.render;
+
+import artifacts.item.trinket.TrinketArtifactItem;
+import dev.emi.trinkets.api.TrinketComponent;
+import dev.emi.trinkets.api.TrinketSlots;
+import dev.emi.trinkets.api.TrinketsApi;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+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.PlayerEntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
+
+/**
+ * Custom trinkets feature renderer, {@link dev.emi.trinkets.TrinketFeatureRenderer} is missing parameters
+ */
+public class ArtifactFeatureRenderer extends FeatureRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
+	private final FeatureRendererContext<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> context;
+
+	public ArtifactFeatureRenderer(
+			FeatureRendererContext<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> context) {
+		super(context);
+		this.context = context;
+	}
+
+	@Override
+	public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, AbstractClientPlayerEntity player, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
+		TrinketComponent comp = TrinketsApi.getTrinketComponent(player);
+		List<String> names = TrinketSlots.getAllSlotNames();
+
+		for (int i = 0; i < comp.getInventory().size(); i++) {
+			matrices.push();
+			ItemStack stack = comp.getInventory().getStack(i);
+			if (stack.getItem() instanceof TrinketArtifactItem) {
+				((TrinketArtifactItem) stack.getItem()).render(names.get(i), matrices, vertexConsumers, light, context.getModel(), player, limbAngle, limbDistance, tickDelta, animationProgress, headYaw, headPitch);
+			}
+			matrices.pop();
+		}
+	}
+}

src/main/java/artifacts/mixin/mixins/client/render/PlayerEntityRendererMixin.java

@@ -1,13 +1,17 @@
 package artifacts.mixin.mixins.client.render;
 
 import artifacts.Artifacts;
+import artifacts.client.render.ArtifactFeatureRenderer;
 import artifacts.item.trinket.glove.GloveItem;
 import dev.emi.trinkets.api.SlotGroups;
 import dev.emi.trinkets.api.Slots;
 import dev.emi.trinkets.api.TrinketsApi;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
+import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -20,7 +24,16 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PlayerEntityRenderer.class)
-public class PlayerEntityRendererMixin {
+public abstract class PlayerEntityRendererMixin extends LivingEntityRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
+
+	public PlayerEntityRendererMixin(EntityRenderDispatcher dispatcher, PlayerEntityModel<AbstractClientPlayerEntity> model, float shadowRadius) {
+		super(dispatcher, model, shadowRadius);
+	}
+
+	@Inject(at = @At("RETURN"), method = "<init>(Lnet/minecraft/client/render/entity/EntityRenderDispatcher;Z)V")
+	public void init(EntityRenderDispatcher dispatcher, boolean b, CallbackInfo info) {
+		this.addFeature(new ArtifactFeatureRenderer(this));
+	}
 
 	@Inject(method = "renderLeftArm", at = @At("TAIL"))
 	private void renderLeftGlove(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, AbstractClientPlayerEntity player, CallbackInfo info) {

src/main/java/artifacts/mixin/mixins/dev/TitleScreenMixin.java

@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(TitleScreen.class)
-public class TitleScreenMixin {
+public abstract class TitleScreenMixin {
 
 	@Shadow
 	@Mutable

src/main/java/artifacts/mixin/mixins/item/diggingclaws/ToolmanagerImplMixin.java

@@ -36,7 +36,6 @@ private static LivingEntity getUserFromStackHolder(LivingEntity user, BlockState
 	@Inject(method = "handleIsEffectiveOnIgnoresVanilla", at = @At(value = "TAIL"), cancellable = true)
 	private static void invokeNonToolsHandlers(BlockState state, ItemStack stack, LivingEntity user, boolean vanillaResult, CallbackInfoReturnable<Boolean> info) {
 		if (!info.getReturnValueZ()) {
-			// TODO: does cancelling at return still run other injectors?
 			info.setReturnValue(ToolHandlers.NON_TOOLS_HANDLER.invoker()
 					.isEffectiveOn(null, state, stack, user).isAccepted());
 		}

src/main/resources/artifacts.mixins.json

@@ -48,10 +48,6 @@
     "item.whoopeecushion.EntityMixin",
     "statuseffect.LivingEntityMixin",
     "statuseffect.StatusEffectInstanceMixin",
-    "trinkets.PlayerEntityMixin",
-    "trinkets.PlayerTrinketComponentMixin",
-    "trinkets.TrinketFeatureRendererMixin",
-    "trinkets.TrinketSlotMixin",
     "util.DefaultedRegistryMixin"
   ],
   "client": [