Change of naming convention

Changed naming convention. All AE blocks, items and TEs were affected.
Most of assets were transfered, but some sill need help. Localizations
will be transfered in a separate commit.
Closes #46.
This commit is contained in:
elix-x
2016-08-19 12:38:21 +02:00
parent 4abc60cf8e
commit 3d2ba425ec
697 changed files with 6939 additions and 2695 deletions
@@ -35,10 +35,10 @@ import appeng.core.AEConfig;
import appeng.core.CommonHelper;
public final class ChargedQuartzOreBlock extends QuartzOreBlock
public final class BlockChargedQuartzOre extends BlockQuartzOre
{
public ChargedQuartzOreBlock()
public BlockChargedQuartzOre()
{
this.setBoostBrightnessLow( 2 );
this.setBoostBrightnessHigh( 5 );
@@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock;
import appeng.core.features.AEFeature;
public final class ChiseledQuartzBlock extends AEDecorativeBlock
public final class BlockChiseledQuartz extends AEDecorativeBlock
{
public ChiseledQuartzBlock()
public BlockChiseledQuartz()
{
super( Material.ROCK );
@@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock;
import appeng.core.features.AEFeature;
public final class FluixBlock extends AEDecorativeBlock
public final class BlockFluix extends AEDecorativeBlock
{
public FluixBlock()
public BlockFluix()
{
super( Material.ROCK );
@@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock;
import appeng.core.features.AEFeature;
public final class QuartzBlock extends AEDecorativeBlock
public final class BlockQuartz extends AEDecorativeBlock
{
public QuartzBlock()
public BlockQuartz()
{
super( Material.ROCK );
@@ -33,9 +33,9 @@ import appeng.core.features.AEFeature;
import appeng.helpers.AEGlassMaterial;
public class QuartzGlassBlock extends AEBaseBlock
public class BlockQuartzGlass extends AEBaseBlock
{
public QuartzGlassBlock()
public BlockQuartzGlass()
{
super( Material.GLASS );
this.setLightOpacity( 0 );
@@ -33,10 +33,10 @@ import appeng.core.CommonHelper;
import appeng.core.features.AEFeature;
public class QuartzLampBlock extends QuartzGlassBlock
public class BlockQuartzLamp extends BlockQuartzGlass
{
public QuartzLampBlock()
public BlockQuartzLamp()
{
this.setLightLevel( 1.0f );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
@@ -39,13 +39,13 @@ import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
public class QuartzOreBlock extends AEBaseBlock
public class BlockQuartzOre extends AEBaseBlock
{
private int boostBrightnessLow;
private int boostBrightnessHigh;
private boolean enhanceBrightness;
public QuartzOreBlock()
public BlockQuartzOre()
{
super( Material.ROCK );
this.setHardness( 3.0F );
@@ -36,11 +36,11 @@ import appeng.core.features.AEFeature;
import appeng.helpers.MetaRotation;
public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock
{
public static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
public QuartzPillarBlock()
public BlockQuartzPillar()
{
super( Material.ROCK );
this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
@@ -39,14 +39,14 @@ import appeng.core.worlddata.WorldData;
import appeng.util.Platform;
public class SkyStoneBlock extends AEBaseBlock
public class BlockSkyStone extends AEBaseBlock
{
private static final float BLOCK_RESISTANCE = 150.0f;
private static final float BREAK_SPEAK_SCALAR = 0.1f;
private static final double BREAK_SPEAK_THRESHOLD = 7.0;
private final SkystoneType type;
public SkyStoneBlock( final SkystoneType type )
public BlockSkyStone( final SkystoneType type )
{
super( Material.ROCK, Optional.of( type.name() ) );
this.setHardness( 50 );
@@ -1,21 +0,0 @@
package appeng.decorative.solid;
import javax.annotation.Nonnull;
/**
* @author thatsIch
* @version rv3 - 29.06.2015
* @since rv3 29.06.2015
*/
public class FluixIdentifier implements Identifier
{
@Nonnull
@Override
public String identifier()
{
return "fluix";
}
}
@@ -1,19 +0,0 @@
package appeng.decorative.solid;
import javax.annotation.Nonnull;
/**
*
*
* @author thatsIch
* @version rv3 - 29.06.2015
* @since rv3 29.06.2015
*/
public interface Identifier
{
@Nonnull
String identifier();
}
@@ -10,9 +10,9 @@ import net.minecraft.block.Block;
* @version rv3 - 30.06.2015
* @since rv3 30.06.2015
*/
public class FluixStairBlock extends BlockStairCommon
public class BlockFluixStair extends BlockStairCommon
{
public FluixStairBlock( final Block block, final String type )
public BlockFluixStair( final Block block, final String type )
{
super( block, type );
}
@@ -1,59 +0,0 @@
package appeng.decorative.stair;
import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import appeng.decorative.solid.Identifier;
/**
* An refactor safe implementation for stair identifiers.
* The internal Strings are not supposed to be changed,
* they are used to persist the blocks into the save file.
*
* If you change these, you will break worlds if not countered
*
* @author thatsIch
* @version rv3 - 29.06.2015
* @since rv3 29.06.2015
*/
public enum DecorativeStairIdentifier implements Identifier
{
FLUIX( "stair.fluix" ),
CHISELED_CERTUS_QUARTZ( "stair.quartz.certus.chiseled" ),
CERTUS_QUARTZ( "stair.quartz.certus" ),
CERTUS_QUARTZ_PILLAR( "stair.quartz.certus.pillar" ),
SKYSTONE( "stair.skystone" ),
SKYSTONE_BLOCK( "stair.skystone.block" ),
SKYSTONE_BRICK( "stair.skystone.brick" ),
SKYSTONE_SMALL_BRICK( "stair.skystone.brick.small" );
private final String name;
/**
* Used to register the specific blocks
*
* @param name id of the block or a unique name
*
* @see net.minecraftforge.fml.common.registry.GameRegistry#registerBlock(Block, String)
*/
DecorativeStairIdentifier( @Nonnull final String name )
{
Preconditions.checkNotNull( name );
Preconditions.checkArgument( !name.isEmpty() );
this.name = name;
}
@Nonnull
@Override
public String identifier()
{
return this.name;
}
}
@@ -1,12 +0,0 @@
package appeng.decorative.stair;
/**
* @author thatsIch
* @version rv3 - 30.06.2015
* @since rv3 30.06.2015
*/
public class FluixStairComponent
{
}
@@ -1,23 +0,0 @@
package appeng.decorative.stair;
import javax.annotation.Nonnull;
import appeng.decorative.solid.Identifier;
/**
* @author thatsIch
* @version rv3 - 29.06.2015
* @since rv3 29.06.2015
*/
public final class FluixStairIdentifier implements Identifier
{
@Nonnull
@Override
public String identifier()
{
return "stair.fluix";
}
}
@@ -27,8 +27,8 @@ public class FluixStairSupplier implements Supplier<BlockStairs>
}
@Override
public FluixStairBlock get()
public BlockFluixStair get()
{
return new FluixStairBlock( this.fluixBlockSupplier.get(), "fluix" );
return new BlockFluixStair( this.fluixBlockSupplier.get(), "fluix" );
}
}