Skip to content

Commit dba3a5d

Browse files
Render the solid active blocks on the solid layer (GregTechCEu#1248)
update CTM meta accordingly. I do not know why this worked before as is.
1 parent f39c6e5 commit dba3a5d

File tree

10 files changed

+10
-15
lines changed

10 files changed

+10
-15
lines changed

src/main/java/gregtech/api/block/VariantActiveBlock.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@ protected boolean canSilkHarvest() {
5858
return false;
5959
}
6060

61-
@Override
62-
public BlockRenderLayer getRenderLayer() {
63-
return BlockRenderLayer.CUTOUT;
64-
}
65-
6661
@Override
6762
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) {
68-
return layer == getRenderLayer() || layer == BloomEffectUtil.BLOOM;
63+
return layer == getRenderLayer() || layer == BloomEffectUtil.getRealBloomLayer();
6964
}
7065

7166
@Nonnull

src/main/java/gregtech/client/model/modelfactories/ActiveVariantBlockBakedModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public List<BakedQuad> getQuads(@Nullable IBlockState state, @Nullable EnumFacin
6060
IBakedModel m = Minecraft.getMinecraft().blockRenderDispatcher.getBlockModelShapes().getModelManager().getModel(mrl);
6161
TextureAtlasSprite textureAtlasSprite = m.getParticleTexture();
6262
particle.set(textureAtlasSprite);
63-
if (MinecraftForgeClient.getRenderLayer() == BloomEffectUtil.BLOOM) {
63+
if (MinecraftForgeClient.getRenderLayer() == BloomEffectUtil.getRealBloomLayer()) {
6464
if (ConfigHolder.client.casingsActiveEmissiveTextures) {
6565
quads = new ArrayList<>();
6666
for (BakedQuad b : m.getQuads(state, side, rand)) {

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_cupronickel.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_cupronickel_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_hssg.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_hssg_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_kanthal.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_kanthal_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_naquadah.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_naquadah_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_nichrome.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_nichrome_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_trinium.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_trinium_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_tritanium.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_tritanium_ctm"
88
],

src/main/resources/assets/gregtech/textures/blocks/casings/coils/machine_coil_tungstensteel.png.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ctm": {
33
"ctm_version": 1,
44
"type": "CTM",
5-
"layer": "CUTOUT",
5+
"layer": "SOLID",
66
"textures": [
77
"gregtech:blocks/casings/coils/machine_coil_tungstensteel_ctm"
88
],

0 commit comments

Comments
 (0)