Merge branch 'HbmMods:master' into master

This commit is contained in:
Vaern 2021-11-28 10:39:59 -08:00 committed by GitHub
commit f93dab38f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3271,8 +3271,10 @@ public class ModItems {
syringe_mkunicorn = new ItemSyringe().setUnlocalizedName("syringe_mkunicorn").setFull3D().setCreativeTab(null).setTextureName(RefStrings.MODID + ":syringe_mkunicorn");
iv_empty = new ItemSimpleConsumable().setUseActionServer((stack, user) -> {
ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.syringe", new ItemStack(ModItems.iv_blood));
user.attackEntityFrom(DamageSource.magic, 5F);
if(user.hurtResistantTime <= 0) {
ItemSimpleConsumable.giveSoundAndDecrement(stack, user, "hbm:item.syringe", new ItemStack(ModItems.iv_blood));
user.attackEntityFrom(DamageSource.magic, 5F);
}
}).setUnlocalizedName("iv_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":iv_empty");
iv_blood = new ItemSimpleConsumable().setUseActionServer((stack, user) -> {