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.

src/main/java/appeng/core/Registration.java

@@ -74,7 +74,7 @@ import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.stats.PlayerStatsRegistration;
 import appeng.hooks.TickHandler;
-import appeng.items.materials.MultiItem;
+import appeng.items.materials.ItemMultiItem;
 import appeng.loot.ChestLoot;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;
@@ -252,7 +252,7 @@ public final class Registration
 		final IRegistryContainer registries = api.registries();
 
 		// Perform ore camouflage!
-		MultiItem.instance.makeUnique();
+		ItemMultiItem.instance.makeUnique();
 
 		final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler );
 		recipeLoader.run();

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -65,16 +65,16 @@ import appeng.debug.BlockChunkloader;
 import appeng.debug.BlockCubeGenerator;
 import appeng.debug.BlockItemGen;
 import appeng.debug.BlockPhantomNode;
-import appeng.decorative.solid.ChargedQuartzOreBlock;
-import appeng.decorative.solid.ChiseledQuartzBlock;
-import appeng.decorative.solid.FluixBlock;
-import appeng.decorative.solid.QuartzBlock;
-import appeng.decorative.solid.QuartzGlassBlock;
-import appeng.decorative.solid.QuartzLampBlock;
-import appeng.decorative.solid.QuartzOreBlock;
-import appeng.decorative.solid.QuartzPillarBlock;
-import appeng.decorative.solid.SkyStoneBlock;
-import appeng.decorative.solid.SkyStoneBlock.SkystoneType;
+import appeng.decorative.solid.BlockChargedQuartzOre;
+import appeng.decorative.solid.BlockChiseledQuartz;
+import appeng.decorative.solid.BlockFluix;
+import appeng.decorative.solid.BlockQuartz;
+import appeng.decorative.solid.BlockQuartzGlass;
+import appeng.decorative.solid.BlockQuartzLamp;
+import appeng.decorative.solid.BlockQuartzOre;
+import appeng.decorative.solid.BlockQuartzPillar;
+import appeng.decorative.solid.BlockSkyStone;
+import appeng.decorative.solid.BlockSkyStone.SkystoneType;
 import appeng.decorative.stair.BlockStairCommon;
 
 
@@ -162,20 +162,20 @@ public final class ApiBlocks implements IBlocks
 	public ApiBlocks( final DefinitionConstructor constructor )
 	{
 		// this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() );
-		this.quartzOre = constructor.registerBlockDefinition( new QuartzOreBlock() );
-		this.quartzOreCharged = constructor.registerBlockDefinition( new ChargedQuartzOreBlock() );
+		this.quartzOre = constructor.registerBlockDefinition( new BlockQuartzOre() );
+		this.quartzOreCharged = constructor.registerBlockDefinition( new BlockChargedQuartzOre() );
 		this.matrixFrame = constructor.registerBlockDefinition( new BlockMatrixFrame() );
-		this.quartz = constructor.registerBlockDefinition( new QuartzBlock() );
-		this.quartzPillar = constructor.registerBlockDefinition( new QuartzPillarBlock() );
-		this.quartzChiseled = constructor.registerBlockDefinition( new ChiseledQuartzBlock() );
-		this.quartzGlass = constructor.registerBlockDefinition( new QuartzGlassBlock() );
-		this.quartzVibrantGlass = constructor.registerBlockDefinition( new QuartzLampBlock() );
+		this.quartz = constructor.registerBlockDefinition( new BlockQuartz() );
+		this.quartzPillar = constructor.registerBlockDefinition( new BlockQuartzPillar() );
+		this.quartzChiseled = constructor.registerBlockDefinition( new BlockChiseledQuartz() );
+		this.quartzGlass = constructor.registerBlockDefinition( new BlockQuartzGlass() );
+		this.quartzVibrantGlass = constructor.registerBlockDefinition( new BlockQuartzLamp() );
 		this.quartzTorch = constructor.registerBlockDefinition( new BlockQuartzTorch() );
-		this.fluix = constructor.registerBlockDefinition( new FluixBlock() );
-		this.skyStone_stone = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.STONE ) );
-		this.skyStone_block = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BLOCK ) );
-		this.skyStone_brick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BRICK ) );
-		this.skyStone_smallbrick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.SMALL_BRICK ) );
+		this.fluix = constructor.registerBlockDefinition( new BlockFluix() );
+		this.skyStone_stone = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.STONE ) );
+		this.skyStone_block = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BLOCK ) );
+		this.skyStone_brick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BRICK ) );
+		this.skyStone_smallbrick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.SMALL_BRICK ) );
 		this.skyChest = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.STONE ) );
 		this.skyChestBlock = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.BLOCK ) );
 		this.skyCompass = constructor.registerBlockDefinition( new BlockSkyCompass() );

