From f1da7b197051655f4f8bedd9c968f588f5146e48 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Fri, 28 Feb 2014 09:27:04 -0600 Subject: [PATCH] Stone Not Rock. --- block/solids/{BlockSkyRock.java => BlockSkyStone.java} | 6 +++--- block/storage/BlockSkyChest.java | 2 +- core/Registration.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename block/solids/{BlockSkyRock.java => BlockSkyStone.java} (80%) diff --git a/block/solids/BlockSkyRock.java b/block/solids/BlockSkyStone.java similarity index 80% rename from block/solids/BlockSkyRock.java rename to block/solids/BlockSkyStone.java index 47b8c6ca6..34a45237b 100644 --- a/block/solids/BlockSkyRock.java +++ b/block/solids/BlockSkyStone.java @@ -10,11 +10,11 @@ import appeng.block.AEBaseBlock; import appeng.core.features.AEFeature; import appeng.helpers.LocationRotation; -public class BlockSkyRock extends AEBaseBlock implements IOrientableBlock +public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock { - public BlockSkyRock() { - super( BlockSkyRock.class, Material.rock ); + public BlockSkyStone() { + super( BlockSkyStone.class, Material.rock ); setfeature( EnumSet.of( AEFeature.Core ) ); setHardness( 50 ); blockResistance = 150.0f; diff --git a/block/storage/BlockSkyChest.java b/block/storage/BlockSkyChest.java index a72c4a7a4..00311ccd0 100644 --- a/block/storage/BlockSkyChest.java +++ b/block/storage/BlockSkyChest.java @@ -65,7 +65,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision @Override public IIcon getIcon(int direction, int metadata) { - return AEApi.instance().blocks().blockSkyRock.block().getIcon( direction, metadata ); + return AEApi.instance().blocks().blockSkyStone.block().getIcon( direction, metadata ); } @Override diff --git a/core/Registration.java b/core/Registration.java index 9a69921b2..38aa72ff9 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -54,7 +54,7 @@ import appeng.block.solids.BlockQuartzChiseled; import appeng.block.solids.BlockQuartzGlass; import appeng.block.solids.BlockQuartzLamp; import appeng.block.solids.BlockQuartzPillar; -import appeng.block.solids.BlockSkyRock; +import appeng.block.solids.BlockSkyStone; import appeng.block.solids.OreQuartz; import appeng.block.solids.OreQuartzCharged; import appeng.block.spatial.BlockSpatialIOPort; @@ -247,7 +247,7 @@ public class Registration blocks.blockMatrixFrame = addFeature( BlockMatrixFrame.class ); blocks.blockQuartz = addFeature( BlockQuartz.class ); blocks.blockFluix = addFeature( BlockFluix.class ); - blocks.blockSkyRock = addFeature( BlockSkyRock.class ); + blocks.blockSkyStone = addFeature( BlockSkyStone.class ); blocks.blockSkyChest = addFeature( BlockSkyChest.class ); blocks.blockQuartzGlass = addFeature( BlockQuartzGlass.class );