Merge pull request #1454 from TheJulianJES/doublePlayerInvInscriber

Don't add the player inventory two times (rv2)

build.gradle

@@ -22,9 +22,11 @@ apply from: 'gradle/scripts/dependencies.gradle'
 apply from: 'gradle/scripts/artifacts.gradle'
 apply from: 'gradle/scripts/autoinstallruntime.gradle'
 apply from: 'gradle/scripts/integration.gradle'
+apply from: 'gradle/scripts/optional.gradle'
 
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
 
         maven {

gradle.properties

@@ -11,7 +11,23 @@ minecraft_version=1.7.10
 forge_version=10.13.2.1291
 
 #########################################################
-# APIs used for development                             #
+# Installable                                           #
+#########################################################
+waila_version=1.5.10
+jabba_version=1.2.1a
+enderstorage_version=1.4.7.33
+translocator_version=1.1.1.14
+ic2_version=2.2.717
+enderio_version=2.3.0.375_beta
+#cofhlib_version=1.0.1-157
+#cofhcore_version=3.0.2-270
+#texpansion_version=4.0.0-176
+#tfoundation_version=1.0.0-82
+betterstorage_version=0.11.3.123.20
+invtweaks_version=1.58
+
+#########################################################
+# Provided APIs                                         #
 #########################################################
 fmp_version=1.1.1.324
 code_chicken_lib_version=1.1.3.127
@@ -20,21 +36,22 @@ nei_version=1.0.4.90
 bc_version=6.4.6
 
 #########################################################
-# API Stubs                                             #
+# Self Compiled APIs                                    #
+#########################################################
+mekansim_version=8.0.1.198
+rotarycraft_version=V5c
+
+
+#########################################################
+# Self Compiled API Stubs                               #
 # Note: Do not edit these version numbers as they are   #
 # not the version of the mod, but stub code for AE2 to  #
 # compile                                               #
 #########################################################
-api_betterstorage_version=1
 api_coloredlightscore_version=1
 api_craftguide_version=1
-api_ic2_version=1
 api_immibis_version=1
-api_invtweaks_version=1
-api_mekansim_version=1.7.10-8.0.1.198
 api_mfr_version=1
 api_railcraft_version=1
 api_rblocks_version=1
 api_rf_version=2
-api_rotarycraft_version=V5c
-api_waila_version=1.5.10_1.7.10

gradle/scripts/dependencies.gradle

@@ -19,14 +19,14 @@
 
 
 repositories {
-
+    mavenLocal()
     maven {
-        name 'CB Maven FS'
+        name "ChickenBones"
         url "http://chickenbones.net/maven/"
     }
 
     maven {
-        name "Waila Mobius Repo"
+        name "Mobius"
         url "http://mobiusstrip.eu/maven"
     }
 
@@ -34,31 +34,86 @@ repositories {
         name "FireBall API Depot"
         url "http://dl.tsr.me/artifactory/libs-release-local"
     }
+
+    maven {
+        name = "Player"
+        url = "http://maven.ic2.player.to/"
+    }
+
+    maven {
+        name = "Tterrag"
+        url = "http://maven.tterrag.com/"
+    }
+
+    maven  {
+        name = "RX14 Proxy"
+        url = "http://mvn.rx14.co.uk/repo/"
+    }
+//  CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
+//    ivy {
+//        name = "CoFHLib"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/893/[module]-[revision].[ext]"
+//    }
+//
+//    ivy {
+//        name = "CoFHCore"
+//        artifactPattern "http://addons.cursecdn.com/files/2212/895/[module]-[revision].[ext]"
+//    }
+
+//    ivy {
+//        name = "ThermalExpansion"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/446/[module]-[revision].[ext]"
+//    }
+
+//    ivy {
+//        name = "ThermalFoundation"
+//        artifactPattern "http://addons.curse.cursecdn.com/files/2212/444/[module]-[revision].[ext]"
+//    }
+}
+
+configurations {
+    mods
 }
 
 dependencies {
+    // installable
+    mods "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
+    mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev"
+    mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev"
+    mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev"
+    mods "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:dev"
+    mods "com.enderio:EnderIO:${minecraft_version}-${enderio_version}:dev"
+    mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
+    mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
+//    mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
+//    mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
+//    mods name: 'ThermalExpansion', version: "[${minecraft_version}]${texpansion_version}-dev", ext: 'jar'
+//    mods name: 'ThermalFoundation', version: "[${minecraft_version}]${tfoundation_version}-dev", ext: 'jar'
 
     compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev"
     compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev"
     compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev"
     compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
-
     compile "com.mod-buildcraft:buildcraft:${bc_version}:dev"
 
+    // provided APIs
+    compile "net.industrial-craft:industrialcraft-2:${ic2_version}-experimental:api"
+    compile "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:api"
+
     // self compiled APIs
-    compile(group: 'api', name: 'betterstorage', version: "${api_betterstorage_version}")
+    compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
+    compile "appeng:RotaryCraft:${rotarycraft_version}:api"
+    compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
+    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+
+    // self compiled stubs
     compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
     compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
-    compile(group: 'api', name: 'ic2', version: "${api_ic2_version}")
     compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
-    compile(group: 'api', name: 'invtweaks', version: "${api_invtweaks_version}")
     compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
     compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
     compile(group: 'api', name: 'rblocks', version: "${api_rblocks_version}")
     compile(group: 'api', name: 'rf', version: "${api_rf_version}")
-    compile "appeng:Waila:${api_waila_version}:api"
-    compile "appeng:RotaryCraft:${api_rotarycraft_version}:api"
-    compile "appeng:mekanism:${api_mekansim_version}:api"
 
     testCompile "junit:junit:4.11"
 }

gradle/scripts/optional.gradle

@@ -0,0 +1,106 @@
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.3"
+}
+
+// WAILA
+task installWaila(type: Copy, dependsOn: "deinstallWaila") {
+    from { configurations.mods }
+    include "**/*Waila*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallWaila(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Waila*.jar")
+}
+
+// JABBA
+task installJabba(type: Copy, dependsOn: "deinstallJabba") {
+    from { configurations.mods }
+    include "**/*Jabba*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallJabba(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Jabba*.jar")
+}
+
+// ENDER STORAGE
+task installEnderStorage(type: Copy, dependsOn: "deinstallEnderStorage") {
+    from { configurations.mods }
+    include "**/*EnderStorage*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderStorage*.jar")
+}
+
+// TRANSLOCATOR
+task installTranslocator(type: Copy, dependsOn: "deinstallTranslocator") {
+    from { configurations.mods }
+    include "**/*Translocator*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallTranslocator(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Translocator*.jar")
+}
+
+// INDUSTRIALCRAFT
+task installIC2(type: Copy, dependsOn: "deinstallIC2") {
+    from { configurations.mods }
+    include "**/*industrialcraft*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallIC2(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft*.jar")
+}
+
+// ENDER IO
+task installEnderIO(type: Copy, dependsOn: "deinstallEnderIO") {
+    from { configurations.mods }
+    include "**/*EnderIO*dev.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallEnderIO(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*EnderIO*.jar")
+}
+
+// TE
+//task installTE(type: Copy, dependsOn: "deinstallTE") {
+//    from { configurations.mods }
+//    include "**/*CoFHLib*.jar"
+//    include "**/*CoFHCore*.jar"
+//    include "**/*ThermalFoundation*.jar"
+//    include "**/*ThermalExpansion*.jar"
+//
+//    into file(minecraft.runDir + "/mods")
+//}
+//
+//task deinstallTE(type: Delete) {
+//    delete fileTree(dir: minecraft.runDir + "/mods", includes: ["*CoFHLib*.jar", "*CoFHCore*.jar", "*ThermalFoundation*.jar", "*ThermalExpansion*.jar"])
+//}
+
+// INV TWEAKS
+task installInvTweaks(type: Copy, dependsOn: "deinstallInvTweaks") {
+    from { configurations.mods }
+    include "**/*InventoryTweaks*dev*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallInvTweaks(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*InventoryTweaks*.jar")
+}
+
+// BETTER STORAGE
+task installBetterStorage(type: Copy, dependsOn: "deinstallBetterStorage") {
+    from { configurations.mods }
+    include "**/*BetterStorage*deobf*.jar"
+    into file(minecraft.runDir + "/mods")
+}
+
+task deinstallBetterStorage(type: Delete) {
+    delete fileTree(dir: minecraft.runDir + "/mods", include: "*BetterStorage*.jar")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 13 21:58:22 CEST 2014
+#Sat May 02 19:28:20 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

src/main/java/appeng/block/misc/BlockVibrationChamber.java

@@ -39,7 +39,7 @@ import appeng.tile.misc.TileVibrationChamber;
 import appeng.util.Platform;
 
 
-public class BlockVibrationChamber extends AEBaseBlock
+public final class BlockVibrationChamber extends AEBaseBlock
 {
 
 	public BlockVibrationChamber()

src/main/java/appeng/container/implementations/ContainerInscriber.java

@@ -65,8 +65,6 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres
 		this.addSlotToContainer( this.middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, this.ti, 2, 63, 39, this.invPlayer ) );
 
 		this.addSlotToContainer( new SlotOutput( this.ti, 3, 113, 40, -1 ) );
-
-		this.bindPlayerInventory( ip, 0, this.getHeight() - /* height of player inventory */82 );
 	}
 
 	@Override

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

