Merge pull request #1751 from abel1502/abel-take-euphy-home

Allow collecting Euphy's statue with a red key
This commit is contained in:
HbmMods 2024-11-02 14:19:09 +01:00 committed by GitHub
commit 8be3cd4943
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +1,6 @@
package com.hbm.blocks.generic; package com.hbm.blocks.generic;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import com.hbm.blocks.ModBlocks; import com.hbm.blocks.ModBlocks;
@ -51,11 +52,20 @@ public class DecoBlockAlt extends BlockContainer {
return null; return null;
} }
@Override @Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
{ {
return Item.getItemFromBlock(ModBlocks.statue_elb); ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
} drops.add(new ItemStack(Item.getItemFromBlock(ModBlocks.statue_elb)));
if (this == ModBlocks.statue_elb_g || this == ModBlocks.statue_elb_f)
{
drops.add(new ItemStack(ModItems.gun_revolver_cursed, 1, 0));
}
if (this == ModBlocks.statue_elb_w || this == ModBlocks.statue_elb_f) {
drops.add(new ItemStack(ModItems.watch, 1, 0));
}
return drops;
}
@Override @Override
public int getRenderType(){ public int getRenderType(){
@ -153,6 +163,13 @@ public class DecoBlockAlt extends BlockContainer {
return true; return true;
} }
} }
boolean cracked = player.getHeldItem().getItem() == ModItems.key_red_cracked;
if((player.getHeldItem().getItem() == ModItems.key_red || cracked)) {
if(cracked) player.getHeldItem().stackSize--;
world.func_147480_a(x, y, z, false);
this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
return true;
}
} }
} }
return false; return false;