From ca495d6d5c1cfdcdfb70f90b09d34d1402234725 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jan 2020 19:31:03 -0600 Subject: [PATCH] Fix brews not returning the container after finishing them, fix vials looking like flasks when partially full --- .../java/vazkii/botania/common/item/ModItems.java | 4 ++-- .../vazkii/botania/common/item/brew/ItemBrewBase.java | 11 +++++++---- .../assets/botania/models/item/brew_vial.json | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index f7d26bfa0..3d3203545 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -635,8 +635,8 @@ public final class ModItems { register(r, new ItemManaInkwell(unstackable().setNoRepair()), LibItemNames.MANA_INKWELL); register(r, new ItemVial(defaultBuilder()), LibItemNames.VIAL); register(r, new ItemVial(defaultBuilder()), LibItemNames.FLASK); - register(r, new ItemBrewBase(unstackable(), 4, 32, new ItemStack(vial)), LibItemNames.BREW_VIAL); - register(r, new ItemBrewBase(unstackable(), 6, 24, new ItemStack(flask)), LibItemNames.BREW_FLASK); + register(r, new ItemBrewBase(unstackable(), 4, 32, () -> vial), LibItemNames.BREW_VIAL); + register(r, new ItemBrewBase(unstackable(), 6, 24, () -> flask), LibItemNames.BREW_FLASK); register(r, new ItemBloodPendant(unstackable()), LibItemNames.BLOOD_PENDANT); register(r, new ItemMissileRod(unstackable()), LibItemNames.MISSILE_ROD); register(r, new ItemHolyCloak(unstackable()), LibItemNames.HOLY_CLOAK); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 4c9631cf4..196fa97f8 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -16,6 +16,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; @@ -47,6 +48,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; import java.util.Map; +import java.util.function.Supplier; public class ItemBrewBase extends ItemMod implements IBrewItem { @@ -55,9 +57,9 @@ public class ItemBrewBase extends ItemMod implements IBrewItem { private final int swigs; private final int drinkSpeed; - private final ItemStack baseItem; + private final Supplier baseItem; - public ItemBrewBase(Properties builder, int swigs, int drinkSpeed, ItemStack baseItem) { + public ItemBrewBase(Properties builder, int swigs, int drinkSpeed, Supplier baseItem) { super(builder); this.swigs = swigs; this.drinkSpeed = drinkSpeed; @@ -100,8 +102,9 @@ public class ItemBrewBase extends ItemMod implements IBrewItem { int swigs = getSwigsLeft(stack); if(living instanceof PlayerEntity && !((PlayerEntity) living).abilities.isCreativeMode) { if(swigs == 1) { - if(!((PlayerEntity) living).inventory.addItemStackToInventory(baseItem.copy())) - return baseItem.copy(); + ItemStack result = new ItemStack(baseItem.get()); + if(!((PlayerEntity) living).inventory.addItemStackToInventory(result)) + return result; else { return ItemStack.EMPTY; } diff --git a/src/main/resources/assets/botania/models/item/brew_vial.json b/src/main/resources/assets/botania/models/item/brew_vial.json index fbd5fcf74..42234a149 100644 --- a/src/main/resources/assets/botania/models/item/brew_vial.json +++ b/src/main/resources/assets/botania/models/item/brew_vial.json @@ -9,19 +9,19 @@ "predicate": { "botania:swigs_taken": 1 }, - "model": "botania:item/brew_flask_1" + "model": "botania:item/brew_vial_1" }, { "predicate": { "botania:swigs_taken": 2 }, - "model": "botania:item/brew_flask_2" + "model": "botania:item/brew_vial_2" }, { "predicate": { "botania:swigs_taken": 3 }, - "model": "botania:item/brew_flask_3" + "model": "botania:item/brew_vial_3" } ] } \ No newline at end of file