@@ -20,6 +20,11 @@ package appeng.core.features;
 
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import javax.annotation.Nonnull;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -27,10 +32,6 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ObjectArrays;
-
 import appeng.api.definitions.IBlockDefinition;
 import appeng.block.AEBaseBlock;
 
@@ -92,13 +93,16 @@ public class BlockDefinition extends ItemDefinition implements IBlockDefinition
 	/**
 	 * Create an {@link ItemBlock} from a {@link Block} to register it later as {@link Item}
 	 *
-	 * @param block
-	 * @return
+	 * @param block to be constructed from
+	 *
+	 * @return item from block
 	 */
+	@Nonnull
 	private static Item constructItemFromBlock( Block block )
 	{
-		final Class<? extends ItemBlock> itemclass = getItemBlockConstructor( block );
-		return constructItemBlock( block, itemclass );
+		final Class<? extends ItemBlock> itemClass = getItemBlockConstructor( block );
+
+		return constructItemBlock( block, itemClass );
 	}
 
 	/**
@@ -110,6 +114,7 @@ public class BlockDefinition extends ItemDefinition implements IBlockDefinition
 	 * @param block the block used to determine the used constructor.
 	 * @return a {@link Class} extending ItemBlock
 	 */
+	@Nonnull
 	private static Class<? extends ItemBlock> getItemBlockConstructor( Block block )
 	{
 		if ( block instanceof AEBaseBlock )
@@ -124,32 +129,39 @@ public class BlockDefinition extends ItemDefinition implements IBlockDefinition
 	/**
 	 * Actually construct an instance of {@link Item} with the block and earlier determined constructor.
 	 *
-	 * Shamelessly stolen from the forge magic.
-	 *
-	 * TODO: throw an exception instead of returning null? As this could cause issue later on.
-	 *
 	 * @param block the block to create the {@link ItemBlock} from
-	 * @param itemclass the class used to construct it.
+	 * @param itemClass the class used to construct it.
 	 * @return an {@link Item} for the block. Actually always a sub type of {@link ItemBlock}
 	 */
-	private static Item constructItemBlock( Block block, Class<? extends ItemBlock> itemclass )
+	@Nonnull
+	private static Item constructItemBlock( Block block, Class<? extends ItemBlock> itemClass )
 	{
+		assert block != null;
+		assert itemClass != null;
+
 		try
 		{
-			Object[] itemCtorArgs = new Object[] {};
-			Class<?>[] ctorArgClasses = new Class<?>[itemCtorArgs.length + 1];
-			ctorArgClasses[0] = Block.class;
-			for ( int idx = 1; idx < ctorArgClasses.length; idx++ )
-			{
-				ctorArgClasses[idx] = itemCtorArgs[idx - 1].getClass();
-			}
+			final Constructor<? extends ItemBlock> itemConstructor = itemClass.getConstructor( Block.class );
 
-			Constructor<? extends ItemBlock> itemCtor = itemclass.getConstructor( ctorArgClasses );
-			return itemCtor.newInstance( ObjectArrays.concat( block, itemCtorArgs ) );
+			return itemConstructor.newInstance( block );
 		}
-		catch ( Throwable t )
+		catch( InstantiationException e )
 		{
-			return null;
+			e.printStackTrace();
 		}
+		catch( IllegalAccessException e )
+		{
+			e.printStackTrace();
+		}
+		catch( InvocationTargetException e )
+		{
+			e.printStackTrace();
+		}
+		catch( NoSuchMethodException e )
+		{
+			e.printStackTrace();
+		}
+
+		throw new IllegalStateException( "Tried to construct an ItemBlock from Block " + block.getUnlocalizedName() + " and Class<Item>" + itemClass );
 	}
 }

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

