Vanillinization

- Move all text visual related things into vanillin
Engine-Room · Jan 23, 2025 · 6d2aab7 · 6d2aab7
1 parent 6003748
commit 6d2aab7
Show file tree

Hide file tree

Showing 28 changed files with 126 additions and 104 deletions.
diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java
@@ -103,27 +103,6 @@ public final class InstanceTypes {
 			.cullShader(Flywheel.rl("instance/cull/shadow.glsl"))
 			.build();
 
-	public static final InstanceType<GlyphInstance> GLYPH = SimpleInstanceType.builder(GlyphInstance::new)
-			.layout(LayoutBuilder.create()
-					.matrix("pose", FloatRepr.FLOAT, 4)
-					.vector("u0u1v0v1", FloatRepr.NORMALIZED_UNSIGNED_SHORT, 4)
-					.vector("color", FloatRepr.NORMALIZED_UNSIGNED_BYTE, 4)
-					.vector("light", FloatRepr.UNSIGNED_SHORT, 2)
-					.build())
-			.writer((ptr, instance) -> {
-				ExtraMemoryOps.putMatrix4f(ptr, instance.pose);
-				ExtraMemoryOps.put2x16(ptr + 64, instance.packedUs);
-				ExtraMemoryOps.put2x16(ptr + 68, instance.packedVs);
-				MemoryUtil.memPutByte(ptr + 72, instance.red);
-				MemoryUtil.memPutByte(ptr + 73, instance.green);
-				MemoryUtil.memPutByte(ptr + 74, instance.blue);
-				MemoryUtil.memPutByte(ptr + 75, instance.alpha);
-				ExtraMemoryOps.put2x16(ptr + 76, instance.light);
-			})
-			.vertexShader(Flywheel.rl("instance/glyph.vert"))
-			.cullShader(Flywheel.rl("instance/cull/glyph.glsl"))
-			.build();
-
 	private InstanceTypes() {
 	}
 }
diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java
@@ -10,11 +10,7 @@
 
 import dev.engine_room.flywheel.api.internal.DependencyInjection;
 import dev.engine_room.flywheel.lib.transform.PoseTransformStack;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.font.FontSet;
-import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.resources.ResourceLocation;
 
 public interface FlwLibLink {
 	FlwLibLink INSTANCE = DependencyInjection.load(FlwLibLink.class, "dev.engine_room.flywheel.impl.FlwLibLinkImpl");
@@ -36,10 +32,4 @@ public interface FlwLibLink {
 	boolean isShaderPackInUse();
 
 	boolean isRenderingShadowPass();
-
-	FontSet getFontSet(Font font, ResourceLocation loc);
-
-	boolean getFilterFishyGlyphs(Font font);
-
-	BakedGlyphExtension getBakedGlyphExtension(BakedGlyph glyph);
 }
diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java
@@ -13,15 +13,9 @@
 import dev.engine_room.flywheel.impl.extension.PoseStackExtension;
 import dev.engine_room.flywheel.impl.mixin.ModelPartAccessor;
 import dev.engine_room.flywheel.impl.mixin.PoseStackAccessor;
-import dev.engine_room.flywheel.impl.mixin.text.FontAccessor;
-import dev.engine_room.flywheel.lib.internal.BakedGlyphExtension;
 import dev.engine_room.flywheel.lib.internal.FlwLibLink;
 import dev.engine_room.flywheel.lib.transform.PoseTransformStack;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.font.FontSet;
-import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.resources.ResourceLocation;
 
 public class FlwLibLinkImpl implements FlwLibLink {
 	@Override
@@ -80,19 +74,4 @@ public boolean isRenderingShadowPass() {
 			return false;
 		}
 	}
-
-	@Override
-	public FontSet getFontSet(Font font, ResourceLocation loc) {
-		return ((FontAccessor) font).flywheel$getFontSet(loc);
-	}
-
-	@Override
-	public boolean getFilterFishyGlyphs(Font font) {
-		return ((FontAccessor) font).flywheel$getFilterFishyGlyphs();
-	}
-
-	@Override
-	public BakedGlyphExtension getBakedGlyphExtension(BakedGlyph glyph) {
-		return (BakedGlyphExtension) glyph;
-	}
 }
