diff --git a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java b/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java index c2956db26..36e4228f5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java +++ b/src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.simibubi.create.foundation.block.render.QuadHelper; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; +import com.simibubi.create.foundation.model.BakedQuadHelper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -53,13 +53,13 @@ public class CopycatBarsModel extends CopycatModel { for (int i = 0; i < superQuads.size(); i++) { BakedQuad quad = superQuads.get(i); TextureAtlasSprite original = quad.getSprite(); - BakedQuad newQuad = QuadHelper.clone(quad); + BakedQuad newQuad = BakedQuadHelper.clone(quad); int[] vertexData = newQuad.getVertices(); for (int vertex = 0; vertex < 4; vertex++) { - QuadHelper.setU(vertexData, vertex, targetSprite - .getU(SpriteShiftEntry.getUnInterpolatedU(original, QuadHelper.getU(vertexData, vertex)))); - QuadHelper.setV(vertexData, vertex, targetSprite - .getV(SpriteShiftEntry.getUnInterpolatedV(original, QuadHelper.getV(vertexData, vertex)))); + BakedQuadHelper.setU(vertexData, vertex, targetSprite + .getU(SpriteShiftEntry.getUnInterpolatedU(original, BakedQuadHelper.getU(vertexData, vertex)))); + BakedQuadHelper.setV(vertexData, vertex, targetSprite + .getV(SpriteShiftEntry.getUnInterpolatedV(original, BakedQuadHelper.getV(vertexData, vertex)))); } quads.add(newQuad); } diff --git a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java index 581f3f727..71a6b98a8 100644 --- a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java @@ -1,5 +1,6 @@ package com.simibubi.create.foundation.data; +import static com.simibubi.create.Create.REGISTRATE; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.EAST; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.NORTH; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.SOUTH; @@ -25,8 +26,6 @@ import net.minecraftforge.client.model.generators.ModelFile; public class MetalBarsGen { - private static final CreateRegistrate REGISTRATE = Create.registrate(); - public static
NonNullBiConsumer