mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 19:39:37 +00:00
Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2
This commit is contained in:
commit
a5019da906
2 files changed
+102
No files matched your search
@@ -0,0 +1,92 @@
|
||||
package binnie.extratrees.models;
|
||||
|
||||
import binnie.extratrees.block.BlockETDefaultLeaves;
|
||||
import binnie.extratrees.genetics.ETTreeDefinition;
|
||||
import com.google.common.base.Preconditions;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
import forestry.api.arboriculture.ILeafSpriteProvider;
|
||||
import forestry.api.arboriculture.ITreeGenome;
|
||||
import forestry.api.core.IModelBaker;
|
||||
import forestry.core.models.ModelBlockCached;
|
||||
import forestry.core.models.baker.ModelBaker;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class ModelDefaultETLeaves extends ModelBlockCached<BlockETDefaultLeaves, ETTreeDefinition> {
|
||||
|
||||
public ModelDefaultETLeaves() {
|
||||
super(BlockETDefaultLeaves.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ETTreeDefinition getInventoryKey(ItemStack stack) {
|
||||
Block block = Block.getBlockFromItem(stack.getItem());
|
||||
Preconditions.checkArgument(block instanceof BlockETDefaultLeaves, "ItemStack must be for default leaves.");
|
||||
BlockETDefaultLeaves bBlock = (BlockETDefaultLeaves) block;
|
||||
return bBlock.getTreeType(stack.getMetadata());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ETTreeDefinition getWorldKey(IBlockState state) {
|
||||
Block block = state.getBlock();
|
||||
Preconditions.checkArgument(block instanceof BlockETDefaultLeaves, "state must be for default leaves.");
|
||||
BlockETDefaultLeaves bBlock = (BlockETDefaultLeaves) block;
|
||||
ETTreeDefinition treeDefinition = bBlock.getTreeDefinition(state);
|
||||
Preconditions.checkNotNull(treeDefinition);
|
||||
return treeDefinition;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void bakeBlock(BlockETDefaultLeaves block, ETTreeDefinition treeDefinition, IModelBaker baker, boolean inventory) {
|
||||
TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks();
|
||||
|
||||
ITreeGenome genome = treeDefinition.getGenome();
|
||||
IAlleleTreeSpecies species = genome.getPrimary();
|
||||
ILeafSpriteProvider leafSpriteProvider = species.getLeafSpriteProvider();
|
||||
|
||||
ResourceLocation leafSpriteLocation = leafSpriteProvider.getSprite(false, Proxies.render.fancyGraphicsEnabled());
|
||||
TextureAtlasSprite leafSprite = map.getAtlasSprite(leafSpriteLocation.toString());
|
||||
|
||||
// Render the plain leaf block.
|
||||
baker.addBlockModel(null, leafSprite, 0);
|
||||
|
||||
// Render overlay for fruit leaves.
|
||||
ResourceLocation fruitSpriteLocation = genome.getFruitProvider().getDecorativeSprite();
|
||||
if (fruitSpriteLocation != null) {
|
||||
TextureAtlasSprite fruitSprite = map.getAtlasSprite(fruitSpriteLocation.toString());
|
||||
baker.addBlockModel(null, fruitSprite, 1);
|
||||
}
|
||||
|
||||
// Set the particle sprite
|
||||
baker.setParticleSprite(leafSprite);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected IBakedModel bakeModel(IBlockState state, ETTreeDefinition key, BlockETDefaultLeaves block) {
|
||||
if (key == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
IModelBaker baker = new ModelBaker();
|
||||
|
||||
if (!blockClass.isInstance(block)) {
|
||||
return null;
|
||||
}
|
||||
BlockETDefaultLeaves bBlock = blockClass.cast(block);
|
||||
|
||||
//baker.setRenderBounds(Block.FULL_BLOCK_AABB);
|
||||
bakeBlock(bBlock, key, baker, false);
|
||||
|
||||
blockModel = baker.bakeModel(false);
|
||||
onCreateModel(blockModel);
|
||||
return blockModel;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,6 +4,8 @@ import binnie.Constants;
|
||||
import binnie.core.models.ModelManager;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.block.BlockETDecorativeLeaves;
|
||||
import binnie.extratrees.block.BlockETDefaultLeaves;
|
||||
import binnie.extratrees.models.ModelDefaultETLeaves;
|
||||
import binnie.extratrees.block.wood.BlockETSlab;
|
||||
import binnie.extratrees.models.ModelETDecorativeLeaves;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
@@ -73,6 +75,14 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy {
|
||||
registerBlockModel(blockModelIndex);
|
||||
}
|
||||
|
||||
for (BlockETDefaultLeaves leaves : ExtraTrees.blocks().leavesDefault) {
|
||||
String resourceName = leaves.getRegistryName().toString();
|
||||
ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName);
|
||||
ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory");
|
||||
BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModeLocation, new ModelDefaultETLeaves(), leaves);
|
||||
registerBlockModel(blockModelIndex);
|
||||
}
|
||||
|
||||
for (BlockETSlab slab : ExtraTrees.blocks().slabsDouble) {
|
||||
PluginArboriculture.proxy.registerWoodModel(slab, true);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user