diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index af655ed30..75c686c74 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -24,6 +24,9 @@ import java.util.EnumSet; import java.util.List; import javax.annotation.Nullable; +import com.google.common.base.Optional; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -53,9 +56,6 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; - import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.implementations.tiles.IColorableTile; @@ -627,7 +627,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature if( this.hasBlockTileEntity() ) { - rotatable = (AEBaseTile) this.getTileEntity( w, x, y, z ); + rotatable = (IOrientable) this.getTileEntity( w, x, y, z ); } else if( this instanceof IOrientableBlock ) { @@ -758,7 +758,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature if( this.hasBlockTileEntity() ) { - ori = (AEBaseTile) this.getTileEntity( w, x, y, z ); + ori = (IOrientable) this.getTileEntity( w, x, y, z ); } else if( this instanceof IOrientableBlock ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 9da5d36e3..a56cc3d7e 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -330,7 +330,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi { if( s instanceof AppEngSlot ) { - if( ( (AppEngSlot) s ).xDisplayPosition < 197 ) + if( ( (Slot) s ).xDisplayPosition < 197 ) { this.repositionSlot( (AppEngSlot) s ); } diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 3d4097413..20d74e50d 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -200,7 +200,7 @@ public class ItemRepo { for( Object lp : Platform.getTooltip( is ) ) { - if( lp instanceof String && m.matcher( (String) lp ).find() ) + if( lp instanceof String && m.matcher( (CharSequence) lp ).find() ) { this.view.add( is ); notDone = false; diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 67ad1b11f..b2924e243 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -447,7 +447,7 @@ public class BaseBlockRender { if( block.hasBlockTileEntity() ) { - return (AEBaseTile) block.getTileEntity( w, x, y, z ); + return (IOrientable) block.getTileEntity( w, x, y, z ); } else if( block instanceof IOrientableBlock ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index 15e947f8e..8b69a1e57 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -44,6 +44,7 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.core.sync.packets.PacketValueConfig; import appeng.helpers.ICustomNameObject; +import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.tile.crafting.TileCraftingTile; import appeng.util.Platform; @@ -74,7 +75,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH if( te instanceof TileCraftingTile ) { - this.setCPU( (ICraftingCPU) ( (TileCraftingTile) te ).getCluster() ); + this.setCPU( (ICraftingCPU) ( (IAEMultiBlock) te ).getCluster() ); } if( this.network == null && Platform.isServer() ) diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index 70dd268e0..525848f6a 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -45,6 +45,7 @@ import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; +import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IBaseMonitor; import appeng.api.parts.IPart; @@ -113,11 +114,11 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa if( monitorable instanceof IPortableCell ) { - this.powerSrc = (IPortableCell) monitorable; + this.powerSrc = (IEnergySource) monitorable; } else if( monitorable instanceof IMEChest ) { - this.powerSrc = (IMEChest) monitorable; + this.powerSrc = (IEnergySource) monitorable; } else if( monitorable instanceof IGridHost ) { @@ -128,7 +129,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa IGrid g = node.getGrid(); if( g != null ) { - this.powerSrc = new ChannelPowerSrc( this.networkNode, (IEnergyGrid) g.getCache( IEnergyGrid.class ) ); + this.powerSrc = new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 9a81b78ca..9ff79a6ff 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -32,6 +32,7 @@ import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.config.YesNo; import appeng.api.implementations.IUpgradeableHost; +import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.parts.IPart; import appeng.api.util.IConfigManager; import appeng.container.AEBaseContainer; @@ -96,7 +97,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { this.lockPlayerInventorySlot( x ); this.tbSlot = x; - this.tbInventory = (NetworkToolViewer) ( (ToolNetworkTool) pii.getItem() ).getGuiObject( pii, w, xCoord, yCoord, zCoord ); + this.tbInventory = (NetworkToolViewer) ( (IGuiItem) pii.getItem() ).getGuiObject( pii, w, xCoord, yCoord, zCoord ); break; } } diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index b5b7b2297..1fa83d44b 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.stats.AchievementList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; @@ -119,7 +120,7 @@ public class AppEngCraftingSlot extends AppEngSlot this.thePlayer.addStat( AchievementList.bakeCake, 1 ); } - if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemPickaxe) par1ItemStack.getItem() ).func_150913_i() != Item.ToolMaterial.WOOD ) + if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem() ).func_150913_i() != Item.ToolMaterial.WOOD ) { this.thePlayer.addStat( AchievementList.buildBetterPickaxe, 1 ); } diff --git a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java index a48e6b597..929ec114d 100644 --- a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java +++ b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java @@ -21,6 +21,7 @@ package appeng.core.features.registries.entries; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import appeng.api.implementations.tiles.IChestOrDrive; @@ -79,7 +80,7 @@ public class BasicCellHandler implements ICellHandler @Override public void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan ) { - Platform.openGUI( player, (AEBaseTile) chest, chest.getUp(), GuiBridge.GUI_ME ); + Platform.openGUI( player, (TileEntity) chest, chest.getUp(), GuiBridge.GUI_ME ); } @Override diff --git a/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java b/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java index 9802b05f3..b19a8620e 100644 --- a/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java +++ b/src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java @@ -21,6 +21,7 @@ package appeng.core.features.registries.entries; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import appeng.api.implementations.tiles.IChestOrDrive; @@ -77,7 +78,7 @@ public class CreativeCellHandler implements ICellHandler @Override public void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan ) { - Platform.openGUI( player, (AEBaseTile) chest, chest.getUp(), GuiBridge.GUI_ME ); + Platform.openGUI( player, (TileEntity) chest, chest.getUp(), GuiBridge.GUI_ME ); } @Override diff --git a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java index 961481286..7aeb82e34 100644 --- a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java +++ b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java @@ -43,7 +43,7 @@ public class AEGenericSchematicTile extends SchematicTile ArrayList list = new ArrayList(); if( tile instanceof AEBaseTile ) { - ICommonTile tcb = (AEBaseTile) tile; + ICommonTile tcb = (ICommonTile) tile; tcb.getDrops( tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, list ); } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 8458cba08..243bae6db 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -625,7 +625,7 @@ public class GridNode implements IGridNode, IPathItem @Override public IReadOnlyCollection getPossibleOptions() { - return (ReadOnlyCollection) this.getConnections(); + return (IReadOnlyCollection) this.getConnections(); } @Override diff --git a/src/main/java/appeng/parts/layers/LayerIEnergySink.java b/src/main/java/appeng/parts/layers/LayerIEnergySink.java index b02daa1df..4cdacbd43 100644 --- a/src/main/java/appeng/parts/layers/LayerIEnergySink.java +++ b/src/main/java/appeng/parts/layers/LayerIEnergySink.java @@ -24,6 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import ic2.api.energy.tile.IEnergyAcceptor; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergyTile; @@ -78,7 +79,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink if( !this.isInIC2() && Platform.isServer() && this.isTileValid() ) { this.getLayerFlags().add( LayerFlags.IC2_ENET ); - MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) this.getEnergySinkTile() ) ); + MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergyTile) this.getEnergySinkTile() ) ); } } @@ -92,7 +93,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink if( this.isInIC2() && Platform.isServer() ) { this.getLayerFlags().remove( LayerFlags.IC2_ENET ); - MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) this.getEnergySinkTile() ) ); + MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergyTile) this.getEnergySinkTile() ) ); } } @@ -141,7 +142,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink IPart part = this.getPart( direction ); if( part instanceof IEnergySink ) { - return ( (IEnergySink) part ).acceptsEnergyFrom( emitter, direction ); + return ( (IEnergyAcceptor) part ).acceptsEnergyFrom( emitter, direction ); } return false; } diff --git a/src/main/java/appeng/parts/layers/LayerIEnergySource.java b/src/main/java/appeng/parts/layers/LayerIEnergySource.java index 95ed2b819..8f32e3857 100644 --- a/src/main/java/appeng/parts/layers/LayerIEnergySource.java +++ b/src/main/java/appeng/parts/layers/LayerIEnergySource.java @@ -77,7 +77,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource if( !this.isInIC2() && Platform.isServer() && this.isTileValid() ) { this.getLayerFlags().add( LayerFlags.IC2_ENET ); - MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergySink) this.getEnergySourceTile() ) ); + MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileLoadEvent( (IEnergyTile) this.getEnergySourceTile() ) ); } } @@ -91,7 +91,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource if( this.isInIC2() && Platform.isServer() ) { this.getLayerFlags().remove( LayerFlags.IC2_ENET ); - MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergySink) this.getEnergySourceTile() ) ); + MinecraftForge.EVENT_BUS.post( new ic2.api.energy.event.EnergyTileUnloadEvent( (IEnergyTile) this.getEnergySourceTile() ) ); } } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index c41964db3..ada9477a8 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -476,7 +476,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC if( inv instanceof IMEMonitor ) { - ( (IMEMonitor) inv ).addListener( this, this.handler ); + ( (IBaseMonitor) inv ).addListener( this, this.handler ); } } } diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index 50062fe5e..2e57a0523 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -244,7 +244,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable { boolean matched = false; - for( ItemStack item : (ArrayList) target ) + for( ItemStack item : (Iterable) target ) { matched = matched || this.checkItemEquals( item, slot ); } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index cebbc60ae..5498ae866 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -527,22 +527,22 @@ public class Platform } case 1: // ( A instanceof NBTTagByte ) - return ( (NBTTagByte) left ).func_150287_d() == ( (NBTTagByte) right ).func_150287_d(); + return ( (NBTBase.NBTPrimitive) left ).func_150287_d() == ( (NBTBase.NBTPrimitive) right ).func_150287_d(); case 4: // else if ( A instanceof NBTTagLong ) - return ( (NBTTagLong) left ).func_150291_c() == ( (NBTTagLong) right ).func_150291_c(); + return ( (NBTBase.NBTPrimitive) left ).func_150291_c() == ( (NBTBase.NBTPrimitive) right ).func_150291_c(); case 8: // else if ( A instanceof NBTTagString ) return ( (NBTTagString) left ).func_150285_a_().equals( ( (NBTTagString) right ).func_150285_a_() ) || ( (NBTTagString) left ).func_150285_a_().equals( ( (NBTTagString) right ).func_150285_a_() ); case 6: // else if ( A instanceof NBTTagDouble ) - return ( (NBTTagDouble) left ).func_150286_g() == ( (NBTTagDouble) right ).func_150286_g(); + return ( (NBTBase.NBTPrimitive) left ).func_150286_g() == ( (NBTBase.NBTPrimitive) right ).func_150286_g(); case 5: // else if ( A instanceof NBTTagFloat ) - return ( (NBTTagFloat) left ).func_150288_h() == ( (NBTTagFloat) right ).func_150288_h(); + return ( (NBTBase.NBTPrimitive) left ).func_150288_h() == ( (NBTBase.NBTPrimitive) right ).func_150288_h(); case 3: // else if ( A instanceof NBTTagInt ) - return ( (NBTTagInt) left ).func_150287_d() == ( (NBTTagInt) right ).func_150287_d(); + return ( (NBTBase.NBTPrimitive) left ).func_150287_d() == ( (NBTBase.NBTPrimitive) right ).func_150287_d(); default: return left.equals( right ); @@ -628,22 +628,22 @@ public class Platform } case 1: // ( A instanceof NBTTagByte ) - return hash + ( (NBTTagByte) nbt ).func_150290_f(); + return hash + ( (NBTBase.NBTPrimitive) nbt ).func_150290_f(); case 4: // else if ( A instanceof NBTTagLong ) - return hash + (int) ( (NBTTagLong) nbt ).func_150291_c(); + return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).func_150291_c(); case 8: // else if ( A instanceof NBTTagString ) return hash + ( (NBTTagString) nbt ).func_150285_a_().hashCode(); case 6: // else if ( A instanceof NBTTagDouble ) - return hash + (int) ( (NBTTagDouble) nbt ).func_150286_g(); + return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).func_150286_g(); case 5: // else if ( A instanceof NBTTagFloat ) - return hash + (int) ( (NBTTagFloat) nbt ).func_150288_h(); + return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).func_150288_h(); case 3: // else if ( A instanceof NBTTagInt ) - return hash + ( (NBTTagInt) nbt ).func_150287_d(); + return hash + ( (NBTBase.NBTPrimitive) nbt ).func_150287_d(); default: return hash; @@ -855,7 +855,7 @@ public class Platform return teA; } - return new InventoryLargeChest( "", teA, (TileEntityChest) teB ); + return new InventoryLargeChest( "", teA, (IInventory) teB ); } public static boolean isModLoaded( String modid ) @@ -991,7 +991,7 @@ public class Platform { if( AESharedNBT.isShared( willAdd.getTagCompound() ) ) { - if( ( (AESharedNBT) willAdd.getTagCompound() ).getSpecialComparison() != null ) + if( ( (IAETagCompound) willAdd.getTagCompound() ).getSpecialComparison() != null ) { return true; } diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index 61d31ff77..79199f1de 100644 --- a/src/main/java/appeng/util/item/AEFluidStack.java +++ b/src/main/java/appeng/util/item/AEFluidStack.java @@ -30,6 +30,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -37,6 +38,7 @@ import net.minecraftforge.fluids.FluidStack; import appeng.api.config.FuzzyMode; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IAETagCompound; import appeng.util.Platform; @@ -100,7 +102,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } if( a instanceof AEFluidStack ) { - ( (AEFluidStack) a ).copy(); + ( (IAEStack) a ).copy(); } if( a instanceof FluidStack ) { @@ -214,7 +216,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu if( this.tagCompound != null ) { - i.setTag( "tag", (NBTTagCompound) this.tagCompound ); + i.setTag( "tag", (NBTBase) this.tagCompound ); } else {