From 1d997c7f3b56845a3f0236a442ab3a51dc62b6e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Dec 2017 20:40:42 -0600 Subject: [PATCH] Flatten Quartz --- .../common/core/BotaniaCreativeTab.java | 9 ++- .../common/crafting/ModCraftingRecipes.java | 10 +-- .../common/crafting/ModElvenTradeRecipes.java | 2 +- .../crafting/ModManaAlchemyRecipes.java | 13 ++-- .../crafting/ModManaInfusionRecipes.java | 2 +- .../botania/common/fixers/FlattenItems.java | 4 +- .../vazkii/botania/common/item/ItemElven.java | 25 ++++++++ .../vazkii/botania/common/item/ItemMod.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 27 ++++++-- .../common/item/material/ItemQuartz.java | 63 ------------------- .../botania/common/lib/LibItemNames.java | 10 ++- .../resources/assets/botania/lang/en_us.lang | 14 ++--- .../resources/assets/botania/lang/es_es.lang | 14 ++--- .../resources/assets/botania/lang/fr_fr.lang | 14 ++--- .../resources/assets/botania/lang/ja_jp.lang | 14 ++--- .../resources/assets/botania/lang/ko_kr.lang | 14 ++--- .../resources/assets/botania/lang/nl_nl.lang | 14 ++--- .../resources/assets/botania/lang/pt_br.lang | 14 ++--- .../resources/assets/botania/lang/ru_ru.lang | 12 ++-- .../resources/assets/botania/lang/zh_cn.lang | 14 ++--- .../resources/assets/botania/lang/zh_tw.lang | 14 ++--- .../item/{quartz2.json => quartz_blaze.json} | 0 .../item/{quartz0.json => quartz_dark.json} | 0 .../item/{quartz5.json => quartz_elven.json} | 0 .../{quartz3.json => quartz_lavender.json} | 0 .../item/{quartz1.json => quartz_mana.json} | 0 .../item/{quartz4.json => quartz_red.json} | 0 .../item/{quartz6.json => quartz_sunny.json} | 0 .../{quartz_2.json => quartz_blaze.json} | 3 +- .../{quartz_0.json => quartz_dark.json} | 3 +- .../{quartz_3.json => quartz_lavender.json} | 3 +- .../{quartz_4.json => quartz_red.json} | 3 +- .../{quartz_6.json => quartz_sunny.json} | 3 +- 33 files changed, 154 insertions(+), 166 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/ItemElven.java delete mode 100644 src/main/java/vazkii/botania/common/item/material/ItemQuartz.java rename src/main/resources/assets/botania/models/item/{quartz2.json => quartz_blaze.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz0.json => quartz_dark.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz5.json => quartz_elven.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz3.json => quartz_lavender.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz1.json => quartz_mana.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz4.json => quartz_red.json} (100%) rename src/main/resources/assets/botania/models/item/{quartz6.json => quartz_sunny.json} (100%) rename src/main/resources/assets/botania/recipes/{quartz_2.json => quartz_blaze.json} (83%) rename src/main/resources/assets/botania/recipes/{quartz_0.json => quartz_dark.json} (88%) rename src/main/resources/assets/botania/recipes/{quartz_3.json => quartz_lavender.json} (91%) rename src/main/resources/assets/botania/recipes/{quartz_4.json => quartz_red.json} (83%) rename src/main/resources/assets/botania/recipes/{quartz_6.json => quartz_sunny.json} (84%) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 3f59761ee..2bc15c607 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -351,7 +351,14 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.shimmerrockStairs); addBlock(ModFluffBlocks.shimmerrockSlab); - addItem(ModItems.quartz); + addItem(ModItems.darkQuartz); + addItem(ModItems.manaQuartz); + addItem(ModItems.blazeQuartz); + addItem(ModItems.lavenderQuartz); + addItem(ModItems.redQuartz); + addItem(ModItems.elfQuartz); + addItem(ModItems.sunnyQuartz); + addBlock(ModFluffBlocks.darkQuartz); addBlock(ModFluffBlocks.darkQuartzSlab); addBlock(ModFluffBlocks.darkQuartzStairs); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 58b0538ea..5aec60ad3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -726,11 +726,11 @@ public final class ModCraftingRecipes { recipeLivingwoodDecor3 = path("livingwood_3"); recipeLivingwoodDecor4 = path("livingwood_4"); recipeLivingwoodDecor5 = path("livingwood_5"); - recipeDarkQuartz = path("quartz_0"); - recipeBlazeQuartz = path("quartz_2"); - recipeLavenderQuartz = path("quartz_3"); - recipeRedQuartz = path("quartz_4"); - recipeSunnyQuartz = path("quartz_6"); + recipeDarkQuartz = ModItems.darkQuartz.getRegistryName(); + recipeBlazeQuartz = ModItems.blazeQuartz.getRegistryName(); + recipeLavenderQuartz = ModItems.lavenderQuartz.getRegistryName(); + recipeRedQuartz = ModItems.redQuartz.getRegistryName(); + recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName(); recipesShinyFlowers = allOfGroup(ModBlocks.shinyFlower.getRegistryName()); recipesMiniIsland = allOfGroup(ModBlocks.floatingFlower.getRegistryName()); recipeAzulejo = path("custombrick_4"); diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index 8497d615f..34682123d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -33,7 +33,7 @@ public class ModElvenTradeRecipes { dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), LibOreDict.MANA_DIAMOND)); dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3))); - elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.QUARTZ)); + elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elfQuartz), new ItemStack(Items.QUARTZ)); alfglassRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elfGlass), new ItemStack(ModBlocks.manaGlass)); BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.IRON_INGOT), new ItemStack(Items.IRON_INGOT)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index e2c002e4d..62a2a3be0 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -18,7 +18,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import java.util.ArrayList; @@ -74,12 +73,12 @@ public final class ModManaAlchemyRecipes { glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.GLOWSTONE_DUST, 4), new ItemStack(Blocks.GLOWSTONE), 25); quartzRecipes = new ArrayList<>(); quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.QUARTZ, 4), new ItemStack(Blocks.QUARTZ_BLOCK, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 2), new ItemStack(ModFluffBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 3), new ItemStack(ModFluffBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 5), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.darkQuartz, 4), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaQuartz, 4), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.blazeQuartz, 4), new ItemStack(ModFluffBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.lavenderQuartz, 4), new ItemStack(ModFluffBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.redQuartz, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.elfQuartz, 4), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25)); chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONEBRICK, 1, 3), new ItemStack(Blocks.STONEBRICK), 150); iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ICE), new ItemStack(Blocks.SNOW), 2250); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 3db118484..aff450740 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -71,7 +71,7 @@ public final class ModManaInfusionRecipes { mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.RED_MUSHROOM), 6500)); mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.BROWN_MUSHROOM), 6500)); - manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.QUARTZ), 250); + manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaQuartz), new ItemStack(Items.QUARTZ), 250); tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.POTATO), 1337); if(Botania.thaumcraftLoaded) { diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 527833d44..bb7e6c6b6 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -7,7 +7,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.HashMap; -import java.util.Locale; import java.util.Map; import java.util.function.IntFunction; @@ -21,7 +20,7 @@ public class FlattenItems implements IFixableData { // support ancient prismarine from 1.7 return "minecraft:prismarine_shard"; } else { - return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length].toLowerCase(Locale.ROOT); + return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length]; } }); LOOKUP.put("botania:vial", i -> { @@ -31,6 +30,7 @@ public class FlattenItems implements IFixableData { return LibMisc.MOD_ID + ":" + LibItemNames.VIAL; } }); + LOOKUP.put("botania:quartz", i -> LibMisc.MOD_ID + ":" + LibItemNames.QUARTZ_NAMES[i % LibItemNames.QUARTZ_NAMES.length]); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemElven.java b/src/main/java/vazkii/botania/common/item/ItemElven.java new file mode 100644 index 000000000..14d3d2e85 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/ItemElven.java @@ -0,0 +1,25 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.item.ItemStack; +import vazkii.botania.api.recipe.IElvenItem; + +public class ItemElven extends ItemMod implements IElvenItem { + public ItemElven(String name) { + super(name); + } + + @Override + public boolean isElvenItem(ItemStack stack) { + return true; + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index f07c23003..080ae1ae9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public abstract class ItemMod extends Item implements IModelRegister { +public class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 71f3f28cc..2283ae5ce 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -68,7 +68,6 @@ import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.item.material.ItemManaResource; import vazkii.botania.common.item.material.ItemPestleAndMortar; import vazkii.botania.common.item.material.ItemPetal; -import vazkii.botania.common.item.material.ItemQuartz; import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.item.record.ItemRecordGaia1; import vazkii.botania.common.item.record.ItemRecordGaia2; @@ -170,7 +169,13 @@ public final class ModItems { public static final Item divaCharm = new ItemDivaCharm(); public static final Item flightTiara = new ItemFlightTiara(); public static final Item enderDagger = new ItemEnderDagger(); - public static final Item quartz = new ItemQuartz(); + public static final Item darkQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[0]); + public static final Item manaQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[1]); + public static final Item blazeQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[2]); + public static final Item lavenderQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[3]); + public static final Item redQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[4]); + public static final Item elfQuartz = new ItemElven(LibItemNames.QUARTZ_NAMES[5]); + public static final Item sunnyQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[6]); public static final Item waterRod = new ItemWaterRod(); public static final Item elementiumHelm = new ItemElementiumHelm(); public static final Item elementiumHelmRevealing = new ItemElementiumHelmRevealing(); @@ -349,7 +354,13 @@ public final class ModItems { r.register(divaCharm); r.register(flightTiara); r.register(enderDagger); - r.register(quartz); + r.register(darkQuartz); + r.register(manaQuartz); + r.register(blazeQuartz); + r.register(lavenderQuartz); + r.register(redQuartz); + r.register(elfQuartz); + r.register(sunnyQuartz); r.register(waterRod); r.register(elementiumHelm); r.register(elementiumHelmRevealing); @@ -464,8 +475,14 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); } OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE)); - for(int i = 0; i < 7; i++) - OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i)); + + OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[2], new ItemStack(blazeQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[3], new ItemStack(lavenderQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[4], new ItemStack(redQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[5], new ItemStack(elfQuartz)); + OreDictionary.registerOre(LibOreDict.QUARTZ[6], new ItemStack(sunnyQuartz)); OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar); OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaSteel)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java deleted file mode 100644 index fb96fc66c..000000000 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)] - */ -package vazkii.botania.common.item.material; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.lib.LibItemNames; - -import javax.annotation.Nonnull; - -public class ItemQuartz extends ItemMod implements IElvenItem { - - private static final int SUBTYPES = 7; - - public ItemQuartz() { - super(LibItemNames.QUARTZ); - setHasSubtypes(true); - } - - @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 getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - private String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); - } - - @Override - public boolean isElvenItem(ItemStack stack) { - return stack.getItemDamage() == 5; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 7, LibItemNames.QUARTZ); - } -} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 44e84f4e8..65c43a9cb 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -60,7 +60,15 @@ public final class LibItemNames { public static final String DIVA_CHARM = "divaCharm"; public static final String FLIGHT_TIARA = "flightTiara"; public static final String ENDER_DAGGER = "enderDagger"; - public static final String QUARTZ = "quartz"; + public static final String[] QUARTZ_NAMES = { + "quartz_dark", + "quartz_mana", + "quartz_blaze", + "quartz_lavender", + "quartz_red", + "quartz_elven", + "quartz_sunny" + }; public static final String WATER_ROD = "waterRod"; public static final String ELEMENTIUM_HELM = "elementiumHelm"; public static final String ELEMENTIUM_CHEST = "elementiumChest"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 578cf5c02..2129aabfc 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1419,13 +1419,13 @@ item.botania:terraPick.name=Terra Shatterer item.botania:divaCharm.name=Charm of the Diva item.botania:flightTiara.name=Flügel Tiara item.botania:enderDagger.name=Soulscribe -item.botania:quartz0.name=Smokey Quartz -item.botania:quartz1.name=Mana Quartz -item.botania:quartz2.name=Blaze Quartz -item.botania:quartz3.name=Lavender Quartz -item.botania:quartz4.name=Redquartz -item.botania:quartz5.name=Elven Quartz -item.botania:quartz6.name=Sunny Quartz +item.botania:quartz_dark.name=Smokey Quartz +item.botania:quartz_mana.name=Mana Quartz +item.botania:quartz_blaze.name=Blaze Quartz +item.botania:quartz_lavender.name=Lavender Quartz +item.botania:quartz_red.name=Redquartz +item.botania:quartz_elven.name=Elven Quartz +item.botania:quartz_sunny.name=Sunny Quartz item.botania:elementium_ingot.name=Elementium Ingot item.botania:pixie_dust.name=Pixie Dust item.botania:dragonstone.name=Dragonstone diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 32e7510fa..d46e9a798 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1179,13 +1179,13 @@ item.botania:terraPick.name=Destructor de Terra item.botania:divaCharm.name=Amuleto de la diva item.botania:flightTiara.name=Tiara de los Flügel item.botania:enderDagger.name=Escribalma -item.botania:quartz0.name=Cuarzo ahumado -item.botania:quartz1.name=Cuarzo de maná -item.botania:quartz2.name=Cuarzo de blaze -item.botania:quartz3.name=Cuarzo lavanda -item.botania:quartz4.name=Cuarzo rojo -item.botania:quartz5.name=Cuarzo élfico -item.botania:quartz6.name=Cuarzo solar +item.botania:quartz_dark.name=Cuarzo ahumado +item.botania:quartz_mana.name=Cuarzo de maná +item.botania:quartz_blaze.name=Cuarzo de blaze +item.botania:quartz_lavender.name=Cuarzo lavanda +item.botania:quartz_red.name=Cuarzo rojo +item.botania:quartz_elven.name=Cuarzo élfico +item.botania:quartz_sunny.name=Cuarzo solar item.botania:elementium_ingot.name=Lingote de elementio item.botania:pixie_dust.name=Polvo de hada item.botania:dragonstone.name=Piedra de dragón diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 4c74c75cf..5a45fa0e5 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1041,13 +1041,13 @@ item.botania:terraPick.name=Voleur en éclat de terre item.botania:divaCharm.name=Charme de la diva item.botania:flightTiara.name=Flügel Tiara item.botania:enderDagger.name=Scribe d'âme -item.botania:quartz0.name=Quartz fumé -item.botania:quartz1.name=Quartz de mana -item.botania:quartz2.name=Quartz flambé -item.botania:quartz3.name=Quartz lavande -item.botania:quartz4.name=Redquartz -item.botania:quartz5.name=Quartz elfique -item.botania:quartz6.name=Quartz ensoleillé +item.botania:quartz_dark.name=Quartz fumé +item.botania:quartz_mana.name=Quartz de mana +item.botania:quartz_blaze.name=Quartz flambé +item.botania:quartz_lavender.name=Quartz lavande +item.botania:quartz_red.name=Redquartz +item.botania:quartz_elven.name=Quartz elfique +item.botania:quartz_sunny.name=Quartz ensoleillé item.botania:elementium_ingot.name=Lingot d'élémentium item.botania:pixie_dust.name=Poudre de lutin item.botania:dragonstone.name=Dragonite diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 53f61d2f8..fbb321934 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1204,13 +1204,13 @@ item.botania:terraPick.name=テラシャッタラー item.botania:divaCharm.name=歌姫のお守り item.botania:flightTiara.name=フリューゲルのティアラ item.botania:enderDagger.name=ソウルスクライブ -item.botania:quartz0.name=煙がかったクォーツ -item.botania:quartz1.name=マナクォーツ -item.botania:quartz2.name=ブレイズクォーツ -item.botania:quartz3.name=ラベンダークォーツ -item.botania:quartz4.name=レッドクォーツ -item.botania:quartz5.name=エレブンクォーツ -item.botania:quartz6.name=サニークォーツ +item.botania:quartz_dark.name=煙がかったクォーツ +item.botania:quartz_mana.name=マナクォーツ +item.botania:quartz_blaze.name=ブレイズクォーツ +item.botania:quartz_lavender.name=ラベンダークォーツ +item.botania:quartz_red.name=レッドクォーツ +item.botania:quartz_elven.name=エレブンクォーツ +item.botania:quartz_sunny.name=サニークォーツ item.botania:elementium_ingot.name=エレメンチウムインゴット item.botania:pixie_dust.name=ピクシィダスト item.botania:dragonstone.name=ドラゴンストーン diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index fa22cc9ee..09672f28a 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1140,13 +1140,13 @@ item.botania:terraPick.name=대지 파괴 item.botania:divaCharm.name=디바의 매력 item.botania:flightTiara.name=플뤼겔 티아라 item.botania:enderDagger.name=영혼 스크라이브 -item.botania:quartz0.name=스모키 석영 -item.botania:quartz1.name=마나석영 -item.botania:quartz2.name=불꽃석영 -item.botania:quartz3.name=라벤더석영 -item.botania:quartz4.name=붉은석영 -item.botania:quartz5.name=요정의석영 -item.botania:quartz6.name=태양의 석영 +item.botania:quartz_dark.name=스모키 석영 +item.botania:quartz_mana.name=마나석영 +item.botania:quartz_blaze.name=불꽃석영 +item.botania:quartz_lavender.name=라벤더석영 +item.botania:quartz_red.name=붉은석영 +item.botania:quartz_elven.name=요정의석영 +item.botania:quartz_sunny.name=태양의 석영 item.botania:elementium_ingot.name=엘레멘티움 주괴 item.botania:pixie_dust.name=픽시의 가루 item.botania:dragonstone.name=드래곤스톤 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index fe25b2c37..73bd182a1 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1272,13 +1272,13 @@ item.botania:terraPick.name=Terrabreker item.botania:divaCharm.name=Diva Talisman item.botania:flightTiara.name=Flügel Tiara item.botania:enderDagger.name=Zielschrijver -item.botania:quartz0.name=Donker Kwarts -item.botania:quartz1.name=Mana Kwarts -item.botania:quartz2.name=Schijnend Kwarts -item.botania:quartz3.name=Lavendel Kwarts -item.botania:quartz4.name=Rood Kwarts -item.botania:quartz5.name=Elven Kwarts -item.botania:quartz6.name=Zonnig Kwarts +item.botania:quartz_dark.name=Donker Kwarts +item.botania:quartz_mana.name=Mana Kwarts +item.botania:quartz_blaze.name=Schijnend Kwarts +item.botania:quartz_lavender.name=Lavendel Kwarts +item.botania:quartz_red.name=Rood Kwarts +item.botania:quartz_elven.name=Elven Kwarts +item.botania:quartz_sunny.name=Zonnig Kwarts item.botania:elementium_ingot.name=Staaf Elementium item.botania:pixie_dust.name=Sterrenstof item.botania:dragonstone.name=Drakensteen diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index c3edb8f96..f8bce802c 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1422,13 +1422,13 @@ item.botania:terraPick.name=Terra-Destruidor item.botania:divaCharm.name=Encanto da Diva item.botania:flightTiara.name=Tiara de Flügel item.botania:enderDagger.name=Soulscribe -item.botania:quartz0.name=Quartzo Escuro -item.botania:quartz1.name=Quartzo de Mana -item.botania:quartz2.name=Quartzo Flamejante -item.botania:quartz3.name=Quartzo de Lavanda -item.botania:quartz4.name=Quartzo-vermelho -item.botania:quartz5.name=Quartzo Élfico -item.botania:quartz6.name=Quartzo Solar +item.botania:quartz_dark.name=Quartzo Escuro +item.botania:quartz_mana.name=Quartzo de Mana +item.botania:quartz_blaze.name=Quartzo Flamejante +item.botania:quartz_lavender.name=Quartzo de Lavanda +item.botania:quartz_red.name=Quartzo-vermelho +item.botania:quartz_elven.name=Quartzo Élfico +item.botania:quartz_sunny.name=Quartzo Solar item.botania:elementium_ingot.name=Barra de Elementium item.botania:pixie_dust.name=Pó de Fada item.botania:dragonstone.name=Pedra Draconiana diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 05997df19..0a95fadf2 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -667,12 +667,12 @@ item.botania:terraPick.name=Землекрушитель item.botania:divaCharm.name=Шарм Дивы item.botania:flightTiara.name=Крылатая тиара item.botania:enderDagger.name=Бесплотный резчик -item.botania:quartz0.name=Дымной кварц -item.botania:quartz1.name=Манакварц -item.botania:quartz2.name=Пламенный кварц -item.botania:quartz3.name=Лавандовый кварц -item.botania:quartz4.name=Красный кварц -item.botania:quartz5.name=Эльфийский кварц +item.botania:quartz_dark.name=Дымной кварц +item.botania:quartz_mana.name=Манакварц +item.botania:quartz_blaze.name=Пламенный кварц +item.botania:quartz_lavender.name=Лавандовый кварц +item.botania:quartz_red.name=Красный кварц +item.botania:quartz_elven.name=Эльфийский кварц item.botania:elementium_ingot.name=Слиток элементия item.botania:pixie_dust.name=Пыльца феи item.botania:dragonstone.name=Камень дракона diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index aa3e1b0d4..8bd67bae6 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1419,13 +1419,13 @@ item.botania:terraPick.name=泰拉粉碎者 item.botania:divaCharm.name=女王之魅 item.botania:flightTiara.name=天翼族之冠 item.botania:enderDagger.name=灵魂匕首 -item.botania:quartz0.name=烟熏石英 -item.botania:quartz1.name=魔力石英 -item.botania:quartz2.name=烈焰石英 -item.botania:quartz3.name=熏香石英 -item.botania:quartz4.name=红色石英 -item.botania:quartz5.name=精灵石英 -item.botania:quartz6.name=金黄石英 +item.botania:quartz_dark.name=烟熏石英 +item.botania:quartz_mana.name=魔力石英 +item.botania:quartz_blaze.name=烈焰石英 +item.botania:quartz_lavender.name=熏香石英 +item.botania:quartz_red.name=红色石英 +item.botania:quartz_elven.name=精灵石英 +item.botania:quartz_sunny.name=金黄石英 item.botania:elementium_ingot.name=源质钢锭 item.botania:pixie_dust.name=精灵尘 item.botania:dragonstone.name=龙石 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index ff476be5c..fba826ab0 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1385,13 +1385,13 @@ item.botania:terraPick.name=泰拉粉碎者 item.botania:divaCharm.name=女王之魅 item.botania:flightTiara.name=天翼族之冠 item.botania:enderDagger.name=靈魂匕首 -item.botania:quartz0.name=煙熏石英 -item.botania:quartz1.name=瑪那石英 -item.botania:quartz2.name=烈焰石英 -item.botania:quartz3.name=熏香石英 -item.botania:quartz4.name=紅色石英 -item.botania:quartz5.name=精靈石英 -item.botania:quartz6.name=金黃石英 +item.botania:quartz_dark.name=煙熏石英 +item.botania:quartz_mana.name=瑪那石英 +item.botania:quartz_blaze.name=烈焰石英 +item.botania:quartz_lavender.name=熏香石英 +item.botania:quartz_red.name=紅色石英 +item.botania:quartz_elven.name=精靈石英 +item.botania:quartz_sunny.name=金黃石英 item.botania:elementium_ingot.name=源質鋼錠 item.botania:pixie_dust.name=精靈塵 item.botania:dragonstone.name=龍石 diff --git a/src/main/resources/assets/botania/models/item/quartz2.json b/src/main/resources/assets/botania/models/item/quartz_blaze.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz2.json rename to src/main/resources/assets/botania/models/item/quartz_blaze.json diff --git a/src/main/resources/assets/botania/models/item/quartz0.json b/src/main/resources/assets/botania/models/item/quartz_dark.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz0.json rename to src/main/resources/assets/botania/models/item/quartz_dark.json diff --git a/src/main/resources/assets/botania/models/item/quartz5.json b/src/main/resources/assets/botania/models/item/quartz_elven.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz5.json rename to src/main/resources/assets/botania/models/item/quartz_elven.json diff --git a/src/main/resources/assets/botania/models/item/quartz3.json b/src/main/resources/assets/botania/models/item/quartz_lavender.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz3.json rename to src/main/resources/assets/botania/models/item/quartz_lavender.json diff --git a/src/main/resources/assets/botania/models/item/quartz1.json b/src/main/resources/assets/botania/models/item/quartz_mana.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz1.json rename to src/main/resources/assets/botania/models/item/quartz_mana.json diff --git a/src/main/resources/assets/botania/models/item/quartz4.json b/src/main/resources/assets/botania/models/item/quartz_red.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz4.json rename to src/main/resources/assets/botania/models/item/quartz_red.json diff --git a/src/main/resources/assets/botania/models/item/quartz6.json b/src/main/resources/assets/botania/models/item/quartz_sunny.json similarity index 100% rename from src/main/resources/assets/botania/models/item/quartz6.json rename to src/main/resources/assets/botania/models/item/quartz_sunny.json diff --git a/src/main/resources/assets/botania/recipes/quartz_2.json b/src/main/resources/assets/botania/recipes/quartz_blaze.json similarity index 83% rename from src/main/resources/assets/botania/recipes/quartz_2.json rename to src/main/resources/assets/botania/recipes/quartz_blaze.json index 89fd2c9bf..6fbb5401e 100644 --- a/src/main/resources/assets/botania/recipes/quartz_2.json +++ b/src/main/resources/assets/botania/recipes/quartz_blaze.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartz", - "data": 2, + "item": "botania:quartz_blaze", "count": 8 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/quartz_0.json b/src/main/resources/assets/botania/recipes/quartz_dark.json similarity index 88% rename from src/main/resources/assets/botania/recipes/quartz_0.json rename to src/main/resources/assets/botania/recipes/quartz_dark.json index 3185d721e..d51358a31 100644 --- a/src/main/resources/assets/botania/recipes/quartz_0.json +++ b/src/main/resources/assets/botania/recipes/quartz_dark.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartz", - "data": 0, + "item": "botania:quartz_dark", "count": 8 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/quartz_3.json b/src/main/resources/assets/botania/recipes/quartz_lavender.json similarity index 91% rename from src/main/resources/assets/botania/recipes/quartz_3.json rename to src/main/resources/assets/botania/recipes/quartz_lavender.json index cbccc463c..f261bd7cc 100644 --- a/src/main/resources/assets/botania/recipes/quartz_3.json +++ b/src/main/resources/assets/botania/recipes/quartz_lavender.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartz", - "data": 3, + "item": "botania:quartz_lavender", "count": 8 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/quartz_4.json b/src/main/resources/assets/botania/recipes/quartz_red.json similarity index 83% rename from src/main/resources/assets/botania/recipes/quartz_4.json rename to src/main/resources/assets/botania/recipes/quartz_red.json index 1290d14c8..6bc19c848 100644 --- a/src/main/resources/assets/botania/recipes/quartz_4.json +++ b/src/main/resources/assets/botania/recipes/quartz_red.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartz", - "data": 4, + "item": "botania:quartz_red", "count": 8 }, "pattern": [ diff --git a/src/main/resources/assets/botania/recipes/quartz_6.json b/src/main/resources/assets/botania/recipes/quartz_sunny.json similarity index 84% rename from src/main/resources/assets/botania/recipes/quartz_6.json rename to src/main/resources/assets/botania/recipes/quartz_sunny.json index 5174c5c42..4164a66ec 100644 --- a/src/main/resources/assets/botania/recipes/quartz_6.json +++ b/src/main/resources/assets/botania/recipes/quartz_sunny.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartz", - "data": 6, + "item": "botania:quartz_sunny", "count": 8 }, "pattern": [