Second update pass (2/3) - 82 -> 0 errors

Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
This commit is contained in:
elix-x
2016-06-21 11:03:10 +02:00
parent 5498eb6d7c
commit 05aa6972c4
83 changed files with 564 additions and 405 deletions
@@ -365,11 +365,10 @@ public class ContainerCraftConfirm extends AEBaseContainer
return new PlayerSource( this.getPlayerInv().player, (IActionHost) this.getTarget() );
}
//TODO 1.9.4 - removeCraftingFromCrafters => ?
@Override
public void removeCraftingFromCrafters( final IContainerListener c )
public void removeListener( final IContainerListener c )
{
super.removeCraftingFromCrafters( c );
super.removeListener( c );
if( this.getJob() != null )
{
this.getJob().cancel( true );
@@ -152,11 +152,10 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
this.setEstimatedTime( -1 );
}
//TODO 1.9.4 - removeCraftingFromCrafters => ?
@Override
public void removeCraftingFromCrafters( final IContainerListener c )
public void removeListener( final IContainerListener c )
{
super.removeCraftingFromCrafters( c );
super.removeListener( c );
if( this.listeners.isEmpty() && this.getMonitor() != null )
{
@@ -300,11 +300,10 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
super.onUpdate( field, oldValue, newValue );
}
//TODO 1.9.4 - onCraftGuiOpened => ?
@Override
public void onCraftGuiOpened( final IContainerListener c )
public void addListener( final IContainerListener c )
{
super.onCraftGuiOpened( c );
super.addListener( c );
this.queueInventory( c );
}
@@ -24,6 +24,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
@@ -174,8 +175,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
if( item.stackSize == 0 )
{
this.getPlayerInv().mainInventory[this.getPlayerInv().currentItem] = null;
//TODO 1.9.4 - 2 hands. Just do something!
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( this.getPlayerInv().player, item ) );
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( this.getPlayerInv().player, item, null ) );
}
return true;