@@ -19,23 +19,26 @@
 package appeng.core.features;
 
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
+import javax.annotation.Nonnull;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+
 import appeng.api.definitions.IItemDefinition;
 import appeng.util.Platform;
 
 
 public class ItemDefinition implements IItemDefinition
 {
+	@Nonnull
 	private final Item item;
 	private final boolean enabled;
 
-	public ItemDefinition( Item item, ActivityState state )
+	public ItemDefinition( @Nonnull Item item, @Nonnull ActivityState state )
 	{
 		Preconditions.checkNotNull( item );
 		Preconditions.checkNotNull( state );

src/main/java/appeng/helpers/Reflected.java

@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
  * Marker interface to help identify invocation of reflection
  */
 @Retention( RetentionPolicy.SOURCE )
-@Target( { ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.TYPE } )
+@Target( { ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.TYPE, ElementType.METHOD } )
 public @interface Reflected
 {
 

src/main/java/appeng/services/version/VersionParser.java

@@ -86,7 +86,11 @@ public final class VersionParser
 	{
 		assert PATTERN_VALID_REVISION.matcher( rawRevision ).matches();
 
-		final int revision = new Scanner( rawRevision ).useDelimiter( PATTERN_REVISION ).nextInt();
+		final Scanner scanner = new Scanner( rawRevision );
+
+		final int revision = scanner.useDelimiter( PATTERN_REVISION ).nextInt();
+
+		scanner.close();
 
 		return revision;
 	}
@@ -124,7 +128,11 @@ public final class VersionParser
 	{
 		assert PATTERN_NATURAL.matcher( rawBuild ).matches();
 
-		final int build = new Scanner( rawBuild ).useDelimiter( PATTERN_BUILD ).nextInt();
+		final Scanner scanner = new Scanner( rawBuild );
+
+		final int build = scanner.useDelimiter( PATTERN_BUILD ).nextInt();
+
+		scanner.close();
 
 		return build;
 	}

src/main/java/appeng/services/version/github/Release.java

@@ -4,7 +4,7 @@ package appeng.services.version.github;
 /**
  * Template class for Gson to write values from the Json Object into an actual class
  */
-@SuppressWarnings( "ALL" )
+@SuppressWarnings( "all" )
 public class Release
 {
 	/**

src/main/java/appeng/tile/AEBaseInvTile.java

@@ -19,6 +19,8 @@
 package appeng.tile;
 
 
+import javax.annotation.Nullable;
+
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -93,7 +95,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
 	}
 
 	@Override
-	public void setInventorySlotContents( int i, ItemStack itemstack )
+	public void setInventorySlotContents( int i, @Nullable ItemStack itemstack )
 	{
 		this.getInternalInventory().setInventorySlotContents( i, itemstack );
 	}

src/main/java/appeng/tile/AEBaseTile.java

@@ -26,6 +26,9 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -61,14 +64,15 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 {
 
 	public static final ThreadLocal<WeakReference<AEBaseTile>> DROP_NO_ITEMS = new ThreadLocal<WeakReference<AEBaseTile>>();
-	private static final HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>> HANDLERS = new HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>>();
-	private static final HashMap<Class, ItemStackSrc> ITEM_STACKS = new HashMap<Class, ItemStackSrc>();
-	public int renderFragment = 0;
+	private static final Map<Class<? extends AEBaseTile>, Map<TileEventType, List<AETileEventHandler>>> HANDLERS = new HashMap<Class<? extends AEBaseTile>, Map<TileEventType, List<AETileEventHandler>>>();
+	private static final Map<Class<? extends TileEntity>, ItemStackSrc> ITEM_STACKS = new HashMap<Class<? extends TileEntity>, ItemStackSrc>();
+	private int renderFragment = 0;
+	@Nullable
 	public String customName;
 	private ForgeDirection forward = ForgeDirection.UNKNOWN;
 	private ForgeDirection up = ForgeDirection.UNKNOWN;
 
-	public static void registerTileItem( Class c, ItemStackSrc wat )
+	public static void registerTileItem( Class<? extends TileEntity> c, ItemStackSrc wat )
 	{
 		ITEM_STACKS.put( c, wat );
 	}
@@ -84,11 +88,13 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 		return !this.worldObj.blockExists( this.xCoord, this.yCoord, this.zCoord );
 	}
 
+	@Nonnull
 	public TileEntity getTile()
 	{
 		return this;
 	}
 
+	@Nullable
 	protected ItemStack getItemFromTile( Object obj )
 	{
 		ItemStackSrc src = ITEM_STACKS.get( obj.getClass() );
@@ -99,11 +105,6 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 		return src.stack( 1 );
 	}
 
-	public final void Tick()
-	{
-
-	}
-
 	/**
 	 * for dormant chunk cache.
 	 */
@@ -176,7 +177,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 	{
 		for( AETileEventHandler h : this.getHandlerListFor( TileEventType.TICK ) )
 		{
-			h.Tick( this );
+			h.tick( this );
 		}
 	}
 
@@ -211,10 +212,11 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 		return this.hasHandlerFor( TileEventType.TICK );
 	}
 
-	protected boolean hasHandlerFor( TileEventType type )
+	private boolean hasHandlerFor( TileEventType type )
 	{
 		List<AETileEventHandler> list = this.getHandlerListFor( type );
-		return list != null && !list.isEmpty();
+
+		return !list.isEmpty();
 	}
 
 	@Override
@@ -331,45 +333,72 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 		return true;
 	}
 
-	protected List<AETileEventHandler> getHandlerListFor( TileEventType type )
+	@Nonnull
+	private List<AETileEventHandler> getHandlerListFor( TileEventType type )
 	{
-		Class clz = this.getClass();
-		EnumMap<TileEventType, List<AETileEventHandler>> handlerSet = HANDLERS.get( clz );
+		final Map<TileEventType, List<AETileEventHandler>> eventToHandlers = this.getEventToHandlers();
+		final List<AETileEventHandler> handlers = this.getHandlers( eventToHandlers, type );
 
-		if( handlerSet == null )
-		{
-			HANDLERS.put( clz, handlerSet = new EnumMap<TileEventType, List<AETileEventHandler>>( TileEventType.class ) );
-
-			for( Method m : clz.getMethods() )
-			{
-				TileEvent te = m.getAnnotation( TileEvent.class );
-				if( te != null )
-				{
-					this.addHandler( handlerSet, te.value(), m );
-				}
-			}
-		}
-
-		List<AETileEventHandler> list = handlerSet.get( type );
-
-		if( list == null )
-		{
-			handlerSet.put( type, list = new LinkedList<AETileEventHandler>() );
-		}
-
-		return list;
+		return handlers;
 	}
 
-	private void addHandler( EnumMap<TileEventType, List<AETileEventHandler>> handlerSet, TileEventType value, Method m )
+	@Nonnull
+	private Map<TileEventType, List<AETileEventHandler>> getEventToHandlers()
+	{
+		final Class<? extends AEBaseTile> clazz = this.getClass();
+		final Map<TileEventType, List<AETileEventHandler>> storedHandlers = HANDLERS.get( clazz );
+
+		if ( storedHandlers == null )
+		{
+			final Map<TileEventType, List<AETileEventHandler>> newStoredHandlers = new EnumMap<TileEventType, List<AETileEventHandler>>( TileEventType.class );
+
+			HANDLERS.put( clazz, newStoredHandlers );
+
+			for( Method method : clazz.getMethods() )
+			{
+				TileEvent event = method.getAnnotation( TileEvent.class );
+				if( event != null )
+				{
+					this.addHandler( newStoredHandlers, event.value(), method );
+				}
+			}
+
+			return newStoredHandlers;
+		}
+		else
+		{
+			return storedHandlers;
+		}
+	}
+
+	@Nonnull
+	private List<AETileEventHandler> getHandlers( Map<TileEventType, List<AETileEventHandler>> eventToHandlers, TileEventType event ) {
+		final List<AETileEventHandler> oldHandlers = eventToHandlers.get( event );
+
+		if( oldHandlers == null )
+		{
+			final List<AETileEventHandler> newHandlers = new LinkedList<AETileEventHandler>();
+			eventToHandlers.put( event, newHandlers );
+
+			return newHandlers;
+		}
+		else
+		{
+			return oldHandlers;
+		}
+	}
+
+	private void addHandler( Map<TileEventType, List<AETileEventHandler>> handlerSet, TileEventType value, Method m )
 	{
 		List<AETileEventHandler> list = handlerSet.get( value );
 
 		if( list == null )
 		{
-			handlerSet.put( value, list = new ArrayList<AETileEventHandler>() );
+			list = new ArrayList<AETileEventHandler>();
+			handlerSet.put( value, list );
 		}
 
-		list.add( new AETileEventHandler( m, value ) );
+		list.add( new AETileEventHandler( m ) );
 	}
 
 	@Override

src/main/java/appeng/tile/events/AETileEventHandler.java

@@ -32,18 +32,18 @@ import cpw.mods.fml.relauncher.SideOnly;
 import appeng.tile.AEBaseTile;
 
 
-public class AETileEventHandler
+public final class AETileEventHandler
 {
 
 	private final Method method;
 
-	public AETileEventHandler( Method m, TileEventType which )
+	public AETileEventHandler( Method method )
 	{
-		this.method = m;
+		this.method = method;
 	}
 
 	// TICK
-	public void Tick( AEBaseTile tile )
+	public void tick( AEBaseTile tile )
 	{
 		try
 		{

src/main/java/appeng/tile/events/TileEventType.java

@@ -25,5 +25,10 @@ public enum TileEventType
 
 	WORLD_NBT_READ, WORLD_NBT_WRITE,
 
-	NETWORK_READ, NETWORK_WRITE
+	/**
+	 * Methods annotated with this need to return a boolean
+	 */
+	NETWORK_READ,
+
+	NETWORK_WRITE
 }

src/main/java/appeng/tile/misc/TileVibrationChamber.java

@@ -36,21 +36,25 @@ import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.util.AECableType;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.settings.TickRates;
+import appeng.helpers.Reflected;
 import appeng.me.GridAccessException;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.tile.grid.AENetworkInvTile;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.tile.inventory.InvOperation;
+import appeng.util.Platform;
 
 
 public class TileVibrationChamber extends AENetworkInvTile implements IGridTickable
 {
-
-	final double powerPerTick = 5;
-
-	final int[] sides = new int[] { 0 };
-	final AppEngInternalInventory inv = new AppEngInternalInventory( this, 1 );
+	private static final int FUEL_SLOT_INDEX = 0;
+	private static final double POWER_PER_TICK = 5;
+	private static final int[] ACCESSIBLE_SLOTS = new int[] { FUEL_SLOT_INDEX };
+	private static final int MAX_BURN_SPEED = 200;
+	private static final double DILATION_SCALING = 100.0;
+	private static final int MIN_BURN_SPEED = 20;
+	private final IInventory inv = new AppEngInternalInventory( this, 1 );
 
 	public int burnSpeed = 100;
 	public double burnTime = 0;
@@ -71,16 +75,20 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 		return AECableType.COVERED;
 	}
 
+	@Reflected
 	@TileEvent( TileEventType.NETWORK_READ )
-	public boolean readFromStream_TileVibrationChamber( ByteBuf data )
+	public boolean hasUpdate( ByteBuf data )
 	{
-		boolean wasOn = this.isOn;
+		final boolean wasOn = this.isOn;
+
 		this.isOn = data.readBoolean();
+
 		return wasOn != this.isOn; // TESR doesn't need updates!
 	}
 
+	@Reflected
 	@TileEvent( TileEventType.NETWORK_WRITE )
-	public void writeToStream_TileVibrationChamber( ByteBuf data )
+	public void writeToNetwork( ByteBuf data )
 	{
 		data.writeBoolean( this.burnTime > 0 );
 	}
@@ -107,12 +115,6 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 		return this.inv;
 	}
 
-	@Override
-	public int getInventoryStackLimit()
-	{
-		return 64;
-	}
-
 	@Override
 	public boolean isItemValidForSlot( int i, ItemStack itemstack )
 	{
@@ -147,12 +149,12 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 	@Override
 	public int[] getAccessibleSlotsBySide( ForgeDirection side )
 	{
-		return this.sides;
+		return ACCESSIBLE_SLOTS;
 	}
 
 	private boolean canEatFuel()
 	{
-		ItemStack is = this.getStackInSlot( 0 );
+		ItemStack is = this.getStackInSlot( FUEL_SLOT_INDEX );
 		if( is != null )
 		{
 			int newBurnTime = TileEntityFurnace.getItemBurnTime( is );
@@ -182,7 +184,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( this.burnTime <= 0 )
 		{
@@ -197,10 +199,10 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 			return TickRateModulation.SLEEP;
 		}
 
-		this.burnSpeed = Math.max( 20, Math.min( this.burnSpeed, 200 ) );
-		double dilation = this.burnSpeed / 100.0;
+		this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) );
+		double dilation = this.burnSpeed / DILATION_SCALING;
 
-		double timePassed = TicksSinceLastCall * dilation;
+		double timePassed = ticksSinceLastCall * dilation;
 		this.burnTime -= timePassed;
 		if( this.burnTime < 0 )
 		{
@@ -211,7 +213,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 		try
 		{
 			IEnergyGrid grid = this.gridProxy.getEnergy();
-			double newPower = timePassed * this.powerPerTick;
+			double newPower = timePassed * POWER_PER_TICK;
 			double overFlow = grid.injectPower( newPower, Actionable.SIMULATE );
 
 			// burn the over flow.
@@ -219,30 +221,30 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 
 			if( overFlow > 0 )
 			{
-				this.burnSpeed -= TicksSinceLastCall;
+				this.burnSpeed -= ticksSinceLastCall;
 			}
 			else
 			{
-				this.burnSpeed += TicksSinceLastCall;
+				this.burnSpeed += ticksSinceLastCall;
 			}
 
-			this.burnSpeed = Math.max( 20, Math.min( this.burnSpeed, 200 ) );
+			this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) );
 			return overFlow > 0 ? TickRateModulation.SLOWER : TickRateModulation.FASTER;
 		}
 		catch( GridAccessException e )
 		{
-			this.burnSpeed -= TicksSinceLastCall;
-			this.burnSpeed = Math.max( 20, Math.min( this.burnSpeed, 200 ) );
+			this.burnSpeed -= ticksSinceLastCall;
+			this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) );
 			return TickRateModulation.SLOWER;
 		}
 	}
 
 	private void eatFuel()
 	{
-		ItemStack is = this.getStackInSlot( 0 );
+		final ItemStack is = this.getStackInSlot( FUEL_SLOT_INDEX );
 		if( is != null )
 		{
-			int newBurnTime = TileEntityFurnace.getItemBurnTime( is );
+			final int newBurnTime = TileEntityFurnace.getItemBurnTime( is );
 			if( newBurnTime > 0 && is.stackSize > 0 )
 			{
 				this.burnTime += newBurnTime;
@@ -252,7 +254,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 				{
 					ItemStack container = null;
 
-					if( is.getItem().hasContainerItem( is ) )
+					if( is.getItem() != null && is.getItem().hasContainerItem( is ) )
 					{
 						container = is.getItem().getContainerItem( is );
 					}
@@ -263,6 +265,8 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 				{
 					this.setInventorySlotContents( 0, is );
 				}
+
+				this.markDirty();
 			}
 		}
 
@@ -278,10 +282,16 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 			}
 		}
 
