diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch index 4f6cd2e15e..78f75f8215 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch @@ -132,7 +132,7 @@ + protected BakedQuad makeBakedQuad(BlockPart p_177589_1_, BlockPartFace p_177589_2_, TextureAtlasSprite p_177589_3_, EnumFacing p_177589_4_, net.minecraftforge.client.model.ITransformation p_177589_5_, boolean p_177589_6_) + { -+ return this.field_177607_l.makeBakedQuad(p_177589_1_.field_178241_a, p_177589_1_.field_178239_b, p_177589_2_, p_177589_3_, p_177589_4_, p_177589_5_, p_177589_1_.field_178237_d, p_177589_6_, p_177589_1_.field_178238_e); ++ return this.field_177607_l.makeBakedQuad(p_177589_1_.field_178241_a, p_177589_1_.field_178239_b, p_177589_2_, p_177589_3_, p_177589_4_, p_177589_5_, p_177589_1_.field_178237_d, p_177589_6_, false); + } + private void func_177597_h() diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch index e256ce39c0..00f4a4f0e0 100644 --- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch @@ -31,15 +31,16 @@ int j = blockrenderlayer1.ordinal(); if (block.func_176223_P().func_185901_i() != EnumBlockRenderType.INVISIBLE) -@@ -191,6 +195,7 @@ +@@ -191,6 +195,8 @@ aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, iblockaccess, vertexbuffer); } + } ++ net.minecraftforge.client.ForgeHooksClient.setRenderLayer(null); } for (BlockRenderLayer blockrenderlayer : BlockRenderLayer.values()) -@@ -413,6 +418,26 @@ +@@ -413,6 +419,26 @@ return this.field_178593_n && this.field_188284_q; } diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 541683a881..111dad6c41 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -149,13 +149,7 @@ public class ForgeHooksClient renderPass = pass; } - static final ThreadLocal renderLayer = new ThreadLocal() - { - protected BlockRenderLayer initialValue() - { - return BlockRenderLayer.SOLID; - } - }; + static final ThreadLocal renderLayer = new ThreadLocal(); public static void setRenderLayer(BlockRenderLayer layer) { @@ -525,13 +519,16 @@ public class ForgeHooksClient public static void putQuadColor(VertexBuffer renderer, BakedQuad quad, int color) { - float cr = color & 0xFF; + float cb = color & 0xFF; float cg = (color >>> 8) & 0xFF; - float cb = (color >>> 16) & 0xFF; + float cr = (color >>> 16) & 0xFF; float ca = (color >>> 24) & 0xFF; + VertexFormat format = quad.getFormat(); + int size = format.getIntegerSize(); + int offset = format.getColorOffset() / 4; // assumes that color is aligned for(int i = 0; i < 4; i++) { - int vc = quad.getVertexData()[3 + 7 * i]; + int vc = quad.getVertexData()[offset + size * i]; float vcr = vc & 0xFF; float vcg = (vc >>> 8) & 0xFF; float vcb = (vc >>> 16) & 0xFF; diff --git a/src/main/java/net/minecraftforge/client/model/IColoredBakedQuad.java b/src/main/java/net/minecraftforge/client/model/IColoredBakedQuad.java deleted file mode 100644 index e8acab1cb7..0000000000 --- a/src/main/java/net/minecraftforge/client/model/IColoredBakedQuad.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.minecraftforge.client.model; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.util.EnumFacing; - -public interface IColoredBakedQuad { - public static class ColoredBakedQuad extends BakedQuad implements IColoredBakedQuad - { - public ColoredBakedQuad(int[] data, int tintIndex, EnumFacing side, TextureAtlasSprite sprite, VertexFormat format) - { - super(data, tintIndex, side, sprite, format); - } - } -} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java index 074e687e55..c9467393ce 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java +++ b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java @@ -206,7 +206,6 @@ public final class ItemTextureQuadConverter UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(format); builder.setQuadTint(-1); builder.setQuadOrientation(side); - builder.setQuadColored(); if (side == EnumFacing.NORTH) { diff --git a/src/main/java/net/minecraftforge/client/model/ModelFluid.java b/src/main/java/net/minecraftforge/client/model/ModelFluid.java index a876fc4796..be1134a11c 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelFluid.java +++ b/src/main/java/net/minecraftforge/client/model/ModelFluid.java @@ -209,7 +209,6 @@ public final class ModelFluid implements IModelCustomData EnumFacing side = gas ? EnumFacing.DOWN : EnumFacing.UP; UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(format); builder.setQuadOrientation(side); - builder.setQuadColored(); for(int i = gas ? 3 : 0; i != (gas ? -1 : 4); i+= (gas ? -1 : 1)) { putVertex( @@ -225,7 +224,6 @@ public final class ModelFluid implements IModelCustomData side = side.getOpposite(); builder = new UnpackedBakedQuad.Builder(format); builder.setQuadOrientation(side); - builder.setQuadColored(); for(int i = gas ? 3 : 0; i != (gas ? -1 : 4); i+= (gas ? -1 : 1)) { putVertex( @@ -247,7 +245,6 @@ public final class ModelFluid implements IModelCustomData { builder = new UnpackedBakedQuad.Builder(format); builder.setQuadOrientation(side); - builder.setQuadColored(); for(int j = 0; j < 4; j++) { int l = (k * 3) + (1 - 2 * k) * j; @@ -269,7 +266,6 @@ public final class ModelFluid implements IModelCustomData // 1 quad for inventory UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(format); builder.setQuadOrientation(EnumFacing.UP); - builder.setQuadColored(); for(int i = 0; i < 4; i++) { putVertex( @@ -299,11 +295,10 @@ public final class ModelFluid implements IModelCustomData builder.put(e, data); break; case COLOR: - float d = LightUtil.diffuseLight(side); builder.put(e, - d * ((color >> 16) & 0xFF) / 255f, - d * ((color >> 8) & 0xFF) / 255f, - d * (color & 0xFF) / 255f, + ((color >> 16) & 0xFF) / 255f, + ((color >> 8) & 0xFF) / 255f, + (color & 0xFF) / 255f, ((color >> 24) & 0xFF) / 255f); break; case UV: if(format.getElement(e).getIndex() == 0) diff --git a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java index b110763cb9..347884188c 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java @@ -164,7 +164,7 @@ public final class MultiLayerModel implements IModelCustomData { return quads.get(Optional.fromNullable(side)); } - else if(!models.containsKey(layer)) + else if(!models.containsKey(Optional.of(layer))) { model = missing; } @@ -172,6 +172,7 @@ public final class MultiLayerModel implements IModelCustomData { model = models.get(Optional.of(layer)); } + // assumes that child model will handle this state properly. FIXME? return model.getQuads(state, side, rand); } diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index 7196cda27c..34371c50f2 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -717,7 +717,6 @@ public final class B3DLoader implements ICustomModelLoader { UnpackedBakedQuad.Builder quadBuilder = new UnpackedBakedQuad.Builder(format); quadBuilder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); - quadBuilder.setQuadColored(); List textures = null; if(f.getBrush() != null) textures = f.getBrush().getTextures(); TextureAtlasSprite sprite; @@ -744,14 +743,13 @@ public final class B3DLoader implements ICustomModelLoader builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, 1); break; case COLOR: - float d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); if(v.getColor() != null) { - builder.put(e, d * v.getColor().x, d * v.getColor().y, d * v.getColor().z, v.getColor().w); + builder.put(e, v.getColor().x, v.getColor().y, v.getColor().z, v.getColor().w); } else { - builder.put(e, d, d, d, 1); + builder.put(e, 1, 1, 1, 1); } break; case UV: diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java index 5c9df533cc..fc53067645 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -1400,7 +1400,6 @@ public class OBJModel implements IRetexturableModel, IModelCustomData } else sprite = this.textures.get(f.getMaterialName()); UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(format); builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); - builder.setQuadColored(); Normal faceNormal = f.getNormal(); putVertexData(builder, f.verts[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], sprite); putVertexData(builder, f.verts[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], sprite); @@ -1423,20 +1422,14 @@ public class OBJModel implements IRetexturableModel, IModelCustomData builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); break; case COLOR: - float d; - if (v.hasNormal()) - d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z); - else - d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); - if (v.getMaterial() != null) builder.put(e, - d * v.getMaterial().getColor().x, - d * v.getMaterial().getColor().y, - d * v.getMaterial().getColor().z, + v.getMaterial().getColor().x, + v.getMaterial().getColor().y, + v.getMaterial().getColor().z, v.getMaterial().getColor().w); else - builder.put(e, d, d, d, 1); + builder.put(e, 1, 1, 1, 1); break; case UV: if (!v.hasTextureCoordinate()) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java index 92cf355ca9..f079cb17cd 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java @@ -17,7 +17,6 @@ public interface IVertexConsumer void setQuadTint(int tint); void setQuadOrientation(EnumFacing orientation); - void setQuadColored(); void put(int element, float... data); } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java index de273c2f41..c6e7bdb740 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java @@ -8,7 +8,6 @@ import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUsage; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.model.IColoredBakedQuad; import org.apache.commons.lang3.tuple.Pair; @@ -89,10 +88,6 @@ public class LightUtil { consumer.setQuadTint(quad.getTintIndex()); } - if(quad instanceof IColoredBakedQuad) - { - consumer.setQuadColored(); - } //int[] eMap = mapFormats(consumer.getVertexFormat(), DefaultVertexFormats.ITEM); float[] data = new float[4]; VertexFormat formatFrom = consumer.getVertexFormat(); @@ -281,19 +276,11 @@ public class LightUtil public static void renderQuadColor(VertexBuffer wr, BakedQuad quad, int auxColor) { wr.addVertexData(quad.getVertexData()); - if(quad instanceof IColoredBakedQuad) - { - ForgeHooksClient.putQuadColor(wr, quad, auxColor); - } - else - { - wr.putColor4(auxColor); - } + ForgeHooksClient.putQuadColor(wr, quad, auxColor); } public static class ItemConsumer extends VertexTransformer { - private boolean colored = false; private int vertices = 0; private float[] auxColor = new float[]{1, 1, 1, 1}; @@ -309,23 +296,14 @@ public class LightUtil System.arraycopy(auxColor, 0, this.auxColor, 0, this.auxColor.length); } - @Override - public void setQuadColored() - { - colored = true; - } - public void put(int element, float... data) { if(getVertexFormat().getElement(element).getUsage() == EnumUsage.COLOR) { System.arraycopy(auxColor, 0, buf, 0, buf.length); - if(colored) + for(int i = 0; i < 4; i++) { - for(int i = 0; i < 4; i++) - { - buf[i] *= data[i]; - } + buf[i] *= data[i]; } super.put(element, buf); } @@ -339,7 +317,6 @@ public class LightUtil if(vertices == 4) { vertices = 0; - colored = false; } } } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java index 8e04342919..1dc298bd95 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java @@ -4,7 +4,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IColoredBakedQuad; // advantages: non-fixed-length vertex format, no overhead of packing and unpacking attributes to transform the model // disadvantages: (possibly) larger memory footprint, overhead on packing the attributes at the final rendering stage @@ -48,10 +47,6 @@ public class UnpackedBakedQuad extends BakedQuad consumer.setQuadTint(getTintIndex()); } consumer.setQuadOrientation(getFace()); - if(this instanceof IColoredBakedQuad) - { - consumer.setQuadColored(); - } for(int v = 0; v < 4; v++) { for(int e = 0; e < consumer.getVertexFormat().getElementCount(); e++) @@ -68,14 +63,6 @@ public class UnpackedBakedQuad extends BakedQuad } } - public static class Colored extends UnpackedBakedQuad implements IColoredBakedQuad - { - public Colored(float[][][] unpackedData, int tint, EnumFacing orientation, TextureAtlasSprite texture, VertexFormat format) - { - super(unpackedData, tint, orientation, texture, format); - } - } - public static class Builder implements IVertexConsumer { private final VertexFormat format; @@ -83,7 +70,6 @@ public class UnpackedBakedQuad extends BakedQuad private int tint = -1; private EnumFacing orientation; private TextureAtlasSprite texture; - private boolean isColored = false; private int vertices = 0; private int elements = 0; @@ -115,11 +101,6 @@ public class UnpackedBakedQuad extends BakedQuad this.texture = texture; } - public void setQuadColored() - { - this.isColored = true; - } - public void put(int element, float... data) { for(int i = 0; i < 4; i++) @@ -151,10 +132,6 @@ public class UnpackedBakedQuad extends BakedQuad { throw new IllegalStateException("not enough data"); } - if(isColored) - { - return new Colored(unpackedData, tint, orientation, texture, format); - } return new UnpackedBakedQuad(unpackedData, tint, orientation, texture, format); } } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java index 7a783b4d97..f07e1498c5 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java @@ -57,5 +57,4 @@ public class VertexBufferConsumer implements IVertexConsumer public void setQuadTint(int tint) {} public void setQuadOrientation(EnumFacing orientation) {} - public void setQuadColored() {} } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java index 5ffd67f67b..3f5d9132af 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java @@ -148,6 +148,11 @@ public class VertexLighterFlat extends QuadGatheringTransformer if(skyLight > lightmap[v][1]) lightmap[v][1] = skyLight; } updateColor(normal[v], color[v], x, y, z, tint, multiplier); + float diffuse = LightUtil.diffuseLight(normal[v][0], normal[v][1], normal[v][2]); + for(int i = 0; i < 3; i++) + { + color[v][i] *= diffuse; + } if(EntityRenderer.anaglyphEnable) { applyAnaglyph(color[v]); @@ -234,7 +239,6 @@ public class VertexLighterFlat extends QuadGatheringTransformer } public void setQuadOrientation(EnumFacing orientation) {} public void setQuadCulled() {} - public void setQuadColored() {} public void setWorld(IBlockAccess world) { diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java index 5fe6565ed9..7a384675d4 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexTransformer.java @@ -27,11 +27,6 @@ public class VertexTransformer implements IVertexConsumer parent.setQuadOrientation(orientation); } - public void setQuadColored() - { - parent.setQuadColored(); - } - public void put(int element, float... data) { parent.put(element, data); diff --git a/src/test/resources/assets/forgedebugmodelanimation/blockstates/test_animation_block.json b/src/test/resources/assets/forgedebugmodelanimation/blockstates/test_animation_block.json index 6fc5602258..f2faef79e5 100644 --- a/src/test/resources/assets/forgedebugmodelanimation/blockstates/test_animation_block.json +++ b/src/test/resources/assets/forgedebugmodelanimation/blockstates/test_animation_block.json @@ -16,14 +16,7 @@ "variants": { "normal": [{}], "inventory": [{ - "transform": { - "rotation": { "y": 180 }, - "thirdperson": { - "rotation": [ { "z": 170 }, { "y": -45 }, { "z": 20 } ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": 0.375 - } - }, + "transform": "forge:default-block", "model": "forgedebugmodelanimation:engine", "submodel": { "ring": { "model": "forgedebugmodelanimation:engine_ring" } diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/CustomModelBlock.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/CustomModelBlock.json index e4e82e072e..ced7cffd1c 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/CustomModelBlock.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/CustomModelBlock.json @@ -13,14 +13,7 @@ "variants": { "normal": [{}], "inventory": [{ - "transform": { - "rotation": { "y": 180 }, - "thirdperson": { - "rotation": [ { "z": 170 }, { "y": -45 }, { "z": 20 } ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": 0.375 - } - } + "transform": "forge:default-block" }], "facing": { "down": {"x": 90}, diff --git a/src/test/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json b/src/test/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json index 15a23f01cf..e5ff027bd1 100644 --- a/src/test/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json +++ b/src/test/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json @@ -7,13 +7,16 @@ "base": "forgedebugmultilayermodel:test_layer_block#aux", // per-layer models "Solid": "forgedebugmultilayermodel:test_layer_block#aux", - "Translucent": "minecraft:pink_stained_glass_pane#east=true,north=false,south=false,west=true" + "Translucent": "forgedebugmultilayermodel:test_layer_block#pane" }, "transform": "forge:default-block" }, "variants": { "normal": [{}], "inventory": [{}], + "pane": [{ + "model": "minecraft:pink_stained_glass_pane_noside" + }], "aux": [{ "model": "cube_all", "textures": { "all": "blocks/slime" },