src/main/java/appeng/core/api/definitions/ApiMaterials.java

@@ -23,7 +23,7 @@ import appeng.api.definitions.IItemDefinition;
 import appeng.api.definitions.IMaterials;
 import appeng.core.features.DamagedItemDefinition;
 import appeng.items.materials.MaterialType;
-import appeng.items.materials.MultiItem;
+import appeng.items.materials.ItemMultiItem;
 
 
 /**
@@ -105,7 +105,7 @@ public final class ApiMaterials implements IMaterials
 
 	public ApiMaterials( final DefinitionConstructor constructor )
 	{
-		final MultiItem materials = new MultiItem();
+		final ItemMultiItem materials = new ItemMultiItem();
 		constructor.registerItemDefinition( materials );
 
 		this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.Cell2SpatialPart ) );

src/main/java/appeng/core/features/AEBlockFeatureHandler.java

@@ -29,6 +29,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.IRegistry;
 import net.minecraftforge.client.model.ModelLoader;
@@ -79,7 +80,11 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 	{
 		if( this.enabled )
 		{
-			final String name = this.extractor.get();
+			String name = this.extractor.get();
+			if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) )
+			{
+				name += "_block";
+			}
 			this.featured.setCreativeTab( CreativeTab.instance );
 			this.featured.setUnlocalizedName( "appliedenergistics2." + name );
 

src/main/java/appeng/core/features/AECableBusFeatureHandler.java

@@ -83,14 +83,14 @@ public final class AECableBusFeatureHandler implements IFeatureHandler
 		{
 			final String name = this.extractor.get();
 			this.featured.setCreativeTab( CreativeTab.instance );
-			this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name );
+			this.featured.setUnlocalizedName( "appliedenergistics2." + name );
 
 			if( Platform.isClient() )
 			{
 				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
 			}
 
-			registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name );
+			registryName = new ResourceLocation( AppEng.MOD_ID, name );
 
 			// Bypass the forge magic with null to register our own itemblock later.
 			GameRegistry.register( this.featured.setRegistryName( registryName ) );

src/main/java/appeng/core/features/AETileBlockFeatureHandler.java

@@ -31,6 +31,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.IRegistry;
 import net.minecraftforge.client.ForgeHooksClient;
@@ -87,22 +88,26 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
 	{
 		if( this.enabled )
 		{
-			final String name = this.extractor.get();
+			String name = this.extractor.get();
+			if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) )
+			{
+				name += "_block";
+			}
 			this.featured.setCreativeTab( CreativeTab.instance );
-			this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name );
+			this.featured.setUnlocalizedName( "appliedenergistics2." + name );
 
 			if( Platform.isClient() )
 			{
 				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
 			}
 
-			registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name );
+			registryName = new ResourceLocation( AppEng.MOD_ID, name );
 
 			GameRegistry.register( this.featured.setRegistryName( registryName ) );
 			GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) );
 			AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) );
 
-			GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() );
+			GameRegistry.registerTileEntityWithAlternatives( this.featured.getTileEntityClass(), this.featured.toString() );
 
 			if( side == Side.CLIENT )
 			{

src/main/java/appeng/core/features/FeatureNameExtractor.java

@@ -19,6 +19,7 @@
 package appeng.core.features;
 
 
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.google.common.base.Optional;
@@ -30,6 +31,9 @@ public class FeatureNameExtractor
 	private static final Pattern PATTERN_ITEM_MULTI_MATERIAL = Pattern.compile( "ItemMultiMaterial", Pattern.LITERAL );
 	private static final Pattern PATTERN_QUARTZ = Pattern.compile( "Quartz", Pattern.LITERAL );
 
+	private static final Pattern PATTERN_LOWERCASE = Pattern.compile( "([\\p{Upper}])([\\p{Upper}]+)" );
+	private static final Pattern PATTERN_LOWERCASER = Pattern.compile( "(.)?([\\p{Upper}])" );
+
 	private final Class<?> clazz;
 	private final Optional<String> subName;
 
@@ -40,6 +44,60 @@ public class FeatureNameExtractor
 	}
 
 	public String get()
+	{
+		String ret;
+		String name = this.clazz.getSimpleName().replaceFirst( "\\p{Upper}[\\p{Lower}]*(\\p{Upper})", "$1" );
+
+		if( this.subName.isPresent() )
+		{
+			final String subName = this.subName.get();
+			// simple hack to allow me to do get nice names for these without
+			// mode code outside of AEBaseItem
+			if( subName.startsWith( "P2PTunnel" ) )
+			{
+				ret = "p2ptunnel";
+			}
+			else if( subName.equals( "CertusQuartzTools" ) )
+			{
+				ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "CertusQuartz" );
+			}
+			else if( subName.equals( "NetherQuartzTools" ) )
+			{
+				ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "NetherQuartz" );
+			}
+			else
+			{
+				ret = name + '_' + subName;
+			}
+		}
+		else
+		{
+			ret = name;
+		}
+
+		System.out.println( ret );
+		StringBuffer buffer = new StringBuffer();
+		Matcher m = PATTERN_LOWERCASE.matcher( ret );
+		while( m.find() )
+		{
+			m.appendReplacement( buffer, m.group( 1 ) + m.group( 2 ).toLowerCase() );
+		}
+		m.appendTail( buffer );
+		m = PATTERN_LOWERCASER.matcher( buffer.toString() );
+		buffer = new StringBuffer();
+		while( m.find() )
+		{
+			m.appendReplacement( buffer, ( m.group( 1 ) != null ? m.group( 1 ) + '_' : "" ) + m.group( 2 ).toLowerCase() );
+		}
+		m.appendTail( buffer );
+		ret = buffer.toString().replace( '.', '_' ).replaceAll( "_+", "_" );
+		System.out.println( ret );
+		return ret;
+	}
+
+	// To Convert devs' test worlds
+	@Deprecated
+	public String getOld()
 	{
 		String name = this.clazz.getSimpleName();
 

src/main/java/appeng/core/features/ItemFeatureHandler.java

@@ -77,7 +77,10 @@ public final class ItemFeatureHandler implements IFeatureHandler
 		if( this.enabled )
 		{
 			String name = this.extractor.get();
-			final String itemPhysicalName = name;
+			if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) )
+			{
+				name += "_item";
+			}
 
 			// this.item.setTextureName( "appliedenergistics2:" + name );
 			this.item.setUnlocalizedName( "appliedenergistics2." + name );
@@ -91,15 +94,6 @@ public final class ItemFeatureHandler implements IFeatureHandler
 				this.item.setCreativeTab( CreativeTab.instance );
 			}
 
-			if( name.equals( "ItemMaterial" ) )
-			{
-				name = "ItemMultiMaterial";
-			}
-			else if( name.equals( "ItemPart" ) )
-			{
-				name = "ItemMultiPart";
-			}
-
 			registryName = new ResourceLocation( AppEng.MOD_ID, name );
 			GameRegistry.register( this.item.setRegistryName( registryName ) );
 

src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java

@@ -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 );

src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java

@@ -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 );
 

src/main/java/appeng/decorative/solid/BlockFluix.java

@@ -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 );
 

src/main/java/appeng/decorative/solid/BlockQuartz.java

@@ -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 );
 

src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

@@ -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 );

src/main/java/appeng/decorative/solid/BlockQuartzLamp.java

@@ -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 ) );

src/main/java/appeng/decorative/solid/BlockQuartzOre.java

@@ -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 );

src/main/java/appeng/decorative/solid/BlockQuartzPillar.java

@@ -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 ) );

src/main/java/appeng/decorative/solid/BlockSkyStone.java

@@ -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 );

src/main/java/appeng/decorative/solid/FluixIdentifier.java

@@ -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";
-	}
-}

src/main/java/appeng/decorative/solid/Identifier.java

@@ -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();
-}

src/main/java/appeng/decorative/stair/BlockFluixStair.java

@@ -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 );
 	}

src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java

@@ -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;
-	}
-}

src/main/java/appeng/decorative/stair/FluixStairComponent.java

@@ -1,12 +0,0 @@
-
-package appeng.decorative.stair;
-
-
-/**
- * @author thatsIch
- * @version rv3 - 30.06.2015
- * @since rv3 30.06.2015
- */
-public class FluixStairComponent
-{
-}

