mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 10:55:06 +00:00
Fix #1490 Crash in 1.10.2 when trying to render a Hill Cherry sapling
This commit is contained in:
1 parent
a8e4f5dde7
commit
a02af0ddf2
3 files changed
+10
-4
No files matched your search
@@ -11,10 +11,7 @@ import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.multiblock.ICharcoalPileComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.apiculture.network.packets.PacketActiveUpdate;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.blocks.BlockPile;
|
||||
import forestry.core.multiblock.IMultiblockControllerInternal;
|
||||
import forestry.core.multiblock.MultiblockRegistry;
|
||||
import forestry.core.multiblock.MultiblockValidationException;
|
||||
import forestry.core.multiblock.RectangularMultiblockControllerBase;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
@@ -22,7 +19,6 @@ import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.Translator;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
@@ -37,6 +37,9 @@ public abstract class ModelBlockCached<B extends Block, K> extends ModelBlockDef
|
||||
|
||||
@Override
|
||||
protected IBakedModel getModel(@Nonnull IBlockState state) {
|
||||
if(state == null){
|
||||
return null;
|
||||
}
|
||||
K key = getWorldKey(state);
|
||||
if (key == null) {
|
||||
return null;
|
||||
|
||||
@@ -20,6 +20,7 @@ import forestry.api.core.IModelBakerModel;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.propertys.UnlistedBlockPos;
|
||||
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;
|
||||
@@ -101,6 +102,9 @@ public abstract class ModelBlockDefault<B extends Block, K> implements IBakedMod
|
||||
}
|
||||
|
||||
protected IBakedModel getModel(ItemStack stack, World world) {
|
||||
if(stack == null){
|
||||
return null;
|
||||
}
|
||||
return bakeModel(stack, world, getInventoryKey(stack));
|
||||
}
|
||||
|
||||
@@ -187,6 +191,9 @@ public abstract class ModelBlockDefault<B extends Block, K> implements IBakedMod
|
||||
|
||||
@Override
|
||||
public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) {
|
||||
if(world == null){
|
||||
world = Proxies.common.getRenderWorld();
|
||||
}
|
||||
return getModel(stack, world);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user