diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3d47d5df1..f8d20f371 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -43,6 +43,7 @@ import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; @@ -617,7 +618,7 @@ public final class ModCraftingRecipes { recipeStarSword = ModItems.starSword.getRegistryName(); recipeThunderSword = ModItems.thunderSword.getRegistryName(); recipeCorporeaRetainer = ModBlocks.corporeaRetainer.getRegistryName(); - recipesCosmeticItems = IntStream.range(0, 32).mapToObj(i -> path("cosmetic_" + i)).collect(Collectors.toList()); + recipesCosmeticItems = IntStream.range(0, ItemBaubleCosmetic.SUBTYPES).mapToObj(i -> path("cosmetic_" + i)).collect(Collectors.toList()); recipeTinyPlanet = ModItems.tinyPlanet.getRegistryName(); recipeTinyPlanetBlock = ModBlocks.tinyPlanet.getRegistryName(); recipeManaRing = ModItems.manaRing.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 5f0ee7c78..149fdfa7c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -54,7 +54,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { THINKING_HAND } - private static final int SUBTYPES = Variants.values().length; + public static final int SUBTYPES = Variants.values().length; private ItemStack renderStack; public ItemBaubleCosmetic() { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 522d6c191..a27e1c0d2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -37,6 +37,7 @@ import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; @@ -1149,7 +1150,7 @@ public final class LexiconData { List pages = new ArrayList<>(); pages.add(new PageText("0")); pages.add(new PageText("1")); - for (int i = 0; i < 32; i++) + for (int i = 0; i < ItemBaubleCosmetic.SUBTYPES; i++) pages.add(new PageCraftingRecipe("" + (i + 2), ModCraftingRecipes.recipesCosmeticItems.get(i))); cosmeticBaubles.setPriority().setLexiconPages(pages.toArray(new LexiconPage[pages.size()])); } diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 4790dd1da..da3d9f7e9 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -3386,6 +3386,7 @@ botania.page.cosmeticBaubles30=I can fly with these botania.page.cosmeticBaubles31=Not actually part of spain botania.page.cosmeticBaubles32=Now you too can believe botania.page.cosmeticBaubles33=Get on the treadmill, angbadang +botania.page.cosmeticBaubles34=Really makes you think # -- TINY PLANET botania.entry.tinyPlanet=Tiny Planet