Remove block drop overrides, it will come back later and use jsons or something :D

This commit is contained in:
modmuss50 2019-08-08 23:25:10 +01:00
parent 05d449faac
commit 2bda5c6ce4
8 changed files with 11 additions and 125 deletions

View file

@ -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 {
@ -46,13 +39,5 @@ public class BlockAdjustableSU extends BlockEnergyStorage {
public BlockEntity createBlockEntity(BlockView worldIn) {
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);
}
}
}

View file

@ -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.
@ -49,13 +42,5 @@ public class BlockHighVoltageSU extends BlockEnergyStorage {
public BlockEntity createBlockEntity(BlockView worldIn) {
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);
}
}
}

View file

@ -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 {
@ -66,13 +63,5 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage {
((InterdimensionalSUBlockEntity) blockEntity).ownerUdid = placer.getUuid().toString();
}
}
@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);
}
}
}

View file

@ -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);
}
}
}

View file

@ -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 {
@ -46,13 +39,5 @@ public class BlockLapotronicSU extends BlockEnergyStorage {
public BlockEntity createBlockEntity(BlockView worldIn) {
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);
}
}
}

View file

@ -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.
@ -49,13 +42,5 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage {
public BlockEntity createBlockEntity(BlockView worldIn) {
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);
}
}
}

View file

@ -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));
}
}
}

View file

@ -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;
/**
@ -48,14 +41,5 @@ public class BlockMVTransformer extends BlockTransformer {
public BlockEntity createBlockEntity(BlockView worldIn) {
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));
}
}
}