Skip to content

Remove LDLib usage in ICoverableRenderer & StaticFaceBakery #4792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gustovafing merged 1 commit into from
Apr 28, 2026
Merged

Remove LDLib usage in ICoverableRenderer & StaticFaceBakery #4792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/main/java/com/gregtechceu/gtceu/client/renderer/cover/ICoverableRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
import com.gregtechceu.gtceu.api.cover.CoverBehavior;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.client.util.RenderUtil;
import com.gregtechceu.gtceu.client.util.StaticFaceBakery;
import com.gregtechceu.gtceu.utils.GTUtil;

import com.lowdragmc.lowdraglib.client.bakedpipeline.FaceQuad;

import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
Expand All @@ -24,7 +23,6 @@
import net.minecraftforge.client.model.data.ModelData;

import com.mojang.blaze3d.vertex.PoseStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;
Expand All @@ -40,9 +38,9 @@ static void initSprites(TextureAtlas atlas) {
}

@OnlyIn(Dist.CLIENT)
default void renderCovers(List<BakedQuad> quads, @NotNull ICoverable coverable,
BlockPos pos, BlockAndTintGetter level, @Nullable Direction side,
RandomSource rand, @NotNull ModelData modelData, @Nullable RenderType renderType) {
default void renderCovers(List<BakedQuad> quads, ICoverable coverable, BlockPos pos, BlockAndTintGetter level,
@Nullable Direction side, RandomSource rand, ModelData modelData,
@Nullable RenderType renderType) {
var thickness = coverable.getCoverPlateThickness();
for (Direction face : GTUtil.DIRECTIONS) {
var cover = coverable.getCoverAtSide(face);
Expand All @@ -59,11 +57,9 @@ default void renderCovers(List<BakedQuad> quads, @NotNull ICoverable coverable,
normal.getY() >= 0 ? 0.99 : min,
normal.getZ() >= 0 ? 0.99 : min);
if (side == null) { // render back
quads.add(FaceQuad.builder(face.getOpposite(), COVER_BACK_PLATE[0])
.cube(cube).cubeUV().bake());
quads.add(StaticFaceBakery.bakeFace(cube, face.getOpposite(), COVER_BACK_PLATE[0]));
} else if (side != face.getOpposite()) { // render sides
quads.add(FaceQuad.builder(side, COVER_BACK_PLATE[0])
.cube(cube).cubeUV().bake());
quads.add(StaticFaceBakery.bakeFace(cube, side, COVER_BACK_PLATE[0]));
}
}
// it won't ever be null on the client
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/client/util/StaticFaceBakery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.gregtechceu.gtceu.client.util;

import com.lowdragmc.lowdraglib.client.bakedpipeline.FaceQuad;

import net.minecraft.client.renderer.FaceInfo;
import net.minecraft.client.renderer.block.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
Expand All @@ -25,6 +23,7 @@

public class StaticFaceBakery {

public static final AABB BLOCK = new AABB(0, 0, 0, 1, 1, 1);
public static final AABB SLIGHTLY_OVER_BLOCK = new AABB(-0.001f, -0.001f, -0.001f,
1.001f, 1.001f, 1.001f);
public static final AABB OUTPUT_OVERLAY = new AABB(-.006f, -.006f, -.006f,
Expand Down Expand Up @@ -71,7 +70,7 @@ public static BakedQuad bakeFace(AABB cube, Direction face, TextureAtlasSprite s

public static BakedQuad bakeFace(Direction face, TextureAtlasSprite sprite, ModelState rotation, int tintIndex,
int emissivity, boolean cull, boolean shade) {
return bakeFace(FaceQuad.BLOCK, face, sprite, rotation, tintIndex, emissivity, cull, shade);
return bakeFace(BLOCK, face, sprite, rotation, tintIndex, emissivity, cull, shade);
}

public static BakedQuad bakeFace(Direction face, TextureAtlasSprite sprite, ModelState rotation, int tintIndex,
Expand Down
Loading