tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes startup warning for missing block, and fixes orientation of stair item models.

Browse source
This commit is contained in:
Sebastian Hartte 2016-08-26 02:35:58 +02:00
parent 5211bf4c98
commit ea6c892ec0
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/appeng/core/api/definitions/ApiBlocks.java
View file

@ -20,6 +20,7 @@ package appeng.core.api.definitions;
import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockDispenser;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@ -351,6 +352,15 @@ public final class ApiBlocks implements IBlocks
{ {
return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) ) return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
.features( AEFeature.DecorativeQuartzBlocks ) .features( AEFeature.DecorativeQuartzBlocks )
.rendering( new BlockRenderingCustomizer()
{
@Override
@SideOnly( Side.CLIENT )
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
itemRendering.model( new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, registryName ), "facing=east,half=bottom,shape=straight" ) );
}
} )
.build(); .build();
} }

2
src/main/resources/assets/appliedenergistics2/models/item/material_invalid_type.json
View file

@ -1,3 +1,3 @@
{ {
"parent": "builtin/missing" "parent": "block/block"
} }