color annotation

Author: gdavid04

README.md

@@ -9,6 +9,7 @@ This mod is client side only, you don't have to install it on the server to use
 - Change between Extract X, Y and Z with hotkeys (planned: config panel buttons)
 - Improved Number Constant editing
 - Color coded psi cost based on the sustainability or danger of the spell
+- Colored piece outlines using the @color=name_or_hex comment annotation (planned: config panel buttons)
 - Planned: hotkey to highlight tricks, unused, dependency and dependent pieces
 - Planned: insert Cross Connectors with shift-arrow
 

src/main/java/gdavid/psionicutilities/PsionicUtilities.java

@@ -1,12 +1,22 @@
 package gdavid.psionicutilities;
 
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.event.RegistryEvent.Register;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
 import net.minecraftforge.network.NetworkConstants;
 
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import vazkii.psi.api.ClientPsiAPI;
 
 @Mod(PsionicUtilities.modId)
+@EventBusSubscriber(bus = Bus.MOD, value = Dist.CLIENT)
 public class PsionicUtilities {
 
 	public static final String modId = "psionicutilities";
@@ -16,4 +26,10 @@ public PsionicUtilities() {
 			() -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 	}
 
+	@OnlyIn(Dist.CLIENT)
+	@SubscribeEvent
+	public static void registerTextures(Register<Item> e) {
+		ClientPsiAPI.registerPieceTexture(new ResourceLocation(modId, "highlight"), new ResourceLocation(modId, "spell/highlight"));
+	}
+	
 }

src/main/java/gdavid/psionicutilities/mixin/SpellPieceMixin.java

@@ -1,20 +1,31 @@
 package gdavid.psionicutilities.mixin;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
+import gdavid.psionicutilities.PsionicUtilities;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.resources.model.Material;
+import net.minecraft.network.chat.TextColor;
+import net.minecraft.resources.ResourceLocation;
 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.Redirect;
 
 import gdavid.psionicutilities.Util;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import vazkii.psi.api.ClientPsiAPI;
 import vazkii.psi.api.spell.IGenericRedirector;
 import vazkii.psi.api.spell.SpellParam;
 import vazkii.psi.api.spell.SpellPiece;
 
+import java.util.Arrays;
+import java.util.Optional;
+
 @Mixin(value = SpellPiece.class, remap = false)
-public class SpellPieceMixin {
+public abstract class SpellPieceMixin {
 
 	@OnlyIn(Dist.CLIENT)
 	@Redirect(method = "drawParam(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;ILvazkii/psi/api/spell/SpellParam$Side;ILvazkii/psi/api/spell/SpellParam$ArrowType;F)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/VertexConsumer;color(IIII)Lcom/mojang/blaze3d/vertex/VertexConsumer;", remap = true))
@@ -29,4 +40,38 @@ private VertexConsumer paramColor(VertexConsumer builder, int r, int g, int b, i
 		return builder.color(r, g, b, a);
 	}
 
+	@OnlyIn(Dist.CLIENT)
+	@Inject(method = "drawBackground", at = @At("HEAD"))
+	private void drawBackground(PoseStack ms, MultiBufferSource buffers, int light, CallbackInfo callback) {
+		SpellPiece self = (SpellPiece) (Object) this;
+		if (self.comment != null) {
+			String prefix = "@color=";
+			Optional<String> str = Arrays.stream(self.comment.split(";")).filter(ln -> ln.startsWith(prefix)).findFirst().map(ln -> ln.substring(prefix.length()));
+			str.ifPresent(color -> {
+				TextColor value = TextColor.parseColor(color);
+				if (value != null) {
+					drawHighlight(ms, buffers, light, value.getValue());
+				}
+			});
+		}
+	}
+	
+	private void drawHighlight(PoseStack ms, MultiBufferSource buffers, int light, int value) {
+		int r = (value >> 16) & 0xFF;
+		int g = (value >> 8) & 0xFF;
+		int b = value & 0xFF;
+		Material material = new Material(ClientPsiAPI.PSI_PIECE_TEXTURE_ATLAS, new ResourceLocation(PsionicUtilities.modId, "spell/highlight"));
+		VertexConsumer buf = material.buffer(buffers, ignore -> SpellPiece.getLayer());
+		Matrix4f mat = ms.last().pose();
+		buf.vertex(mat, -1, 17, 0).color(r, g, b, 128);
+		buf.uv(0, 1).uv2(light).endVertex();
+		buf.vertex(mat, 17, 17, 0).color(r, g, b, 128);
+		buf.uv(1, 1).uv2(light).endVertex();
+		buf.vertex(mat, 17, -1, 0).color(r, g, b, 128);
+		buf.uv(1, 0).uv2(light).endVertex();
+		buf.vertex(mat, -1, -1, 0).color(r, g, b, 128);
+		buf.uv(0, 0).uv2(light).endVertex();
+		ms.translate(0, 0, 0.1f);
+	}
+	
 }

src/main/resources/assets/psionicutilities/textures/spell/highlight.png

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Psionic Utilities resources",
-        "pack_format": 6
+        "pack_format": 8
     }
 }