diff --git a/build.gradle b/build.gradle index 287d38826..0daa21f09 100644 --- a/build.gradle +++ b/build.gradle @@ -23,10 +23,10 @@ if(hasProperty('buildnumber')){ } minecraft { - version = "1.10.2-12.18.2.2121" + version = "1.11-13.19.0.2153" runDir = "idea" - mappings = "snapshot_20160519" + mappings = "snapshot_20161111" makeObfSourceJar = false //useDepAts = true @@ -45,7 +45,7 @@ repositories { dependencies { compile "net.darkhax.tesla:Tesla:1.10.2-1.2.1.49" - deobfCompile "mezz.jei:jei_1.10.2:3.13.2.360" + deobfCompile "mezz.jei:jei_1.11:4.0.1.193" } processResources { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6917d27a0..e18cba72f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index 1c97be5a0..7c618c273 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -64,7 +64,8 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack heldItem = player.getHeldItem(hand); if(this.tryToggleRedstone(world, pos, player)){ return true; } @@ -140,7 +141,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java index c21031491..61a447b0c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java @@ -43,7 +43,7 @@ public class BlockBioReactor extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ if(world.getTileEntity(pos) instanceof TileEntityBioReactor){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BIO_REACTOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index 7a8ee49a3..b31ebff06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -52,7 +52,7 @@ public class BlockBreaker extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(this.tryToggleRedstone(world, pos, player)){ return true; } @@ -73,7 +73,7 @@ public class BlockBreaker extends BlockContainerBase{ @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 910555c46..8004fdd84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -52,11 +52,11 @@ public class BlockCanolaPress extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityCanolaPress press = (TileEntityCanolaPress)world.getTileEntity(pos); if(press != null){ - if(this.checkFailUseItemOnTank(player, stack, press.tank)){ + if(this.checkFailUseItemOnTank(player, player.getHeldItem(hand), press.tank)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CANOLA_PRESS.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index 7cffafe6f..ba3813e73 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -77,7 +77,7 @@ public class BlockCoalGenerator extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityCoalGenerator press = (TileEntityCoalGenerator)world.getTileEntity(pos); if(press != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 281e67f21..bf72fa8db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -61,11 +61,11 @@ public class BlockCoffeeMachine extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing f6, float f7, float f8, float f9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing f6, float f7, float f8, float f9){ if(!world.isRemote){ TileEntityCoffeeMachine machine = (TileEntityCoffeeMachine)world.getTileEntity(pos); if(machine != null){ - if(this.checkFailUseItemOnTank(player, stack, machine.tank)){ + if(this.checkFailUseItemOnTank(player, player.getHeldItem(hand), machine.tank)){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.COFFEE_MACHINE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 58b047733..a8270c8a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -64,7 +65,8 @@ public class BlockColoredLamp extends BlockBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ + ItemStack stack = player.getHeldItem(hand); //Turning On if(player.isSneaking()){ if(!world.isRemote){ @@ -105,7 +107,7 @@ public class BlockColoredLamp extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_LAMP_TYPES.length; j++){ list.add(new ItemStack(item, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java index 45df9cabb..d495e43e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java @@ -82,7 +82,8 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stackPlayer, EnumFacing f6, float f7, float f8, float f9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing f6, float f7, float f8, float f9){ + ItemStack stackPlayer = player.getHeldItem(hand); if(!world.isRemote){ TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityCompost){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 3cf768f30..80c98edc4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -23,6 +23,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -50,7 +51,7 @@ public class BlockCrystal extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_CRYSTALS.length; j++){ list.add(new ItemStack(item, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java index 9f37f45b5..a5c752497 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java @@ -49,7 +49,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(this.tryToggleRedstone(world, pos, player)){ return true; } @@ -70,7 +70,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{ @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java index 9ad6c05d3..4a2149474 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java @@ -50,7 +50,8 @@ public class BlockDisplayStand extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand,EnumFacing par6, float par7, float par8, float par9){ + ItemStack heldItem = player.getHeldItem(hand); if(!world.isRemote){ TileEntityDisplayStand stand = (TileEntityDisplayStand)world.getTileEntity(pos); if(stand != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index 517c1134a..834eb5809 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -48,7 +48,7 @@ public class BlockDropper extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(this.tryToggleRedstone(world, pos, player)){ return true; } @@ -69,7 +69,7 @@ public class BlockDropper extends BlockContainerBase{ @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java index 55ff2cc66..ed5451eb3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java @@ -50,7 +50,8 @@ public class BlockEmpowerer extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack heldItem = player.getHeldItem(hand); if(!world.isRemote){ TileEntityEmpowerer empowerer = (TileEntityEmpowerer)world.getTileEntity(pos); if(empowerer != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 8be3a2da6..6205c9e5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -47,7 +47,7 @@ public class BlockEnergizer extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ if(this.isEnergizer){ TileEntityEnergizer energizer = (TileEntityEnergizer)world.getTileEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java index 11542d741..e27dc0395 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java @@ -48,7 +48,7 @@ public class BlockFarmer extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityFarmer farmer = (TileEntityFarmer)world.getTileEntity(pos); if(farmer != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index b1e5c1765..da0b1393d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -43,7 +43,7 @@ public class BlockFeeder extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityFeeder feeder = (TileEntityFeeder)world.getTileEntity(pos); if(feeder != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index b44cb6bde..9242fa82b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -58,7 +58,8 @@ public class BlockFermentingBarrel extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack heldItem = player.getHeldItem(hand); if(!world.isRemote){ TileEntityFermentingBarrel press = (TileEntityFermentingBarrel)world.getTileEntity(pos); if(press != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index 240fac039..73759b23b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -42,7 +42,7 @@ public class BlockFireworkBox extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ return this.tryToggleRedstone(world, pos, player); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index c6152b475..ca43c8e8e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -53,7 +53,8 @@ public class BlockFluidCollector extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack stack = player.getHeldItem(hand); if(this.tryToggleRedstone(world, pos, player)){ return true; } @@ -76,7 +77,7 @@ public class BlockFluidCollector extends BlockContainerBase{ @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 54631bb4e..08897889f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -96,7 +96,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble)world.getTileEntity(pos); if(furnace != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 58987855d..8478fa859 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -79,7 +79,7 @@ public class BlockGiantChest extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityGiantChest chest = (TileEntityGiantChest)world.getTileEntity(pos); if(chest != null){ @@ -106,7 +106,7 @@ public class BlockGiantChest extends BlockContainerBase{ for(int i = 0; i < list.tagCount(); i++){ NBTTagCompound compound = list.getCompoundTagAt(i); if(compound != null && compound.hasKey("id")){ - slots[i] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)); + slots[i] = new ItemStack(list.getCompoundTagAt(i)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index 126fa437d..54167b3a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -71,7 +71,7 @@ public class BlockGrinder extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityGrinder grinder = (TileEntityGrinder)world.getTileEntity(pos); if(grinder != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java index cd30abe71..47fe66827 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java @@ -58,7 +58,7 @@ public class BlockInputter extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityInputter inputter = (TileEntityInputter)world.getTileEntity(pos); if(inputter != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java index 0aefdaf7d..2ed22dfb6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java @@ -46,7 +46,7 @@ public class BlockItemRepairer extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityItemRepairer repairer = (TileEntityItemRepairer)world.getTileEntity(pos); if(repairer != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index 5b5631d5e..ec6419a97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -42,7 +42,7 @@ public class BlockLampPowerer extends BlockBase{ } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){ + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos otherPos){ this.updateLamp(worldIn, pos); } @@ -53,7 +53,7 @@ public class BlockLampPowerer extends BlockBase{ @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.getFacingFromEntity(pos, player).ordinal(); + int rotation = EnumFacing.func_190914_a(pos, player).ordinal(); world.setBlockState(pos, this.getStateFromMeta(rotation), 2); super.onBlockPlacedBy(world, pos, state, player, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index e3471792e..19d8fc2bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -135,7 +135,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack stack = player.getHeldItem(hand); TileEntityLaserRelay tile = (TileEntityLaserRelay)world.getTileEntity(pos); if(tile instanceof TileEntityLaserRelayItem){ TileEntityLaserRelayItem relay = (TileEntityLaserRelayItem)tile; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index dba732efe..6d1b6c233 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -49,7 +49,7 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityMiner){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java index b535656bb..4e7e9b75d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java @@ -23,6 +23,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -47,7 +48,7 @@ public class BlockMisc extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_MISC_BLOCKS.length; j++){ list.add(new ItemStack(item, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 60517feda..a9b9f692f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -77,7 +77,8 @@ public class BlockOilGenerator extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ TileEntityOilGenerator generator = (TileEntityOilGenerator)world.getTileEntity(pos); if(generator != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index ede88b7a0..b20bb67cc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -106,7 +106,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ if(this.tryToggleRedstone(world, pos, player)){ return true; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index f8c58bcb4..6d51e8390 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -43,7 +43,7 @@ public class BlockRangedCollector extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityRangedCollector breaker = (TileEntityRangedCollector)world.getTileEntity(pos); if(breaker != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index e5b3cee8b..112b2eff4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -118,7 +118,8 @@ public class BlockSlabs extends BlockBase{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + ItemStack stack = playerIn.getHeldItem(hand); if(StackUtil.isValid(stack) && playerIn.canPlayerEdit(pos.offset(facing), facing, stack)){ IBlockState state = worldIn.getBlockState(pos); @@ -138,7 +139,7 @@ public class BlockSlabs extends BlockBase{ } } - return this.tryPlace(playerIn, stack, hand, worldIn, pos.offset(facing)) ? EnumActionResult.SUCCESS : super.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); + return this.tryPlace(playerIn, stack, hand, worldIn, pos.offset(facing)) ? EnumActionResult.SUCCESS : super.onItemUse(playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); } else{ return EnumActionResult.FAIL; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index e3bcd06a6..3145170d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -72,7 +72,7 @@ public class BlockSmileyCloud extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing f6, float f7, float f8, float f9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing f6, float f7, float f8, float f9){ if(!world.isRemote){ TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntitySmileyCloud){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java index f7da7d120..61f69cc26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java @@ -26,6 +26,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.Random; //Copied from BlockTorch. @@ -66,8 +67,9 @@ public class BlockTinyTorch extends BlockBase{ } } + @Nullable @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){ + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos){ return NULL_AABB; } @@ -125,7 +127,7 @@ public class BlockTinyTorch extends BlockBase{ } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){ + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos otherPos){ this.onNeighborChangeInternal(worldIn, pos, state); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java index f45663c54..8a6793e27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java @@ -66,7 +66,7 @@ public class BlockTreasureChest extends BlockBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ world.playSound(null, pos, SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.2F, world.rand.nextFloat()*0.1F+0.9F); this.dropItems(world, pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 699261da3..0ca706722 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -109,7 +110,7 @@ public class BlockWallAA extends BlockBase{ } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){ + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos){ blockState = this.getActualState(blockState, worldIn, pos); return CLIP_AABB_BY_INDEX[yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(blockState)]; } @@ -126,7 +127,7 @@ public class BlockWallAA extends BlockBase{ @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){ list.add(new ItemStack(item, 1, 0)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index e88ff0805..9f8775cd0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -28,6 +28,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -65,7 +66,7 @@ public class BlockWildPlant extends BlockBushBase{ @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ + public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_WILD_PLANTS.length; j++){ list.add(new ItemStack(item, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index 380b24071..6d09c8994 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -49,7 +49,7 @@ public class BlockXPSolidifier extends BlockContainerBase{ } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityXPSolidifier solidifier = (TileEntityXPSolidifier)world.getTileEntity(pos); if(solidifier != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index 295be905f..766578f6b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -37,6 +37,7 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidUtil; @@ -167,8 +168,8 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){ - super.neighborChanged(state, worldIn, pos, blockIn); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos otherPos){ + super.neighborChanged(state, worldIn, pos, blockIn, otherPos); this.neighborsChangedCustom(worldIn, pos); } @@ -201,7 +202,7 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB } protected boolean checkFailUseItemOnTank(EntityPlayer player, ItemStack heldItem, FluidTank tank){ - return !StackUtil.isValid(heldItem) || !FluidUtil.interactWithFluidHandler(heldItem, tank, player); + return !StackUtil.isValid(heldItem) || !FluidUtil.interactWithFluidHandler(heldItem, tank, player).isSuccess(); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index b3e7aa2ab..b4473429d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -90,7 +90,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing facing, float hitX, float hitY, float hitZ){ + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ if(this.getMetaFromState(state) >= 7){ if(!world.isRemote){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index ab6cb9d63..b0bf568b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -18,6 +18,7 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fml.relauncher.Side; @@ -28,7 +29,7 @@ import java.util.List; public class CreativeTab extends CreativeTabs{ public static final CreativeTab INSTANCE = new CreativeTab(); - private List list; + private NonNullList list; public CreativeTab(){ super(ModUtil.MOD_ID); @@ -46,13 +47,13 @@ public class CreativeTab extends CreativeTabs{ } @Override - public Item getTabIconItem(){ - return InitItems.itemBooklet; + public ItemStack getTabIconItem(){ + return new ItemStack(InitItems.itemBooklet); } @Override @SideOnly(Side.CLIENT) - public void displayAllRelevantItems(List list){ + public void displayAllRelevantItems(NonNullList list){ this.list = list; this.add(InitItems.itemBooklet); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java index 77f73bb5f..4b11b5b3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.entity; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -22,7 +23,7 @@ public final class InitEntities{ public static void init(){ ModUtil.LOGGER.info("Initializing Entities..."); - EntityRegistry.registerModEntity(EntityWorm.class, ModUtil.MOD_ID+".worm", 0, ActuallyAdditions.instance, 64, 1, false); + EntityRegistry.registerModEntity(new ResourceLocation(ModUtil.MOD_ID, "worm"), EntityWorm.class, ModUtil.MOD_ID+".worm", 0, ActuallyAdditions.instance, 64, 1, false); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeList.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeList.java index 2f31f00df..27e4a2edc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeList.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeList.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.gen; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams; import de.ellpeck.actuallyadditions.mod.util.StackUtil; +import net.minecraft.entity.IMerchant; import net.minecraft.entity.passive.EntityVillager.ITradeList; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -24,7 +25,7 @@ import java.util.Random; public class JamVillagerTradeList implements ITradeList{ @Override - public void modifyMerchantRecipeList(MerchantRecipeList recipeList, Random random){ + public void func_190888_a(IMerchant merchant, MerchantRecipeList recipeList, Random random){ for(int i = 0; i < random.nextInt(3)+3; i++){ ItemStack jam = new ItemStack(InitItems.itemJams, 1, random.nextInt(TheJams.values().length)); ItemStack emerald = new ItemStack(Items.EMERALD); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java index fb0ee68f5..bcb3519d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java @@ -115,7 +115,7 @@ public class OreGen implements IWorldGenerator{ BlockPos randomPos = new BlockPos(event.getPos().getX()+event.getRand().nextInt(16)+8, 0, event.getPos().getZ()+event.getRand().nextInt(16)+8); randomPos = event.getWorld().getTopSolidOrLiquidBlock(randomPos); - if(event.getWorld().getBiomeGenForCoords(randomPos) instanceof BiomeOcean){ + if(event.getWorld().getBiome(randomPos) instanceof BiomeOcean){ if(randomPos.getY() >= 25 && randomPos.getY() <= 45){ if(event.getWorld().getBlockState(randomPos).getMaterial() == Material.WATER){ if(event.getWorld().getBlockState(randomPos.down()).getMaterial().isSolid()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java index d8755c2c8..7ee307e25 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java @@ -183,7 +183,7 @@ public class ContainerBag extends Container implements IButtonReactor{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } @@ -308,6 +308,11 @@ public class ContainerBag extends Container implements IButtonReactor{ return this.slots.length; } + @Override + public boolean func_191420_l(){ + return StackUtil.isIInvEmpty(this.slots); + } + @Override public ItemStack getStackInSlot(int i){ if(i < this.getSizeInventory()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java index 67249ccf3..15556024c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java @@ -88,7 +88,7 @@ public class ContainerBioReactor extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java index b92042b4e..643abff1c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java @@ -85,7 +85,7 @@ public class ContainerBreaker extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java index 4ed63df07..c8b06e942 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java @@ -87,7 +87,7 @@ public class ContainerCanolaPress extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java index f9db178b3..4b30c075f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java @@ -86,7 +86,7 @@ public class ContainerCoalGenerator extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java index fa0241e08..8f7d66d70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java @@ -114,7 +114,7 @@ public class ContainerCoffeeMachine extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java index b5f07bd01..70bf54148 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java @@ -91,7 +91,7 @@ public class ContainerCrafter extends Container{ return StackUtil.getNull(); } - slot.onPickupFromSlot(player, itemstack1); + slot.func_190901_a(player, itemstack1); } return itemstack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java index 929684d93..7f4ef45bf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java @@ -85,7 +85,7 @@ public class ContainerDirectionalBreaker extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index 668d7b142..225e22599 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -115,7 +115,7 @@ public class ContainerDrill extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } @@ -222,6 +222,11 @@ public class ContainerDrill extends Container{ return this.slots.length; } + @Override + public boolean func_191420_l(){ + return StackUtil.isIInvEmpty(this.slots); + } + @Override public ItemStack getStackInSlot(int i){ if(i < this.getSizeInventory()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java index 4c2e9230c..e5a073104 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java @@ -85,7 +85,7 @@ public class ContainerDropper extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 0d6da3702..9f852af9e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -124,7 +124,7 @@ public class ContainerEnergizer extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index e8051a9ff..f8b9b04ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -123,7 +123,7 @@ public class ContainerEnervator extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java index 35fdd9c97..8cd7515b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java @@ -95,7 +95,7 @@ public class ContainerFarmer extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java index 95da84bf9..7e5fd925f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java @@ -80,7 +80,7 @@ public class ContainerFeeder extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java index 3b1d0c18b..1600f83b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java @@ -75,7 +75,7 @@ public class ContainerFermentingBarrel extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java index a3d857e0d..2a74a91dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java @@ -104,7 +104,7 @@ public class ContainerFilter extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } @@ -215,6 +215,11 @@ public class ContainerFilter extends Container{ return this.slots.length; } + @Override + public boolean func_191420_l(){ + return StackUtil.isIInvEmpty(this.slots); + } + @Override public ItemStack getStackInSlot(int i){ if(i < this.getSizeInventory()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java index e1b98a0d8..314c093d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java @@ -82,7 +82,7 @@ public class ContainerFluidCollector extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java index 3e781c463..7e259f21c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java @@ -99,7 +99,7 @@ public class ContainerFurnaceDouble extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java index 001f0aec7..e949a75d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java @@ -86,7 +86,7 @@ public class ContainerGiantChest extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java index 5dada756d..b633e5717 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java @@ -110,7 +110,7 @@ public class ContainerGrinder extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 40f5f49bd..b382adef8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -97,7 +97,7 @@ public class ContainerInputter extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java index 485ff092e..1bc10e0ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java @@ -85,7 +85,7 @@ public class ContainerLaserRelayItemWhitelist extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java index 9bc844a95..a8f8c8d30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java @@ -85,7 +85,7 @@ public class ContainerMiner extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java index 3b0ba0b5e..b9c011e20 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java @@ -74,7 +74,7 @@ public class ContainerOilGenerator extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java index 9f220d4c2..dd39b6c70 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java @@ -85,7 +85,7 @@ public class ContainerPhantomPlacer extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java index 342e3a4b6..7da1f7039 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java @@ -92,7 +92,7 @@ public class ContainerRangedCollector extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java index 7829a5e30..e339b52fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java @@ -87,7 +87,7 @@ public class ContainerRepairer extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java index e64f6a022..3deab6620 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java @@ -85,7 +85,7 @@ public class ContainerXPSolidifier extends Container{ if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){ return StackUtil.getNull(); } - theSlot.onPickupFromSlot(player, newStack); + theSlot.func_190901_a(player, newStack); return currentStack; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 82a73cecf..ed9ed48fe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -64,12 +64,12 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ if(!playerIn.isSneaking()){ - return Items.IRON_HOE.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); + return Items.IRON_HOE.onItemUse(playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); } else{ - return Items.IRON_SHOVEL.onItemUse(stack, playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); + return Items.IRON_SHOVEL.onItemUse(playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index 8ef4fcda6..3b25fd9fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -137,7 +137,8 @@ public class ItemBag extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + ItemStack stack = playerIn.getHeldItem(hand); if(!this.isVoid){ TileEntity tile = worldIn.getTileEntity(pos); if(tile != null && tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing)){ @@ -178,11 +179,11 @@ public class ItemBag extends ItemBase{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ player.openGui(ActuallyAdditions.instance, (this.isVoid ? GuiTypes.VOID_BAG : GuiTypes.BAG).ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java index 4caa4a4da..699e06772 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java @@ -77,14 +77,15 @@ public class ItemBattery extends ItemEnergy{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World worldIn, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World worldIn, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!worldIn.isRemote && player.isSneaking()){ boolean isDischarge = this.isDischargeMode(stack); this.setDischargeMode(stack, !isDischarge); return new ActionResult(EnumActionResult.SUCCESS, stack); } - return super.onItemRightClick(stack, worldIn, player, hand); + return super.onItemRightClick(worldIn, player, hand); } private boolean isDischargeMode(ItemStack stack){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java index 1c8123bfe..ec541c8fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java @@ -54,7 +54,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitX, float hitY, float hitZ){ if(player.isSneaking()){ IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); @@ -64,7 +64,7 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ if(world.isRemote){ forcedPage = page; } - this.onItemRightClick(stack, world, player, hand); + this.onItemRightClick(world, player, hand); return EnumActionResult.SUCCESS; } } @@ -73,14 +73,14 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{ @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); if(!world.isRemote){ TheAchievements.OPEN_BOOKLET.get(player); TheAchievements.OPEN_BOOKLET_MILESTONE.get(player); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java index f41e70d4f..39c7e01ce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java @@ -37,7 +37,8 @@ public class ItemChestToCrateUpgrade extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack heldStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float par8, float par9, float par10){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float par8, float par9, float par10){ + ItemStack heldStack = player.getHeldItem(hand); if(player.isSneaking()){ TileEntity tileHit = world.getTileEntity(pos); if(tileHit.getClass() == this.start){ @@ -79,7 +80,7 @@ public class ItemChestToCrateUpgrade extends ItemBase{ } } - return super.onItemUse(heldStack, player, world, pos, hand, facing, par8, par9, par10); + return super.onItemUse(player, world, pos, hand, facing, par8, par9, par10); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java index c83422dd3..b3acc584b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java @@ -30,11 +30,11 @@ public class ItemCrafterOnAStick extends ItemBase{ @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CRAFTER.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index 76634ed55..d8e0bff2c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -58,7 +59,7 @@ public class ItemCrystal extends ItemBase{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < BlockCrystal.ALL_CRYSTALS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 93bcbfb3e..5e7f637c9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -104,7 +104,8 @@ public class ItemDrill extends ItemEnergy{ @Override //Places Blocks if the Placing Upgrade is installed - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ){ + ItemStack stack = player.getHeldItem(hand); ItemStack upgrade = this.getHasUpgradeAsStack(stack, ItemDrillUpgrade.UpgradeType.PLACER); if(StackUtil.isValid(upgrade)){ int slot = ItemDrillUpgrade.getSlotToPlaceFrom(upgrade); @@ -127,7 +128,7 @@ public class ItemDrill extends ItemEnergy{ } //Notify the Player and log the Exception catch(Exception e){ - player.addChatComponentMessage(new TextComponentString("Ouch! That really hurt! You must have done something wrong, don't do that again please!")); + player.addChatMessage(new TextComponentString("Ouch! That really hurt! You must have done something wrong, don't do that again please!")); ModUtil.LOGGER.error("Player "+player.getName()+" who should place a Block using a Drill at "+player.posX+", "+player.posY+", "+player.posZ+" in World "+world.provider.getDimension()+" threw an Exception! Don't let that happen again!"); } } @@ -168,11 +169,11 @@ public class ItemDrill extends ItemEnergy{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote && player.isSneaking()){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); } @Override @@ -366,7 +367,7 @@ public class ItemDrill extends ItemEnergy{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list){ + public void getSubItems(Item item, CreativeTabs tabs, NonNullList list){ for(int i = 0; i < 16; i++){ this.addDrillStack(list, i); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java index 9be78d3b0..30327f3dc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java @@ -39,7 +39,8 @@ public class ItemDrillUpgrade extends ItemBase{ @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote && this.type == UpgradeType.PLACER){ this.setSlotToPlaceFrom(stack, player.inventory.currentItem); return new ActionResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 0d40df918..b30c232af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -53,7 +54,7 @@ public class ItemDust extends ItemBase implements IColorProvidingItem{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_DUSTS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java index f95a4ff15..de795fdb9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java @@ -33,14 +33,15 @@ public class ItemFertilizer extends ItemBase{ @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){ + ItemStack stack = player.getHeldItem(hand); if(ItemDye.applyBonemeal(stack, world, pos, player)){ if(!world.isRemote){ world.playEvent(2005, pos, 0); } return EnumActionResult.SUCCESS; } - return super.onItemUse(stack, player, world, pos, hand, side, par8, par9, par10); + return super.onItemUse(player, world, pos, hand, side, par8, par9, par10); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java index c6489255d..c0eab6c9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java @@ -85,7 +85,8 @@ public class ItemFillingWand extends ItemEnergy{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote && player.getItemInUseCount() <= 0){ if(player.isSneaking()){ IBlockState state = world.getBlockState(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java index 03fd5a779..fe07e17fe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFilter.java @@ -38,11 +38,11 @@ public class ItemFilter extends ItemBase{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ if(!world.isRemote){ player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FILTER.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 7c4d895e9..a7fbab4e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -24,6 +24,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -96,7 +97,7 @@ public class ItemFoods extends ItemFoodBase{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_FOODS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java index e86fa7ab4..d136f3823 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java @@ -55,7 +55,8 @@ public class ItemHairyBall extends ItemBase{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ ItemStack returnItem = this.getRandomReturnItem(world.rand); if(!player.inventory.addItemStackToInventory(returnItem)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index 5dfd93ffe..f5d924c83 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -62,7 +63,7 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_JAMS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java index a7a9c7848..ca6ab43d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java @@ -39,13 +39,14 @@ public class ItemLaserWrench extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ + ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityLaserRelay){ if(!world.isRemote){ if(ItemPhantomConnector.getStoredPosition(stack) == null){ ItemPhantomConnector.storeConnection(stack, pos.getX(), pos.getY(), pos.getZ(), world); - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.stored.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.stored.desc")); } else{ BlockPos savedPos = ItemPhantomConnector.getStoredPosition(stack); @@ -59,10 +60,10 @@ public class ItemLaserWrench extends ItemBase{ ((TileEntityLaserRelay)savedTile).sendUpdate(); relay.sendUpdate(); - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.connected.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.connected.desc")); } else{ - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.cantConnect.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".laser.cantConnect.desc")); ItemPhantomConnector.clearStorage(stack, "XCoordOfTileStored", "YCoordOfTileStored", "ZCoordOfTileStored", "WorldOfTileStored"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index 568b7eaed..824b032b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -45,9 +45,9 @@ public class ItemLeafBlower extends ItemBase implements IDisplayStandItem{ @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ player.setActiveHand(hand); - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 9947f586e..39c5ec4de 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -22,6 +22,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.Fluid; @@ -58,7 +59,7 @@ public class ItemMisc extends ItemBase{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_MISC_ITEMS.length; j++){ if(j != TheMiscItems.YOUTUBE_ICON.ordinal()){ list.add(new ItemStack(this, 1, j)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java index 7af581e86..483537189 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java @@ -86,7 +86,8 @@ public class ItemPhantomConnector extends ItemBase{ @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing par7, float par8, float par9, float par10){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ //Passing Data to Phantoms TileEntity tile = world.getTileEntity(pos); @@ -99,7 +100,7 @@ public class ItemPhantomConnector extends ItemBase{ ((TileEntityBase)tile).sendUpdate(); } clearStorage(stack, "XCoordOfTileStored", "YCoordOfTileStored", "ZCoordOfTileStored", "WorldOfTileStored"); - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.connected.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.connected.desc")); return EnumActionResult.SUCCESS; } return EnumActionResult.FAIL; @@ -107,7 +108,7 @@ public class ItemPhantomConnector extends ItemBase{ } //Storing Connections storeConnection(stack, pos.getX(), pos.getY(), pos.getZ(), world); - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.stored.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.stored.desc")); } return EnumActionResult.SUCCESS; } @@ -120,7 +121,7 @@ public class ItemPhantomConnector extends ItemBase{ if(tile instanceof IPhantomTile){ ((IPhantomTile)tile).setBoundPosition(null); } - player.addChatComponentMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.unbound.desc")); + player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.unbound.desc")); return false; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java index 47b4ccc39..d9ffd3e9e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java @@ -67,7 +67,8 @@ public class ItemPlayerProbe extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + ItemStack stack = player.getHeldItem(hand); TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityPlayerInterface){ if(stack.hasTagCompound()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 01a2deecb..8691006fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -91,7 +92,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem, IDi @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ + public void getSubItems(Item item, CreativeTabs tab, NonNullList list){ for(int j = 0; j < ALL_RINGS.length; j++){ list.add(new ItemStack(this, 1, j)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java index a1eaaaecf..7985534b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java @@ -28,7 +28,8 @@ public class ItemResonantRice extends ItemBase{ @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ stack = StackUtil.addStackSize(stack, -1); world.createExplosion(null, player.posX, player.posY, player.posZ, 0.5F, true); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java index c7163a0a1..2ae857404 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java @@ -51,8 +51,8 @@ public class ItemShovelAA extends ItemToolAA{ @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ - return Items.IRON_SHOVEL.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + return Items.IRON_SHOVEL.onItemUse(playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java index 538704d80..9a1ad39cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java @@ -52,7 +52,8 @@ public class ItemSolidifiedExperience extends ItemBase{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ int amount; if(!player.isSneaking()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java index 037c778c6..faba35ed0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java @@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -58,7 +59,7 @@ public class ItemSpawnerChanger extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack aStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){ if(!world.isRemote){ ItemStack stack = player.getHeldItemMainhand(); if(player.canPlayerEdit(pos.offset(facing), facing, stack)){ @@ -76,7 +77,7 @@ public class ItemSpawnerChanger extends ItemBase{ compound.removeTag("SpawnData"); logic.readFromNBT(compound); - logic.setEntityName(entity); + logic.func_190894_a(new ResourceLocation(entity)); tile.markDirty(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index c83e9877e..9f8a2ed19 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -32,7 +32,8 @@ public class ItemTeleStaff extends ItemEnergy{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote){ RayTraceResult pos = WorldUtil.getNearestPositionWithAir(world, player, 100); if(pos != null && (pos.typeOfHit == RayTraceResult.Type.BLOCK || player.rotationPitch >= -5)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java index cf24a5912..6a7562a94 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java @@ -79,7 +79,9 @@ public class ItemWaterBowl extends ItemBase{ } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){ + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand){ + ItemStack stack = player.getHeldItem(hand); + RayTraceResult trace = WorldUtil.getNearestBlockWithDefaultReachDistance(world, player); ActionResult result = ForgeEventFactory.onBucketUse(player, world, stack, trace); if(result != null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java index 787846241..448ebe4c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java @@ -41,7 +41,8 @@ public class ItemWorm extends ItemBase{ } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10){ + ItemStack stack = player.getHeldItem(hand); IBlockState state = world.getBlockState(pos); if(EntityWorm.canWormify(world, pos, state)){ List worms = world.getEntitiesWithinAABB(EntityWorm.class, new AxisAlignedBB(pos.getX()-1, pos.getY(), pos.getZ()-1, pos.getX()+2, pos.getY()+1, pos.getZ()+2)); @@ -56,7 +57,7 @@ public class ItemWorm extends ItemBase{ return EnumActionResult.SUCCESS; } } - return super.onItemUse(stack, player, world, pos, hand, side, par8, par9, par10); + return super.onItemUse(player, world, pos, hand, side, par8, par9, par10); } @SubscribeEvent diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 5abaea389..552d96124 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java @@ -20,6 +20,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -78,7 +80,7 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list){ + public void getSubItems(Item item, CreativeTabs tabs, NonNullList list){ ItemStack stackFull = new ItemStack(this); this.setEnergy(stackFull, this.getMaxEnergyStored(stackFull)); list.add(stackFull); @@ -100,6 +102,13 @@ public abstract class ItemEnergy extends ItemEnergyContainer{ return energyDif/maxAmount; } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack){ + int currEnergy = this.getEnergyStored(stack); + int maxEnergy = this.getMaxEnergyStored(stack); + return MathHelper.hsvToRGB(Math.max(0.0F, (float)currEnergy/maxEnergy)/3.0F, 1.0F, 1.0F); + } + public void setEnergy(ItemStack stack, int energy){ NBTTagCompound compound = stack.getTagCompound(); if(compound == null){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java index 0d7626720..2ce7dca88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java @@ -24,11 +24,6 @@ public class BookletRecipeHandler implements IRecipeHandler{ @Override public String getRecipeCategoryUid(IBookletPage recipe){ - return this.getRecipeCategoryUid(); - } - - @Override - public String getRecipeCategoryUid(){ return BookletRecipeCategory.NAME; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index a144d1fd6..b9ec43668 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java @@ -65,11 +65,6 @@ public class BookletRecipeWrapper extends RecipeWrapperWithButton{ super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); } - @Override - public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ - - } - @Override public int getButtonX(){ return 0; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java index 8f59b37a4..321435952 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java @@ -24,15 +24,9 @@ public class CoffeeMachineRecipeHandler implements IRecipeHandler{ return CrusherRecipe.class; } - - @Override - public String getRecipeCategoryUid(){ - return CrusherRecipeCategory.NAME; - } - @Override public String getRecipeCategoryUid(CrusherRecipe recipe){ - return this.getRecipeCategoryUid(); + return CrusherRecipeCategory.NAME; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java index c65558a34..e7be76c0d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java @@ -53,11 +53,6 @@ public class CrusherRecipeWrapper extends RecipeWrapperWithButton{ super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); } - @Override - public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ - - } - @Override public int getButtonX(){ return -5; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeHandler.java index 04338ee31..02a49a818 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeHandler.java @@ -21,14 +21,9 @@ public class EmpowererRecipeHandler implements IRecipeHandler{ return EmpowererRecipe.class; } - @Override - public String getRecipeCategoryUid(){ - return EmpowererRecipeCategory.NAME; - } - @Override public String getRecipeCategoryUid(EmpowererRecipe recipe){ - return this.getRecipeCategoryUid(); + return EmpowererRecipeCategory.NAME; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java index a501caf59..6583c4ca0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java @@ -35,11 +35,6 @@ public class EmpowererRecipeWrapper extends RecipeWrapperWithButton{ ingredients.setOutput(ItemStack.class, this.theRecipe.output); } - @Override - public void drawAnimations(Minecraft minecraft, int recipeWidth, int recipeHeight){ - - } - @Override public int getButtonX(){ return 2; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java index a33ffe9c3..89930c8dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java @@ -21,14 +21,9 @@ public class ReconstructorRecipeHandler implements IRecipeHandler 0){ EnumFacing[] sides = handler.getFluidShareSides(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index d99729812..0294411d5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -156,62 +156,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IC } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? 0 : handler.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canFillFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canDrainFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler instanceof IFluidTank){ - return new FluidTankInfo[]{((IFluidTank)handler).getInfo()}; - } - else{ - return null; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return this.tank.getFluidAmount(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index 32b0402d6..9b1e3f284 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -218,62 +218,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? 0 : handler.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canFillFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canDrainFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler instanceof IFluidTank){ - return new FluidTankInfo[]{((IFluidTank)handler).getInfo()}; - } - else{ - return null; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return 0; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 023a6817a..6090d5a26 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -123,62 +123,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? 0 : handler.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canFillFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canDrainFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler instanceof IFluidTank){ - return new FluidTankInfo[]{((IFluidTank)handler).getInfo()}; - } - else{ - return null; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return this.oilTank.getFluidAmount(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index 6d94c907a..95040645b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -166,68 +166,8 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing } } - @SideOnly(Side.CLIENT) - public int getTankScaled(int i){ - return this.tank.getFluidAmount()*i/this.tank.getCapacity(); - } - @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? 0 : handler.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canFillFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canDrainFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler instanceof IFluidTank){ - return new FluidTankInfo[]{((IFluidTank)handler).getInfo()}; - } - else{ - return null; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return this.tank.getFluidAmount(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index 6ede6d218..10cfea1f3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -58,7 +58,7 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements NBTTagList tagList = compound.getTagList("Items", 10); for(int i = 0; i < slots.length; i++){ NBTTagCompound tagCompound = tagList.getCompoundTagAt(i); - slots[i] = tagCompound != null && tagCompound.hasKey("id") ? ItemStack.loadItemStackFromNBT(tagCompound) : StackUtil.getNull(); + slots[i] = tagCompound != null && tagCompound.hasKey("id") ? new ItemStack(tagCompound) : StackUtil.getNull(); } } } @@ -218,4 +218,9 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements public boolean hasInvWrapperCapabilities(){ return true; } + + @Override + public boolean func_191420_l(){ + return StackUtil.isIInvEmpty(this.slots); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java index 25f6c3386..5ce7703ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayFluids.java @@ -22,7 +22,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,8 +35,37 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements public final ConcurrentHashMap receiversAround = new ConcurrentHashMap(); + private final IFluidHandler[] fluidHandlers = new IFluidHandler[6]; + public TileEntityLaserRelayFluids(){ super("laserRelayFluids", LaserType.FLUID); + + for(int i = 0; i < this.fluidHandlers.length; i++){ + final EnumFacing facing = EnumFacing.values()[i]; + this.fluidHandlers[i] = new IFluidHandler(){ + @Override + public IFluidTankProperties[] getTankProperties(){ + return new IFluidTankProperties[0]; + } + + @Override + public int fill(FluidStack resource, boolean doFill){ + return TileEntityLaserRelayFluids.this.transmitFluid(facing, resource, doFill); + } + + @Nullable + @Override + public FluidStack drain(FluidStack resource, boolean doDrain){ + return null; + } + + @Nullable + @Override + public FluidStack drain(int maxDrain, boolean doDrain){ + return null; + } + }; + } } @Override @@ -52,7 +83,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements BlockPos pos = this.getPos().offset(side); TileEntity tile = this.worldObj.getTileEntity(pos); if(tile != null && !(tile instanceof TileEntityLaserRelay)){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler || tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())){ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())){ this.receiversAround.put(side, tile); TileEntity oldTile = old.get(side); @@ -72,7 +103,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements } @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return 0; } @@ -87,22 +118,22 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - return this.transmitEnergy(from, resource, doFill); + public IFluidHandler getFluidHandler(EnumFacing facing){ + return this.fluidHandlers[facing == null ? 0 : facing.ordinal()]; } - private int transmitEnergy(EnumFacing from, FluidStack stack, boolean doFill){ + private int transmitFluid(EnumFacing from, FluidStack stack, boolean doFill){ int transmitted = 0; if(stack != null){ Network network = ActuallyAdditionsAPI.connectionHandler.getNetworkFor(this.pos, this.worldObj); if(network != null){ - transmitted = this.transferEnergyToReceiverInNeed(from, network, stack, doFill); + transmitted = this.transferFluidToReceiverInNeed(from, network, stack, doFill); } } return transmitted; } - private int transferEnergyToReceiverInNeed(EnumFacing from, Network network, FluidStack stack, boolean doFill){ + private int transferFluidToReceiverInNeed(EnumFacing from, Network network, FluidStack stack, boolean doFill){ int transmitted = 0; //Keeps track of all the Laser Relays and Energy Acceptors that have been checked already to make nothing run multiple times List alreadyChecked = new ArrayList(); @@ -142,15 +173,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements if(!alreadyChecked.contains(tile.getPos())){ alreadyChecked.add(tile.getPos()); if(theRelay != this || side != from){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - net.minecraftforge.fluids.IFluidHandler iHandler = (net.minecraftforge.fluids.IFluidHandler)tile; - if(iHandler.canFill(opp, stack.getFluid())){ - FluidStack copy = stack.copy(); - copy.amount = amountPer; - transmitted += iHandler.fill(opp, copy, doFill); - } - } - else if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, opp)){ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, opp)){ IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, opp); if(cap != null){ FluidStack copy = stack.copy(); @@ -172,29 +195,4 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements return transmitted; } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - return null; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - return null; - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - return true; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - return new FluidTankInfo[0]; - } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java index e0d0a7853..8651d8cb0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java @@ -109,6 +109,11 @@ public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem return this.tile.slots.length; } + @Override + public boolean func_191420_l(){ + return StackUtil.isIInvEmpty(this.tile.slots); + } + @Override public ItemStack getStackInSlot(int i){ if(i < this.getSizeInventory()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index 92f6ff85e..d83964527 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -148,62 +148,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? 0 : handler.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - IFluidHandler handler = this.getFluidHandler(from); - return handler == null ? null : handler.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canFillFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler != null){ - for(IFluidTankProperties prop : handler.getTankProperties()){ - if(prop != null && prop.canDrainFluidType(new FluidStack(fluid, Integer.MAX_VALUE))){ - return true; - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - IFluidHandler handler = this.getFluidHandler(from); - if(handler instanceof IFluidTank){ - return new FluidTankInfo[]{((IFluidTank)handler).getInfo()}; - } - else{ - return null; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return 0; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index c61187cdf..08537052e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -13,12 +13,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements ISharingFluidHandler{ @@ -32,14 +27,9 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements if(super.isBoundThingInRange()){ TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return true; - } - else{ - for(EnumFacing facing : EnumFacing.values()){ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)){ - return true; - } + for(EnumFacing facing : EnumFacing.values()){ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)){ + return true; } } } @@ -48,139 +38,7 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill){ - if(this.isBoundThingInRange()){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).fill(from, resource, doFill); - } - else{ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ - IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); - if(cap != null){ - return cap.fill(resource, doFill); - } - } - } - } - } - return 0; - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ - if(this.isBoundThingInRange()){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).drain(from, resource, doDrain); - } - else{ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ - IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); - if(cap != null){ - return cap.drain(resource, doDrain); - } - } - } - } - } - return null; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ - if(this.isBoundThingInRange()){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).drain(from, maxDrain, doDrain); - } - else{ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ - IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); - if(cap != null){ - return cap.drain(maxDrain, doDrain); - } - } - } - } - } - return null; - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid){ - if(this.isBoundThingInRange()){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).canFill(from, fluid); - } - else{ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ - IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); - if(cap != null){ - FluidStack stack = new FluidStack(fluid, 1); - IFluidTankProperties[] props = cap.getTankProperties(); - if(props != null){ - for(IFluidTankProperties prop : props){ - if(prop.canFillFluidType(stack)){ - return true; - } - } - } - } - } - } - } - } - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid){ - if(this.isBoundThingInRange()){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile != null){ - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).canDrain(from, fluid); - } - else{ - if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ - IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); - if(cap != null){ - FluidStack stack = new FluidStack(fluid, 1); - IFluidTankProperties[] props = cap.getTankProperties(); - if(props != null){ - for(IFluidTankProperties prop : props){ - if(prop.canDrainFluidType(stack)){ - return true; - } - } - } - } - } - } - } - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ - return ((net.minecraftforge.fluids.IFluidHandler)tile).getTankInfo(from); - } - else{ - return new FluidTankInfo[0]; - } - } - - @Override - public int getFluidAmountToSplitShare(){ + public int getMaxFluidAmountToSplitShare(){ return Integer.MAX_VALUE; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java index c9467881f..f18ca54cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java @@ -114,7 +114,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP this.boundBlockBefore = this.boundPosition == null ? null : this.worldObj.getBlockState(this.boundPosition).getBlock(); if(this.boundPosition != null){ - this.worldObj.notifyNeighborsOfStateChange(this.pos, this.worldObj.getBlockState(this.boundPosition).getBlock()); + this.worldObj.notifyNeighborsOfStateChange(this.pos, this.worldObj.getBlockState(this.boundPosition).getBlock(), false); } this.sendUpdate(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java index 188bea870..3f9c2b0d7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java @@ -53,13 +53,13 @@ public class UpdateChecker{ if(ticksElapsedBeforeInfo >= 800){ EntityPlayer player = Minecraft.getMinecraft().thePlayer; if(UpdateChecker.checkFailed){ - player.addChatComponentMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ModUtil.MOD_ID+".update.failed"))); + player.addChatMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ModUtil.MOD_ID+".update.failed"))); notified = true; } else if(UpdateChecker.needsUpdateNotify){ - player.addChatComponentMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ModUtil.MOD_ID+".update.generic"))); - player.addChatComponentMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".update.versionCompare", ModUtil.VERSION, UpdateChecker.updateVersionString))); - player.addChatComponentMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK))); + player.addChatMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ModUtil.MOD_ID+".update.generic"))); + player.addChatMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".update.versionCompare", ModUtil.VERSION, UpdateChecker.updateVersionString))); + player.addChatMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK))); notified = true; } ticksElapsedBeforeInfo = 0; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java index ccfbfab57..a5ce48986 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java @@ -33,11 +33,11 @@ public final class StackUtil{ } public static boolean isValid(ItemStack stack){ - return stack != null && !ItemStack.areItemStacksEqual(stack, getNull()) && stack.stackSize > 0 && stack.getItem() != null; + return stack != null && !stack.func_190926_b(); } public static ItemStack getNull(){ - return null; + return ItemStack.field_190927_a; } public static int getStackSize(ItemStack stack){ @@ -45,7 +45,7 @@ public final class StackUtil{ return 0; } else{ - return stack.stackSize; + return stack.func_190916_E(); } } @@ -58,11 +58,21 @@ public final class StackUtil{ return getNull(); } } - stack.stackSize = size; + stack.func_190920_e(size); return stack; } public static ItemStack addStackSize(ItemStack stack, int size){ return setStackSize(stack, getStackSize(stack)+size); } + + public static boolean isIInvEmpty(ItemStack[] slots){ + for(ItemStack stack : slots){ + if(StackUtil.isValid(stack)){ + return false; + } + } + + return true; + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 46172671c..ee3db26e8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -43,9 +43,12 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -94,28 +97,13 @@ public final class WorldUtil{ public static void doFluidInteraction(TileEntity tileFrom, TileEntity tileTo, EnumFacing sideTo, int maxTransfer){ if(maxTransfer > 0){ - //Push and pull with old fluid system - if(tileFrom instanceof net.minecraftforge.fluids.IFluidHandler && tileTo instanceof net.minecraftforge.fluids.IFluidHandler){ - net.minecraftforge.fluids.IFluidHandler handlerTo = (net.minecraftforge.fluids.IFluidHandler)tileTo; - net.minecraftforge.fluids.IFluidHandler handlerFrom = (net.minecraftforge.fluids.IFluidHandler)tileFrom; - FluidStack drain = handlerFrom.drain(sideTo, maxTransfer, false); + if(tileFrom.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo) && tileTo.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo.getOpposite())){ + IFluidHandler handlerFrom = tileFrom.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo); + IFluidHandler handlerTo = tileTo.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo.getOpposite()); + FluidStack drain = handlerFrom.drain(maxTransfer, false); if(drain != null){ - if(handlerTo.canFill(sideTo.getOpposite(), drain.getFluid())){ - int filled = handlerTo.fill(sideTo.getOpposite(), drain.copy(), true); - handlerFrom.drain(sideTo, filled, true); - } - } - } - //Push and pull with new fluid system - else{ - if(tileFrom.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo) && tileTo.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo.getOpposite())){ - IFluidHandler handlerFrom = tileFrom.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo); - IFluidHandler handlerTo = tileTo.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, sideTo.getOpposite()); - FluidStack drain = handlerFrom.drain(maxTransfer, false); - if(drain != null){ - int filled = handlerTo.fill(drain.copy(), true); - handlerFrom.drain(filled, true); - } + int filled = handlerTo.fill(drain.copy(), true); + handlerFrom.drain(filled, true); } } } @@ -147,29 +135,6 @@ public final class WorldUtil{ Block block = state.getBlock(); boolean replaceable = block.isReplaceable(world, offsetPos); - //Fluids - if(replaceable && !(block instanceof IFluidBlock) && !(block instanceof BlockLiquid)){ - FluidStack fluid = null; - if(FluidContainerRegistry.isFilledContainer(stack)){ - fluid = FluidContainerRegistry.getFluidForFilledItem(stack); - } - else if(stack.getItem() instanceof IFluidContainerItem){ - fluid = ((IFluidContainerItem)stack.getItem()).getFluid(stack); - } - - if(fluid != null && fluid.amount >= Util.BUCKET){ - Fluid theFluid = fluid.getFluid(); - if(theFluid != null){ - Block fluidBlock = theFluid.getBlock(); - if(fluidBlock != null && fluidBlock.canPlaceBlockAt(world, offsetPos)){ - if(world.setBlockState(offsetPos, fluidBlock.getDefaultState(), 2)){ - return stack.getItem().getContainerItem(stack); - } - } - } - } - } - //Redstone if(replaceable && stack.getItem() == Items.REDSTONE){ world.setBlockState(offsetPos, Blocks.REDSTONE_WIRE.getDefaultState(), 2);