From c201768ffa8f63bd27647dd0f26659f27899ab7c Mon Sep 17 00:00:00 2001 From: marcin212 Date: Thu, 27 Oct 2016 05:20:23 +0200 Subject: [PATCH] Fix sapling rendering --- .../core/models/DoublePassBakedModel.java | 91 ++++++++++++++++++ .../java/binnie/extratrees/ExtraTrees.java | 23 +++++ .../models/block/saplings/baseSapling.json | 48 +++++++++ .../models/block/saplings/treeConifer.json | 5 +- .../models/block/saplings/treeDefault.json | 5 +- .../models/block/saplings/treeFruit.json | 5 +- .../models/block/saplings/treeJungle.json | 5 +- .../models/block/saplings/treePalm.json | 5 +- .../models/block/saplings/treePoplar.json | 5 +- .../models/block/saplings/treeShrub.json | 5 +- .../textures/blocks/saplings/default.png | Bin 623 -> 0 bytes 11 files changed, 183 insertions(+), 14 deletions(-) create mode 100644 src/main/java/binnie/core/models/DoublePassBakedModel.java create mode 100644 src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json delete mode 100644 src/main/resources/assets/extratrees/textures/blocks/saplings/default.png diff --git a/src/main/java/binnie/core/models/DoublePassBakedModel.java b/src/main/java/binnie/core/models/DoublePassBakedModel.java new file mode 100644 index 00000000..4d1d0147 --- /dev/null +++ b/src/main/java/binnie/core/models/DoublePassBakedModel.java @@ -0,0 +1,91 @@ +package binnie.core.models; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.EnumFacing; + +import javax.annotation.Nullable; +import java.util.LinkedList; +import java.util.List; + +public class DoublePassBakedModel implements IBakedModel { + private IBakedModel mainModel; + private int primaryColor = 0xFF000000; + private int secondaryColor = 0xFF000000; + private static final int c = DefaultVertexFormats.ITEM.getColorOffset() / 4; + private static final int v = DefaultVertexFormats.ITEM.getNextOffset() / 4; + + /** + * It colorizes the quads according to tintindex, which is defined in the json file. + * + * @param mainModel old model + * @param primaryColor color for tintindex 0 + * @param secondaryColor color for tintindex 1 + */ + public DoublePassBakedModel(IBakedModel mainModel, int primaryColor, int secondaryColor) { + this.mainModel = mainModel; + this.primaryColor |= (Integer.reverseBytes(primaryColor) >> 8); + this.secondaryColor |= (Integer.reverseBytes(secondaryColor) >> 8); + } + + @Override + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { + List quads = mainModel.getQuads(state, side, rand); + List recolored = new LinkedList<>(); + quads.stream().forEach(quad -> { + if (quad.hasTintIndex()) { + if (quad.getTintIndex() == 0) + recolored.add(recolorQuad(quad, primaryColor)); + else + recolored.add(recolorQuad(quad, secondaryColor)); + } else { + recolored.add(quad); + } + }); + + return recolored; + } + + public BakedQuad recolorQuad(BakedQuad quad, int color) { + int[] vertexData = quad.getVertexData(); + for (int i = 0; i < 4; i++) { + vertexData[v * i + c] = color; + } + return quad; + } + + @Override + public boolean isAmbientOcclusion() { + return mainModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + return mainModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + return mainModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return mainModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return mainModel.getItemCameraTransforms(); + } + + @Override + public ItemOverrideList getOverrides() { + return mainModel.getOverrides(); + } +} diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 38e9ee30..a657cfb9 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -4,6 +4,7 @@ import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; +import binnie.core.models.DoublePassBakedModel; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.ExtraBees; @@ -30,7 +31,9 @@ import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; @@ -40,6 +43,9 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import java.util.List; +import java.util.stream.Collectors; + @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { @@ -167,4 +173,21 @@ public class ExtraTrees extends AbstractMod { } } + @SubscribeEvent + public void onBakedEvent(ModelBakeEvent e) { + //Find all ExtraTrees saplings + List models = e.getModelRegistry().getKeys().stream() + .filter(mrl -> mrl.getResourceDomain().startsWith(Constants.EXTRA_TREES_MOD_ID)) + .filter(mrl -> mrl.getResourcePath().startsWith("germlings")).collect(Collectors.toList()); + //Replace model + models.forEach(model -> { + String species = model.getVariant().split("=")[1]; + ExtraTreeSpecies treeSpecies = ExtraTreeSpecies.names().get(species); + int primaryColor = treeSpecies.getSpriteColour(1); + int secondaryColor = treeSpecies.getSpriteColour(0); + e.getModelRegistry().putObject(model, new DoublePassBakedModel(e.getModelRegistry().getObject(model), primaryColor, secondaryColor)); + }); + + } + } diff --git a/src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json b/src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json new file mode 100644 index 00000000..bf7cf7c8 --- /dev/null +++ b/src/main/resources/assets/extratrees/models/block/saplings/baseSapling.json @@ -0,0 +1,48 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "minecraft:blocks/sapling_oak" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaves", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 0 } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 0 }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#leaves", "tintindex": 0 } + } + }, + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#trunk", "tintindex": 1 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#trunk", "tintindex": 1 } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#trunk" , "tintindex": 1}, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#trunk" , "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json b/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json index 6474ecdc..d37a972f 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treeConifer.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/conifer" + "leaves": "extratrees:blocks/saplings/conifer.leaves", + "trunk": "extratrees:blocks/saplings/conifer.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json b/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json index 37abbabb..f341ded2 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treeDefault.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/default" + "leaves": "extratrees:blocks/saplings/default.leaves", + "trunk": "extratrees:blocks/saplings/default.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json b/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json index 6307f330..671f1ec0 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treeFruit.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/fruit" + "leaves": "extratrees:blocks/saplings/fruit.leaves", + "trunk": "extratrees:blocks/saplings/fruit.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json b/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json index 44481202..5abee181 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treeJungle.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/jungle" + "leaves": "extratrees:blocks/saplings/jungle.leaves", + "trunk": "extratrees:blocks/saplings/jungle.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json b/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json index d958139e..296a9a9b 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treePalm.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/palm" + "leaves": "extratrees:blocks/saplings/palm.leaves", + "trunk": "extratrees:blocks/saplings/palm.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json b/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json index 9fe6e09a..cb63e823 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treePoplar.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/poplar" + "leaves": "extratrees:blocks/saplings/poplar.leaves", + "trunk": "extratrees:blocks/saplings/poplar.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json b/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json index e5fc52b2..15e723b8 100644 --- a/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json +++ b/src/main/resources/assets/extratrees/models/block/saplings/treeShrub.json @@ -1,6 +1,7 @@ { - "parent": "block/cross", + "parent": "extratrees:block/saplings/baseSapling", "textures": { - "cross": "extratrees:blocks/saplings/shrub" + "leaves": "extratrees:blocks/saplings/shrub.leaves", + "trunk": "extratrees:blocks/saplings/shrub.trunk" } } \ No newline at end of file diff --git a/src/main/resources/assets/extratrees/textures/blocks/saplings/default.png b/src/main/resources/assets/extratrees/textures/blocks/saplings/default.png deleted file mode 100644 index 50e60305e9f6acedc6c2f05b1a365d9d404b2bd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>A%4O3wBvD2vI=_Df9kj!*UT46){ZnRkPo2@YW!I99p7PG#lDUh! z|NsA=mv3(mbSPsEak7ak;kNUC7Ch$65BJ^NYRP{on7s^FPa?g=aEvTxN>>O|hTB&z9R=YB=bzK#pam z!Gx_M2GjLx+yhivmliFJ;`Z5lF=wlFZ0|>orPs?3DvB9N^d(qM+rT!t#OiU)#+aYM zJ+a!`Zfbe`Xufmp?mbi4C7x3bUsSm$zx;FS#KOIIAN$LnpDvznFU%(9{-Hz{=qS|^ z*NBpo#FA92