diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 64f5bac97..3f1dbd7f3 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -24,10 +24,13 @@ import java.util.Random; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -41,12 +44,32 @@ import appeng.util.Platform; public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock { + + private static final PropertyBool POWERED = PropertyBool.create( "powered" ); + public BlockQuartzGrowthAccelerator() { super( Material.ROCK ); this.setSoundType( SoundType.METAL ); this.setTileEntity( TileQuartzGrowthAccelerator.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); + this.setDefaultState( getDefaultState().withProperty( POWERED, false ) ); + } + + @Override + public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) + { + TileQuartzGrowthAccelerator te = getTileEntity( world, pos ); + boolean powered = te != null && te.isPowered(); + + return super.getActualState( state, world, pos ) + .withProperty( POWERED, powered ); + } + + @Override + protected IProperty[] getAEStates() + { + return new IProperty[] { AE_BLOCK_FORWARD, AE_BLOCK_UP, POWERED }; } @Override diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json new file mode 100644 index 000000000..921614b15 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json @@ -0,0 +1,6 @@ +{ + "variants": { + "powered=false": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.off" }, + "powered=true": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.on" } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json new file mode 100644 index 000000000..de3d38e07 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSide", + "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator", + "top": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json new file mode 100644 index 000000000..87fabfcd5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSideOn", + "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn", + "top": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json new file mode 100644 index 000000000..bb40520b8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockQuartzGrowthAccelerator.off" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png new file mode 100644 index 000000000..01f89df10 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png new file mode 100644 index 000000000..b2e260be8 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta new file mode 100644 index 000000000..935410988 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png new file mode 100644 index 000000000..d98c1c4ac Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png new file mode 100644 index 000000000..3b90a175c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta new file mode 100644 index 000000000..935410988 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +}