mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-07 02:34:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Get impl'd

Browse source 
- Move all font/text related mixins into impl
This commit is contained in:
Jozufozu 2024-09-27 14:31:41 -07:00
parent c0b19a2f01
commit 9515462d0d
10 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/backend/resources/flywheel.backend.mixins.json
View file

@ -6,10 +6,6 @@
"refmap": "backend-flywheel.refmap.json",
"client": [
"AbstractClientPlayerAccessor",
"CodePointMapMixin",
"FontSetMixin",
"FontTexture$NodeAccessor",
"FontTextureMixin",
"GlStateManagerMixin",
"LevelRendererAccessor",
"OptionsMixin",

2
common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java
View file

@ -9,9 +9,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
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;

4
common/src/backend/java/dev/engine_room/flywheel/backend/util/FontTextureUpload.java → common/src/main/java/dev/engine_room/flywheel/impl/FontTextureUpload.java
View file

@ -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) {

2
common/src/main/java/dev/engine_room/flywheel/impl/mixin/BakedGlyphMixin.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/BakedGlyphMixin.java
View file

@ -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;

2
common/src/backend/java/dev/engine_room/flywheel/backend/mixin/CodePointMapMixin.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/CodePointMapMixin.java
View file

@ -1,4 +1,4 @@
package dev.engine_room.flywheel.backend.mixin;
package dev.engine_room.flywheel.impl.mixin.text;
import java.util.function.IntFunction;

2
common/src/main/java/dev/engine_room/flywheel/impl/mixin/FontAccessor.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/FontAccessor.java
View file

@ -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;

2
common/src/backend/java/dev/engine_room/flywheel/backend/mixin/FontSetMixin.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/FontSetMixin.java
View file

@ -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;

2
common/src/backend/java/dev/engine_room/flywheel/backend/mixin/FontTexture$NodeAccessor.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/FontTexture$NodeAccessor.java
View file

@ -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;

4
common/src/backend/java/dev/engine_room/flywheel/backend/mixin/FontTextureMixin.java → common/src/main/java/dev/engine_room/flywheel/impl/mixin/text/FontTextureMixin.java
View file

@ -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.font.SheetGlyphInfo;
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;

8
common/src/main/resources/flywheel.impl.mixins.json
View file

@ -5,11 +5,9 @@
"compatibilityLevel": "JAVA_17",
"refmap": "flywheel.refmap.json",
"client": [
"BakedGlyphMixin",
"BlockEntityTypeMixin",
"ClientChunkCacheMixin",
"EntityTypeMixin",
"FontAccessor",
"LevelMixin",
"LevelRendererMixin",
"MinecraftMixin",
@ -18,6 +16,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",