diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index a680d2d63..01ce94b59 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -28,7 +28,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @SuppressWarnings("unchecked") public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder> builder = ImmutableList.builder(); - builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); + builder.add(ImmutableList.of(new ItemStack(ModItems.vial), new ItemStack(ModItems.flask))); for(Object o : recipeBrew.getInputs()) { if(o instanceof ItemStack) { builder.add(ImmutableList.of((ItemStack) o)); @@ -39,7 +39,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } input = builder.build(); - output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy()); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.flask)).copy()); } @Override diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2142ea28a..f44d2ad65 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -160,6 +160,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.terraPlate); addBlock(ModBlocks.brewery); addItem(ModItems.vial); + addItem(ModItems.flask); addItem(ModItems.brewVial); addItem(ModItems.brewFlask); addBlock(ModBlocks.incensePlate); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 0e0cd2782..3067849a6 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -561,8 +561,8 @@ public final class ModCraftingRecipes { recipeCraftCrate = path("opencrate_1"); recipesPatterns = allOfGroup("craftpattern"); recipeBrewery = ModBlocks.brewery.getRegistryName(); - recipeVial = path("vial_0"); - recipeFlask = path("vial_1"); + recipeVial = ModItems.vial.getRegistryName(); + recipeFlask = ModItems.flask.getRegistryName(); recipeIncenseStick = ModItems.incenseStick.getRegistryName(); recipeIncensePlate = ModBlocks.incensePlate.getRegistryName(); recipeHourglass = ModBlocks.hourglass.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index f7b1e8c10..527833d44 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -21,7 +21,14 @@ public class FlattenItems implements IFixableData { // support ancient prismarine from 1.7 return "minecraft:prismarine_shard"; } else { - return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i].toLowerCase(Locale.ROOT); + return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length].toLowerCase(Locale.ROOT); + } + }); + LOOKUP.put("botania:vial", i -> { + if (i == 1) { + return LibMisc.MOD_ID + ":" + LibItemNames.FLASK; + } else { + return LibMisc.MOD_ID + ":" + LibItemNames.VIAL; } }); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b5612d7f8..71f3f28cc 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -205,7 +205,8 @@ public final class ModItems { public static final Item diviningRod = new ItemDiviningRod(); public static final Item gravityRod = new ItemGravityRod(); public static final Item manaInkwell = new ItemManaInkwell(); - public static final Item vial = new ItemVial(); + public static final Item vial = new ItemVial(LibItemNames.VIAL); + public static final Item flask = new ItemVial(LibItemNames.FLASK); public static final Item brewVial = new ItemBrewVial(); public static final Item brewFlask = new ItemBrewFlask(); public static final Item bloodPendant = new ItemBloodPendant(); @@ -384,6 +385,7 @@ public final class ModItems { r.register(gravityRod); r.register(manaInkwell); r.register(vial); + r.register(flask); r.register(brewVial); r.register(brewFlask); r.register(bloodPendant); @@ -490,8 +492,8 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaweaveCloth)); OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaPowder)); - OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); - OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); + OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial)); + OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(flask)); BotaniaAPI.blackListItemFromLoonium(lexicon); BotaniaAPI.blackListItemFromLoonium(overgrowthSeed); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java index 3b8cb5e21..bb16bf4d1 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java @@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemBrewFlask extends ItemBrewBase { public ItemBrewFlask() { - super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1)); + super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.flask)); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index bea264ca9..fae819eb9 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -10,63 +10,31 @@ */ package vazkii.botania.common.item.brew; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; - -import javax.annotation.Nonnull; public class ItemVial extends ItemMod implements IBrewContainer { - public ItemVial() { - this(LibItemNames.VIAL); - } - public ItemVial(String name) { super(name); - setHasSubtypes(true); - } - - @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - ItemStack brewStack = new ItemStack(stack.getItemDamage() == 1 ? ModItems.brewFlask : ModItems.brewVial); + ItemStack brewStack = new ItemStack(this == ModItems.flask ? ModItems.brewFlask : ModItems.brewVial); ItemBrewBase.setBrew(brewStack, brew); return brewStack; } @Override public int getManaCost(Brew brew, ItemStack stack) { - return brew.getManaCost() * (stack.getItemDamage() + 1); + if (this == ModItems.flask) { + return brew.getManaCost() * 2; + } else { + return brew.getManaCost(); + } } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation("botania:vial", "inventory")); - ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation("botania:flask", "inventory")); - } - } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 7bed0cb0d..9996d8983 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -61,7 +61,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class); if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); - renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.vial, 1, 1))); + renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.flask))); } else renderItemAtLinePos(gui, 0, -1, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); int i = 0; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 75c29e205..ac414a5a1 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1470,8 +1470,8 @@ item.botania:diviningRod.name=Rod of the Plentiful Mantle item.botania:gravityRod.name=Rod of the Shaded Mesa item.botania:regenIvy.name=Timeless Ivy item.botania:manaInkwell.name=Botanurgist's Inkwell -item.botania:vial0.name=Managlass Vial -item.botania:vial1.name=Alfglass Flask +item.botania:vial.name=Managlass Vial +item.botania:flask.name=Alfglass Flask item.botania:brewVial.name=Vial of %s (%s) item.botania:brewFlask.name=Flask of %s (%s) item.botania:bloodPendant.name=Tainted Blood Pendant diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 57ac66230..226f64272 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1230,8 +1230,8 @@ item.botania:diviningRod.name=Vara de manto abundante item.botania:gravityRod.name=Vara de mesa sombría item.botania:regenIvy.name=Hiedra eterna item.botania:manaInkwell.name=Tintero del Botanurgista -item.botania:vial0.name=Vial de manacristal -item.botania:vial1.name=Matraz de alfcristal +item.botania:vial.name=Vial de manacristal +item.botania:flask.name=Matraz de alfcristal item.botania:brewVial.name=Vial de %s (%s) item.botania:brewFlask.name=Matraz de %s (%s) item.botania:bloodPendant.name=Colgante de sangre corrupta diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 8019983e5..e60a877c7 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1092,8 +1092,8 @@ item.botania:diviningRod.name=Bâton du manteau abondant item.botania:gravityRod.name=Bâton de la mesa hachurée item.botania:regenIvy.name=Lierre éternel item.botania:manaInkwell.name=Encrier du botanurgiste -item.botania:vial0.name=Fiole en verre de mana -item.botania:vial1.name=Flasque en verre elfique +item.botania:vial.name=Fiole en verre de mana +item.botania:flask.name=Flasque en verre elfique item.botania:brewVial.name=Fiole de %s (%s) item.botania:brewFlask.name=Flasque de %s (%s) item.botania:bloodPendant.name=Pendentif de sang infecté diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 8451c6813..b567a1dc7 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1255,8 +1255,8 @@ item.botania:diviningRod.name=豊富なマントルの杖 item.botania:gravityRod.name=暗がりのメサの杖 item.botania:regenIvy.name=永遠のツタ item.botania:manaInkwell.name=植物魔法学者のインク瓶 -item.botania:vial0.name=マナガラスの小瓶 -item.botania:vial1.name=アルフガラスのフラスコ +item.botania:vial.name=マナガラスの小瓶 +item.botania:flask.name=アルフガラスのフラスコ item.botania:brewVial.name=%s (%s) の小瓶 item.botania:brewFlask.name=%s (%s) のフラスコ item.botania:bloodPendant.name=汚染された血のペンダント diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 728143a8a..49dbc7454 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1191,8 +1191,8 @@ item.botania:diviningRod.name=나눗셈의 막대 item.botania:gravityRod.name=블랙메사의 막대 item.botania:regenIvy.name=시간을 초월한 아이비 item.botania:manaInkwell.name=식물학자의 잉크 통 -item.botania:vial0.name=마나유리병 -item.botania:vial1.name=엘프유리 플라스트 +item.botania:vial.name=마나유리병 +item.botania:flask.name=엘프유리 플라스트 item.botania:brewVial.name=%s의 물약 (%s) item.botania:brewFlask.name=%s의 물약 (%s) item.botania:bloodPendant.name=더럽혀진 피의 펜던트 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 73d46e575..d22406406 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1323,8 +1323,8 @@ item.botania:diviningRod.name=Wichelroede item.botania:gravityRod.name=Staf van het Schaduw Plateau item.botania:regenIvy.name=Tijdloze Klimop item.botania:manaInkwell.name=Botanisten Inktpot -item.botania:vial0.name=Flacon Managlas -item.botania:vial1.name=Flesje Elvenglas +item.botania:vial.name=Flacon Managlas +item.botania:flask.name=Flesje Elvenglas item.botania:brewVial.name=Flacon %s (%s) item.botania:brewFlask.name=Flesje %s (%s) item.botania:bloodPendant.name=Bedorven Bloed Hanger diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 13a316fb1..c119a373b 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1473,8 +1473,8 @@ item.botania:diviningRod.name=Cajado do Manto Pleno item.botania:gravityRod.name=Cajado da Mesa Sombria item.botania:regenIvy.name=Hera Eterna item.botania:manaInkwell.name=Tinteiro do Botanurgista -item.botania:vial0.name=Frasco Pequeno -item.botania:vial1.name=Frasco de Vidro Élfico +item.botania:vial.name=Frasco Pequeno +item.botania:flask.name=Frasco de Vidro Élfico item.botania:brewVial.name=Frasco Pequeno de %s (%s) item.botania:brewFlask.name=Frasco de %s (%s) item.botania:bloodPendant.name=Pingente de Sangue diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 404df7063..f1e42ed4a 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1470,8 +1470,8 @@ item.botania:diviningRod.name=占矿法杖 item.botania:gravityRod.name=黑山法杖 item.botania:regenIvy.name=永恒常春藤 item.botania:manaInkwell.name=植物学家的笔墨 -item.botania:vial0.name=魔法玻璃小瓶 -item.botania:vial1.name=精灵玻璃烧瓶 +item.botania:vial.name=魔法玻璃小瓶 +item.botania:flask.name=精灵玻璃烧瓶 item.botania:brewVial.name=装有%s (%s)的小瓶 item.botania:brewFlask.name=装有%s (%s)的烧瓶 item.botania:bloodPendant.name=污血吊坠 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 4b6aa44e7..8a41d6b6c 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1436,8 +1436,8 @@ item.botania:diviningRod.name=占礦法杖 item.botania:gravityRod.name=黑山法杖 item.botania:regenIvy.name=永恆常春籐 item.botania:manaInkwell.name=植物學家的筆墨 -item.botania:vial0.name=瑪那玻璃小瓶 -item.botania:vial1.name=精靈玻璃燒瓶 +item.botania:vial.name=瑪那玻璃小瓶 +item.botania:flask.name=精靈玻璃燒瓶 item.botania:brewVial.name=裝有%s (%s)的小瓶 item.botania:brewFlask.name=裝有%s (%s)的燒瓶 item.botania:bloodPendant.name=污血吊墜 diff --git a/src/main/resources/assets/botania/recipes/vial_1.json b/src/main/resources/assets/botania/recipes/flask.json similarity index 80% rename from src/main/resources/assets/botania/recipes/vial_1.json rename to src/main/resources/assets/botania/recipes/flask.json index 5cdbf40a5..4e7f92bd5 100644 --- a/src/main/resources/assets/botania/recipes/vial_1.json +++ b/src/main/resources/assets/botania/recipes/flask.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:vial", - "data": 1, + "item": "botania:flask", "count": 3 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/vial_0.json b/src/main/resources/assets/botania/recipes/vial.json similarity index 100% rename from src/main/resources/assets/botania/recipes/vial_0.json rename to src/main/resources/assets/botania/recipes/vial.json