Get impl'd

- Move all font/text related mixins into impl
Engine-Room · Sep 27, 2024 · 99e4b24 · 99e4b24
1 parent a9f63e8
commit 99e4b24
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/common/src/backend/resources/flywheel.backend.mixins.json b/common/src/backend/resources/flywheel.backend.mixins.json
@@ -6,10 +6,6 @@
   "refmap": "backend-flywheel.refmap.json",
   "client": [
     "AbstractClientPlayerAccessor",
-    "CodePointMapMixin",
-    "FontSetMixin",
-    "FontTexture$NodeAccessor",
-    "FontTextureMixin",
     "GlStateManagerMixin",
     "LevelRendererAccessor",
     "OptionsMixin",

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
@@ -9,9 +9,9 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 
 import dev.engine_room.flywheel.impl.extension.PoseStackExtension;
-import dev.engine_room.flywheel.impl.mixin.FontAccessor;
 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.FlwLibLink;
 import dev.engine_room.flywheel.lib.internal.GlyphExtension;
 import dev.engine_room.flywheel.lib.transform.PoseTransformStack;

diff --git a/...wheel/backend/util/FontTextureUpload.java → ...room/flywheel/impl/FontTextureUpload.java b/...wheel/backend/util/FontTextureUpload.java → ...room/flywheel/impl/FontTextureUpload.java
@@ -1,9 +1,9 @@
-package dev.engine_room.flywheel.backend.util;
+package dev.engine_room.flywheel.impl;
 
 import com.mojang.blaze3d.font.SheetGlyphInfo;
 
 /**
- * For use in {@link dev.engine_room.flywheel.backend.mixin.FontTextureMixin}
+ * For use in {@link dev.engine_room.flywheel.impl.mixin.text.FontTextureMixin}
  * to batch glyph uploads when they're created in a flywheel worker thread.
  */
 public record FontTextureUpload(SheetGlyphInfo info, int x, int y) {

diff --git a/.../flywheel/impl/mixin/BakedGlyphMixin.java → ...heel/impl/mixin/text/BakedGlyphMixin.java b/.../flywheel/impl/mixin/BakedGlyphMixin.java → ...heel/impl/mixin/text/BakedGlyphMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.impl.mixin;
+package dev.engine_room.flywheel.impl.mixin.text;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

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

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

diff --git a/.../flywheel/backend/mixin/FontSetMixin.java → ...lywheel/impl/mixin/text/FontSetMixin.java b/.../flywheel/backend/mixin/FontSetMixin.java → ...lywheel/impl/mixin/text/FontSetMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.backend.mixin;
+package dev.engine_room.flywheel.impl.mixin.text;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

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

diff --git a/...wheel/backend/mixin/FontTextureMixin.java → ...eel/impl/mixin/text/FontTextureMixin.java b/...wheel/backend/mixin/FontTextureMixin.java → ...eel/impl/mixin/text/FontTextureMixin.java
@@ -1,4 +1,4 @@
-package dev.engine_room.flywheel.backend.mixin;
+package dev.engine_room.flywheel.impl.mixin.text;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import dev.engine_room.flywheel.backend.util.FontTextureUpload;
+import dev.engine_room.flywheel.impl.FontTextureUpload;
 import dev.engine_room.flywheel.lib.internal.FontTextureExtension;
 import dev.engine_room.flywheel.lib.internal.GlyphExtension;
 import net.minecraft.client.gui.font.FontTexture;

diff --git a/common/src/main/resources/flywheel.impl.mixins.json b/common/src/main/resources/flywheel.impl.mixins.json
@@ -5,12 +5,10 @@
   "compatibilityLevel": "JAVA_17",
   "refmap": "flywheel.refmap.json",
   "client": [
-    "BakedGlyphMixin",
     "BlockEntityTypeMixin",
     "ClientChunkCacheMixin",
     "ClientLevelMixin",
     "EntityTypeMixin",
-    "FontAccessor",
     "LevelMixin",
     "LevelRendererMixin",
     "MinecraftMixin",
@@ -19,6 +17,12 @@
     "PoseStackMixin",
     "fix.FixFabulousDepthMixin",
     "fix.FixNormalScalingMixin",
+    "text.BakedGlyphMixin",
+    "text.CodePointMapMixin",
+    "text.FontAccessor",
+    "text.FontSetMixin",
+    "text.FontTexture$NodeAccessor",
+    "text.FontTextureMixin",
     "visualmanage.BlockEntityMixin",
     "visualmanage.LevelChunkMixin",
     "visualmanage.LevelRendererMixin",