diff --git a/common/src/main/resources/flywheel.impl.mixins.json b/common/src/main/resources/flywheel.impl.mixins.json
@@ -16,12 +16,6 @@
     "PoseStackMixin",
     "fix.FixFabulousDepthMixin",
     "fix.FixNormalScalingMixin",
-    "text.BakedGlyphMixin",
-    "text.CodePointMapMixin",
-    "text.FontAccessor",
-    "text.FontSetMixin",
-    "text.FontTexture$NodeAccessor",
-    "text.FontTextureMixin",
     "visualmanage.BlockEntityMixin",
     "visualmanage.LevelChunkMixin",
     "visualmanage.LevelRendererMixin",

diff --git a/.../flywheel/lib/instance/GlyphInstance.java → ...v/engine_room/vanillin/GlyphInstance.java b/.../flywheel/lib/instance/GlyphInstance.java → ...v/engine_room/vanillin/GlyphInstance.java
@@ -1,13 +1,14 @@
-package dev.engine_room.flywheel.lib.instance;
+package dev.engine_room.vanillin;
 
 import org.joml.Matrix4f;
 import org.joml.Matrix4fc;
 
 import dev.engine_room.flywheel.api.instance.InstanceHandle;
 import dev.engine_room.flywheel.api.instance.InstanceType;
-import dev.engine_room.flywheel.lib.internal.BakedGlyphExtension;
-import dev.engine_room.flywheel.lib.internal.FlwLibLink;
+import dev.engine_room.flywheel.lib.instance.ColoredLitInstance;
 import dev.engine_room.flywheel.lib.math.DataPacker;
