From 9b14ab4e2c69d92767524e18215b16a8e05b45f9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Dec 2017 17:46:46 -0600 Subject: [PATCH] Flatten cosmetics (easier than expected) --- .../render/tile/RenderTileTinyPotato.java | 1 - .../common/core/BotaniaCreativeTab.java | 2 +- .../botania/common/fixers/FlattenItems.java | 5 + .../vazkii/botania/common/item/ModItems.java | 12 +- .../equipment/bauble/ItemBaubleCosmetic.java | 122 +++++++----------- .../botania/common/lexicon/LexiconData.java | 3 +- .../common/lexicon/WelcomeLexiconEntry.java | 3 +- .../resources/assets/botania/lang/en_us.lang | 64 ++++----- .../resources/assets/botania/lang/es_es.lang | 64 ++++----- .../resources/assets/botania/lang/fr_fr.lang | 64 ++++----- .../resources/assets/botania/lang/ja_jp.lang | 64 ++++----- .../resources/assets/botania/lang/ko_kr.lang | 64 ++++----- .../resources/assets/botania/lang/nl_nl.lang | 64 ++++----- .../resources/assets/botania/lang/pt_br.lang | 64 ++++----- .../resources/assets/botania/lang/zh_cn.lang | 64 ++++----- .../resources/assets/botania/lang/zh_tw.lang | 64 ++++----- ...tic24.json => cosmetic_alien_antenna.json} | 0 ...25.json => cosmetic_anaglyph_glasses.json} | 0 ...etic22.json => cosmetic_ancient_mask.json} | 0 ...metic0.json => cosmetic_black_bowtie.json} | 0 ...cosmetic1.json => cosmetic_black_tie.json} | 0 ...ic10.json => cosmetic_blue_butterfly.json} | 0 ...c21.json => cosmetic_botanist_emblem.json} | 0 ...cosmetic11.json => cosmetic_cat_ears.json} | 0 ...osmetic17.json => cosmetic_clock_eye.json} | 0 ...metic19.json => cosmetic_devil_horns.json} | 0 ...smetic13.json => cosmetic_devil_tail.json} | 0 ...smetic23.json => cosmetic_eerie_mask.json} | 0 ...c4.json => cosmetic_engineer_goggles.json} | 0 ...{cosmetic5.json => cosmetic_eyepatch.json} | 0 ...16.json => cosmetic_four_leaf_clover.json} | 0 ...metic15.json => cosmetic_googly_eyes.json} | 0 ...c27.json => cosmetic_groucho_glasses.json} | 0 ...smetic20.json => cosmetic_hyper_plus.json} | 0 ...osmetic14.json => cosmetic_kamui_eye.json} | 0 ...29.json => cosmetic_lusitanic_shield.json} | 0 ...tic26.json => cosmetic_orange_shades.json} | 0 ...ic8.json => cosmetic_pink_flower_bud.json} | 0 ...9.json => cosmetic_polka_dotted_bows.json} | 0 ...smetic3.json => cosmetic_puffy_scarf.json} | 0 ...c31.json => cosmetic_questgiver_mark.json} | 0 ...smetic2.json => cosmetic_red_glasses.json} | 0 ...smetic7.json => cosmetic_red_ribbons.json} | 0 ...ic28.json => cosmetic_thick_eyebrows.json} | 0 ...30.json => cosmetic_tiny_potato_mask.json} | 0 ...etic18.json => cosmetic_unicorn_horn.json} | 0 ...ic6.json => cosmetic_wicked_eyepatch.json} | 0 ...osmetic12.json => cosmetic_witch_pin.json} | 0 ...ic_24.json => cosmetic_alien_antenna.json} | 3 +- ...25.json => cosmetic_anaglyph_glasses.json} | 3 +- ...tic_22.json => cosmetic_ancient_mask.json} | 3 +- ...etic_0.json => cosmetic_black_bowtie.json} | 3 +- ...osmetic_1.json => cosmetic_black_tie.json} | 3 +- ...c_10.json => cosmetic_blue_butterfly.json} | 3 +- ..._21.json => cosmetic_botanist_emblem.json} | 3 +- ...osmetic_11.json => cosmetic_cat_ears.json} | 3 +- ...smetic_17.json => cosmetic_clock_eye.json} | 3 +- ...etic_19.json => cosmetic_devil_horns.json} | 3 +- ...metic_13.json => cosmetic_devil_tail.json} | 3 +- ...metic_23.json => cosmetic_eerie_mask.json} | 3 +- ..._4.json => cosmetic_engineer_goggles.json} | 3 +- ...cosmetic_5.json => cosmetic_eyepatch.json} | 3 +- ...16.json => cosmetic_four_leaf_clover.json} | 3 +- ...etic_15.json => cosmetic_googly_eyes.json} | 3 +- ..._27.json => cosmetic_groucho_glasses.json} | 3 +- ...metic_20.json => cosmetic_hyper_plus.json} | 3 +- ...smetic_14.json => cosmetic_kamui_eye.json} | 3 +- ...29.json => cosmetic_lusitanic_shield.json} | 3 +- ...ic_26.json => cosmetic_orange_shades.json} | 3 +- ...c_8.json => cosmetic_pink_flower_bud.json} | 3 +- ...9.json => cosmetic_polka_dotted_bows.json} | 3 +- ...metic_3.json => cosmetic_puffy_scarf.json} | 3 +- ..._31.json => cosmetic_questgiver_mark.json} | 3 +- ...metic_2.json => cosmetic_red_glasses.json} | 3 +- ...metic_7.json => cosmetic_red_ribbons.json} | 3 +- ...c_28.json => cosmetic_thick_eyebrows.json} | 3 +- ...30.json => cosmetic_tiny_potato_mask.json} | 3 +- ...tic_18.json => cosmetic_unicorn_horn.json} | 3 +- ...c_6.json => cosmetic_wicked_eyepatch.json} | 3 +- ...smetic_12.json => cosmetic_witch_pin.json} | 3 +- 80 files changed, 388 insertions(+), 432 deletions(-) rename src/main/resources/assets/botania/models/item/{cosmetic24.json => cosmetic_alien_antenna.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic25.json => cosmetic_anaglyph_glasses.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic22.json => cosmetic_ancient_mask.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic0.json => cosmetic_black_bowtie.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic1.json => cosmetic_black_tie.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic10.json => cosmetic_blue_butterfly.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic21.json => cosmetic_botanist_emblem.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic11.json => cosmetic_cat_ears.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic17.json => cosmetic_clock_eye.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic19.json => cosmetic_devil_horns.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic13.json => cosmetic_devil_tail.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic23.json => cosmetic_eerie_mask.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic4.json => cosmetic_engineer_goggles.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic5.json => cosmetic_eyepatch.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic16.json => cosmetic_four_leaf_clover.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic15.json => cosmetic_googly_eyes.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic27.json => cosmetic_groucho_glasses.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic20.json => cosmetic_hyper_plus.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic14.json => cosmetic_kamui_eye.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic29.json => cosmetic_lusitanic_shield.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic26.json => cosmetic_orange_shades.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic8.json => cosmetic_pink_flower_bud.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic9.json => cosmetic_polka_dotted_bows.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic3.json => cosmetic_puffy_scarf.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic31.json => cosmetic_questgiver_mark.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic2.json => cosmetic_red_glasses.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic7.json => cosmetic_red_ribbons.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic28.json => cosmetic_thick_eyebrows.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic30.json => cosmetic_tiny_potato_mask.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic18.json => cosmetic_unicorn_horn.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic6.json => cosmetic_wicked_eyepatch.json} (100%) rename src/main/resources/assets/botania/models/item/{cosmetic12.json => cosmetic_witch_pin.json} (100%) rename src/main/resources/assets/botania/recipes/{cosmetic_24.json => cosmetic_alien_antenna.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_25.json => cosmetic_anaglyph_glasses.json} (81%) rename src/main/resources/assets/botania/recipes/{cosmetic_22.json => cosmetic_ancient_mask.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_0.json => cosmetic_black_bowtie.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_1.json => cosmetic_black_tie.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_10.json => cosmetic_blue_butterfly.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_21.json => cosmetic_botanist_emblem.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_11.json => cosmetic_cat_ears.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_17.json => cosmetic_clock_eye.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_19.json => cosmetic_devil_horns.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_13.json => cosmetic_devil_tail.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_23.json => cosmetic_eerie_mask.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_4.json => cosmetic_engineer_goggles.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_5.json => cosmetic_eyepatch.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_16.json => cosmetic_four_leaf_clover.json} (81%) rename src/main/resources/assets/botania/recipes/{cosmetic_15.json => cosmetic_googly_eyes.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_27.json => cosmetic_groucho_glasses.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_20.json => cosmetic_hyper_plus.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_14.json => cosmetic_kamui_eye.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_29.json => cosmetic_lusitanic_shield.json} (81%) rename src/main/resources/assets/botania/recipes/{cosmetic_26.json => cosmetic_orange_shades.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_8.json => cosmetic_pink_flower_bud.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_9.json => cosmetic_polka_dotted_bows.json} (81%) rename src/main/resources/assets/botania/recipes/{cosmetic_3.json => cosmetic_puffy_scarf.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_31.json => cosmetic_questgiver_mark.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_2.json => cosmetic_red_glasses.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_7.json => cosmetic_red_ribbons.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_28.json => cosmetic_thick_eyebrows.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_30.json => cosmetic_tiny_potato_mask.json} (81%) rename src/main/resources/assets/botania/recipes/{cosmetic_18.json => cosmetic_unicorn_horn.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_6.json => cosmetic_wicked_eyepatch.json} (82%) rename src/main/resources/assets/botania/recipes/{cosmetic_12.json => cosmetic_witch_pin.json} (82%) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 4b2c544f8..98d0e4688 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -52,7 +52,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer new ItemStack(ModItems.cosmetic, 1, v.ordinal())).toArray(ItemStack[]::new); private static boolean matches(String name, String match) { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 56185802b..e1c9a3c91 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -457,7 +457,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { for (Block pavementSlab : ModFluffBlocks.pavementSlabs) addBlock(pavementSlab); - addItem(ModItems.cosmetic); + ModItems.cosmetics.values().forEach(this::addItem); } private void addItem(Item item) { diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index c0598b16f..653b88ca3 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -7,6 +7,7 @@ import net.minecraft.util.datafix.IFixableData; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.state.enums.CratePattern; 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; @@ -103,6 +104,10 @@ public class FlattenItems implements IFixableData { return LibMisc.MOD_ID + ":" + LibItemNames.CRAFT_PATTERN + "_" + vals[(i + 1) % vals.length].name().toLowerCase(Locale.ROOT); }); LOOKUP.put("botania:rune", i -> LibMisc.MOD_ID + ":" + LibItemNames.RUNE_NAMES[i % LibItemNames.RUNE_NAMES.length]); + LOOKUP.put("botania:cosmetic", i -> { + ItemBaubleCosmetic.Variant[] vals = ItemBaubleCosmetic.Variant.values(); + return LibMisc.MOD_ID + ":" + LibItemNames.COSMETIC + "_" + vals[i % vals.length].name().toLowerCase(Locale.ROOT); + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b338bddc8..e7781504e 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -101,8 +101,11 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; +import java.util.Arrays; import java.util.EnumMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModItems { @@ -322,7 +325,12 @@ public final class ModItems { public static final Item corporeaSpark = new ItemCorporeaSpark(); public static final Item livingwoodBow = new ItemLivingwoodBow(); public static final Item crystalBow = new ItemCrystalBow(); - public static final Item cosmetic = new ItemBaubleCosmetic(); + public static final Map cosmetics = new EnumMap<>(ItemBaubleCosmetic.Variant.class); + static { + for(ItemBaubleCosmetic.Variant v : ItemBaubleCosmetic.Variant.values()) { + cosmetics.put(v, new ItemBaubleCosmetic(v)); + } + } public static final Item swapRing = new ItemSwapRing(); public static final Item flowerBag = new ItemFlowerBag(); public static final Item phantomInk = new ItemPhantomInk(); @@ -574,7 +582,7 @@ public final class ModItems { r.register(corporeaSpark); r.register(livingwoodBow); r.register(crystalBow); - r.register(cosmetic); + cosmetics.values().forEach(r::register); r.register(swapRing); r.register(flowerBag); r.register(phantomInk); 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 0aad9a8b1..1dff89a37 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 @@ -39,10 +39,11 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.List; +import java.util.Locale; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { - public enum Variants { + public enum Variant { BLACK_BOWTIE, BLACK_TIE, RED_GLASSES, PUFFY_SCARF, ENGINEER_GOGGLES, EYEPATCH, WICKED_EYEPATCH, RED_RIBBONS, PINK_FLOWER_BUD, POLKA_DOTTED_BOWS, BLUE_BUTTERFLY, CAT_EARS, @@ -53,27 +54,11 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { THICK_EYEBROWS, LUSITANIC_SHIELD, TINY_POTATO_MASK, QUESTGIVER_MARK } - private static final int SUBTYPES = 32; - private ItemStack renderStack; + private final Variant variant; - public ItemBaubleCosmetic() { - super(LibItemNames.COSMETIC); - setHasSubtypes(true); - renderStack = new ItemStack(this); - } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public ItemBaubleCosmetic(Variant variant) { + super(LibItemNames.COSMETIC + "_" + variant.name().toLowerCase(Locale.ROOT)); + this.variant = variant; } @SideOnly(Side.CLIENT) @@ -83,12 +68,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { super.addHiddenTooltip(par1ItemStack, world, stacks, flags); } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 32, LibItemNames.COSMETIC); - } - @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.TRINKET; @@ -98,11 +77,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - renderStack = stack; - - if (stack.getItemDamage() >= 32 || stack.getItemDamage() < 0) return; - Variants variant = Variants.values()[stack.getItemDamage()]; - if (type == RenderType.HEAD) { Helper.translateToHeadLevel(player); Helper.translateToFace(); @@ -111,102 +85,102 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case RED_GLASSES: GlStateManager.scale(1.25, 1.25, 1.25); GlStateManager.translate(0F, -0.085F, 0.045F); - renderItem(); + renderItem(stack); break; case ENGINEER_GOGGLES: GlStateManager.scale(1.25, 1.25, 1.25); GlStateManager.translate(0F, -0.085F, 0.045F); - renderItem(); + renderItem(stack); break; case EYEPATCH: scale(0.55F); GlStateManager.translate(-0.45F, -0.25F, 0F); - renderItem(); + renderItem(stack); break; case WICKED_EYEPATCH: scale(0.55F); GlStateManager.translate(0.45F, -0.25F, 0F); - renderItem(); + renderItem(stack); break; case RED_RIBBONS: scale(0.9F); GlStateManager.translate(0F, 0.75F, 1F); - renderItem(); + renderItem(stack); break; case PINK_FLOWER_BUD: GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.translate(0.4F, 0.6F, 0.45F); - renderItem(); + renderItem(stack); break; case POLKA_DOTTED_BOWS: GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.translate(0.65F, 0.3F, 0.5F); - renderItem(); + renderItem(stack); GlStateManager.translate(0F, 0F, -1F); - renderItem(); + renderItem(stack); break; case BLUE_BUTTERFLY: GlStateManager.translate(-0.75F, 0.1F, 1F); GlStateManager.pushMatrix(); GlStateManager.rotate(45F, 0F, 1F, 0F); - renderItem(); + renderItem(stack); GlStateManager.popMatrix(); GlStateManager.translate(0F, 0F, -0.75F); GlStateManager.rotate(-45F, 0F, 1F, 0F); - renderItem(); + renderItem(stack); break; case CAT_EARS: GlStateManager.translate(0F, 0.25F, 0.25F); - renderItem(); + renderItem(stack); break; case GOOGLY_EYES: GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.scale(1.5F, 1.5F, 1F); GlStateManager.translate(0F, -0.05F, -0.15F); - renderItem(); + renderItem(stack); break; case CLOCK_EYE: scale(0.75F); GlStateManager.translate(-0.25F, -0.1F, 0F); GlStateManager.rotate(180F, 0F, 0F, 1F); - renderItem(); + renderItem(stack); break; case UNICORN_HORN: scale(1.25F); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.translate(0F, 0.4F, 0F); - renderItem(); + renderItem(stack); break; case DEVIL_HORNS: GlStateManager.translate(0F, 0.2F, 0.25F); - renderItem(); + renderItem(stack); break; case HYPER_PLUS: scale(0.35F); GlStateManager.translate(-0.7F, 1F, -0.5F); - renderItem(); + renderItem(stack); GlStateManager.translate(1.45F, 0F, 0F); - renderItem(); + renderItem(stack); break; case ANCIENT_MASK: scale(1.25F); GlStateManager.translate(0F, 0.025F, 0.01F); - renderItem(); + renderItem(stack); break; case EERIE_MASK: - renderItem(); + renderItem(stack); break; case ALIEN_ANTENNA: scale(0.9F); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(0F, 0.75F, -1F); - renderItem(); + renderItem(stack); break; case ANAGLYPH_GLASSES: scale(1.25F); GlStateManager.translate(0F, -0.025F, 0F); - renderItem(); + renderItem(stack); break; case ORANGE_SHADES: scale(1.25f); @@ -214,30 +188,30 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 0.7F); - renderItem(); + renderItem(stack); break; case GROUCHO_GLASSES: scale(1.5F); GlStateManager.translate(0F, -0.2125F, 0F); - renderItem(); + renderItem(stack); break; case THICK_EYEBROWS: scale(0.5F); GlStateManager.translate(-0.4F, 0.05F, 0F); - renderItem(); + renderItem(stack); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(-0.775F, 0F, 0F); - renderItem(); + renderItem(stack); break; case TINY_POTATO_MASK: scale(1.25F); GlStateManager.translate(0F, 0.025F, 0F); - renderItem(); + renderItem(stack); break; case QUESTGIVER_MARK: scale(0.8F); GlStateManager.translate(0F, 1F, 0.3F); - renderItem(); + renderItem(stack); break; default: break; } @@ -248,50 +222,50 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { switch (variant) { case BLACK_BOWTIE: GlStateManager.translate(0F, 0.15F, 0F); - renderItem(); + renderItem(stack); break; case BLACK_TIE: GlStateManager.translate(0F, -0.15F, 0F); - renderItem(); + renderItem(stack); break; case PUFFY_SCARF: GlStateManager.translate(0F, -0.15F, 0F); - renderItem(); + renderItem(stack); break; case WITCH_PIN: scale(0.35F); GlStateManager.translate(-0.35F, 0.35F, 0.15F); - renderItem(); + renderItem(stack); break; case DEVIL_TAIL: GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(0.5F, -0.75F, 0F); - renderItem(); + renderItem(stack); break; case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY scale(0.9F); GlStateManager.translate(0.9F, 0.35F, 0F); - renderItem(); + renderItem(stack); GlStateManager.translate(-1.3F, -0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(180F, 1F, 0F, 0F); - renderKamuiBlack(); + renderKamuiBlack(stack); break; case FOUR_LEAF_CLOVER: scale(0.5F); GlStateManager.translate(0.35F, 0.3F, -0.075F); - renderItem(); + renderItem(stack); break; case BOTANIST_EMBLEM: scale(0.5F); GlStateManager.translate(0F, -0.75F, 0F); - renderItem(); + renderItem(stack); break; case LUSITANIC_SHIELD: GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(0.035F, -0.2F, 0.55F); GlStateManager.rotate(8F, 0F, 0F, 1F); - renderItem(); + renderItem(stack); break; default: break; } @@ -302,19 +276,19 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.scale(f, f, f); } - public void renderItem() { + public void renderItem(ItemStack stack) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.NONE); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } - public void renderKamuiBlack() { + private void renderKamuiBlack(ItemStack stack) { // Modified copy of RenderItem.renderItem(stack, transformtype) Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).setBlurMipmap(false, false); - IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(renderStack); + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); GlStateManager.enableRescaleNormal(); GlStateManager.alphaFunc(516, 0.1F); @@ -323,7 +297,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.pushMatrix(); model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.NONE, false); - renderModel(model, renderStack, 0xFF00004C); + renderModel(model, stack, 0xFF00004C); GlStateManager.cullFace(GlStateManager.CullFace.BACK); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 5a353b39f..0778eb9ae 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; @@ -1382,7 +1383,7 @@ public final class LexiconData { challenges = new BasicLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() - .setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); + .setIcon(new ItemStack(ModItems.cosmetics.get(ItemBaubleCosmetic.Variant.QUESTGIVER_MARK))); cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), diff --git a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java index 828a0ecba..d73c935bd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java @@ -15,6 +15,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; @@ -27,7 +28,7 @@ public class WelcomeLexiconEntry extends BasicLexiconEntry { public WelcomeLexiconEntry() { super(LibLexicon.BASICS_WELCOME, BotaniaAPI.categoryBasics); setPriority(); - setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); + setIcon(new ItemStack(ModItems.cosmetics.get(ItemBaubleCosmetic.Variant.QUESTGIVER_MARK))); LexiconPage[] pages = new LexiconPage[PAGES]; for(int i = 0; i < PAGES; i++) diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index a66cfccbc..9136b60fa 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1515,38 +1515,38 @@ item.botania:corporeaSpark1.name=Master Corporea Spark item.botania:ender_air_bottle.name=Ender Air Bottle item.botania:livingwoodBow.name=Livingwood Bow item.botania:crystalBow.name=Crystal Bow -item.botania:cosmetic0.name=Black Bowtie -item.botania:cosmetic1.name=Black Tie -item.botania:cosmetic2.name=Red Glasses -item.botania:cosmetic3.name=Puffy Scarf -item.botania:cosmetic4.name=Engineer Goggles -item.botania:cosmetic5.name=Eyepatch -item.botania:cosmetic6.name=Wicked Eyepatch -item.botania:cosmetic7.name=Red Ribbons -item.botania:cosmetic8.name=Pink Flower Bud -item.botania:cosmetic9.name=Polka-Dotted Bows -item.botania:cosmetic10.name=Blue Butterfly -item.botania:cosmetic11.name=Cat Ears -item.botania:cosmetic12.name=Witch Pin -item.botania:cosmetic13.name=Devil Tail -item.botania:cosmetic14.name=Kamui Eye -item.botania:cosmetic15.name=Googly Eyes -item.botania:cosmetic16.name=Four-Leafed Clover -item.botania:cosmetic17.name=Clock Eye -item.botania:cosmetic18.name=Unicorn Horn -item.botania:cosmetic19.name=Devil Horns -item.botania:cosmetic20.name=Hyper Plus -item.botania:cosmetic21.name=Botanist Emblem -item.botania:cosmetic22.name=Ancient Mask -item.botania:cosmetic23.name=Eerie Mask -item.botania:cosmetic24.name=Alien Antenna -item.botania:cosmetic25.name=Anaglyph Glasses -item.botania:cosmetic26.name=Orange Shades -item.botania:cosmetic27.name=Groucho Glasses -item.botania:cosmetic28.name=Thick Eyebrows -item.botania:cosmetic29.name=Lusitanic Shield -item.botania:cosmetic30.name=Tiny Potato Mask -item.botania:cosmetic31.name=Questgiver Mark +item.botania:cosmetic_black_bowtie.name=Black Bowtie +item.botania:cosmetic_black_tie.name=Black Tie +item.botania:cosmetic_red_glasses.name=Red Glasses +item.botania:cosmetic_puffy_scarf.name=Puffy Scarf +item.botania:cosmetic_engineer_goggles.name=Engineer Goggles +item.botania:cosmetic_eyepatch.name=Eyepatch +item.botania:cosmetic_wicked_eyepatch.name=Wicked Eyepatch +item.botania:cosmetic_red_ribbons.name=Red Ribbons +item.botania:cosmetic_pink_flower_bud.name=Pink Flower Bud +item.botania:cosmetic_polka_dotted_bows.name=Polka-Dotted Bows +item.botania:cosmetic_blue_butterfly.name=Blue Butterfly +item.botania:cosmetic_cat_ears.name=Cat Ears +item.botania:cosmetic_witch_pin.name=Witch Pin +item.botania:cosmetic_devil_tail.name=Devil Tail +item.botania:cosmetic_kamui_eye.name=Kamui Eye +item.botania:cosmetic_googly_eyes.name=Googly Eyes +item.botania:cosmetic_four_leaf_clover.name=Four-Leafed Clover +item.botania:cosmetic_clock_eye.name=Clock Eye +item.botania:cosmetic_unicorn_horn.name=Unicorn Horn +item.botania:cosmetic_devil_horns.name=Devil Horns +item.botania:cosmetic_hyper_plus.name=Hyper Plus +item.botania:cosmetic_botanist_emblem.name=Botanist Emblem +item.botania:cosmetic_ancient_mask.name=Ancient Mask +item.botania:cosmetic_eerie_mask.name=Eerie Mask +item.botania:cosmetic_alien_antenna.name=Alien Antenna +item.botania:cosmetic_anaglyph_glasses.name=Anaglyph Glasses +item.botania:cosmetic_orange_shades.name=Orange Shades +item.botania:cosmetic_groucho_glasses.name=Groucho Glasses +item.botania:cosmetic_thick_eyebrows.name=Thick Eyebrows +item.botania:cosmetic_lusitanic_shield.name=Lusitanic Shield +item.botania:cosmetic_tiny_potato_mask.name=Tiny Potato Mask +item.botania:cosmetic_questgiver_mark.name=Questgiver Mark item.botania:mana_string.name=Mana Infused String item.botania:swapRing.name=Ring of Correction item.botania:flowerBag.name=Flower Pouch diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index ba5f6b6f6..3c0aa6957 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1272,38 +1272,38 @@ item.botania:corporeaSpark1.name=Chispa maestra de corporea item.botania:ender_air_bottle.name=Botella de aire del Fin item.botania:livingwoodBow.name=Arco de madera viviente item.botania:crystalBow.name=Arco de cristal -item.botania:cosmetic0.name=Pajarita negra -item.botania:cosmetic1.name=Corbata negra -item.botania:cosmetic2.name=Gafas rojas -item.botania:cosmetic3.name=Bufanda trenzada -item.botania:cosmetic4.name=Gafas de ingeniero -item.botania:cosmetic5.name=Parche -item.botania:cosmetic6.name=Parche malvado -item.botania:cosmetic7.name=Lazos rojos -item.botania:cosmetic8.name=Capullo de flor rosa -item.botania:cosmetic9.name=Lazo a lunares -item.botania:cosmetic10.name=Mariposa azul -item.botania:cosmetic11.name=Orejas de gato -item.botania:cosmetic12.name=Broche de bruja -item.botania:cosmetic13.name=Cola de demonio -item.botania:cosmetic14.name=Ojo Kamui -item.botania:cosmetic15.name=Ojos saltones -item.botania:cosmetic16.name=Trébol de 4 hojas -item.botania:cosmetic17.name=Ojo reloj -item.botania:cosmetic18.name=Cuerno unicornio -item.botania:cosmetic19.name=Cuernos de demonio -item.botania:cosmetic20.name=Hipermás -item.botania:cosmetic21.name=Emblema de Botanista -item.botania:cosmetic22.name=Máscara antigua -item.botania:cosmetic23.name=Máscara inquietante -item.botania:cosmetic24.name=Antena alienígena -item.botania:cosmetic25.name=Gafas anaglifo -item.botania:cosmetic26.name=Gafas de sol naranjas -item.botania:cosmetic27.name=Gafas de Groucho -item.botania:cosmetic28.name=Cejas espesas -item.botania:cosmetic29.name=Escudo luso -item.botania:cosmetic30.name=Máscara patatita -item.botania:cosmetic31.name=Mascara de dador de misiones +item.botania:cosmetic_black_bowtie.name=Pajarita negra +item.botania:cosmetic_black_tie.name=Corbata negra +item.botania:cosmetic_red_glasses.name=Gafas rojas +item.botania:cosmetic_puffy_scarf.name=Bufanda trenzada +item.botania:cosmetic_engineer_goggles.name=Gafas de ingeniero +item.botania:cosmetic_eyepatch.name=Parche +item.botania:cosmetic_wicked_eyepatch.name=Parche malvado +item.botania:cosmetic_red_ribbons.name=Lazos rojos +item.botania:cosmetic_pink_flower_bud.name=Capullo de flor rosa +item.botania:cosmetic_polka_dotted_bows.name=Lazo a lunares +item.botania:cosmetic_blue_butterfly.name=Mariposa azul +item.botania:cosmetic_cat_ears.name=Orejas de gato +item.botania:cosmetic_witch_pin.name=Broche de bruja +item.botania:cosmetic_devil_tail.name=Cola de demonio +item.botania:cosmetic_kamui_eye.name=Ojo Kamui +item.botania:cosmetic_googly_eyes.name=Ojos saltones +item.botania:cosmetic_four_leaf_clover.name=Trébol de 4 hojas +item.botania:cosmetic_clock_eye.name=Ojo reloj +item.botania:cosmetic_unicorn_horn.name=Cuerno unicornio +item.botania:cosmetic_devil_horns.name=Cuernos de demonio +item.botania:cosmetic_hyper_plus.name=Hipermás +item.botania:cosmetic_botanist_emblem.name=Emblema de Botanista +item.botania:cosmetic_ancient_mask.name=Máscara antigua +item.botania:cosmetic_eerie_mask.name=Máscara inquietante +item.botania:cosmetic_alien_antenna.name=Antena alienígena +item.botania:cosmetic_anaglyph_glasses.name=Gafas anaglifo +item.botania:cosmetic_orange_shades.name=Gafas de sol naranjas +item.botania:cosmetic_groucho_glasses.name=Gafas de Groucho +item.botania:cosmetic_thick_eyebrows.name=Cejas espesas +item.botania:cosmetic_lusitanic_shield.name=Escudo luso +item.botania:cosmetic_tiny_potato_mask.name=Máscara patatita +item.botania:cosmetic_questgiver_mark.name=Mascara de dador de misiones item.botania:mana_string.name=Hilo infundido de maná item.botania:swapRing.name=Anillo de corrección item.botania:flowerBag.name=Bolsa de flores diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 33019eafa..f2fe78ee2 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1134,38 +1134,38 @@ item.botania:corporeaSpark1.name=Étincelle maitresse de Corporea item.botania:ender_air_bottle.name=Bouteille d'air du néant item.botania:livingwoodBow.name=Arc en vifbois item.botania:crystalBow.name=Arc de cristal -item.botania:cosmetic0.name=Noeud papillon noir -item.botania:cosmetic1.name=Tenue de soirée -item.botania:cosmetic2.name=Lunettes rouges -item.botania:cosmetic3.name=Écharpe gonflée -item.botania:cosmetic4.name=Lunettes d'ingénieur -item.botania:cosmetic5.name=Cache -item.botania:cosmetic6.name=Mauvais cache -item.botania:cosmetic7.name=Ruban rouge -item.botania:cosmetic8.name=Bouton à fleurs rose -item.botania:cosmetic9.name=Noeud à pois -item.botania:cosmetic10.name=Papillon bleu -item.botania:cosmetic11.name=Oreille de chat -item.botania:cosmetic12.name=Épingle de sorcière -item.botania:cosmetic13.name=Queue de démon -item.botania:cosmetic14.name=Oeil de Kamui -item.botania:cosmetic15.name=Yeux écarquillés -item.botania:cosmetic16.name=Trèfle à quatre feuilles -item.botania:cosmetic17.name=Yeux pendule -item.botania:cosmetic18.name=Corne de licorne -item.botania:cosmetic19.name=Cornes de démon -item.botania:cosmetic20.name=Hyper plus -item.botania:cosmetic21.name=Emblème du botaniste -item.botania:cosmetic22.name=Masque antique -item.botania:cosmetic23.name=Masque à faire frémir -item.botania:cosmetic24.name=Antenne d'alien -item.botania:cosmetic25.name=Lunettes d'anaglyphe -item.botania:cosmetic26.name=Nuances d'oranges -item.botania:cosmetic27.name=Lunettes de Groucho -item.botania:cosmetic28.name=Sourcils épais -item.botania:cosmetic29.name=Protection lusitanique -item.botania:cosmetic30.name=Masque de la minuscule pomme de terre -item.botania:cosmetic31.name=Marque du donneur de quète +item.botania:cosmetic_black_bowtie.name=Noeud papillon noir +item.botania:cosmetic_black_tie.name=Tenue de soirée +item.botania:cosmetic_red_glasses.name=Lunettes rouges +item.botania:cosmetic_puffy_scarf.name=Écharpe gonflée +item.botania:cosmetic_engineer_goggles.name=Lunettes d'ingénieur +item.botania:cosmetic_eyepatch.name=Cache +item.botania:cosmetic_wicked_eyepatch.name=Mauvais cache +item.botania:cosmetic_red_ribbons.name=Ruban rouge +item.botania:cosmetic_pink_flower_bud.name=Bouton à fleurs rose +item.botania:cosmetic_polka_dotted_bows.name=Noeud à pois +item.botania:cosmetic_blue_butterfly.name=Papillon bleu +item.botania:cosmetic_cat_ears.name=Oreille de chat +item.botania:cosmetic_witch_pin.name=Épingle de sorcière +item.botania:cosmetic_devil_tail.name=Queue de démon +item.botania:cosmetic_kamui_eye.name=Oeil de Kamui +item.botania:cosmetic_googly_eyes.name=Yeux écarquillés +item.botania:cosmetic_four_leaf_clover.name=Trèfle à quatre feuilles +item.botania:cosmetic_clock_eye.name=Yeux pendule +item.botania:cosmetic_unicorn_horn.name=Corne de licorne +item.botania:cosmetic_devil_horns.name=Cornes de démon +item.botania:cosmetic_hyper_plus.name=Hyper plus +item.botania:cosmetic_botanist_emblem.name=Emblème du botaniste +item.botania:cosmetic_ancient_mask.name=Masque antique +item.botania:cosmetic_eerie_mask.name=Masque à faire frémir +item.botania:cosmetic_alien_antenna.name=Antenne d'alien +item.botania:cosmetic_anaglyph_glasses.name=Lunettes d'anaglyphe +item.botania:cosmetic_orange_shades.name=Nuances d'oranges +item.botania:cosmetic_groucho_glasses.name=Lunettes de Groucho +item.botania:cosmetic_thick_eyebrows.name=Sourcils épais +item.botania:cosmetic_lusitanic_shield.name=Protection lusitanique +item.botania:cosmetic_tiny_potato_mask.name=Masque de la minuscule pomme de terre +item.botania:cosmetic_questgiver_mark.name=Marque du donneur de quète item.botania:mana_string.name=Ficelle infusée de mana item.botania:swapRing.name=Anneau de correction item.botania:flowerBag.name=Poche à fleur diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index bf625fd8c..7785a3543 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1300,38 +1300,38 @@ item.botania:corporeaSpark1.name=マスターコーポリアスパーク item.botania:ender_air_bottle.name=エンダー空気瓶 item.botania:livingwoodBow.name=リビングウッドの弓 item.botania:crystalBow.name=水晶の弓 -item.botania:cosmetic0.name=黒色の蝶ネクタイ -item.botania:cosmetic1.name=黒色のネクタイ -item.botania:cosmetic2.name=赤色のメガネ -item.botania:cosmetic3.name=ふっくらしたスカーフ -item.botania:cosmetic4.name=エンジニアのゴーグル -item.botania:cosmetic5.name=眼帯 -item.botania:cosmetic6.name=悪者の眼帯 -item.botania:cosmetic7.name=赤いリボン -item.botania:cosmetic8.name=ピンクの花のつぼみ -item.botania:cosmetic9.name=水玉模様のリボン -item.botania:cosmetic10.name=青色の蝶 -item.botania:cosmetic11.name=ネコミミ -item.botania:cosmetic12.name=魔女のピン -item.botania:cosmetic13.name=悪魔のしっぽ -item.botania:cosmetic14.name=カムイの目 -item.botania:cosmetic15.name=グーグルっぽい目 -item.botania:cosmetic16.name=四つ葉のクローバー -item.botania:cosmetic17.name=時計の目 -item.botania:cosmetic18.name=ユニコーンの角 -item.botania:cosmetic19.name=悪魔の角 -item.botania:cosmetic20.name=ハイパープラス -item.botania:cosmetic21.name=植物学者の紋章 -item.botania:cosmetic22.name=古代のマスク -item.botania:cosmetic23.name=不気味なマスク -item.botania:cosmetic24.name=エイリアンのアンテナ -item.botania:cosmetic25.name=3Dメガネ -item.botania:cosmetic26.name=橙色の影 -item.botania:cosmetic27.name=鼻メガネ -item.botania:cosmetic28.name=濃いアイブロウ -item.botania:cosmetic29.name=ルシタニアの盾 -item.botania:cosmetic30.name=小さなポテトのマスク -item.botania:cosmetic31.name=クエスト担当者の印 +item.botania:cosmetic_black_bowtie.name=黒色の蝶ネクタイ +item.botania:cosmetic_black_tie.name=黒色のネクタイ +item.botania:cosmetic_red_glasses.name=赤色のメガネ +item.botania:cosmetic_puffy_scarf.name=ふっくらしたスカーフ +item.botania:cosmetic_engineer_goggles.name=エンジニアのゴーグル +item.botania:cosmetic_eyepatch.name=眼帯 +item.botania:cosmetic_wicked_eyepatch.name=悪者の眼帯 +item.botania:cosmetic_red_ribbons.name=赤いリボン +item.botania:cosmetic_pink_flower_bud.name=ピンクの花のつぼみ +item.botania:cosmetic_polka_dotted_bows.name=水玉模様のリボン +item.botania:cosmetic_blue_butterfly.name=青色の蝶 +item.botania:cosmetic_cat_ears.name=ネコミミ +item.botania:cosmetic_witch_pin.name=魔女のピン +item.botania:cosmetic_devil_tail.name=悪魔のしっぽ +item.botania:cosmetic_kamui_eye.name=カムイの目 +item.botania:cosmetic_googly_eyes.name=グーグルっぽい目 +item.botania:cosmetic_four_leaf_clover.name=四つ葉のクローバー +item.botania:cosmetic_clock_eye.name=時計の目 +item.botania:cosmetic_unicorn_horn.name=ユニコーンの角 +item.botania:cosmetic_devil_horns.name=悪魔の角 +item.botania:cosmetic_hyper_plus.name=ハイパープラス +item.botania:cosmetic_botanist_emblem.name=植物学者の紋章 +item.botania:cosmetic_ancient_mask.name=古代のマスク +item.botania:cosmetic_eerie_mask.name=不気味なマスク +item.botania:cosmetic_alien_antenna.name=エイリアンのアンテナ +item.botania:cosmetic_anaglyph_glasses.name=3Dメガネ +item.botania:cosmetic_orange_shades.name=橙色の影 +item.botania:cosmetic_groucho_glasses.name=鼻メガネ +item.botania:cosmetic_thick_eyebrows.name=濃いアイブロウ +item.botania:cosmetic_lusitanic_shield.name=ルシタニアの盾 +item.botania:cosmetic_tiny_potato_mask.name=小さなポテトのマスク +item.botania:cosmetic_questgiver_mark.name=クエスト担当者の印 item.botania:mana_string.name=マナが注入された糸 item.botania:swapRing.name=適正の指輪 item.botania:flowerBag.name=花入れ小袋 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index cd90e00b2..d5ba72747 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1234,38 +1234,38 @@ item.botania:corporeaSpark1.name=Master Corporea 스파크 item.botania:ender_air_bottle.name=엔더 공기가 담긴 병 item.botania:livingwoodBow.name=생명의 나무 활 item.botania:crystalBow.name=수정 활 -item.botania:cosmetic0.name=검은색 나비넥타이 -item.botania:cosmetic1.name=검은색 넥타이 -item.botania:cosmetic2.name=붉은색 안경 -item.botania:cosmetic3.name=뭉게뭉게 스카프 -item.botania:cosmetic4.name=엔지니어 고글 -item.botania:cosmetic5.name=안대 -item.botania:cosmetic6.name=사악한 안대 -item.botania:cosmetic7.name=붉은 리본 -item.botania:cosmetic8.name=분홍색 꽃망울 -item.botania:cosmetic9.name=물방울 무늬 활 -item.botania:cosmetic10.name=푸른 나비 -item.botania:cosmetic11.name=고양이 귀 -item.botania:cosmetic12.name=마녀 머리핀 -item.botania:cosmetic13.name=악마꼬리 -item.botania:cosmetic14.name=카무이의 눈 -item.botania:cosmetic15.name=구글리 눈 -item.botania:cosmetic16.name=네잎클로버 -item.botania:cosmetic17.name=시계 눈 -item.botania:cosmetic18.name=유니콘 뿔 -item.botania:cosmetic19.name=악마 뿔 -item.botania:cosmetic20.name=하이퍼 플러스 -item.botania:cosmetic21.name=식물학자의 엠블럼 -item.botania:cosmetic22.name=고대의 마스크 -item.botania:cosmetic23.name=에릭 마스크 -item.botania:cosmetic24.name=에일리언 더듬이 -item.botania:cosmetic25.name=3D 안경 -item.botania:cosmetic26.name=오렌지 쉐이드 -item.botania:cosmetic27.name=그루 초 안경 -item.botania:cosmetic28.name=송충이 눈썹 -item.botania:cosmetic29.name=러시태닉 실드 -item.botania:cosmetic30.name=타이니 포테이토 마스크 -item.botania:cosmetic31.name=느낌표 +item.botania:cosmetic_black_bowtie.name=검은색 나비넥타이 +item.botania:cosmetic_black_tie.name=검은색 넥타이 +item.botania:cosmetic_red_glasses.name=붉은색 안경 +item.botania:cosmetic_puffy_scarf.name=뭉게뭉게 스카프 +item.botania:cosmetic_engineer_goggles.name=엔지니어 고글 +item.botania:cosmetic_eyepatch.name=안대 +item.botania:cosmetic_wicked_eyepatch.name=사악한 안대 +item.botania:cosmetic_red_ribbons.name=붉은 리본 +item.botania:cosmetic_pink_flower_bud.name=분홍색 꽃망울 +item.botania:cosmetic_polka_dotted_bows.name=물방울 무늬 활 +item.botania:cosmetic_blue_butterfly.name=푸른 나비 +item.botania:cosmetic_cat_ears.name=고양이 귀 +item.botania:cosmetic_witch_pin.name=마녀 머리핀 +item.botania:cosmetic_devil_tail.name=악마꼬리 +item.botania:cosmetic_kamui_eye.name=카무이의 눈 +item.botania:cosmetic_googly_eyes.name=구글리 눈 +item.botania:cosmetic_four_leaf_clover.name=네잎클로버 +item.botania:cosmetic_clock_eye.name=시계 눈 +item.botania:cosmetic_unicorn_horn.name=유니콘 뿔 +item.botania:cosmetic_devil_horns.name=악마 뿔 +item.botania:cosmetic_hyper_plus.name=하이퍼 플러스 +item.botania:cosmetic_botanist_emblem.name=식물학자의 엠블럼 +item.botania:cosmetic_ancient_mask.name=고대의 마스크 +item.botania:cosmetic_eerie_mask.name=에릭 마스크 +item.botania:cosmetic_alien_antenna.name=에일리언 더듬이 +item.botania:cosmetic_anaglyph_glasses.name=3D 안경 +item.botania:cosmetic_orange_shades.name=오렌지 쉐이드 +item.botania:cosmetic_groucho_glasses.name=그루 초 안경 +item.botania:cosmetic_thick_eyebrows.name=송충이 눈썹 +item.botania:cosmetic_lusitanic_shield.name=러시태닉 실드 +item.botania:cosmetic_tiny_potato_mask.name=타이니 포테이토 마스크 +item.botania:cosmetic_questgiver_mark.name=느낌표 item.botania:mana_string.name=마나가 주입된 실 item.botania:swapRing.name=교정의 반지 item.botania:flowerBag.name=꽃 파우치 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 75747aa38..32b05a74a 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1367,38 +1367,38 @@ item.botania:corporeaSpark1.name=Corporea Bronvonk item.botania:ender_air_bottle.name=Ender Lucht Flesje item.botania:livingwoodBow.name=Levenshout Boog item.botania:crystalBow.name=Kristallen Boog -item.botania:cosmetic0.name=Zwarte Vlinderdas -item.botania:cosmetic1.name=Zwarte Stropdas -item.botania:cosmetic2.name=Rode Bril -item.botania:cosmetic3.name=Dikke Sjaal -item.botania:cosmetic4.name=Oogglazen -item.botania:cosmetic5.name=Ooglapje -item.botania:cosmetic6.name=Boosaardig Ooglapje -item.botania:cosmetic7.name=Rode Band -item.botania:cosmetic8.name=Roze Bloembed -item.botania:cosmetic9.name=Gestippelde Strik -item.botania:cosmetic10.name=Blauwe Vlinder -item.botania:cosmetic11.name=Kattenoren -item.botania:cosmetic12.name=Heksenspeld -item.botania:cosmetic13.name=Duivelsstaart -item.botania:cosmetic14.name=Kamui Oog -item.botania:cosmetic15.name=Gekke Ogen -item.botania:cosmetic16.name=Klavertje Vier -item.botania:cosmetic17.name=Kloks Oog -item.botania:cosmetic18.name=Eenhoorn -item.botania:cosmetic19.name=Duivelhoornen -item.botania:cosmetic20.name=Hyper Plus -item.botania:cosmetic21.name=Botanisten Embleem -item.botania:cosmetic22.name=Antiek Masker -item.botania:cosmetic23.name=Griezelig Masker -item.botania:cosmetic24.name=Alien Antenne -item.botania:cosmetic25.name=3D Bril -item.botania:cosmetic26.name=Oranje Zonnebril -item.botania:cosmetic27.name=Groucho Bril -item.botania:cosmetic28.name=Dikke Wenkbrauwen -item.botania:cosmetic29.name=Lusitanisch Schild -item.botania:cosmetic30.name=Kleine Aardappel Masker -item.botania:cosmetic31.name=Spelleider Teken +item.botania:cosmetic_black_bowtie.name=Zwarte Vlinderdas +item.botania:cosmetic_black_tie.name=Zwarte Stropdas +item.botania:cosmetic_red_glasses.name=Rode Bril +item.botania:cosmetic_puffy_scarf.name=Dikke Sjaal +item.botania:cosmetic_engineer_goggles.name=Oogglazen +item.botania:cosmetic_eyepatch.name=Ooglapje +item.botania:cosmetic_wicked_eyepatch.name=Boosaardig Ooglapje +item.botania:cosmetic_red_ribbons.name=Rode Band +item.botania:cosmetic_pink_flower_bud.name=Roze Bloembed +item.botania:cosmetic_polka_dotted_bows.name=Gestippelde Strik +item.botania:cosmetic_blue_butterfly.name=Blauwe Vlinder +item.botania:cosmetic_cat_ears.name=Kattenoren +item.botania:cosmetic_witch_pin.name=Heksenspeld +item.botania:cosmetic_devil_tail.name=Duivelsstaart +item.botania:cosmetic_kamui_eye.name=Kamui Oog +item.botania:cosmetic_googly_eyes.name=Gekke Ogen +item.botania:cosmetic_four_leaf_clover.name=Klavertje Vier +item.botania:cosmetic_clock_eye.name=Kloks Oog +item.botania:cosmetic_unicorn_horn.name=Eenhoorn +item.botania:cosmetic_devil_horns.name=Duivelhoornen +item.botania:cosmetic_hyper_plus.name=Hyper Plus +item.botania:cosmetic_botanist_emblem.name=Botanisten Embleem +item.botania:cosmetic_ancient_mask.name=Antiek Masker +item.botania:cosmetic_eerie_mask.name=Griezelig Masker +item.botania:cosmetic_alien_antenna.name=Alien Antenne +item.botania:cosmetic_anaglyph_glasses.name=3D Bril +item.botania:cosmetic_orange_shades.name=Oranje Zonnebril +item.botania:cosmetic_groucho_glasses.name=Groucho Bril +item.botania:cosmetic_thick_eyebrows.name=Dikke Wenkbrauwen +item.botania:cosmetic_lusitanic_shield.name=Lusitanisch Schild +item.botania:cosmetic_tiny_potato_mask.name=Kleine Aardappel Masker +item.botania:cosmetic_questgiver_mark.name=Spelleider Teken item.botania:mana_string.name=Mana Doordrenkt Draad item.botania:swapRing.name=Ring der Correctie item.botania:flowerBag.name=Bloementas diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index e12f953f6..1f383d886 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1517,38 +1517,38 @@ item.botania:corporeaSpark1.name=Fagulha Corporea Mestre item.botania:ender_air_bottle.name=Garrafa de ar do Fim item.botania:livingwoodBow.name=Arco de Madeira-viva item.botania:crystalBow.name=Arco de Cristal -item.botania:cosmetic0.name=Gravata-borboleta preta -item.botania:cosmetic1.name=Gravata preta -item.botania:cosmetic2.name=Óculos vermelhos -item.botania:cosmetic3.name=Cachecol macio -item.botania:cosmetic4.name=Óculos de Engenheiro -item.botania:cosmetic5.name=Tapa-olho -item.botania:cosmetic6.name=Tapa-olho sombrio -item.botania:cosmetic7.name=Fitas vermelhas -item.botania:cosmetic8.name=Botão rosa -item.botania:cosmetic9.name=Laço de Polca -item.botania:cosmetic10.name=Borboleta azul -item.botania:cosmetic11.name=Orelhas de gato -item.botania:cosmetic12.name=Alfinete de bruxa -item.botania:cosmetic13.name=Cauda de demônio -item.botania:cosmetic14.name=Olho de Kamui -item.botania:cosmetic15.name=Olhos postiços -item.botania:cosmetic16.name=Trevo de quatro folhas -item.botania:cosmetic17.name=Olho de relógio -item.botania:cosmetic18.name=Chifre de unicórnio -item.botania:cosmetic19.name=Chifres de demônio -item.botania:cosmetic20.name=Hiper Sinal -item.botania:cosmetic21.name=Emblema de Botanista -item.botania:cosmetic22.name=Máscara antiga -item.botania:cosmetic23.name=Máscara misteriosa -item.botania:cosmetic24.name=Antena de alienígena -item.botania:cosmetic25.name=Óculos 3D -item.botania:cosmetic26.name=Óculos laranja -item.botania:cosmetic27.name=Disfarce -item.botania:cosmetic28.name=Sobrancelhas grossas -item.botania:cosmetic29.name=Escudo lusitânico -item.botania:cosmetic30.name=Máscara de Batatinha -item.botania:cosmetic31.name=Sinal de NPC +item.botania:cosmetic_black_bowtie.name=Gravata-borboleta preta +item.botania:cosmetic_black_tie.name=Gravata preta +item.botania:cosmetic_red_glasses.name=Óculos vermelhos +item.botania:cosmetic_puffy_scarf.name=Cachecol macio +item.botania:cosmetic_engineer_goggles.name=Óculos de Engenheiro +item.botania:cosmetic_eyepatch.name=Tapa-olho +item.botania:cosmetic_wicked_eyepatch.name=Tapa-olho sombrio +item.botania:cosmetic_red_ribbons.name=Fitas vermelhas +item.botania:cosmetic_pink_flower_bud.name=Botão rosa +item.botania:cosmetic_polka_dotted_bows.name=Laço de Polca +item.botania:cosmetic_blue_butterfly.name=Borboleta azul +item.botania:cosmetic_cat_ears.name=Orelhas de gato +item.botania:cosmetic_witch_pin.name=Alfinete de bruxa +item.botania:cosmetic_devil_tail.name=Cauda de demônio +item.botania:cosmetic_kamui_eye.name=Olho de Kamui +item.botania:cosmetic_googly_eyes.name=Olhos postiços +item.botania:cosmetic_four_leaf_clover.name=Trevo de quatro folhas +item.botania:cosmetic_clock_eye.name=Olho de relógio +item.botania:cosmetic_unicorn_horn.name=Chifre de unicórnio +item.botania:cosmetic_devil_horns.name=Chifres de demônio +item.botania:cosmetic_hyper_plus.name=Hiper Sinal +item.botania:cosmetic_botanist_emblem.name=Emblema de Botanista +item.botania:cosmetic_ancient_mask.name=Máscara antiga +item.botania:cosmetic_eerie_mask.name=Máscara misteriosa +item.botania:cosmetic_alien_antenna.name=Antena de alienígena +item.botania:cosmetic_anaglyph_glasses.name=Óculos 3D +item.botania:cosmetic_orange_shades.name=Óculos laranja +item.botania:cosmetic_groucho_glasses.name=Disfarce +item.botania:cosmetic_thick_eyebrows.name=Sobrancelhas grossas +item.botania:cosmetic_lusitanic_shield.name=Escudo lusitânico +item.botania:cosmetic_tiny_potato_mask.name=Máscara de Batatinha +item.botania:cosmetic_questgiver_mark.name=Sinal de NPC item.botania:mana_string.name=Linha infundida em Mana item.botania:swapRing.name=Anel da Correção item.botania:flowerBag.name=Cesto de Flores diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 663e9df0e..cea95866d 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1515,38 +1515,38 @@ item.botania:corporeaSpark1.name=主媒体火花 item.botania:ender_air_bottle.name=瓶装末地空气 item.botania:livingwoodBow.name=活木弓 item.botania:crystalBow.name=水晶弓 -item.botania:cosmetic0.name=黑领结 -item.botania:cosmetic1.name=黑领带 -item.botania:cosmetic2.name=红眼镜 -item.botania:cosmetic3.name=蓬松围巾 -item.botania:cosmetic4.name=工程师护目镜 -item.botania:cosmetic5.name=眼罩 -item.botania:cosmetic6.name=中二眼罩 -item.botania:cosmetic7.name=红丝带 -item.botania:cosmetic8.name=粉花蕾 -item.botania:cosmetic9.name=斑点蝴蝶结 -item.botania:cosmetic10.name=蓝蝴蝶 -item.botania:cosmetic11.name=猫耳 -item.botania:cosmetic12.name=女巫别针 -item.botania:cosmetic13.name=恶魔尾巴 -item.botania:cosmetic14.name=神威之眼 -item.botania:cosmetic15.name=青蛙眼 -item.botania:cosmetic16.name=四叶草 -item.botania:cosmetic17.name=时钟之眼 -item.botania:cosmetic18.name=独角兽之角 -item.botania:cosmetic19.name=恶魔尖角 -item.botania:cosmetic20.name=十字头饰 -item.botania:cosmetic21.name=植物学家徽章 -item.botania:cosmetic22.name=远古面具 -item.botania:cosmetic23.name=怪异面具 -item.botania:cosmetic24.name=外星人天线 -item.botania:cosmetic25.name=红蓝眼镜 -item.botania:cosmetic26.name=橙色墨镜 -item.botania:cosmetic27.name=大鼻子面具 -item.botania:cosmetic28.name=浓眉毛 -item.botania:cosmetic29.name=盾牌 -item.botania:cosmetic30.name=小土豆面具 -item.botania:cosmetic31.name=任务人标志 +item.botania:cosmetic_black_bowtie.name=黑领结 +item.botania:cosmetic_black_tie.name=黑领带 +item.botania:cosmetic_red_glasses.name=红眼镜 +item.botania:cosmetic_puffy_scarf.name=蓬松围巾 +item.botania:cosmetic_engineer_goggles.name=工程师护目镜 +item.botania:cosmetic_eyepatch.name=眼罩 +item.botania:cosmetic_wicked_eyepatch.name=中二眼罩 +item.botania:cosmetic_red_ribbons.name=红丝带 +item.botania:cosmetic_pink_flower_bud.name=粉花蕾 +item.botania:cosmetic_polka_dotted_bows.name=斑点蝴蝶结 +item.botania:cosmetic_blue_butterfly.name=蓝蝴蝶 +item.botania:cosmetic_cat_ears.name=猫耳 +item.botania:cosmetic_witch_pin.name=女巫别针 +item.botania:cosmetic_devil_tail.name=恶魔尾巴 +item.botania:cosmetic_kamui_eye.name=神威之眼 +item.botania:cosmetic_googly_eyes.name=青蛙眼 +item.botania:cosmetic_four_leaf_clover.name=四叶草 +item.botania:cosmetic_clock_eye.name=时钟之眼 +item.botania:cosmetic_unicorn_horn.name=独角兽之角 +item.botania:cosmetic_devil_horns.name=恶魔尖角 +item.botania:cosmetic_hyper_plus.name=十字头饰 +item.botania:cosmetic_botanist_emblem.name=植物学家徽章 +item.botania:cosmetic_ancient_mask.name=远古面具 +item.botania:cosmetic_eerie_mask.name=怪异面具 +item.botania:cosmetic_alien_antenna.name=外星人天线 +item.botania:cosmetic_anaglyph_glasses.name=红蓝眼镜 +item.botania:cosmetic_orange_shades.name=橙色墨镜 +item.botania:cosmetic_groucho_glasses.name=大鼻子面具 +item.botania:cosmetic_thick_eyebrows.name=浓眉毛 +item.botania:cosmetic_lusitanic_shield.name=盾牌 +item.botania:cosmetic_tiny_potato_mask.name=小土豆面具 +item.botania:cosmetic_questgiver_mark.name=任务人标志 item.botania:mana_string.name=蕴魔丝线 item.botania:swapRing.name=修正指环 item.botania:flowerBag.name=采花袋 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 012532b75..f1e1bd515 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1480,38 +1480,38 @@ item.botania:corporeaSpark1.name=主媒體火花 item.botania:ender_air_bottle.name=終界氣瓶 item.botania:livingwoodBow.name=活木弓 item.botania:crystalBow.name=水晶弓 -item.botania:cosmetic0.name=黑領結 -item.botania:cosmetic1.name=黑領帶 -item.botania:cosmetic2.name=紅眼鏡 -item.botania:cosmetic3.name=蓬鬆圍巾 -item.botania:cosmetic4.name=工程師護目鏡 -item.botania:cosmetic5.name=眼罩 -item.botania:cosmetic6.name=中二眼罩 -item.botania:cosmetic7.name=紅絲帶 -item.botania:cosmetic8.name=粉花蕾 -item.botania:cosmetic9.name=斑點蝴蝶結 -item.botania:cosmetic10.name=藍蝴蝶 -item.botania:cosmetic11.name=貓耳 -item.botania:cosmetic12.name=女巫別針 -item.botania:cosmetic13.name=惡魔尾巴 -item.botania:cosmetic14.name=神威之眼 -item.botania:cosmetic15.name=青蛙眼 -item.botania:cosmetic16.name=四葉草 -item.botania:cosmetic17.name=時鐘之眼 -item.botania:cosmetic18.name=獨角獸之角 -item.botania:cosmetic19.name=惡魔尖角 -item.botania:cosmetic20.name=十字頭飾 -item.botania:cosmetic21.name=植物學家徽章 -item.botania:cosmetic22.name=遠古面具 -item.botania:cosmetic23.name=怪異面具 -item.botania:cosmetic24.name=外星人天線 -item.botania:cosmetic25.name=紅藍眼鏡 -item.botania:cosmetic26.name=橘色墨鏡 -item.botania:cosmetic27.name=大鼻子面具 -item.botania:cosmetic28.name=濃眉毛 -item.botania:cosmetic29.name=盾牌 -item.botania:cosmetic30.name=小土豆面具 -item.botania:cosmetic31.name=任務人標誌 +item.botania:cosmetic_black_bowtie.name=黑領結 +item.botania:cosmetic_black_tie.name=黑領帶 +item.botania:cosmetic_red_glasses.name=紅眼鏡 +item.botania:cosmetic_puffy_scarf.name=蓬鬆圍巾 +item.botania:cosmetic_engineer_goggles.name=工程師護目鏡 +item.botania:cosmetic_eyepatch.name=眼罩 +item.botania:cosmetic_wicked_eyepatch.name=中二眼罩 +item.botania:cosmetic_red_ribbons.name=紅絲帶 +item.botania:cosmetic_pink_flower_bud.name=粉花蕾 +item.botania:cosmetic_polka_dotted_bows.name=斑點蝴蝶結 +item.botania:cosmetic_blue_butterfly.name=藍蝴蝶 +item.botania:cosmetic_cat_ears.name=貓耳 +item.botania:cosmetic_witch_pin.name=女巫別針 +item.botania:cosmetic_devil_tail.name=惡魔尾巴 +item.botania:cosmetic_kamui_eye.name=神威之眼 +item.botania:cosmetic_googly_eyes.name=青蛙眼 +item.botania:cosmetic_four_leaf_clover.name=四葉草 +item.botania:cosmetic_clock_eye.name=時鐘之眼 +item.botania:cosmetic_unicorn_horn.name=獨角獸之角 +item.botania:cosmetic_devil_horns.name=惡魔尖角 +item.botania:cosmetic_hyper_plus.name=十字頭飾 +item.botania:cosmetic_botanist_emblem.name=植物學家徽章 +item.botania:cosmetic_ancient_mask.name=遠古面具 +item.botania:cosmetic_eerie_mask.name=怪異面具 +item.botania:cosmetic_alien_antenna.name=外星人天線 +item.botania:cosmetic_anaglyph_glasses.name=紅藍眼鏡 +item.botania:cosmetic_orange_shades.name=橘色墨鏡 +item.botania:cosmetic_groucho_glasses.name=大鼻子面具 +item.botania:cosmetic_thick_eyebrows.name=濃眉毛 +item.botania:cosmetic_lusitanic_shield.name=盾牌 +item.botania:cosmetic_tiny_potato_mask.name=小土豆面具 +item.botania:cosmetic_questgiver_mark.name=任務人標誌 item.botania:mana_string.name=蘊魔絲線 item.botania:swapRing.name=修正指環 item.botania:flowerBag.name=採花袋 diff --git a/src/main/resources/assets/botania/models/item/cosmetic24.json b/src/main/resources/assets/botania/models/item/cosmetic_alien_antenna.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic24.json rename to src/main/resources/assets/botania/models/item/cosmetic_alien_antenna.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic25.json b/src/main/resources/assets/botania/models/item/cosmetic_anaglyph_glasses.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic25.json rename to src/main/resources/assets/botania/models/item/cosmetic_anaglyph_glasses.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic22.json b/src/main/resources/assets/botania/models/item/cosmetic_ancient_mask.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic22.json rename to src/main/resources/assets/botania/models/item/cosmetic_ancient_mask.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic0.json b/src/main/resources/assets/botania/models/item/cosmetic_black_bowtie.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic0.json rename to src/main/resources/assets/botania/models/item/cosmetic_black_bowtie.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic1.json b/src/main/resources/assets/botania/models/item/cosmetic_black_tie.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic1.json rename to src/main/resources/assets/botania/models/item/cosmetic_black_tie.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic10.json b/src/main/resources/assets/botania/models/item/cosmetic_blue_butterfly.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic10.json rename to src/main/resources/assets/botania/models/item/cosmetic_blue_butterfly.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic21.json b/src/main/resources/assets/botania/models/item/cosmetic_botanist_emblem.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic21.json rename to src/main/resources/assets/botania/models/item/cosmetic_botanist_emblem.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic11.json b/src/main/resources/assets/botania/models/item/cosmetic_cat_ears.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic11.json rename to src/main/resources/assets/botania/models/item/cosmetic_cat_ears.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic17.json b/src/main/resources/assets/botania/models/item/cosmetic_clock_eye.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic17.json rename to src/main/resources/assets/botania/models/item/cosmetic_clock_eye.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic19.json b/src/main/resources/assets/botania/models/item/cosmetic_devil_horns.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic19.json rename to src/main/resources/assets/botania/models/item/cosmetic_devil_horns.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic13.json b/src/main/resources/assets/botania/models/item/cosmetic_devil_tail.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic13.json rename to src/main/resources/assets/botania/models/item/cosmetic_devil_tail.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic23.json b/src/main/resources/assets/botania/models/item/cosmetic_eerie_mask.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic23.json rename to src/main/resources/assets/botania/models/item/cosmetic_eerie_mask.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic4.json b/src/main/resources/assets/botania/models/item/cosmetic_engineer_goggles.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic4.json rename to src/main/resources/assets/botania/models/item/cosmetic_engineer_goggles.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic5.json b/src/main/resources/assets/botania/models/item/cosmetic_eyepatch.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic5.json rename to src/main/resources/assets/botania/models/item/cosmetic_eyepatch.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic16.json b/src/main/resources/assets/botania/models/item/cosmetic_four_leaf_clover.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic16.json rename to src/main/resources/assets/botania/models/item/cosmetic_four_leaf_clover.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic15.json b/src/main/resources/assets/botania/models/item/cosmetic_googly_eyes.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic15.json rename to src/main/resources/assets/botania/models/item/cosmetic_googly_eyes.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic27.json b/src/main/resources/assets/botania/models/item/cosmetic_groucho_glasses.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic27.json rename to src/main/resources/assets/botania/models/item/cosmetic_groucho_glasses.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic20.json b/src/main/resources/assets/botania/models/item/cosmetic_hyper_plus.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic20.json rename to src/main/resources/assets/botania/models/item/cosmetic_hyper_plus.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic14.json b/src/main/resources/assets/botania/models/item/cosmetic_kamui_eye.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic14.json rename to src/main/resources/assets/botania/models/item/cosmetic_kamui_eye.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic29.json b/src/main/resources/assets/botania/models/item/cosmetic_lusitanic_shield.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic29.json rename to src/main/resources/assets/botania/models/item/cosmetic_lusitanic_shield.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic26.json b/src/main/resources/assets/botania/models/item/cosmetic_orange_shades.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic26.json rename to src/main/resources/assets/botania/models/item/cosmetic_orange_shades.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic8.json b/src/main/resources/assets/botania/models/item/cosmetic_pink_flower_bud.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic8.json rename to src/main/resources/assets/botania/models/item/cosmetic_pink_flower_bud.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic9.json b/src/main/resources/assets/botania/models/item/cosmetic_polka_dotted_bows.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic9.json rename to src/main/resources/assets/botania/models/item/cosmetic_polka_dotted_bows.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic3.json b/src/main/resources/assets/botania/models/item/cosmetic_puffy_scarf.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic3.json rename to src/main/resources/assets/botania/models/item/cosmetic_puffy_scarf.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic31.json b/src/main/resources/assets/botania/models/item/cosmetic_questgiver_mark.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic31.json rename to src/main/resources/assets/botania/models/item/cosmetic_questgiver_mark.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic2.json b/src/main/resources/assets/botania/models/item/cosmetic_red_glasses.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic2.json rename to src/main/resources/assets/botania/models/item/cosmetic_red_glasses.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic7.json b/src/main/resources/assets/botania/models/item/cosmetic_red_ribbons.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic7.json rename to src/main/resources/assets/botania/models/item/cosmetic_red_ribbons.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic28.json b/src/main/resources/assets/botania/models/item/cosmetic_thick_eyebrows.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic28.json rename to src/main/resources/assets/botania/models/item/cosmetic_thick_eyebrows.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic30.json b/src/main/resources/assets/botania/models/item/cosmetic_tiny_potato_mask.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic30.json rename to src/main/resources/assets/botania/models/item/cosmetic_tiny_potato_mask.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic18.json b/src/main/resources/assets/botania/models/item/cosmetic_unicorn_horn.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic18.json rename to src/main/resources/assets/botania/models/item/cosmetic_unicorn_horn.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic6.json b/src/main/resources/assets/botania/models/item/cosmetic_wicked_eyepatch.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic6.json rename to src/main/resources/assets/botania/models/item/cosmetic_wicked_eyepatch.json diff --git a/src/main/resources/assets/botania/models/item/cosmetic12.json b/src/main/resources/assets/botania/models/item/cosmetic_witch_pin.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cosmetic12.json rename to src/main/resources/assets/botania/models/item/cosmetic_witch_pin.json diff --git a/src/main/resources/assets/botania/recipes/cosmetic_24.json b/src/main/resources/assets/botania/recipes/cosmetic_alien_antenna.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_24.json rename to src/main/resources/assets/botania/recipes/cosmetic_alien_antenna.json index 199909a55..c0cb99084 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_24.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_alien_antenna.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 24 + "item": "botania:cosmetic_alien_antenna" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_25.json b/src/main/resources/assets/botania/recipes/cosmetic_anaglyph_glasses.json similarity index 81% rename from src/main/resources/assets/botania/recipes/cosmetic_25.json rename to src/main/resources/assets/botania/recipes/cosmetic_anaglyph_glasses.json index 4dcc88eb1..978e2cdf9 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_25.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_anaglyph_glasses.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 25 + "item": "botania:cosmetic_anaglyph_glasses" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_22.json b/src/main/resources/assets/botania/recipes/cosmetic_ancient_mask.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_22.json rename to src/main/resources/assets/botania/recipes/cosmetic_ancient_mask.json index f12e5c9b2..f21fa32db 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_22.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_ancient_mask.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 22 + "item": "botania:cosmetic_ancient_mask" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_0.json b/src/main/resources/assets/botania/recipes/cosmetic_black_bowtie.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_0.json rename to src/main/resources/assets/botania/recipes/cosmetic_black_bowtie.json index 025f832d6..87b15ce16 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_0.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_black_bowtie.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 0 + "item": "botania:cosmetic_black_bowtie" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_1.json b/src/main/resources/assets/botania/recipes/cosmetic_black_tie.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_1.json rename to src/main/resources/assets/botania/recipes/cosmetic_black_tie.json index 59413d034..a43729627 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_1.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_black_tie.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 1 + "item": "botania:cosmetic_black_tie" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_10.json b/src/main/resources/assets/botania/recipes/cosmetic_blue_butterfly.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_10.json rename to src/main/resources/assets/botania/recipes/cosmetic_blue_butterfly.json index a1c250b0a..b88f700d4 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_10.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_blue_butterfly.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 10 + "item": "botania:cosmetic_blue_butterfly" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_21.json b/src/main/resources/assets/botania/recipes/cosmetic_botanist_emblem.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_21.json rename to src/main/resources/assets/botania/recipes/cosmetic_botanist_emblem.json index d71d6e482..47fd8d079 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_21.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_botanist_emblem.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 21 + "item": "botania:cosmetic_botanist_emblem" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_11.json b/src/main/resources/assets/botania/recipes/cosmetic_cat_ears.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_11.json rename to src/main/resources/assets/botania/recipes/cosmetic_cat_ears.json index 53ad86da7..18bc6c40f 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_11.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_cat_ears.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 11 + "item": "botania:cosmetic_cat_ears" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_17.json b/src/main/resources/assets/botania/recipes/cosmetic_clock_eye.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_17.json rename to src/main/resources/assets/botania/recipes/cosmetic_clock_eye.json index 92cc0bf52..0f4eb3e1e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_17.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_clock_eye.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 17 + "item": "botania:cosmetic_clock_eye" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_19.json b/src/main/resources/assets/botania/recipes/cosmetic_devil_horns.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_19.json rename to src/main/resources/assets/botania/recipes/cosmetic_devil_horns.json index 684774d2a..cb2bdda55 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_19.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_devil_horns.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 19 + "item": "botania:cosmetic_devil_horns" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_13.json b/src/main/resources/assets/botania/recipes/cosmetic_devil_tail.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_13.json rename to src/main/resources/assets/botania/recipes/cosmetic_devil_tail.json index ef1595a20..ee7fe5498 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_13.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_devil_tail.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 13 + "item": "botania:cosmetic_devil_tail" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_23.json b/src/main/resources/assets/botania/recipes/cosmetic_eerie_mask.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_23.json rename to src/main/resources/assets/botania/recipes/cosmetic_eerie_mask.json index 7a311c2cb..365eab7f3 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_23.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_eerie_mask.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 23 + "item": "botania:cosmetic_eerie_mask" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_4.json b/src/main/resources/assets/botania/recipes/cosmetic_engineer_goggles.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_4.json rename to src/main/resources/assets/botania/recipes/cosmetic_engineer_goggles.json index e1fa90acb..8a7eca7a4 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_4.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_engineer_goggles.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 4 + "item": "botania:cosmetic_engineer_goggles" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_5.json b/src/main/resources/assets/botania/recipes/cosmetic_eyepatch.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_5.json rename to src/main/resources/assets/botania/recipes/cosmetic_eyepatch.json index acf4ac19f..8f93f3e46 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_5.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_eyepatch.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 5 + "item": "botania:cosmetic_eyepatch" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_16.json b/src/main/resources/assets/botania/recipes/cosmetic_four_leaf_clover.json similarity index 81% rename from src/main/resources/assets/botania/recipes/cosmetic_16.json rename to src/main/resources/assets/botania/recipes/cosmetic_four_leaf_clover.json index c39c0d71e..2e91aa814 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_16.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_four_leaf_clover.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 16 + "item": "botania:cosmetic_four_leaf_clover" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_15.json b/src/main/resources/assets/botania/recipes/cosmetic_googly_eyes.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_15.json rename to src/main/resources/assets/botania/recipes/cosmetic_googly_eyes.json index 1a5e1e334..1ce6a321e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_15.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_googly_eyes.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 15 + "item": "botania:cosmetic_googly_eyes" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_27.json b/src/main/resources/assets/botania/recipes/cosmetic_groucho_glasses.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_27.json rename to src/main/resources/assets/botania/recipes/cosmetic_groucho_glasses.json index 8ad088151..47d65d4e1 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_27.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_groucho_glasses.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 27 + "item": "botania:cosmetic_groucho_glasses" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_20.json b/src/main/resources/assets/botania/recipes/cosmetic_hyper_plus.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_20.json rename to src/main/resources/assets/botania/recipes/cosmetic_hyper_plus.json index ac98a0cf6..156d484d6 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_20.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_hyper_plus.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 20 + "item": "botania:cosmetic_hyper_plus" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_14.json b/src/main/resources/assets/botania/recipes/cosmetic_kamui_eye.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_14.json rename to src/main/resources/assets/botania/recipes/cosmetic_kamui_eye.json index f756e38d7..b5060f549 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_14.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_kamui_eye.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 14 + "item": "botania:cosmetic_kamui_eye" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_29.json b/src/main/resources/assets/botania/recipes/cosmetic_lusitanic_shield.json similarity index 81% rename from src/main/resources/assets/botania/recipes/cosmetic_29.json rename to src/main/resources/assets/botania/recipes/cosmetic_lusitanic_shield.json index f34d41f7e..c06925fb3 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_29.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_lusitanic_shield.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 29 + "item": "botania:cosmetic_lusitanic_shield" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_26.json b/src/main/resources/assets/botania/recipes/cosmetic_orange_shades.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_26.json rename to src/main/resources/assets/botania/recipes/cosmetic_orange_shades.json index 51c205295..a67e9f121 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_26.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_orange_shades.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 26 + "item": "botania:cosmetic_orange_shades" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_8.json b/src/main/resources/assets/botania/recipes/cosmetic_pink_flower_bud.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_8.json rename to src/main/resources/assets/botania/recipes/cosmetic_pink_flower_bud.json index 4f895077e..9e0f81bcf 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_8.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_pink_flower_bud.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 8 + "item": "botania:cosmetic_pink_flower_bud" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_9.json b/src/main/resources/assets/botania/recipes/cosmetic_polka_dotted_bows.json similarity index 81% rename from src/main/resources/assets/botania/recipes/cosmetic_9.json rename to src/main/resources/assets/botania/recipes/cosmetic_polka_dotted_bows.json index 9df89c74e..7ed9904c0 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_9.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_polka_dotted_bows.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 9 + "item": "botania:cosmetic_polka_dotted_bows" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_3.json b/src/main/resources/assets/botania/recipes/cosmetic_puffy_scarf.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_3.json rename to src/main/resources/assets/botania/recipes/cosmetic_puffy_scarf.json index 1e1514b85..15c4c7cf9 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_3.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_puffy_scarf.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 3 + "item": "botania:cosmetic_puffy_scarf" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_31.json b/src/main/resources/assets/botania/recipes/cosmetic_questgiver_mark.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_31.json rename to src/main/resources/assets/botania/recipes/cosmetic_questgiver_mark.json index 29968b4df..e74d7a108 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_31.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_questgiver_mark.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 31 + "item": "botania:cosmetic_questgiver_mark" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_2.json b/src/main/resources/assets/botania/recipes/cosmetic_red_glasses.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_2.json rename to src/main/resources/assets/botania/recipes/cosmetic_red_glasses.json index 721a0a486..79515d8fa 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_2.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_red_glasses.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 2 + "item": "botania:cosmetic_red_glasses" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_7.json b/src/main/resources/assets/botania/recipes/cosmetic_red_ribbons.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_7.json rename to src/main/resources/assets/botania/recipes/cosmetic_red_ribbons.json index ac8d67431..ff7bb2e87 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_7.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_red_ribbons.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 7 + "item": "botania:cosmetic_red_ribbons" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_28.json b/src/main/resources/assets/botania/recipes/cosmetic_thick_eyebrows.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_28.json rename to src/main/resources/assets/botania/recipes/cosmetic_thick_eyebrows.json index e21a0c3d9..a922b461f 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_28.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_thick_eyebrows.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 28 + "item": "botania:cosmetic_thick_eyebrows" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_30.json b/src/main/resources/assets/botania/recipes/cosmetic_tiny_potato_mask.json similarity index 81% rename from src/main/resources/assets/botania/recipes/cosmetic_30.json rename to src/main/resources/assets/botania/recipes/cosmetic_tiny_potato_mask.json index 83378f14c..c020916f5 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_30.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_tiny_potato_mask.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 30 + "item": "botania:cosmetic_tiny_potato_mask" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_18.json b/src/main/resources/assets/botania/recipes/cosmetic_unicorn_horn.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_18.json rename to src/main/resources/assets/botania/recipes/cosmetic_unicorn_horn.json index 3edbb86f7..fb0c6127b 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_18.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_unicorn_horn.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 18 + "item": "botania:cosmetic_unicorn_horn" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_6.json b/src/main/resources/assets/botania/recipes/cosmetic_wicked_eyepatch.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_6.json rename to src/main/resources/assets/botania/recipes/cosmetic_wicked_eyepatch.json index 085433787..0cfade08c 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_6.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_wicked_eyepatch.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 6 + "item": "botania:cosmetic_wicked_eyepatch" }, "pattern": [ "PPP", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_12.json b/src/main/resources/assets/botania/recipes/cosmetic_witch_pin.json similarity index 82% rename from src/main/resources/assets/botania/recipes/cosmetic_12.json rename to src/main/resources/assets/botania/recipes/cosmetic_witch_pin.json index bd2b146d9..bc20a66fd 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_12.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_witch_pin.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 12 + "item": "botania:cosmetic_witch_pin" }, "pattern": [ "PPP",