diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index d1b3710a..ac217bbb 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -438,13 +438,11 @@ public abstract class AEBaseContainer extends Container if( Platform.isServer() ) { - for( final Object crafter : this.listeners ) + for( final IContainerListener listener : this.listeners ) { - final IContainerListener IContainerListener = (IContainerListener) crafter; - for( final SyncData sd : this.syncData.values() ) { - sd.tick( IContainerListener ); + sd.tick( listener ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index a5932b16..5e0340e5 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -26,6 +26,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; @@ -151,22 +152,24 @@ public class ContainerCellWorkbench extends ContainerUpgradeable this.setValidContainer( false ); } - for( final Object crafter : this.listeners ) + for( final IContainerListener listener : this.listeners ) { - final IContainerListener IContainerListener = (IContainerListener) crafter; - if( this.prevStack != is ) { // if the bars changed an item was probably made, so just send shit! - for( final Object s : this.inventorySlots ) + for( final Slot s : this.inventorySlots ) { if( s instanceof OptionalSlotRestrictedInput ) { final OptionalSlotRestrictedInput sri = (OptionalSlotRestrictedInput) s; - IContainerListener.sendSlotContents( this, sri.slotNumber, sri.getStack() ); + listener.sendSlotContents( this, sri.slotNumber, sri.getStack() ); } } - ( (EntityPlayerMP) IContainerListener ).isChangingQuantityOnly = false; + + if( listener instanceof EntityPlayerMP ) + { + ( (EntityPlayerMP) listener ).isChangingQuantityOnly = false; + } } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 5c88a8ad..18e370da 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -200,7 +200,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA if( output != null && !this.isPattern( output ) ) { return; - }// if nothing is there we should snag a new pattern. + } // if nothing is there we should snag a new pattern. else if( output == null ) { output = this.patternSlotIN.getStack(); @@ -483,19 +483,19 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( s == this.patternSlotOUT && Platform.isServer() ) { - for( final Object crafter : this.listeners ) + for( final IContainerListener listener : this.listeners ) { - final IContainerListener IContainerListener = (IContainerListener) crafter; - - for( final Object g : this.inventorySlots ) + for( final Slot slot : this.inventorySlots ) { - if( g instanceof OptionalSlotFake || g instanceof SlotFakeCraftingMatrix ) + if( slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix ) { - final Slot sri = (Slot) g; - IContainerListener.sendSlotContents( this, sri.slotNumber, sri.getStack() ); + listener.sendSlotContents( this, slot.slotNumber, slot.getStack() ); } } - ( (EntityPlayerMP) IContainerListener ).isChangingQuantityOnly = false; + if( listener instanceof EntityPlayerMP ) + { + ( (EntityPlayerMP) listener ).isChangingQuantityOnly = false; + } } this.detectAndSendChanges(); } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java index 061022e4..f239ac71 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java @@ -168,11 +168,10 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements this.wirelessOut.putStack( term ); // update the two slots in question... - for( final Object crafter : this.listeners ) + for( final IContainerListener listener : this.listeners ) { - final IContainerListener IContainerListener = (IContainerListener) crafter; - IContainerListener.sendSlotContents( this, this.wirelessIn.slotNumber, this.wirelessIn.getStack() ); - IContainerListener.sendSlotContents( this, this.wirelessOut.slotNumber, this.wirelessOut.getStack() ); + listener.sendSlotContents( this, this.wirelessIn.slotNumber, this.wirelessIn.getStack() ); + listener.sendSlotContents( this, this.wirelessOut.slotNumber, this.wirelessOut.getStack() ); } } }