From 5063be576505888875f4316cc9f2c2d328841e96 Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Fri, 9 Feb 2024 19:01:16 +0100 Subject: [PATCH] removed missed slope element --- .../reframedtemplates/TemplatesClient.java | 1 - .../model/SlopeBaseMesh.java | 113 ------------------ 2 files changed, 114 deletions(-) delete mode 100644 src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java diff --git a/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java index b9208fd..ed995be 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java @@ -1,7 +1,6 @@ package fr.adrien1106.reframedtemplates; import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; -import fr.adrien1106.reframedtemplates.model.SlopeBaseMesh; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java b/src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java deleted file mode 100644 index 6cf92bb..0000000 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java +++ /dev/null @@ -1,113 +0,0 @@ -package fr.adrien1106.reframedtemplates.model; - -import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; -import net.fabricmc.fabric.api.renderer.v1.Renderer; -import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; -import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder; -import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.RotationAxis; -import org.joml.Matrix4f; - -public class SlopeBaseMesh { - /** - * @see RetexturingBakedModel for why these values were chosen - */ - public static final int TAG_SLOPE = Direction.UP.ordinal() + 1; - public static final int TAG_LEFT = Direction.EAST.ordinal() + 1; - public static final int TAG_RIGHT = Direction.WEST.ordinal() + 1; - public static final int TAG_BACK = Direction.SOUTH.ordinal() + 1; - public static final int TAG_BOTTOM = Direction.DOWN.ordinal() + 1; - - public static Mesh makeUpright() { - Renderer renderer = TemplatesClientApi.getInstance().getFabricRenderer(); - MeshBuilder builder = renderer.meshBuilder(); - QuadEmitter qu = builder.getEmitter(); - qu.tag(TAG_SLOPE) - .pos(0, 0f, 0f, 0f).pos(1, 0f, 1f, 1f).pos(2, 1f, 1f, 1f).pos(3, 1f, 0f, 0f) - .color(-1, -1, -1, -1) - .uv(0, 0f, 0f).uv(1, 0f, 1f).uv(2, 1f, 1f).uv(3, 1f, 0f) - .emit() - .tag(TAG_LEFT) - .pos(0, 1f, 0f, 0f).pos(1, 1f, 0.5f, 0.5f).pos(2, 1f, 1f, 1f).pos(3, 1f, 0f, 1f) - .color(-1, -1, -1, -1) - .uv(0, 1f, 1f).uv(1, 0.5f, 0.5f).uv(2, 0f, 0f).uv(3, 0f, 1f) - .cullFace(Direction.EAST) - .emit() - .tag(TAG_RIGHT) - .pos(0, 0f, 0.5f, 0.5f).pos(1, 0, 0f, 0f).pos(2, 0f, 0f, 1f).pos(3, 0f, 1f, 1f) - .color(-1, -1, -1, -1) - .uv(0, 0.5f, 0.5f).uv(1, 0f, 1f).uv(2, 1f, 1f).uv(3, 1f, 0f) - .cullFace(Direction.WEST) - .emit() - .tag(TAG_BACK) - .square(Direction.SOUTH, 0, 0, 1, 1, 0) //sets pos & cullFace - .color(-1, -1, -1, -1) - .uvUnitSquare() - .emit() - .tag(TAG_BOTTOM) - .square(Direction.DOWN, 0, 0, 1, 1, 0) //sets pos & cullFace - .color(-1, -1, -1, -1) - .uvUnitSquare() - .emit(); - return builder.build(); - } - - //My mfw (my face when) mfw face when you can't rotate blockmodels on the z axis from a blockstate file - //Fine i will do it myself !!! - public static Mesh makeSide() { - Matrix4f mat = new Matrix4f(); - RotationAxis.POSITIVE_Z.rotationDegrees(90).get(mat); - return MeshTransformUtil.pretransformMesh(makeUpright(), MeshTransformUtil.applyMatrix(mat)); - } - - //looks weird since i wrote a janky script to massage a .bbmodel, some manual fixups applied - public static Mesh makeTinyUpright() { - Renderer renderer = TemplatesClientApi.getInstance().getFabricRenderer(); - MeshBuilder builder = renderer.meshBuilder(); - QuadEmitter qu = builder.getEmitter(); - qu.tag(TAG_LEFT) - .pos(0, 1f, 0.25f, 0.75f).uv(0, 0.25f, 0.75f) - .pos(1, 1f, 0.5f, 1f).uv(1, 0f, 0.5f) - .pos(2, 1f, 0f, 1f).uv(2, 0f, 1f) - .pos(3, 1f, 0f, 0.5f).uv(3, 0.5f, 1f) - .color(-1, -1, -1, -1) - .emit() - .tag(TAG_RIGHT) - .pos(0, 0f, 0f, 1f).uv(0, 1f, 1f) - .pos(1, 0f, 0.5f, 1f).uv(1, 1f, 0.5f) - .pos(2, 0f, 0.25f, 0.75f).uv(2, 0.75f, 0.75f) - .pos(3, 0f, 0f, 0.5f).uv(3, 0.5f, 1f) - .color(-1, -1, -1, -1) - .emit() - .tag(TAG_BOTTOM) - .pos(0, 1f, 0f, 0.5f).uv(0, 1f, 0.5f) - .pos(1, 1f, 0f, 1f).uv(1, 1f, 0f) - .pos(2, 0f, 0f, 1f).uv(2, 0f, 0f) - .pos(3, 0f, 0f, 0.5f).uv(3, 0f, 0.5f) - .color(-1, -1, -1, -1) - .emit() - .tag(TAG_BACK) - .pos(0, 1f, 0f, 1f).uv(0, 1f, 1f) - .pos(1, 1f, 0.5f, 1f).uv(1, 1f, 0.5f) - .pos(2, 0f, 0.5f, 1f).uv(2, 0f, 0.5f) - .pos(3, 0f, 0f, 1f).uv(3, 0f, 1f) - .color(-1, -1, -1, -1) - .emit() - .tag(TAG_SLOPE) - .pos(0, 1f, 0.5f, 1f).uv(2, 0f, 0.5f) //manually permuted uvs - .pos(1, 1f, 0f, 0.5f).uv(3, 0f, 1f) - .pos(2, 0f, 0f, 0.5f).uv(0, 1f, 1f) - .pos(3, 0f, 0.5f, 1f).uv(1, 1f, 0.5f) - .color(-1, -1, -1, -1) - .emit() - ; - return builder.build(); - } - - public static Mesh makeTinySide() { - Matrix4f mat = new Matrix4f(); - RotationAxis.POSITIVE_Z.rotationDegrees(90).get(mat); - return MeshTransformUtil.pretransformMesh(makeTinyUpright(), MeshTransformUtil.applyMatrix(mat)); - } -}