+		// state change
 		if( ( !this.isOn && this.burnTime > 0 ) || ( this.isOn && this.burnTime <= 0 ) )
 		{
 			this.isOn = this.burnTime > 0;
 			this.markForUpdate();
+
+			if ( this.hasWorldObj() )
+			{
+				Platform.notifyBlocksOfNeighbors( this.worldObj, this.xCoord, this.yCoord, this.zCoord );
+			}
 		}
 	}
 }

src/main/java/appeng/tile/networking/TileCableBus.java

@@ -30,7 +30,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -162,12 +161,6 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
 		return this.cb.getCableConnectionType( side );
 	}
 
-	@Override
-	public TileEntity getTile()
-	{
-		return this;
-	}
-
 	@Override
 	public void onChunkUnload()
 	{

src/main/resources/assets/appliedenergistics2/lang/de_DE.lang

@@ -1,5 +1,5 @@
 tile.appliedenergistics2.BlockCableBus.name=AE2-Kabel und/oder Bus
-tile.appliedenergistics2.BlockCellWorkbench.name=Zellenwerkbank
+tile.appliedenergistics2.BlockCellWorkbench.name=Speicherzellenwerkbank
 tile.appliedenergistics2.BlockCharger.name=Ladegerät
 tile.appliedenergistics2.BlockChest.name=ME-Truhe
 tile.appliedenergistics2.BlockCondenser.name=Materiekondensator
@@ -17,7 +17,7 @@ tile.appliedenergistics2.BlockInscriber.name=Gravurmaschine
 tile.appliedenergistics2.BlockInterface.name=ME-Schnittstelle
 tile.appliedenergistics2.BlockQuantumLinkChamber.name=ME-Quantentunnelkammer
 tile.appliedenergistics2.BlockQuantumRing.name=ME-Quantentunnelring
-tile.appliedenergistics2.BlockFluix.name=Fluix-Block
+tile.appliedenergistics2.BlockFluix.name=Fluixblock
 tile.appliedenergistics2.BlockQuartz.name=Certusquarzblock
 tile.appliedenergistics2.BlockQuartzChiseled.name=Gemeißelter Certusquarzblock
 tile.appliedenergistics2.BlockQuartzGlass.name=Quarzglas
@@ -50,7 +50,7 @@ tile.appliedenergistics2.BlockCraftingAccelerator.name=Fertigungs-Prozessoreinhe
 tile.appliedenergistics2.BlockCraftingUnit.name=Fertigungseinheit
 tile.appliedenergistics2.BlockMolecularAssembler.name=Molekularassembler
 
-chat.appliedenergistics2.ChestCannotReadStorageCell=ME-Truhe kann Speicherzelle nicht einlesen.
+chat.appliedenergistics2.ChestCannotReadStorageCell=ME-Truhe kann die Speicherzelle nicht einlesen.
 chat.appliedenergistics2.SettingCleared=Einstellung gelöscht.
 chat.appliedenergistics2.OutOfRange=Drahtloser Zugangspunkt außer Reichweite.
 chat.appliedenergistics2.InvalidMachine=Ungültige Maschine.
@@ -148,11 +148,11 @@ gui.appliedenergistics2.Crafts=Fertigt
 gui.appliedenergistics2.And=und
 gui.appliedenergistics2.Creates=Kreiert
 gui.appliedenergistics2.With=mit
-gui.appliedenergistics2.InWorldCrafting=AE2 In-World-Fertigung
+gui.appliedenergistics2.InWorldCrafting=AE2 In-Welt-Fertigung
 gui.appliedenergistics2.inWorldFluix=Wirf 1 Geladenes Certusquarzstück + 1 Netherquarz + Redstone-Staub nebeneinander in eine Pfütze und warte einen Moment.
 gui.appliedenergistics2.inWorldPurificationCertus=Wirf einen Certusquarzkeim, gemacht aus Certusquarzstaub und Sand, in eine Pfütze Wasser; um den Prozess zu beschleunigen, füge Kristallwachstumsbeschleuniger hinzu.
 gui.appliedenergistics2.inWorldPurificationNether=Wirf einen Netherquarzkeim, gemacht aus Netherquarzstaub und Sand, in eine Pfütze Wasser; um den Prozess zu beschleunigen, füge Kristallwachstumsbeschleuniger hinzu.
-gui.appliedenergistics2.inWorldPurificationFluix=Wirf einen Fluix-Keim, gemacht aus Fluix-Staub und Sand, in eine Pfütze Wasser; um den Prozess zu beschleunigen, füge Kristallwachstumsbeschleuniger hinzu.
+gui.appliedenergistics2.inWorldPurificationFluix=Wirf einen Fluixkeim, gemacht aus Fluixstaub und Sand, in eine Pfütze Wasser; um den Prozess zu beschleunigen, füge Kristallwachstumsbeschleuniger hinzu.
 gui.appliedenergistics2.inWorldSingularity=Wirf zum Erschaffen 1 Singularität und 1 Enderstaub zusammen und erzeuge in Reichweite der Items eine Explosion.
 gui.appliedenergistics2.ChargedQuartz=Geladener Certusquarz entsteht durch Einfügen eines Ungeladenen Certusquarzkristalls in ein Ladegerät, das Energie erhält.
 gui.appliedenergistics2.ChargedQuartzFind=Geladener Certusquarz kann relativ selten in der Welt gefunden werden, er sieht aus wie gewöhnlicher Certusquarz, aber er funkelt.
@@ -309,7 +309,7 @@ waila.appliedenergistics2.Locked=Gesperrt
 waila.appliedenergistics2.Unlocked=Entsperrt
 waila.appliedenergistics2.Showing=Zeigt
 waila.appliedenergistics2.Contains=Enthält
-waila.appliedenergistics2.Channels=%1$d of %2$d Kanäle
+waila.appliedenergistics2.Channels=%1$d von %2$d Kanälen
 
 item.appliedenergistics2.ItemBasicStorageCell.1k.name=1k-ME-Speicherzelle
 item.appliedenergistics2.ItemBasicStorageCell.4k.name=4k-ME-Speicherzelle
@@ -322,7 +322,7 @@ item.appliedenergistics2.ItemFacade.name=Kabelfassade
 
 item.appliedenergistics2.ItemCrystalSeed.Certus.name=Certusquarzkeim
 item.appliedenergistics2.ItemCrystalSeed.Nether.name=Netherquarzkeim
-item.appliedenergistics2.ItemCrystalSeed.Fluix.name=Fluix-Keim
+item.appliedenergistics2.ItemCrystalSeed.Fluix.name=Fluixkeim
 item.appliedenergistics2.ItemMaterial.InvalidType.name=Dieses Item ist deaktiviert.
 item.appliedenergistics2.ItemMaterial.AdvCard.name=Fortgeschrittene Karte
 item.appliedenergistics2.ItemMaterial.AnnihilationCore.name=Annihilationskern

src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang

@@ -1,3 +1,4 @@
+//Blocos
 tile.appliedenergistics2.BlockCableBus.name=Cabos e/ou Barramentos do AE2
 tile.appliedenergistics2.BlockCellWorkbench.name=Bancada de Células
 tile.appliedenergistics2.BlockCharger.name=Carregador
@@ -19,7 +20,7 @@ tile.appliedenergistics2.BlockQuantumLinkChamber.name=Câmara de Ligação Quân
 tile.appliedenergistics2.BlockQuantumRing.name=Anel Quântico ME
 tile.appliedenergistics2.BlockFluix.name=Bloco de Fluix
 tile.appliedenergistics2.BlockQuartz.name=Bloco de Quartzo Certus
-tile.appliedenergistics2.BlockQuartzChiseled.name=Bloco de Quartzo Certus Cinzelado
+tile.appliedenergistics2.BlockQuartzChiseled.name=Bloco de Quartzo Certus Talhado
 tile.appliedenergistics2.BlockQuartzGlass.name=Vidro de Quartzo
 tile.appliedenergistics2.BlockQuartzLamp.name=Vidro Vibrante de Quartzo
 tile.appliedenergistics2.BlockQuartzPillar.name=Pilar de Quartzo Certus
@@ -50,8 +51,8 @@ tile.appliedenergistics2.BlockCraftingAccelerator.name=Unidade de Co-Processamen
 tile.appliedenergistics2.BlockCraftingUnit.name=Unidade de Fabricação
 tile.appliedenergistics2.BlockMolecularAssembler.name=Montador Molecular
 
-// Stairs
-tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Escadas de Quartzo Certus Cinzelado
+// Escadas
+tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Escadas de Quartzo Certus Talhadas
 tile.appliedenergistics2.FluixStairBlock.name=Escadas de Fluix 
 tile.appliedenergistics2.QuartzPillarStairBlock.name=Escadas de Pilar de Quartzo Certus 
 tile.appliedenergistics2.QuartzStairBlock.name=Escadas de Quartzo Certus 
@@ -472,7 +473,7 @@ achievement.ae2.IOPort=Embaralhamento de Células de Armazenamentos
 achievement.ae2.IOPort.desc=Faça uma Porta de ES
 achievement.ae2.CraftingTerminal=Uma Bancada (Muito) Maior
 achievement.ae2.CraftingTerminal.desc=Faça um Terminal de Fabricação
-achievement.ae2.PatternTerminal=Maestro de Fabricação
+achievement.ae2.PatternTerminal=Maestro da Fabricação
 achievement.ae2.PatternTerminal.desc=Faça um Terminal de Padrões
 achievement.ae2.ChargedQuartz=Chocante
 achievement.ae2.ChargedQuartz.desc=Ache Quartzo Carregado
@@ -502,7 +503,7 @@ achievement.ae2.Facade=Estética de Rede
 achievement.ae2.Facade.desc=Faça uma Fachada de Cabo
 achievement.ae2.NetworkTool=Diagnóstico de Rede
 achievement.ae2.NetworkTool.desc=Faça uma Ferramenta de Rede
-achievement.ae2.PortableCell=Armazenamento Portátil
+achievement.ae2.PortableCell=Armazenamento Nômade
 achievement.ae2.PortableCell.desc=Faça uma Célula Portátil
 achievement.ae2.StorageBus=Potencial Sem Limites
 achievement.ae2.StorageBus.desc=Faça um Barramento de Armazenamento

src/main/resources/assets/appliedenergistics2/recipes/index.recipe

@@ -66,3 +66,4 @@ import=dyes_dense.recipe
 import=paint_balls.recipe
 import=crafting.recipe
 import=vanilla_enhance.recipe
+import=stairs.recipe

src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe

@@ -0,0 +1,47 @@
+shaped=
+    ae2:BlockQuartzChiseled _                       _,
+    ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled _,
+    ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled
+    -> 4 ae2:ChiseledQuartzStairBlock
+
+shaped=
+    ae2:BlockFluix _              _,
+    ae2:BlockFluix ae2:BlockFluix _,
+    ae2:BlockFluix ae2:BlockFluix ae2:BlockFluix
+    -> 4 ae2:FluixStairBlock
+
+shaped=
+    ae2:BlockQuartzPillar _                     _,
+    ae2:BlockQuartzPillar ae2:BlockQuartzPillar _,
+    ae2:BlockQuartzPillar ae2:BlockQuartzPillar ae2:BlockQuartzPillar
+    -> 4 ae2:QuartzPillarStairBlock
+
+shaped=
+    ae2:BlockQuartz _               _,
+    ae2:BlockQuartz ae2:BlockQuartz _,
+    ae2:BlockQuartz ae2:BlockQuartz ae2:BlockQuartz
+    -> 4 ae2:QuartzStairBlock
+
+shaped=
+    ae2:BlockSkyStone _                 _,
+    ae2:BlockSkyStone ae2:BlockSkyStone _,
+    ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone
+    -> 4 ae2:SkyStoneStairBlock
+
+shaped=
+    ae2:BlockSkyStone:1 _                   _,
+    ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 _,
+    ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1
+    -> 4 ae2:SkyStoneBlockStairBlock
+
+shaped=
+    ae2:BlockSkyStone:2 _                   _,
+    ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 _,
+    ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 ae2:BlockSkyStone:2
+    -> 4 ae2:SkyStoneBrickStairBlock
+
+shaped=
+    ae2:BlockSkyStone:3 _                   _,
+    ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 _,
+    ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 ae2:BlockSkyStone:3
+    -> 4 ae2:SkyStoneSmallBrickStairBlock