mirror of
https://github.com/Jozufozu/Flywheel.git
synced 2025-02-07 10:45:00 +01:00
Get impl'd
- Move all font/text related mixins into impl
This commit is contained in:
parent
c0b19a2f01
commit
9515462d0d
10 changed files with 16 additions and 16 deletions
|
@ -6,10 +6,6 @@
|
||||||
"refmap": "backend-flywheel.refmap.json",
|
"refmap": "backend-flywheel.refmap.json",
|
||||||
"client": [
|
"client": [
|
||||||
"AbstractClientPlayerAccessor",
|
"AbstractClientPlayerAccessor",
|
||||||
"CodePointMapMixin",
|
|
||||||
"FontSetMixin",
|
|
||||||
"FontTexture$NodeAccessor",
|
|
||||||
"FontTextureMixin",
|
|
||||||
"GlStateManagerMixin",
|
"GlStateManagerMixin",
|
||||||
"LevelRendererAccessor",
|
"LevelRendererAccessor",
|
||||||
"OptionsMixin",
|
"OptionsMixin",
|
||||||
|
|
|
@ -9,9 +9,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
|
|
||||||
import dev.engine_room.flywheel.impl.extension.PoseStackExtension;
|
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.ModelPartAccessor;
|
||||||
import dev.engine_room.flywheel.impl.mixin.PoseStackAccessor;
|
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.FlwLibLink;
|
||||||
import dev.engine_room.flywheel.lib.internal.GlyphExtension;
|
import dev.engine_room.flywheel.lib.internal.GlyphExtension;
|
||||||
import dev.engine_room.flywheel.lib.transform.PoseTransformStack;
|
import dev.engine_room.flywheel.lib.transform.PoseTransformStack;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package dev.engine_room.flywheel.backend.util;
|
package dev.engine_room.flywheel.impl;
|
||||||
|
|
||||||
import com.mojang.blaze3d.font.SheetGlyphInfo;
|
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.
|
* to batch glyph uploads when they're created in a flywheel worker thread.
|
||||||
*/
|
*/
|
||||||
public record FontTextureUpload(SheetGlyphInfo info, int x, int y) {
|
public record FontTextureUpload(SheetGlyphInfo info, int x, int y) {
|
|
@ -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.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.engine_room.flywheel.backend.mixin;
|
package dev.engine_room.flywheel.impl.mixin.text;
|
||||||
|
|
||||||
import java.util.function.IntFunction;
|
import java.util.function.IntFunction;
|
||||||
|
|
|
@ -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.Mixin;
|
||||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
|
@ -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.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
|
@ -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.Mixin;
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
|
@ -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.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -20,7 +20,7 @@ import com.mojang.blaze3d.font.SheetGlyphInfo;
|
||||||
import com.mojang.blaze3d.platform.NativeImage;
|
import com.mojang.blaze3d.platform.NativeImage;
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
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.FontTextureExtension;
|
||||||
import dev.engine_room.flywheel.lib.internal.GlyphExtension;
|
import dev.engine_room.flywheel.lib.internal.GlyphExtension;
|
||||||
import net.minecraft.client.gui.font.FontTexture;
|
import net.minecraft.client.gui.font.FontTexture;
|
|
@ -5,11 +5,9 @@
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"refmap": "flywheel.refmap.json",
|
"refmap": "flywheel.refmap.json",
|
||||||
"client": [
|
"client": [
|
||||||
"BakedGlyphMixin",
|
|
||||||
"BlockEntityTypeMixin",
|
"BlockEntityTypeMixin",
|
||||||
"ClientChunkCacheMixin",
|
"ClientChunkCacheMixin",
|
||||||
"EntityTypeMixin",
|
"EntityTypeMixin",
|
||||||
"FontAccessor",
|
|
||||||
"LevelMixin",
|
"LevelMixin",
|
||||||
"LevelRendererMixin",
|
"LevelRendererMixin",
|
||||||
"MinecraftMixin",
|
"MinecraftMixin",
|
||||||
|
@ -18,6 +16,12 @@
|
||||||
"PoseStackMixin",
|
"PoseStackMixin",
|
||||||
"fix.FixFabulousDepthMixin",
|
"fix.FixFabulousDepthMixin",
|
||||||
"fix.FixNormalScalingMixin",
|
"fix.FixNormalScalingMixin",
|
||||||
|
"text.BakedGlyphMixin",
|
||||||
|
"text.CodePointMapMixin",
|
||||||
|
"text.FontAccessor",
|
||||||
|
"text.FontSetMixin",
|
||||||
|
"text.FontTexture$NodeAccessor",
|
||||||
|
"text.FontTextureMixin",
|
||||||
"visualmanage.BlockEntityMixin",
|
"visualmanage.BlockEntityMixin",
|
||||||
"visualmanage.LevelChunkMixin",
|
"visualmanage.LevelChunkMixin",
|
||||||
"visualmanage.LevelRendererMixin",
|
"visualmanage.LevelRendererMixin",
|
||||||
|
|
Loading…
Reference in a new issue