Skip to content

Fix positive facade planes #4857

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

Open
screret wants to merge 10 commits into
base: 1.20.1
Choose a base branch
from
Open

Fix positive facade planes #4857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8271d49
Fix facades' models when facing +X/+Y/+Z
screret May 20, 2026
6964e65
Fix facaded models' UVs
screret May 20, 2026
4b3e5c4
Fix cover plates Z-fighting
screret May 20, 2026
f0733c0
cleaner back plate AABB code
screret May 20, 2026
1bb0e48
Formatting changes
screret May 20, 2026
19cc64e
Render covers with the render type(s) they request instead of all of …
screret May 20, 2026
a536246
Make cover plates slightly _larger_ than the block they're on, rather…
screret May 20, 2026
356aacb
Fix quad orientation filtering
screret May 20, 2026
c8f0d1c
Add element based UV calculation to StaticFaceBakery.bakeFace
screret May 20, 2026
b41cee0
Merge branch '1.20.1' into sc/fix-positive-facade-planes
gustovafing May 22, 2026
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
23 changes: 18 additions & 5 deletions src/main/java/com/gregtechceu/gtceu/client/model/pipe/ActivablePipeModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ protected BlockModelBuilder makeActiveElementModel(ResourceLocation name, @Nulla
ResourceLocation sideOverlay = this.sideOverlayActive != null ? this.sideOverlayActive : this.sideOverlay;
ResourceLocation endOverlay = this.endOverlayActive != null ? this.endOverlayActive : this.endOverlay;

makePartModelElement(model, endFace, false, faceEndpoints, 0.0f, 0, 1,
makePartModelElement(model, endFace, false, 0.0f, 0, 1,
x1, y1, z1, x2, y2, z2, side, end, SIDE_KEY, END_KEY,
this.sideActive != null, this.endActive != null);

makePartModelElement(model, endFace, true, faceEndpoints, 0.001f, 0, 1,
makePartModelElement(model, endFace, true, 0.001f, 0, 1,
x1, y1, z1, x2, y2, z2, sideSecondary, endSecondary, SIDE_SECONDARY_KEY, END_SECONDARY_KEY,
this.sideSecondaryActive != null, this.endSecondaryActive != null);

makePartModelElement(model, endFace, true, faceEndpoints, 0.002f, 2, 2,
makePartModelElement(model, endFace, true, 0.002f, 2, 2,
x1, y1, z1, x2, y2, z2, sideOverlay, endOverlay, SIDE_OVERLAY_KEY, END_OVERLAY_KEY,
this.sideOverlayActive != null, this.endOverlayActive != null);

Expand All @@ -168,15 +168,28 @@ protected BlockModelBuilder makeActiveElementModel(ResourceLocation name, @Nulla

protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullable Direction endFace,
boolean useEndWithFullCube,
Reference2FloatMap<Direction> faceEndpoints,
float offset, int sideTintIndex, int endTintIndex,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2,
@Nullable ResourceLocation sideTexture,
@Nullable ResourceLocation endTexture,
String sideKey, String endKey,
boolean sideEmissive, boolean endEmissive) {
this.makePartModelElement(model, endFace, useEndWithFullCube, faceEndpoints, offset,
this.makePartModelElement(model, endFace, useEndWithFullCube, false, offset,
sideTintIndex, endTintIndex, x1, y1, z1, x2, y2, z2,
sideTexture, endTexture, sideKey, endKey, sideEmissive, endEmissive);
}

protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullable Direction endFace,
boolean useEndWithFullCube, boolean alwaysAddEnd,
float offset, int sideTintIndex, int endTintIndex,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2,
@Nullable ResourceLocation sideTexture,
@Nullable ResourceLocation endTexture,
String sideKey, String endKey,
boolean sideEmissive, boolean endEmissive) {
this.makePartModelElement(model, endFace, useEndWithFullCube, alwaysAddEnd, offset,
sideTintIndex, endTintIndex, x1, y1, z1, x2, y2, z2, sideTexture, endTexture, sideKey, endKey,
(face, textureKey, builder) -> {
if (activeEmissivity == 0) {
Expand Down
107 changes: 52 additions & 55 deletions src/main/java/com/gregtechceu/gtceu/client/model/pipe/PipeModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,18 +180,18 @@ public void initModels() {
*/
@ApiStatus.OverrideOnly
protected BlockModelBuilder getOrCreateBlockModel() {
if (this.blockModel != null) {
return this.blockModel;
if (this.blockModel == null) {
// spotless:off
this.blockModel = this.provider.models().getBuilder(this.blockId.toString())
// make the "default" model be based on the center part's model
.parent(this.getOrCreateCenterElement())
.customLoader(PipeModelBuilder.begin(this.thickness, this.provider))
.centerModels(this.getOrCreateCenterElement().getLocation())
.connectionModels(this.getOrCreateConnectionElement().getLocation())
.end();
// spotless:on
}
// spotless:off
return this.blockModel = this.provider.models().getBuilder(this.blockId.toString())
// make the "default" model be based on the center part's model
.parent(this.getOrCreateCenterElement())
.customLoader(PipeModelBuilder.begin(this.thickness, this.provider))
.centerModels(this.getOrCreateCenterElement().getLocation())
.connectionModels(this.getOrCreateConnectionElement().getLocation())
.end();
// spotless:on
return this.blockModel;
}

/**
Expand All @@ -203,11 +203,11 @@ protected BlockModelBuilder getOrCreateBlockModel() {
*/
@ApiStatus.OverrideOnly
protected BlockModelBuilder getOrCreateCenterElement() {
if (this.centerElement != null) {
return this.centerElement;
if (this.centerElement == null) {
this.centerElement = makeElementModel(this.blockId.withPath(path -> "block/pipe/" + path + "/center"),
null, minCoord, minCoord, minCoord, maxCoord, maxCoord, maxCoord);
}
return this.centerElement = makeElementModel(this.blockId.withPath(path -> "block/pipe/" + path + "/center"),
null, minCoord, minCoord, minCoord, maxCoord, maxCoord, maxCoord);
return this.centerElement;
}

/**
Expand All @@ -222,12 +222,12 @@ protected BlockModelBuilder getOrCreateCenterElement() {
*/
@ApiStatus.OverrideOnly
protected BlockModelBuilder getOrCreateConnectionElement() {
if (this.connectionElement != null) {
return this.connectionElement;
if (this.connectionElement == null) {
this.connectionElement = makeElementModel(
this.blockId.withPath(path -> "block/pipe/" + path + "/connection"),
Direction.DOWN, minCoord, 0, minCoord, maxCoord, minCoord, maxCoord);
}
return this.connectionElement = makeElementModel(
this.blockId.withPath(path -> "block/pipe/" + path + "/connection"),
Direction.DOWN, minCoord, 0, minCoord, maxCoord, minCoord, maxCoord);
return this.connectionElement;
}

/**
Expand All @@ -239,10 +239,10 @@ protected BlockModelBuilder getOrCreateConnectionElement() {
*/
@ApiStatus.OverrideOnly
protected ItemModelBuilder getOrCreateItemModel() {
if (this.itemModel != null) {
return this.itemModel;
if (this.itemModel == null) {
this.itemModel = createItemModel(this.blockId, this.minCoord, this.maxCoord);
}
return this.itemModel = createItemModel(this.blockId, this.minCoord, this.maxCoord);
return this.itemModel;
}

/**
Expand Down Expand Up @@ -275,22 +275,14 @@ public IGeneratedBlockState createBlockState() {
* @return An item model builder.
*/
protected ItemModelBuilder createItemModel(ResourceLocation name, float min, float max) {
Reference2FloatMap<Direction> faceEndpoints = new Reference2FloatOpenHashMap<>();
faceEndpoints.put(Direction.DOWN, min);
faceEndpoints.put(Direction.UP, max);
faceEndpoints.put(Direction.NORTH, 0);
faceEndpoints.put(Direction.SOUTH, 16);
faceEndpoints.put(Direction.WEST, min);
faceEndpoints.put(Direction.EAST, max);

ItemModelBuilder model = this.provider.itemModels().getBuilder(name.toString())
.parent(this.getOrCreateCenterElement());
makePartModelElement(model, Direction.NORTH, false, faceEndpoints, 0.0f, 0, 1,
makePartModelElement(model, Direction.NORTH, false, true, 0.0f, 0, 1,
min, min, 0, max, max, 16, this.side, this.end, SIDE_KEY, END_KEY);
makePartModelElement(model, Direction.NORTH, true, faceEndpoints, 0.001f, 0, 1,
makePartModelElement(model, Direction.NORTH, true, true, 0.001f, 0, 1,
min, min, 0, max, max, 16, this.sideSecondary, this.endSecondary, SIDE_SECONDARY_KEY,
END_SECONDARY_KEY);
makePartModelElement(model, Direction.NORTH, true, faceEndpoints, 0.002f, 2, 2,
makePartModelElement(model, Direction.NORTH, true, true, 0.002f, 2, 2,
min, min, 0, max, max, 16, this.sideOverlay, this.endOverlay, SIDE_OVERLAY_KEY, END_OVERLAY_KEY);
return model;
}
Expand All @@ -311,38 +303,47 @@ protected ItemModelBuilder createItemModel(ResourceLocation name, float min, flo
protected BlockModelBuilder makeElementModel(ResourceLocation name, @Nullable Direction endFace,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2) {
Reference2FloatMap<Direction> faceEndpoints = makeFaceEndpointMap(x1, y1, z1, x2, y2, z2);

BlockModelBuilder model = this.provider.models().getBuilder(name.toString())
.parent(new ModelFile.UncheckedModelFile("block/block"))
.texture("particle", "#" + (this.side != null ? SIDE_KEY : END_KEY))
.renderType(RENDERTYPE_CUTOUT_MIPPED);
makePartModelElement(model, endFace, false, faceEndpoints, 0.0f, 0, 1,
makePartModelElement(model, endFace, false, 0.0f, 0, 1,
x1, y1, z1, x2, y2, z2, this.side, this.end, SIDE_KEY, END_KEY);
makePartModelElement(model, endFace, true, faceEndpoints, 0.001f, 0, 1,
makePartModelElement(model, endFace, true, 0.001f, 0, 1,
x1, y1, z1, x2, y2, z2, this.sideSecondary, this.endSecondary, "side_secondary", "end_secondary");
makePartModelElement(model, endFace, true, faceEndpoints, 0.002f, 2, 2,
makePartModelElement(model, endFace, true, 0.002f, 2, 2,
x1, y1, z1, x2, y2, z2, this.sideOverlay, this.endOverlay, "side_overlay", "end_overlay");
return model;
}

protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullable Direction endFace,
boolean useEndWithFullCube,
Reference2FloatMap<Direction> faceEndpoints,
float offset, int sideTintIndex, int endTintIndex,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2,
@Nullable ResourceLocation sideTexture,
@Nullable ResourceLocation endTexture,
String sideKey, String endKey) {
makePartModelElement(model, endFace, useEndWithFullCube, faceEndpoints,
makePartModelElement(model, endFace, useEndWithFullCube, false,
offset, sideTintIndex, endTintIndex, x1, y1, z1, x2, y2, z2,
sideTexture, endTexture, sideKey, endKey);
}

protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullable Direction endFace,
boolean useEndWithFullCube, boolean alwaysAddEnd,
float offset, int sideTintIndex, int endTintIndex,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2,
@Nullable ResourceLocation sideTexture,
@Nullable ResourceLocation endTexture,
String sideKey, String endKey) {
makePartModelElement(model, endFace, useEndWithFullCube, alwaysAddEnd,
offset, sideTintIndex, endTintIndex, x1, y1, z1, x2, y2, z2,
sideTexture, endTexture, sideKey, endKey, (face, texture, builder) -> {});
}

protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullable Direction endFace,
boolean useEndWithFullCube,
Reference2FloatMap<Direction> faceEndpoints,
boolean useEndWithFullCube, boolean alwaysAddEnd,
float offset, int sideTintIndex, int endTintIndex,
final float x1, final float y1, final float z1,
final float x2, final float y2, final float z2,
Expand All @@ -365,20 +366,18 @@ protected <T extends ModelBuilder<T>> void makePartModelElement(T model, @Nullab
.to(x2 + offset, y2 + offset, z2 + offset);

for (Direction dir : GTUtil.DIRECTIONS) {
ModelBuilder<T>.ElementBuilder.FaceBuilder face = null;
boolean isEnd = !fullCube && endFace != null && (endFace == dir || endFace == dir.getOpposite());
if (!alwaysAddEnd && endFace == dir.getOpposite()) {
// skip the inside face
continue;
}
boolean isEnd = !fullCube && endFace == dir;
if (isEnd && endTexture != null) {
face = element.face(dir).texture("#" + endKey).tintindex(endTintIndex);
var face = element.face(dir).cullface(dir).texture("#" + endKey).tintindex(endTintIndex);
faceConfigurator.accept(dir, endKey, face);
} else if (!isEnd && sideTexture != null) {
face = element.face(dir).texture("#" + sideKey).tintindex(sideTintIndex);
var face = element.face(dir).texture("#" + sideKey).tintindex(sideTintIndex);
faceConfigurator.accept(dir, sideKey, face);
}

float faceEnd = faceEndpoints.getFloat(dir);
if (face != null && (faceEnd >= 16.0f || faceEnd <= 0.0f)) {
face.cullface(dir);
}
}
}

Expand Down Expand Up @@ -427,9 +426,7 @@ public interface FaceConfigurator<T extends ModelBuilder<T>> {
* @param texture The texture of the face, usually in {@code #reference} format.
* <b>Note that the String does NOT begin with {@code #}</b>.
* @param builder The face builder.
* @see ActivablePipeModel#makePartModelElement(ModelBuilder, Direction, boolean, Reference2FloatMap, float,
* int, int, float, float, float, float, float, float, ResourceLocation, ResourceLocation, String, String,
* boolean, boolean) ActivablePipeModel.makePartModelElement
* @see #makePartModelElement(ModelBuilder, Direction, boolean, float, int, int, float, float, float, float, float, float, ResourceLocation, ResourceLocation, String, String) ActivablePipeModel.makePartModelElement
*/
void accept(Direction face, String texture, ModelBuilder<T>.ElementBuilder.FaceBuilder builder);
}
Expand Down
Loading
Loading