Fix sapling rendering

This commit is contained in:
marcin212 committed 2016-10-27 05:20:23 +02:00
1 parent c91a0c601f
commit c201768ffa
11 files changed
+183 -14

No files matched your search

@@ -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<BakedQuad> getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) {
List<BakedQuad> quads = mainModel.getQuads(state, side, rand);
List<BakedQuad> 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();
}
}
@@ -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<ModelResourceLocation> 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));
});
}
}