Remove block drop overrides, it will come back later and use jsons or something :D
This commit is contained in:
parent
05d449faac
commit
2bda5c6ce4
8 changed files with 11 additions and 125 deletions
|
@ -24,17 +24,10 @@
|
|||
|
||||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.AdjustableSUBlockEntity;
|
||||
import techreborn.client.EGui;
|
||||
|
||||
public class BlockAdjustableSU extends BlockEnergyStorage {
|
||||
|
||||
|
@ -47,12 +40,4 @@ public class BlockAdjustableSU extends BlockEnergyStorage {
|
|||
return new AdjustableSUBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,17 +24,10 @@
|
|||
|
||||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.HighVoltageSUBlockEntity;
|
||||
import techreborn.client.EGui;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 14/03/2016.
|
||||
|
@ -50,12 +43,4 @@ public class BlockHighVoltageSU extends BlockEnergyStorage {
|
|||
return new HighVoltageSUBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,14 +29,11 @@ import net.minecraft.block.entity.BlockEntity;
|
|||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.item.ItemPlacementContext;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.idsu.InterdimensionalSUBlockEntity;
|
||||
import techreborn.client.EGui;
|
||||
|
||||
public class BlockInterdimensionalSU extends BlockEnergyStorage {
|
||||
|
||||
|
@ -67,12 +64,4 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ import net.minecraft.block.entity.BlockEntity;
|
|||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.hit.BlockHitResult;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
@ -39,10 +38,8 @@ import net.minecraft.world.BlockView;
|
|||
import net.minecraft.world.World;
|
||||
import reborncore.api.ToolManager;
|
||||
import reborncore.common.BaseBlockEntityProvider;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||
import reborncore.common.util.WrenchUtils;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.lesu.LSUStorageBlockEntity;
|
||||
|
||||
/**
|
||||
|
@ -106,12 +103,4 @@ public class BlockLSUStorage extends BaseBlockEntityProvider {
|
|||
return super.activate(state, worldIn, pos, playerIn, hand, hitResult);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,17 +24,10 @@
|
|||
|
||||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.lesu.LapotronicSUBlockEntity;
|
||||
import techreborn.client.EGui;
|
||||
|
||||
public class BlockLapotronicSU extends BlockEnergyStorage {
|
||||
|
||||
|
@ -47,12 +40,4 @@ public class BlockLapotronicSU extends BlockEnergyStorage {
|
|||
return new LapotronicSUBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,17 +24,10 @@
|
|||
|
||||
package techreborn.blocks.storage;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.storage.MediumVoltageSUBlockEntity;
|
||||
import techreborn.client.EGui;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 14/03/2016.
|
||||
|
@ -50,12 +43,4 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage {
|
|||
return new MediumVoltageSUBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired) {
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
|
||||
} else {
|
||||
super.getDrops(state, drops, world, pos, fortune);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,15 +24,8 @@
|
|||
|
||||
package techreborn.blocks.transformers;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.transformers.HVTransformerBlockEntity;
|
||||
|
||||
/**
|
||||
|
@ -49,13 +42,4 @@ public class BlockHVTransformer extends BlockTransformer {
|
|||
return new HVTransformerBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired){
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()));
|
||||
}
|
||||
else {
|
||||
drops.add(new ItemStack(this));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,15 +24,8 @@
|
|||
|
||||
package techreborn.blocks.transformers;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DefaultedList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.RebornCoreConfig;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.transformers.MVTransformerBlockEntity;
|
||||
|
||||
/**
|
||||
|
@ -49,13 +42,4 @@ public class BlockMVTransformer extends BlockTransformer {
|
|||
return new MVTransformerBlockEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getDrops(BlockState state, DefaultedList<ItemStack> drops, World world, BlockPos pos, int fortune) {
|
||||
if (RebornCoreConfig.wrenchRequired){
|
||||
drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()));
|
||||
}
|
||||
else {
|
||||
drops.add(new ItemStack(this));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue