mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Fix cacophonium not dropping its proper drops, closes #3005
This commit is contained in:
1 parent
2bf871cb3b
commit
cf5d748194
3 files changed
+14
-16
No files matched your search
@@ -12,22 +12,18 @@ package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.inventory.InventoryHelper;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraft.world.storage.loot.LootParameters;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.TileCacophonium;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockCacophonium extends BlockMod {
|
||||
|
||||
protected BlockCacophonium(Properties builder) {
|
||||
super(builder);
|
||||
setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false));
|
||||
@@ -45,24 +41,22 @@ public class BlockCacophonium extends BlockMod {
|
||||
|
||||
if(power && !powered) {
|
||||
TileEntity tile = world.getTileEntity(pos);
|
||||
if(tile != null && tile instanceof TileCacophonium)
|
||||
if(tile instanceof TileCacophonium)
|
||||
((TileCacophonium) tile).annoyDirewolf();
|
||||
world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, true), 4);
|
||||
} else if(!power && powered)
|
||||
world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false), 4);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public List<ItemStack> getDrops(@Nonnull BlockState state, @Nonnull LootContext.Builder builder) {
|
||||
List<ItemStack> stacks = super.getDrops(state, builder);
|
||||
TileEntity te = builder.get(LootParameters.BLOCK_ENTITY);
|
||||
if(te instanceof TileCacophonium) {
|
||||
ItemStack thingy = ((TileCacophonium) te).stack;
|
||||
if(!thingy.isEmpty())
|
||||
stacks.add(thingy.copy());
|
||||
public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||
if (state.getBlock() != newState.getBlock()) {
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
if(te instanceof TileCacophonium) {
|
||||
InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), ((TileCacophonium) te).stack);
|
||||
}
|
||||
super.onReplaced(state, world, pos, newState, isMoving);
|
||||
}
|
||||
return stacks;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,6 +18,7 @@ import net.minecraft.state.properties.SlabType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.storage.loot.AlternativesLootEntry;
|
||||
import net.minecraft.world.storage.loot.ConstantRange;
|
||||
import net.minecraft.world.storage.loot.DynamicLootEntry;
|
||||
import net.minecraft.world.storage.loot.ItemLootEntry;
|
||||
import net.minecraft.world.storage.loot.LootEntry;
|
||||
import net.minecraft.world.storage.loot.LootParameterSets;
|
||||
@@ -34,6 +35,7 @@ import net.minecraft.world.storage.loot.functions.ExplosionDecay;
|
||||
import net.minecraft.world.storage.loot.functions.SetCount;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import vazkii.botania.common.block.BlockAltGrass;
|
||||
import vazkii.botania.common.block.BlockCacophonium;
|
||||
import vazkii.botania.common.block.BlockModDoubleFlower;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -84,6 +86,8 @@ public class BlockLootProvider implements IDataProvider {
|
||||
tables.put(b.getRegistryName(), genTinyPotato(b));
|
||||
else if (b == ModBlocks.cellBlock)
|
||||
tables.put(b.getRegistryName(), genCellBlock(b));
|
||||
else if (b == ModBlocks.cacophonium)
|
||||
tables.put(b.getRegistryName(), genRegular(Blocks.NOTE_BLOCK));
|
||||
else if (b.getRegistryName().getPath().matches(LibBlockNames.METAMORPHIC_PREFIX + "\\w+" + "_stone"))
|
||||
tables.put(b.getRegistryName(), genMetamorphicStone(b));
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user