From bd001351377fdbf926d1524ef1560980c0d106ba Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 21 Feb 2019 13:54:49 +0300 Subject: [PATCH] Migrated getDrops --- src/main/java/techreborn/blocks/BlockOre.java | 4 ++-- .../java/techreborn/blocks/BlockRubberLog.java | 5 ++--- .../java/techreborn/blocks/cable/BlockCable.java | 14 ++------------ .../blocks/storage/BlockAdjustableSU.java | 5 ++--- .../blocks/storage/BlockHighVoltageSU.java | 4 ++-- .../blocks/storage/BlockInterdimensionalSU.java | 4 ++-- .../techreborn/blocks/storage/BlockLSUStorage.java | 4 ++-- .../blocks/storage/BlockLapotronicSU.java | 5 ++--- .../blocks/storage/BlockMediumVoltageSU.java | 4 ++-- .../blocks/tier0/BlockIronAlloyFurnace.java | 9 +++------ .../techreborn/blocks/tier0/BlockIronFurnace.java | 7 +++---- .../blocks/transformers/BlockHVTransformer.java | 3 +-- .../blocks/transformers/BlockMVTransformer.java | 3 +-- .../java/techreborn/events/BlockBreakHandler.java | 4 +++- 14 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index a45a56e4f..7b55dde4f 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -25,12 +25,12 @@ package techreborn.blocks; import net.minecraft.block.Block; -import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.OreDrop; @@ -71,7 +71,7 @@ public class BlockOre extends Block { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { Block ore = state.getBlock(); Random random = new Random(); diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index a89257ce9..c465f2c9c 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -37,6 +37,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -204,14 +205,12 @@ public class BlockRubberLog extends Block { } @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List drops = new ArrayList<>(); + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { drops.add(new ItemStack(this)); if (state.getValue(HAS_SAP)) { if (new Random().nextInt(4) == 0) { drops.add(TRContent.Parts.SAP.getStack()); } } - return drops; } } diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index c5c9edc70..ebad03d05 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -131,7 +131,7 @@ public class BlockCable extends BlockContainer { // Block @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND); TileEntity tileEntity = worldIn.getTileEntity(pos); @@ -145,7 +145,7 @@ public class BlockCable extends BlockContainer { return true; } } - return super.onBlockActivated(worldIn, pos, state, playerIn, hand, side, hitX, hitY, hitZ); + return super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ); } @Override @@ -186,16 +186,6 @@ public class BlockCable extends BlockContainer { return getStateFromMeta(meta); } - @Override - public int getMetaFromState(IBlockState state) { - return 0; - } - - @Override - public IBlockState getStateFromMeta(int meta) { - return getDefaultState(); - } - @Override public boolean isFullCube(IBlockState state) { return false; diff --git a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java index 34d3bd802..826c6a573 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; @@ -49,11 +48,11 @@ public class BlockAdjustableSU extends BlockEnergyStorage { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } } diff --git a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java index 4ccc623aa..dddb03e39 100644 --- a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java @@ -51,11 +51,11 @@ public class BlockHighVoltageSU extends BlockEnergyStorage { } @Override - public void getDrops(NonNullList drops, IBlockReader world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } } diff --git a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java index ec7db132e..da8e7e674 100644 --- a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java @@ -70,11 +70,11 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index ba8025db8..8bc4aad39 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -108,11 +108,11 @@ public class BlockLSUStorage extends BaseTileBlock { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java index 91661e3ed..6a3416981 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; @@ -49,11 +48,11 @@ public class BlockLapotronicSU extends BlockEnergyStorage { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } } diff --git a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java index 34131048c..337220655 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java @@ -52,11 +52,11 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired) { drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } else { - super.getDrops(drops, world, pos, state, fortune); + super.getDrops(state, drops, world, pos, fortune); } } } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index 6e6652444..77b422293 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -27,6 +27,7 @@ package techreborn.blocks.tier0; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -37,8 +38,6 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.iron.TileIronAlloyFurnace; -import java.util.ArrayList; -import java.util.List; public class BlockIronAlloyFurnace extends BlockMachineBase { @@ -58,9 +57,7 @@ public class BlockIronAlloyFurnace extends BlockMachineBase { } @Override - public List getDrops(final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { - final List items = new ArrayList<>(); - items.add(new ItemStack(this)); - return items; + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { + drops.add(new ItemStack(this)); } } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index a72d840b3..d067cac07 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockReader; @@ -100,9 +101,7 @@ public class BlockIronFurnace extends BlockMachineBase { } @Override - public List getDrops(final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { - final List items = new ArrayList<>(); - items.add(new ItemStack(this)); - return items; + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { + drops.add(new ItemStack(this)); } } diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index 87869cb30..03c235f43 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; @@ -51,7 +50,7 @@ public class BlockHVTransformer extends BlockTransformer { } @Override - public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired){ drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } diff --git a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java index 1be4a445a..42c289e9c 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; @@ -51,7 +50,7 @@ public class BlockMVTransformer extends BlockTransformer { } @Override - public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { + public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { if (RebornCoreConfig.wrenchRequired){ drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index c52f4f955..f70552a8a 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -27,6 +27,8 @@ package techreborn.events; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -98,7 +100,7 @@ public class BlockBreakHandler { for (int i = 1; i < 10; i++) { BlockPos nextPos = pos.up(i); IBlockState nextState = worldIn.getBlockState(nextPos); - if(nextState.getBlock().isWood(worldIn, nextPos)){ + if(nextState.getBlock().isIn(BlockTags.LOGS)){ blocks ++; } }