+import dev.engine_room.vanillin.text.BakedGlyphExtension;
+import dev.engine_room.vanillin.text.TextUtil;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 
 public class GlyphInstance extends ColoredLitInstance {
@@ -25,7 +26,7 @@ public GlyphInstance(InstanceType<? extends GlyphInstance> type, InstanceHandle
 	}
 
 	public GlyphInstance setGlyph(BakedGlyph glyph, Matrix4fc initialPose, float x, float y, boolean italic) {
-		var glyphExtension = FlwLibLink.INSTANCE.getBakedGlyphExtension(glyph);
+		var glyphExtension = TextUtil.getBakedGlyphExtension(glyph);
 		setUvs(glyphExtension);
 
 		float left = glyphExtension.flywheel$left();
@@ -44,7 +45,7 @@ public GlyphInstance setGlyph(BakedGlyph glyph, Matrix4fc initialPose, float x,
 	}
 
 	public GlyphInstance setEffect(BakedGlyph glyph, Matrix4fc initialPose, float x0, float y0, float x1, float y1, float depth) {
-		var glyphExtension = FlwLibLink.INSTANCE.getBakedGlyphExtension(glyph);
+		var glyphExtension = TextUtil.getBakedGlyphExtension(glyph);
 		setUvs(glyphExtension);
 
 		pose.set(initialPose);

diff --git a/common/src/vanillin/java/dev/engine_room/vanillin/VanillaVisuals.java b/common/src/vanillin/java/dev/engine_room/vanillin/VanillaVisuals.java
@@ -4,6 +4,7 @@
 import dev.engine_room.vanillin.visuals.ChestVisual;
 import dev.engine_room.vanillin.visuals.MinecartVisual;
 import dev.engine_room.vanillin.visuals.ShulkerBoxVisual;
+import dev.engine_room.vanillin.visuals.SignVisual;
 import dev.engine_room.vanillin.visuals.TntMinecartVisual;
 import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.world.entity.Entity;
@@ -33,6 +34,9 @@ public static void init() {
 				.factory(ShulkerBoxVisual::new)
 				.apply(true);
 
+		builder(BlockEntityType.SIGN).factory(SignVisual::new)
+				.apply(false);
+
 		builder(EntityType.CHEST_MINECART)
 				.factory((ctx, entity, partialTick) -> new MinecartVisual<>(ctx, entity, partialTick, ModelLayers.CHEST_MINECART))
 				.skipVanillaRender(MinecartVisual::shouldSkipRender)

diff --git a/common/src/vanillin/java/dev/engine_room/vanillin/VanillinInstanceTypes.java b/common/src/vanillin/java/dev/engine_room/vanillin/VanillinInstanceTypes.java
@@ -0,0 +1,32 @@
+package dev.engine_room.vanillin;
+
+import org.lwjgl.system.MemoryUtil;
+
+import dev.engine_room.flywheel.api.instance.InstanceType;
+import dev.engine_room.flywheel.api.layout.FloatRepr;
+import dev.engine_room.flywheel.api.layout.LayoutBuilder;
+import dev.engine_room.flywheel.lib.instance.SimpleInstanceType;
+import dev.engine_room.flywheel.lib.util.ExtraMemoryOps;
+
+public class VanillinInstanceTypes {
+	public static final InstanceType<GlyphInstance> GLYPH = SimpleInstanceType.builder(GlyphInstance::new)
+			.layout(LayoutBuilder.create()
+					.matrix("pose", FloatRepr.FLOAT, 4)
+					.vector("u0u1v0v1", FloatRepr.NORMALIZED_UNSIGNED_SHORT, 4)
+					.vector("color", FloatRepr.NORMALIZED_UNSIGNED_BYTE, 4)
+					.vector("light", FloatRepr.UNSIGNED_SHORT, 2)
+					.build())
+			.writer((ptr, instance) -> {
+				ExtraMemoryOps.putMatrix4f(ptr, instance.pose);
+				ExtraMemoryOps.put2x16(ptr + 64, instance.packedUs);
+				ExtraMemoryOps.put2x16(ptr + 68, instance.packedVs);
+				MemoryUtil.memPutByte(ptr + 72, instance.red);
+				MemoryUtil.memPutByte(ptr + 73, instance.green);
+				MemoryUtil.memPutByte(ptr + 74, instance.blue);
+				MemoryUtil.memPutByte(ptr + 75, instance.alpha);
+				ExtraMemoryOps.put2x16(ptr + 76, instance.light);
+			})
+			.vertexShader(Vanillin.rl("instance/glyph.vert"))
+			.cullShader(Vanillin.rl("instance/cull/glyph.glsl"))
+			.build();
+}
diff --git a/...heel/impl/mixin/text/BakedGlyphMixin.java → .../vanillin/mixin/text/BakedGlyphMixin.java b/...heel/impl/mixin/text/BakedGlyphMixin.java → .../vanillin/mixin/text/BakedGlyphMixin.java
@@ -1,11 +1,11 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
-import dev.engine_room.flywheel.lib.internal.BakedGlyphExtension;
+import dev.engine_room.vanillin.text.BakedGlyphExtension;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/...el/impl/mixin/text/CodePointMapMixin.java → ...anillin/mixin/text/CodePointMapMixin.java b/...el/impl/mixin/text/CodePointMapMixin.java → ...anillin/mixin/text/CodePointMapMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import java.util.function.IntFunction;
 

diff --git a/...lywheel/impl/mixin/text/FontAccessor.java → ...oom/vanillin/mixin/text/FontAccessor.java b/...lywheel/impl/mixin/text/FontAccessor.java → ...oom/vanillin/mixin/text/FontAccessor.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

diff --git a/...lywheel/impl/mixin/text/FontSetMixin.java → ...oom/vanillin/mixin/text/FontSetMixin.java b/...lywheel/impl/mixin/text/FontSetMixin.java → ...oom/vanillin/mixin/text/FontSetMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -8,7 +8,7 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 
-import dev.engine_room.flywheel.impl.extension.FontTextureExtension;
+import dev.engine_room.vanillin.text.FontTextureExtension;
 import net.minecraft.client.gui.font.FontSet;
 import net.minecraft.client.gui.font.FontTexture;
 import net.minecraft.resources.ResourceLocation;

diff --git a/.../mixin/text/FontTexture$NodeAccessor.java → .../mixin/text/FontTexture$NodeAccessor.java b/.../mixin/text/FontTexture$NodeAccessor.java → .../mixin/text/FontTexture$NodeAccessor.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

diff --git a/...eel/impl/mixin/text/FontTextureMixin.java → ...vanillin/mixin/text/FontTextureMixin.java b/...eel/impl/mixin/text/FontTextureMixin.java → ...vanillin/mixin/text/FontTextureMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin.text;
+package dev.engine_room.vanillin.mixin.text;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,9 +20,9 @@
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import dev.engine_room.flywheel.impl.FontTextureUpload;
-import dev.engine_room.flywheel.impl.extension.FontTextureExtension;
-import dev.engine_room.flywheel.lib.internal.BakedGlyphExtension;
+import dev.engine_room.vanillin.text.BakedGlyphExtension;
+import dev.engine_room.vanillin.text.FontTextureExtension;
+import dev.engine_room.vanillin.text.FontTextureUpload;
 import net.minecraft.client.gui.font.FontTexture;
 import net.minecraft.client.gui.font.glyphs.BakedGlyph;
 import net.minecraft.client.renderer.texture.AbstractTexture;

diff --git a/...eel/lib/internal/BakedGlyphExtension.java → ...om/vanillin/text/BakedGlyphExtension.java b/...eel/lib/internal/BakedGlyphExtension.java → ...om/vanillin/text/BakedGlyphExtension.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.lib.internal;
+package dev.engine_room.vanillin.text;
 
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/.../impl/extension/FontTextureExtension.java → ...m/vanillin/text/FontTextureExtension.java b/.../impl/extension/FontTextureExtension.java → ...m/vanillin/text/FontTextureExtension.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.extension;
+package dev.engine_room.vanillin.text;
 
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/...room/flywheel/impl/FontTextureUpload.java → ...room/vanillin/text/FontTextureUpload.java b/...room/flywheel/impl/FontTextureUpload.java → ...room/vanillin/text/FontTextureUpload.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl;
+package dev.engine_room.vanillin.text;
 
 import com.mojang.blaze3d.font.SheetGlyphInfo;
 

diff --git a/...heel/lib/visual/text/SimpleTextLayer.java → ...e_room/vanillin/text/SimpleTextLayer.java b/...heel/lib/visual/text/SimpleTextLayer.java → ...e_room/vanillin/text/SimpleTextLayer.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.lib.visual.text;
+package dev.engine_room.vanillin.text;
 
 import java.util.Objects;
 

diff --git a/...m/flywheel/lib/visual/text/TextLayer.java → .../engine_room/vanillin/text/TextLayer.java b/...m/flywheel/lib/visual/text/TextLayer.java → .../engine_room/vanillin/text/TextLayer.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.lib.visual.text;
+package dev.engine_room.vanillin.text;
 
 import java.util.function.Consumer;
 

diff --git a/.../flywheel/lib/visual/text/TextLayers.java → ...engine_room/vanillin/text/TextLayers.java b/.../flywheel/lib/visual/text/TextLayers.java → ...engine_room/vanillin/text/TextLayers.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.lib.visual.text;
+package dev.engine_room.vanillin.text;
 
 import net.minecraft.client.gui.Font;
 

diff --git a/common/src/vanillin/java/dev/engine_room/vanillin/text/TextUtil.java b/common/src/vanillin/java/dev/engine_room/vanillin/text/TextUtil.java
@@ -0,0 +1,21 @@
+package dev.engine_room.vanillin.text;
+
+import dev.engine_room.vanillin.mixin.text.FontAccessor;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.font.FontSet;
+import net.minecraft.client.gui.font.glyphs.BakedGlyph;
+import net.minecraft.resources.ResourceLocation;
+
+public class TextUtil {
+	public static FontSet getFontSet(Font font, ResourceLocation loc) {
+		return ((FontAccessor) font).flywheel$getFontSet(loc);
+	}
+
+	public static boolean getFilterFishyGlyphs(Font font) {
+		return ((FontAccessor) font).flywheel$getFilterFishyGlyphs();
+	}
+
+	public static BakedGlyphExtension getBakedGlyphExtension(BakedGlyph glyph) {
+		return (BakedGlyphExtension) glyph;
+	}
+}