src/main/java/appeng/decorative/stair/FluixStairIdentifier.java

@@ -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";
-	}
-}

src/main/java/appeng/decorative/stair/FluixStairSupplier.java

@@ -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" );
 	}
 }

src/main/java/appeng/helpers/MetaRotation.java

@@ -29,7 +29,7 @@ import net.minecraft.world.World;
 
 import appeng.api.util.IOrientable;
 import appeng.block.AEBaseBlock;
-import appeng.decorative.solid.QuartzPillarBlock;
+import appeng.decorative.solid.BlockQuartzPillar;
 
 
 public class MetaRotation implements IOrientable
@@ -73,7 +73,7 @@ public class MetaRotation implements IOrientable
 		}
 
 		//TODO 1.10.2-R - Temp
-		Axis a = state.getValue( QuartzPillarBlock.AXIS_ORIENTATION );
+		Axis a = state.getValue( BlockQuartzPillar.AXIS_ORIENTATION );
 
 		if( a == null )
 		{
@@ -104,7 +104,7 @@ public class MetaRotation implements IOrientable
 			else
 			{
 				//TODO 1.10.2-R - Temp
-				( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( QuartzPillarBlock.AXIS_ORIENTATION, up.getAxis() ) );
+				( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockQuartzPillar.AXIS_ORIENTATION, up.getAxis() ) );
 			}
 		}
 		else

