Fix model overrides for brew vial/flask and mana bottle

(fixes #4842)

Author: TheRealWormbo

Xplat/src/generated/resources/.cache/e50b421f53620945aa4912c1c2808ee8f6be1628

@@ -30,7 +30,11 @@ public static void init(TriConsumer<ItemLike, ResourceLocation, ClampedItemPrope
 		consumer.accept(BotaniaItems.blackHoleTalisman, botaniaRL("active"),
 				(stack, world, entity, seed) -> stack.has(BotaniaDataComponents.ACTIVE) ? 1 : 0);
 		consumer.accept(BotaniaItems.manaBottle, botaniaRL("swigs_taken"),
-				(stack, world, entity, seed) -> BottledManaItem.SWIGS - BottledManaItem.getSwigsLeft(stack));
+				(stack, world, entity, seed) -> {
+					int swigsLeft = BottledManaItem.getSwigsLeft(stack) - 1;
+					int totalSwigs = BottledManaItem.SWIGS - 1;
+					return swigsLeft == totalSwigs ? 0.0F : Math.nextUp((totalSwigs - swigsLeft) / (float) totalSwigs);
+				});
 
 		ResourceLocation vuvuzelaId = botaniaRL("vuvuzela");
 		ClampedItemPropertyFunction isVuvuzela = (stack, world, entity, seed) -> stack.getHoverName().getString().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0;
@@ -67,7 +71,9 @@ public static void init(TriConsumer<ItemLike, ResourceLocation, ClampedItemPrope
 
 		ClampedItemPropertyFunction brewGetter = (stack, world, entity, seed) -> {
 			BaseBrewItem item = ((BaseBrewItem) stack.getItem());
-			return item.getSwigs(stack) - item.getSwigsLeft(stack);
+			int swigsLeft = item.getSwigsLeft(stack) - 1;
+			int totalSwigs = item.getSwigs(stack) - 1;
+			return swigsLeft == totalSwigs ? 0.0F : Math.nextUp((totalSwigs - swigsLeft) / (float) totalSwigs);
 		};
 		consumer.accept(BotaniaItems.brewVial, botaniaRL("swigs_taken"), brewGetter);
 		consumer.accept(BotaniaItems.brewFlask, botaniaRL("swigs_taken"), brewGetter);

Xplat/src/generated/resources/assets/botania/models/item/brew_flask.json

@@ -380,9 +380,9 @@ public final class BotaniaItems {
 	// Brewing
 	public static final Item vial = make(LibItemNames.VIAL, new VialItem(defaultBuilder()));
 	public static final Item flask = make(LibItemNames.FLASK, new VialItem(defaultBuilder()));
-	public static final Item brewVial = make(LibItemNames.BREW_VIAL, new BaseBrewItem(unstackable()
+	public static final BaseBrewItem brewVial = make(LibItemNames.BREW_VIAL, new BaseBrewItem(unstackable()
 			.component(BotaniaDataComponents.MAX_USES, BaseBrewItem.DEFAULT_USES_VIAL), 32, () -> vial));
-	public static final Item brewFlask = make(LibItemNames.BREW_FLASK, new BaseBrewItem(unstackable()
+	public static final BaseBrewItem brewFlask = make(LibItemNames.BREW_FLASK, new BaseBrewItem(unstackable()
 			.component(BotaniaDataComponents.MAX_USES, BaseBrewItem.DEFAULT_USES_FLASK), 24, () -> flask));
 	public static final Item bloodPendant = make(LibItemNames.BLOOD_PENDANT, new TaintedBloodPendantItem(unstackable()));
 	public static final Item incenseStick = make(LibItemNames.INCENSE_STICK, new IncenseStickItem(unstackable()));

Xplat/src/generated/resources/assets/botania/models/item/brew_vial.json

@@ -40,6 +40,8 @@
 import vazkii.botania.common.block.decor.PetalBlock;
 import vazkii.botania.common.block.mana.ManaPoolBlock;
 import vazkii.botania.common.block.mana.ManaSpreaderBlock;
+import vazkii.botania.common.item.BottledManaItem;
+import vazkii.botania.common.item.brew.BaseBrewItem;
 import vazkii.botania.common.item.lens.LensItem;
 import vazkii.botania.common.item.material.MysticalPetalItem;
 import vazkii.botania.common.lib.LibMisc;
@@ -202,13 +204,13 @@ private static void registerItemOverrides(Set<Item> items, BiConsumer<ResourceLo
 		items.remove(blackHoleTalisman);
 
 		OverrideHolder flaskOverrides = new OverrideHolder();
-		for (int i = 1; i <= 5; i++) {
+		for (int i = 1; i < BaseBrewItem.DEFAULT_USES_FLASK; i++) {
 			ResourceLocation overrideModel = ModelLocationUtils.getModelLocation(brewFlask, "_" + i);
 			GENERATED_1.create(overrideModel,
 					TextureMapping.layer0(flask).put(LAYER1, overrideModel),
 					consumer);
 
-			flaskOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i));
+			flaskOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i / (BaseBrewItem.DEFAULT_USES_FLASK - 1)));
 		}
 		GENERATED_OVERRIDES_1.create(ModelLocationUtils.getModelLocation(brewFlask),
 				TextureMapping.layer0(flask).put(LAYER1, TextureMapping.getItemTexture(brewFlask, "_0")),
@@ -217,12 +219,12 @@ private static void registerItemOverrides(Set<Item> items, BiConsumer<ResourceLo
 		items.remove(brewFlask);
 
 		OverrideHolder vialOverrides = new OverrideHolder();
-		for (int i = 1; i <= 3; i++) {
+		for (int i = 1; i < BaseBrewItem.DEFAULT_USES_VIAL; i++) {
 			ResourceLocation overrideModel = ModelLocationUtils.getModelLocation(brewVial, "_" + i);
 			GENERATED_1.create(overrideModel,
 					TextureMapping.layer0(vial).put(LAYER1, overrideModel),
 					consumer);
-			vialOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i));
+			vialOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i / (BaseBrewItem.DEFAULT_USES_VIAL - 1)));
 		}
 		GENERATED_OVERRIDES_1.create(ModelLocationUtils.getModelLocation(brewVial),
 				TextureMapping.layer0(vial).put(LAYER1, TextureMapping.getItemTexture(brewVial, "_0")),
@@ -259,10 +261,10 @@ private static void registerItemOverrides(Set<Item> items, BiConsumer<ResourceLo
 		items.remove(magnetRingGreater);
 
 		OverrideHolder bottleOverrides = new OverrideHolder();
-		for (int i = 1; i <= 5; i++) {
+		for (int i = 1; i < BottledManaItem.SWIGS; i++) {
 			ResourceLocation overrideModel = ModelLocationUtils.getModelLocation(manaBottle, "_" + i);
 			ModelTemplates.FLAT_ITEM.create(overrideModel, TextureMapping.layer0(overrideModel), consumer);
-			bottleOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i));
+			bottleOverrides.add(overrideModel, Pair.of(botaniaRL("swigs_taken"), (double) i / (BottledManaItem.SWIGS - 1)));
 		}
 		GENERATED_OVERRIDES.create(ModelLocationUtils.getModelLocation(manaBottle),
 				TextureMapping.layer0(manaBottle),