Skip to content

Fix Extreme Z-fighting #5057

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
Ghostipedia merged 3 commits into from
Jul 4, 2026
+1,081 −943
Merged

Fix Extreme Z-fighting #5057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd8ad56
Wave one, Json Fixes
Ghostipedia Jul 4, 2026
f7b51af
Whoops didn't meant to commit that one
Ghostipedia Jul 4, 2026
3f1ffb6
Some formatter fixing
Ghostipedia Jul 4, 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
7 changes: 3 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/client/model/quad/StaticFaceBakery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ public class StaticFaceBakery {

public static final AABB BLOCK = new AABB(0, 0, 0, 1, 1, 1);

public static final AABB SLIGHTLY_OVER_BLOCK = BLOCK.inflate(0.001);
Comment thread
Ghostipedia marked this conversation as resolved.
public static final AABB OUTPUT_OVERLAY = BLOCK.inflate(0.006);
public static final AABB AUTO_OUTPUT_OVERLAY = BLOCK.inflate(0.008);
public static final AABB COVER_OVERLAY = BLOCK.inflate(0.002);
public static final AABB COVER_OVERLAY = BLOCK.inflate(0.014);
public static final AABB OUTPUT_OVERLAY = BLOCK.inflate(0.018);
public static final AABB AUTO_OUTPUT_OVERLAY = BLOCK.inflate(0.022);

private static final int VERTEX_INT_SIZE = 8;
private static final float RESCALE_22_5 = 1.0F / (float) Math.cos((float) (Math.PI / 8)) - 1.0F;
Expand Down
39 changes: 22 additions & 17 deletions src/main/resources/assets/gtceu/models/block/fire_box_active.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
{
"parent": "block/block",
"textures": {
"active_side": "gtceu:block/casings/firebox/machine_casing_firebox_bloom",
"particle": "#side"
},
"textures": { "active_side": "gtceu:block/casings/firebox/machine_casing_firebox_bloom", "particle": "#side" },
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"up": { "texture": "#top", "cullface": "up" },
"down": { "texture": "#bottom", "cullface": "down" },
"north": { "texture": "#side", "cullface": "north" },
"south": { "texture": "#side", "cullface": "south" },
"west": { "texture": "#side", "cullface": "west" },
"east": { "texture": "#side", "cullface": "east" }
"up": { "texture": "#top", "cullface": "up" },
"down": { "texture": "#bottom", "cullface": "down" },
"north": { "texture": "#side", "cullface": "north" },
"south": { "texture": "#side", "cullface": "south" },
"west": { "texture": "#side", "cullface": "west" },
"east": { "texture": "#side", "cullface": "east" }
}
},
{
"from": [ -0.001, 0, -0.001 ],
"to": [ 16.001, 16, 16.001 ],
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [-0.032, 0, 0],
"to": [16.032, 16, 16],
"faces": {
"west": { "texture": "#active_side", "cullface": "west", "tintindex": -101 },
"east": { "texture": "#active_side", "cullface": "east", "tintindex": -101 }
}
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [0, 0, -0.032],
"to": [16, 16, 16.032],
"faces": {
"north": { "texture": "#active_side", "cullface": "north", "tintindex": -101 },
"south": { "texture": "#active_side", "cullface": "south", "tintindex": -101 },
"west": { "texture": "#active_side", "cullface": "west", "tintindex": -101 },
"east": { "texture": "#active_side", "cullface": "east", "tintindex": -101 }
"south": { "texture": "#active_side", "cullface": "south", "tintindex": -101 }
}
}
]
Expand Down
124 changes: 74 additions & 50 deletions src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,77 @@
{
"parent": "gtceu:block/machine/template/cube_all/sided",
"textures": {
"overlay_pipe": "gtceu:block/overlay/machine/overlay_pipe"
"parent": "gtceu:block/machine/template/cube_all/sided",
"textures": { "overlay_pipe": "gtceu:block/overlay/machine/overlay_pipe" },
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"down": { "texture": "#all", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#all", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#all", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#all", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#all", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#all", "cullface": "east", "tintindex": 1 }
}
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "texture": "#all", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#all", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#all", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#all", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#all", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#all", "cullface": "east", "tintindex": 1 }
}
},
{
"from": [ -0.002, -0.002, -0.002 ],
"to": [ 16.002, 16.002, 16.002 ],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" },
"south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" },
"up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" },
"down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" },
"west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" },
"east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" }
}
},
{
"from": [ -0.004, -0.004, -0.004 ],
"to": [ 16.004, 16.004, 16.004 ],
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 },
"south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 },
"up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 },
"down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 },
"west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 },
"east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 }
}
},
{
"from": [ 0, -0.01, 16 ],
"to": [ 16, -16 , 32 ],
"faces": {
"down": { "uv": [0, 0, 16, 16], "texture": "#overlay_pipe", "cullface": "down" }
}
}
]
{
"from": [-0.032, 0, 0],
"to": [16.032, 16, 16],
"faces": {
"west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" },
"east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" }
}
},
{
"from": [0, -0.032, 0],
"to": [16, 16.032, 16],
"faces": {
"up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" },
"down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" }
}
},
{
"from": [0, 0, -0.032],
"to": [16, 16, 16.032],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" },
"south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }
}
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [-0.064, 0, 0],
"to": [16.064, 16, 16],
"faces": {
"west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 },
"east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 }
}
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [0, -0.064, 0],
"to": [16, 16.064, 16],
"faces": {
"up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 },
"down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 }
}
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [0, 0, -0.064],
"to": [16, 16, 16.064],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 },
"south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 }
}
},
{
"from": [0, -0.096, 0],
"to": [16, 16, 16],
"faces": { "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_pipe", "cullface": "down" } }
}
]
}
78 changes: 36 additions & 42 deletions src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
{
"parent": "gtceu:block/overlay/2_layer/tinted/front",
"textures": {
"overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted",
"overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in",
"overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive"
"parent": "gtceu:block/overlay/2_layer/tinted/front",
"textures": {
"overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted",
"overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in",
"overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#top", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#side", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#side", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#side", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#side", "cullface": "east", "tintindex": 1 }
}
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#top", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#side", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#side", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#side", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#side", "cullface": "east", "tintindex": 1 }
}
},
{
"from": [ -0.01, -0.01, -0.01 ],
"to": [ 16.01, 16.01, 16.01 ],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 }
}
},
{
"from": [ -0.02, -0.02, -0.02 ],
"to": [ 16.02, 16.02, 16.02 ],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" }
}
},
{
"from": [ -0.02, -0.02, -0.02 ],
"to": [ 16.02, 16.02, 16.02 ],
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" }
}
}
]
{
"from": [0, 0, -0.096],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } }
},
{
"from": [0, 0, -0.128],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } }
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [0, 0, -0.128],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } }
}
]
}
78 changes: 36 additions & 42 deletions src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
{
"parent": "gtceu:block/overlay/2_layer/tinted/front",
"textures": {
"overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted",
"overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in",
"overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_in_emissive"
"parent": "gtceu:block/overlay/2_layer/tinted/front",
"textures": {
"overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted",
"overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in",
"overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_in_emissive"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#top", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#side", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#side", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#side", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#side", "cullface": "east", "tintindex": 1 }
}
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 },
"up": { "texture": "#top", "cullface": "up", "tintindex": 1 },
"north": { "texture": "#side", "cullface": "north", "tintindex": 1 },
"south": { "texture": "#side", "cullface": "south", "tintindex": 1 },
"west": { "texture": "#side", "cullface": "west", "tintindex": 1 },
"east": { "texture": "#side", "cullface": "east", "tintindex": 1 }
}
},
{
"from": [ -0.01, -0.01, -0.01 ],
"to": [ 16.01, 16.01, 16.01 ],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 }
}
},
{
"from": [ -0.02, -0.02, -0.02 ],
"to": [ 16.02, 16.02, 16.02 ],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" }
}
},
{
"from": [ -0.02, -0.02, -0.02 ],
"to": [ 16.02, 16.02, 16.02 ],
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" }
}
}
]
{
"from": [0, 0, -0.096],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } }
},
{
"from": [0, 0, -0.128],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } }
},
{
"neoforge_data": { "block_light": 15, "sky_light": 15 },
"shade": false,
"from": [0, 0, -0.128],
"to": [16, 16, 16],
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } }
}
]
}
Loading
Loading