src/main/java/appeng/items/materials/ItemMultiItem.java

@@ -71,15 +71,15 @@ import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 
 
-public final class MultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
+public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule
 {
-	public static MultiItem instance;
+	public static ItemMultiItem instance;
 
 	private static final int KILO_SCALAR = 1024;
 
 	private final Map<Integer, MaterialType> dmgToMaterial = new HashMap<Integer, MaterialType>();
 
-	public MultiItem()
+	public ItemMultiItem()
 	{
 		this.setFeature( EnumSet.of( AEFeature.Core ) );
 		this.setHasSubtypes( true );

src/main/java/appeng/items/parts/ItemFacade.java

@@ -48,7 +48,7 @@ import appeng.api.parts.IAlphaPassItem;
 import appeng.api.util.AEPartLocation;
 import appeng.core.FacadeConfig;
 import appeng.core.features.AEFeature;
-import appeng.decorative.solid.QuartzOreBlock;
+import appeng.decorative.solid.BlockQuartzOre;
 import appeng.facade.FacadePart;
 import appeng.facade.IFacadeItem;
 import appeng.items.AEBaseItem;
@@ -150,7 +150,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
 
 		final boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) );
 		final boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass;
-		final boolean disableOre = b instanceof QuartzOreBlock;
+		final boolean disableOre = b instanceof BlockQuartzOre;
 
 		final boolean defaultValue = ( b.isOpaqueCube(b.getDefaultState()) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass;
 		if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) )

src/main/java/appeng/recipes/AEItemResolver.java

@@ -32,7 +32,7 @@ import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.core.AppEng;
 import appeng.items.materials.MaterialType;
-import appeng.items.materials.MultiItem;
+import appeng.items.materials.ItemMultiItem;
 import appeng.items.misc.ItemCrystalSeed;
 import appeng.items.parts.ItemMultiPart;
 import appeng.items.parts.PartType;
@@ -124,7 +124,7 @@ public class AEItemResolver implements ISubItemResolver
 				final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 );
 				final MaterialType mt = MaterialType.valueOf( materialName );
 				// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
-				if( mt.getItemInstance() == MultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
+				if( mt.getItemInstance() == ItemMultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
 				{
 					return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() );
 				}

src/main/java/appeng/recipes/RecipeHandler.java

@@ -59,7 +59,7 @@ import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.features.AEFeature;
-import appeng.items.materials.MultiItem;
+import appeng.items.materials.ItemMultiItem;
 import appeng.items.misc.ItemCrystalSeed;
 import appeng.items.parts.ItemMultiPart;
 import appeng.recipes.handlers.IWebsiteSerializer;
@@ -204,10 +204,10 @@ public class RecipeHandler implements IRecipeHandler
 				default:
 			}
 		}
-		else if( is.getItem() instanceof MultiItem )
+		else if( is.getItem() instanceof ItemMultiItem )
 		{
 			realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" );
-			realName += '.' + ( (MultiItem) is.getItem() ).getTypeByStack( is ).name();
+			realName += '.' + ( (ItemMultiItem) is.getItem() ).getTypeByStack( is ).name();
 		}
 		else if( is.getItem() instanceof ItemMultiPart )
 		{