From e1e649caf7e34900e77a73cb200194dcd9da0854 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Fri, 26 Aug 2016 00:45:04 +0200 Subject: [PATCH] Fixes glass rendering and item model for vibrant glass. --- src/main/java/appeng/decorative/solid/BlockQuartzGlass.java | 2 +- .../models/item/{quartz_lamp.json => quartz_vibrant_glass.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/assets/appliedenergistics2/models/item/{quartz_lamp.json => quartz_vibrant_glass.json} (100%) diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index 63c187bf..7e0e0747 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -61,7 +61,7 @@ public class BlockQuartzGlass extends AEBaseBlock } @Override - public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) + public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) { for( EnumFacing facing : EnumFacing.values() ) { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_lamp.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/quartz_lamp.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json