From 7afd84d5f15fac0ec8749bdfdcc2d3509443d515 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Dec 2017 14:05:34 -0600 Subject: [PATCH] Flatten runes (a bit dirty since we don't have tags yet) --- .../client/challenge/ModChallenges.java | 2 +- .../gui/lexicon/GuiLexiconChallenge.java | 3 +- .../common/block/tile/TileRuneAltar.java | 3 +- .../common/core/BotaniaCreativeTab.java | 18 +- .../common/crafting/ModRuneRecipes.java | 34 ++-- .../botania/common/fixers/FlattenItems.java | 1 + .../vazkii/botania/common/item/ModItems.java | 55 +++++- .../common/item/material/ItemRune.java | 38 +--- .../botania/common/lib/LibItemNames.java | 7 +- .../advancements/main/rune_pickup.json | 162 +++++++++++++++++- .../resources/assets/botania/lang/de_de.lang | 32 ++-- .../resources/assets/botania/lang/en_us.lang | 32 ++-- .../resources/assets/botania/lang/es_es.lang | 32 ++-- .../resources/assets/botania/lang/fr_fr.lang | 32 ++-- .../resources/assets/botania/lang/ja_jp.lang | 32 ++-- .../resources/assets/botania/lang/ko_kr.lang | 32 ++-- .../resources/assets/botania/lang/nl_nl.lang | 32 ++-- .../resources/assets/botania/lang/pt_br.lang | 32 ++-- .../resources/assets/botania/lang/ru_ru.lang | 32 ++-- .../resources/assets/botania/lang/zh_cn.lang | 32 ++-- .../resources/assets/botania/lang/zh_tw.lang | 32 ++-- .../botania/loot_tables/gaia_guardian_2.json | 107 +++++++++++- 22 files changed, 529 insertions(+), 253 deletions(-) diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index d325acdd5..3ba325fb8 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -55,7 +55,7 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS)); addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE)); - addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.rune)); + addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.runeWater)); } private static void addChallenge(EnumChallengeLevel level, String name, ItemStack icon) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 6989393da..c41aa4766 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -22,6 +22,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.lexicon.page.PageText; import java.io.IOException; @@ -67,7 +68,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { boolean unicode = fontRenderer.getUnicodeFlag(); fontRenderer.setUnicodeFlag(true); fontRenderer.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0); - fontRenderer.drawString(I18n.format(challenge.level.getName()) + ((challenge.icon.getItem() == ModItems.rune) ? "+" : "") + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); + fontRenderer.drawString(I18n.format(challenge.level.getName()) + ((challenge.icon.getItem() instanceof ItemRune) ? "+" : "") + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); int width = guiWidth - 30; int x = left + 16; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index fed115f1f..a5b10ffd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -243,7 +244,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = itemHandler.getStackInSlot(i); if(!stack.isEmpty()) { - if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) { + if(stack.getItem() instanceof ItemRune && (player == null || !player.capabilities.isCreativeMode)) { EntityItem outputRune = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy()); world.spawnEntity(outputRune); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b8b514c8f..56185802b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -88,8 +88,22 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manaPowder); addBlock(ModBlocks.storage); addItem(ModItems.manaCookie); - addItem(ModItems.rune); - + addItem(ModItems.runeWater); + addItem(ModItems.runeFire); + addItem(ModItems.runeEarth); + addItem(ModItems.runeAir); + addItem(ModItems.runeSpring); + addItem(ModItems.runeSummer); + addItem(ModItems.runeAutumn); + addItem(ModItems.runeWinter); + addItem(ModItems.runeMana); + addItem(ModItems.runeLust); + addItem(ModItems.runeGluttony); + addItem(ModItems.runeGreed); + addItem(ModItems.runeSloth); + addItem(ModItems.runeWrath); + addItem(ModItems.runeEnvy); + addItem(ModItems.runePride); addBlock(ModBlocks.avatar); addItem(ModItems.dirtRod); addItem(ModItems.skyDirtRod); diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index 7d6538a46..3b83d0269 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -48,34 +48,34 @@ public final class ModRuneRecipes { final int costTier2 = 8000; final int costTier3 = 12000; - recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 0), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.DYE, 1, 15), "sugarcane", new ItemStack(Items.FISHING_ROD)); - recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 1), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "ingotBrickNether", "gunpowder", "cropNetherWart"); + recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWater, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.DYE, 1, 15), "sugarcane", new ItemStack(Items.FISHING_ROD)); + recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeFire, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "ingotBrickNether", "gunpowder", "cropNetherWart"); recipesEarthRune = new ArrayList<>(); - recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.BROWN_MUSHROOM))); - recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.RED_MUSHROOM))); + recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.BROWN_MUSHROOM))); + recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.RED_MUSHROOM))); recipesAirRune = new ArrayList<>(); for(int i = 0; i < 16; i++) - recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 3), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), "feather", "string")); + recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAir, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), "feather", "string")); - recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 4), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", "cropWheat"); - recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.SAND), new ItemStack(Blocks.SAND), "slimeball", new ItemStack(Items.MELON)); - recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE)); + recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSpring), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", "cropWheat"); + recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSummer), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.SAND), new ItemStack(Blocks.SAND), "slimeball", new ItemStack(Items.MELON)); + recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAutumn), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE)); recipesWinterRune = new ArrayList<>(); for(int i = 0; i < 16; i++) - recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 7), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Items.CAKE))); + recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWinter), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Items.CAKE))); - recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 8), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL); + recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeMana), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL); - recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 9), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[3]); - recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 10), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[1]); - recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 11), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[4], LibOreDict.RUNE[0]); - recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 12), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[6], LibOreDict.RUNE[3]); - recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 13), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[2]); - recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 14), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]); - recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 15), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]); + recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeLust), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[3]); + recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGluttony), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[1]); + recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGreed), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[4], LibOreDict.RUNE[0]); + recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSloth), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[6], LibOreDict.RUNE[3]); + recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWrath), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[2]); + recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEnvy), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]); + recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runePride), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]); recipeHead = new HeadRecipe(new ItemStack(Items.SKULL, 1, 3), 22500, new ItemStack(Items.SKULL), LibOreDict.PIXIE_DUST, "gemPrismarine", new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE)); BotaniaAPI.runeAltarRecipes.add(recipeHead); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 4e735223d..c0598b16f 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -102,6 +102,7 @@ public class FlattenItems implements IFixableData { CratePattern[] vals = CratePattern.values(); 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]); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 0af03ac48..b338bddc8 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -169,7 +169,23 @@ public final class ModItems { public static final Item lensTripwire = new ItemLens(LibItemNames.LENS_NAMES[23], new LensTripwire(), ItemLens.PROP_CONTROL); public static final Item lensStorm = new ItemLens(LibItemNames.LENS_NAMES[24], new LensStorm(), ItemLens.PROP_NONE); - public static final Item rune = new ItemRune(); + public static final Item runeWater = new ItemRune(LibItemNames.RUNE_NAMES[0]); + public static final Item runeFire = new ItemRune(LibItemNames.RUNE_NAMES[1]); + public static final Item runeEarth = new ItemRune(LibItemNames.RUNE_NAMES[2]); + public static final Item runeAir = new ItemRune(LibItemNames.RUNE_NAMES[3]); + public static final Item runeSpring = new ItemRune(LibItemNames.RUNE_NAMES[4]); + public static final Item runeSummer = new ItemRune(LibItemNames.RUNE_NAMES[5]); + public static final Item runeAutumn = new ItemRune(LibItemNames.RUNE_NAMES[6]); + public static final Item runeWinter = new ItemRune(LibItemNames.RUNE_NAMES[7]); + public static final Item runeMana = new ItemRune(LibItemNames.RUNE_NAMES[8]); + public static final Item runeLust = new ItemRune(LibItemNames.RUNE_NAMES[9]); + public static final Item runeGluttony = new ItemRune(LibItemNames.RUNE_NAMES[10]); + public static final Item runeGreed = new ItemRune(LibItemNames.RUNE_NAMES[11]); + public static final Item runeSloth = new ItemRune(LibItemNames.RUNE_NAMES[12]); + public static final Item runeWrath = new ItemRune(LibItemNames.RUNE_NAMES[13]); + public static final Item runeEnvy = new ItemRune(LibItemNames.RUNE_NAMES[14]); + public static final Item runePride = new ItemRune(LibItemNames.RUNE_NAMES[15]); + public static final Item manaTablet = new ItemManaTablet(); public static final Item manaGun = new ItemManaGun(); public static final Item manaCookie = new ItemManaCookie(); @@ -408,7 +424,22 @@ public final class ModItems { r.register(lensMessenger); r.register(lensTripwire); r.register(lensStorm); - r.register(rune); + r.register(runeWater); + r.register(runeFire); + r.register(runeEarth); + r.register(runeAir); + r.register(runeSpring); + r.register(runeSummer); + r.register(runeAutumn); + r.register(runeWinter); + r.register(runeMana); + r.register(runeLust); + r.register(runeGluttony); + r.register(runeGreed); + r.register(runeSloth); + r.register(runeWrath); + r.register(runeEnvy); + r.register(runePride); r.register(manaTablet); r.register(manaGun); r.register(manaCookie); @@ -599,10 +630,22 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dyes.get(color))); } - for(int i = 0; i < 16; i++) { - OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); - } - + OreDictionary.registerOre(LibOreDict.RUNE[0], new ItemStack(runeWater)); + OreDictionary.registerOre(LibOreDict.RUNE[1], new ItemStack(runeFire)); + OreDictionary.registerOre(LibOreDict.RUNE[2], new ItemStack(runeEarth)); + OreDictionary.registerOre(LibOreDict.RUNE[3], new ItemStack(runeAir)); + OreDictionary.registerOre(LibOreDict.RUNE[4], new ItemStack(runeSpring)); + OreDictionary.registerOre(LibOreDict.RUNE[5], new ItemStack(runeSummer)); + OreDictionary.registerOre(LibOreDict.RUNE[6], new ItemStack(runeAutumn)); + OreDictionary.registerOre(LibOreDict.RUNE[7], new ItemStack(runeWinter)); + OreDictionary.registerOre(LibOreDict.RUNE[8], new ItemStack(runeMana)); + OreDictionary.registerOre(LibOreDict.RUNE[9], new ItemStack(runeLust)); + OreDictionary.registerOre(LibOreDict.RUNE[10], new ItemStack(runeGluttony)); + OreDictionary.registerOre(LibOreDict.RUNE[11], new ItemStack(runeGreed)); + OreDictionary.registerOre(LibOreDict.RUNE[12], new ItemStack(runeSloth)); + OreDictionary.registerOre(LibOreDict.RUNE[13], new ItemStack(runeWrath)); + OreDictionary.registerOre(LibOreDict.RUNE[14], new ItemStack(runeEnvy)); + OreDictionary.registerOre(LibOreDict.RUNE[15], new ItemStack(runePride)); OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz)); OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 695d73251..7890c8ab5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -10,42 +10,15 @@ */ 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.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.lib.LibItemNames; - -import javax.annotation.Nonnull; public class ItemRune extends ItemMod implements IFlowerComponent { - public ItemRune() { - super(LibItemNames.RUNE); - setHasSubtypes(true); - } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + public ItemRune(String name) { + super(name); } @Override @@ -58,11 +31,4 @@ public class ItemRune extends ItemMod implements IFlowerComponent { return 0xA8A8A8; } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - String[] runeNames = { "water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride" }; - ModelHandler.registerItemMetas(this, runeNames.length, i -> "rune_" + runeNames[i]); - } - } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index c75f1b92a..9bf9ecd27 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -17,7 +17,12 @@ public final class LibItemNames { public static final String DYE = "dye"; public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; public static final String TWIG_WAND = "twigWand"; - public static final String RUNE = "rune"; + public static final String[] RUNE_NAMES = { + "rune_water", "rune_fire", "rune_earth", "rune_air", + "rune_spring", "rune_summer", "rune_autumn", "rune_winter", + "rune_mana", + "rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride" + }; public static final String MANA_TABLET = "manaTablet"; public static final String MANA_GUN = "manaGun"; public static final String MANA_COOKIE = "manaCookie"; diff --git a/src/main/resources/assets/botania/advancements/main/rune_pickup.json b/src/main/resources/assets/botania/advancements/main/rune_pickup.json index 4d374ace4..e5f18d38b 100644 --- a/src/main/resources/assets/botania/advancements/main/rune_pickup.json +++ b/src/main/resources/assets/botania/advancements/main/rune_pickup.json @@ -12,15 +12,171 @@ }, "parent": "botania:main/mana_pool_pickup", "criteria": { - "rune": { + "rune_water": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:rune" + "item": "botania:rune_water" + } + ] + } + }, + "rune_fire": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_fire" + } + ] + } + }, + "rune_earth": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_earth" + } + ] + } + }, + "rune_air": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_air" + } + ] + } + }, + "rune_spring": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_spring" + } + ] + } + }, + "rune_summer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_summer" + } + ] + } + }, + "rune_autumn": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_autumn" + } + ] + } + }, + "rune_winter": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_winter" + } + ] + } + }, + "rune_mana": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_mana" + } + ] + } + }, + "rune_lust": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_lust" + } + ] + } + }, + "rune_gluttony": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_gluttony" + } + ] + } + }, + "rune_greed": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_greed" + } + ] + } + }, + "rune_sloth": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_sloth" + } + ] + } + }, + "rune_wrath": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_wrath" + } + ] + } + }, + "rune_envy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_envy" + } + ] + } + }, + "rune_pride": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune_pride" } ] } } - } + }, + "requirements": [ + [ + "rune_water", "rune_fire", "rune_earth", "rune_air", "rune_spring", "rune_summer", "rune_autumn", "rune_winter", + "rune_mana", "rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride" + ] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index c2376af50..494d9fe22 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -329,22 +329,22 @@ item.botania:manaPetal12.name=Braunes Manablättchen item.botania:manaPetal13.name=Grünes Manablättchen item.botania:manaPetal14.name=Rotes Manablättchen item.botania:manaPetal15.name=Schwarzes Manablättchen -item.botania:rune0.name=Rune des Wassers -item.botania:rune1.name=Rune des Feuers -item.botania:rune2.name=Rune der Erde -item.botania:rune3.name=Rune der Luft -item.botania:rune4.name=Rune des Frühlings -item.botania:rune5.name=Rune des Sommers -item.botania:rune6.name=Rune des Herbstes -item.botania:rune7.name=Rune des Winters -item.botania:rune8.name=Manarune -item.botania:rune9.name=Rune der Wollust -item.botania:rune10.name=Rune der Völlerei -item.botania:rune11.name=Rune der Gier -item.botania:rune12.name=Rune der Trägheit -item.botania:rune13.name=Rune des Zorns -item.botania:rune14.name=Rune des Neides -item.botania:rune15.name=Rune des Hochmutes +item.botania:rune_water.name=Rune des Wassers +item.botania:rune_fire.name=Rune des Feuers +item.botania:rune_earth.name=Rune der Erde +item.botania:rune_air.name=Rune der Luft +item.botania:rune_spring.name=Rune des Frühlings +item.botania:rune_summer.name=Rune des Sommers +item.botania:rune_autumn.name=Rune des Herbstes +item.botania:rune_winter.name=Rune des Winters +item.botania:rune_mana.name=Manarune +item.botania:rune_lust.name=Rune der Wollust +item.botania:rune_gluttony.name=Rune der Völlerei +item.botania:rune_greed.name=Rune der Gier +item.botania:rune_sloth.name=Rune der Trägheit +item.botania:rune_wrath.name=Rune des Zorns +item.botania:rune_envy.name=Rune des Neides +item.botania:rune_pride.name=Rune des Hochmutes item.botania:signalFlare.name=Signalpistole item.botania:manaTablet.name=Manatablett item.botania:manaGun.name=Mana-Blaster diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 483ec0ae6..a66cfccbc 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1347,22 +1347,22 @@ item.botania:lens_messenger.name=Mana Lens: Messenger item.botania:lens_messenger.short=Messenger item.botania:lens_tripwire.name=Mana Lens: Tripwire item.botania:lens_tripwire.short=Tripwire -item.botania:rune0.name=Rune of Water -item.botania:rune1.name=Rune of Fire -item.botania:rune2.name=Rune of Earth -item.botania:rune3.name=Rune of Air -item.botania:rune4.name=Rune of Spring -item.botania:rune5.name=Rune of Summer -item.botania:rune6.name=Rune of Autumn -item.botania:rune7.name=Rune of Winter -item.botania:rune8.name=Rune of Mana -item.botania:rune9.name=Rune of Lust -item.botania:rune10.name=Rune of Gluttony -item.botania:rune11.name=Rune of Greed -item.botania:rune12.name=Rune of Sloth -item.botania:rune13.name=Rune of Wrath -item.botania:rune14.name=Rune of Envy -item.botania:rune15.name=Rune of Pride +item.botania:rune_water.name=Rune of Water +item.botania:rune_fire.name=Rune of Fire +item.botania:rune_earth.name=Rune of Earth +item.botania:rune_air.name=Rune of Air +item.botania:rune_spring.name=Rune of Spring +item.botania:rune_summer.name=Rune of Summer +item.botania:rune_autumn.name=Rune of Autumn +item.botania:rune_winter.name=Rune of Winter +item.botania:rune_mana.name=Rune of Mana +item.botania:rune_lust.name=Rune of Lust +item.botania:rune_gluttony.name=Rune of Gluttony +item.botania:rune_greed.name=Rune of Greed +item.botania:rune_sloth.name=Rune of Sloth +item.botania:rune_wrath.name=Rune of Wrath +item.botania:rune_envy.name=Rune of Envy +item.botania:rune_pride.name=Rune of Pride item.botania:signalFlare.name=Signal Flare item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 8d79d3722..ba5f6b6f6 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1113,22 +1113,22 @@ item.botania:manaPetal12.name=Pétalo de maná marrón item.botania:manaPetal13.name=Pétalo de maná verde item.botania:manaPetal14.name=Pétalo de maná rojo item.botania:manaPetal15.name=Pétalo de maná negro -item.botania:rune0.name=Runa de agua -item.botania:rune1.name=Runa de fuego -item.botania:rune2.name=Runa de tierra -item.botania:rune3.name=Runa de aire -item.botania:rune4.name=Runa de primavera -item.botania:rune5.name=Runa de verano -item.botania:rune6.name=Runa de otoño -item.botania:rune7.name=Runa de invierno -item.botania:rune8.name=Runa de maná -item.botania:rune9.name=Runa de lujuria -item.botania:rune10.name=Runa de gula -item.botania:rune11.name=Runa de avaricia -item.botania:rune12.name=Runa de pereza -item.botania:rune13.name=Runa de ira -item.botania:rune14.name=Runa de envidia -item.botania:rune15.name=Runa de orgullo +item.botania:rune_water.name=Runa de agua +item.botania:rune_fire.name=Runa de fuego +item.botania:rune_earth.name=Runa de tierra +item.botania:rune_air.name=Runa de aire +item.botania:rune_spring.name=Runa de primavera +item.botania:rune_summer.name=Runa de verano +item.botania:rune_autumn.name=Runa de otoño +item.botania:rune_winter.name=Runa de invierno +item.botania:rune_mana.name=Runa de maná +item.botania:rune_lust.name=Runa de lujuria +item.botania:rune_gluttony.name=Runa de gula +item.botania:rune_greed.name=Runa de avaricia +item.botania:rune_sloth.name=Runa de pereza +item.botania:rune_wrath.name=Runa de ira +item.botania:rune_envy.name=Runa de envidia +item.botania:rune_pride.name=Runa de orgullo item.botania:signalFlare.name=Bengala de señales item.botania:manaTablet.name=Tableta de maná item.botania:manaGun.name=Pistola de maná diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index cd3bcd395..33019eafa 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -975,22 +975,22 @@ item.botania:manaPetal12.name=Pétale de mana marron item.botania:manaPetal13.name=Pétale de mana verte item.botania:manaPetal14.name=Pétale de mana rouge item.botania:manaPetal15.name=Pétale de mana noire -item.botania:rune0.name=Rune d'eau -item.botania:rune1.name=Rune de feu -item.botania:rune2.name=Rune de terre -item.botania:rune3.name=Rune d'air -item.botania:rune4.name=Rune du printemps -item.botania:rune5.name=Rune de l'été -item.botania:rune6.name=Rune de l'automne -item.botania:rune7.name=Rune de l'hiver -item.botania:rune8.name=Rune de mana -item.botania:rune9.name=Rune de soif -item.botania:rune10.name=Rune de gloutonnerie -item.botania:rune11.name=Rune d'avidité -item.botania:rune12.name=Rune de paresse -item.botania:rune13.name=Rune de colère -item.botania:rune14.name=Rune d'envie -item.botania:rune15.name=Rune de fierté +item.botania:rune_water.name=Rune d'eau +item.botania:rune_fire.name=Rune de feu +item.botania:rune_earth.name=Rune de terre +item.botania:rune_air.name=Rune d'air +item.botania:rune_spring.name=Rune du printemps +item.botania:rune_summer.name=Rune de l'été +item.botania:rune_autumn.name=Rune de l'automne +item.botania:rune_winter.name=Rune de l'hiver +item.botania:rune_mana.name=Rune de mana +item.botania:rune_lust.name=Rune de soif +item.botania:rune_gluttony.name=Rune de gloutonnerie +item.botania:rune_greed.name=Rune d'avidité +item.botania:rune_sloth.name=Rune de paresse +item.botania:rune_wrath.name=Rune de colère +item.botania:rune_envy.name=Rune d'envie +item.botania:rune_pride.name=Rune de fierté item.botania:signalFlare.name=Feux de détresse item.botania:manaTablet.name=Tablette de mana item.botania:manaGun.name=Exploseur de mana diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 59a123be6..bf625fd8c 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1132,22 +1132,22 @@ item.botania:lens_messenger.name=マナレンズ: 通信 item.botania:lens_messenger.short=通信 item.botania:lens_tripwire.name=マナレンズ: トリップワイヤー item.botania:lens_tripwire.short=トリップワイヤー -item.botania:rune0.name=水のルーン -item.botania:rune1.name=火のルーン -item.botania:rune2.name=土のルーン -item.botania:rune3.name=空気のルーン -item.botania:rune4.name=春のルーン -item.botania:rune5.name=夏のルーン -item.botania:rune6.name=秋のルーン -item.botania:rune7.name=冬のルーン -item.botania:rune8.name=マナのルーン -item.botania:rune9.name=色欲のルーン -item.botania:rune10.name=暴食のルーン -item.botania:rune11.name=貪食のルーン -item.botania:rune12.name=怠惰のルーン -item.botania:rune13.name=憤怒のルーン -item.botania:rune14.name=嫉妬のルーン -item.botania:rune15.name=高慢のルーン +item.botania:rune_water.name=水のルーン +item.botania:rune_fire.name=火のルーン +item.botania:rune_earth.name=土のルーン +item.botania:rune_air.name=空気のルーン +item.botania:rune_spring.name=春のルーン +item.botania:rune_summer.name=夏のルーン +item.botania:rune_autumn.name=秋のルーン +item.botania:rune_winter.name=冬のルーン +item.botania:rune_mana.name=マナのルーン +item.botania:rune_lust.name=色欲のルーン +item.botania:rune_gluttony.name=暴食のルーン +item.botania:rune_greed.name=貪食のルーン +item.botania:rune_sloth.name=怠惰のルーン +item.botania:rune_wrath.name=憤怒のルーン +item.botania:rune_envy.name=嫉妬のルーン +item.botania:rune_pride.name=高慢のルーン item.botania:signalFlare.name=信号フレア item.botania:manaTablet.name=マナタブレット item.botania:manaGun.name=マナ銃 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 36083c162..cd90e00b2 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1074,22 +1074,22 @@ item.botania:manaPetal12.name=갈색 마나 꽃잎 item.botania:manaPetal13.name=초록색 마나 꽃잎 item.botania:manaPetal14.name=빨강색 마나 꽃잎 item.botania:manaPetal15.name=검은색 마나 꽃잎 -item.botania:rune0.name=물의 룬 -item.botania:rune1.name=불의 룬 -item.botania:rune2.name=대지의 룬 -item.botania:rune3.name=대기의 룬 -item.botania:rune4.name=봄의 룬 -item.botania:rune5.name=여름의 룬 -item.botania:rune6.name=가을의 룬 -item.botania:rune7.name=겨울의 룬 -item.botania:rune8.name=마나 룬 -item.botania:rune9.name=욕망의 룬 -item.botania:rune10.name=폭식의 룬 -item.botania:rune11.name=탐욕의 룬 -item.botania:rune12.name=게으름의 룬 -item.botania:rune13.name=격노의 룬 -item.botania:rune14.name=질투의 룬 -item.botania:rune15.name=교만의 룬 +item.botania:rune_water.name=물의 룬 +item.botania:rune_fire.name=불의 룬 +item.botania:rune_earth.name=대지의 룬 +item.botania:rune_air.name=대기의 룬 +item.botania:rune_spring.name=봄의 룬 +item.botania:rune_summer.name=여름의 룬 +item.botania:rune_autumn.name=가을의 룬 +item.botania:rune_winter.name=겨울의 룬 +item.botania:rune_mana.name=마나 룬 +item.botania:rune_lust.name=욕망의 룬 +item.botania:rune_gluttony.name=폭식의 룬 +item.botania:rune_greed.name=탐욕의 룬 +item.botania:rune_sloth.name=게으름의 룬 +item.botania:rune_wrath.name=격노의 룬 +item.botania:rune_envy.name=질투의 룬 +item.botania:rune_pride.name=교만의 룬 item.botania:signalFlare.name=신호탄 item.botania:manaTablet.name=마나 태블릿 item.botania:manaGun.name=마나 블래스터 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index cae5dab68..75747aa38 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1206,22 +1206,22 @@ item.botania:manaPetal12.name=Bruin Mana Bloemblad item.botania:manaPetal13.name=Groen Mana Bloemblad item.botania:manaPetal14.name=Rood Mana Bloemblad item.botania:manaPetal15.name=Zwart Mana Bloemblad -item.botania:rune0.name=Rune der Water -item.botania:rune1.name=Rune der Vuur -item.botania:rune2.name=Rune der Aarde -item.botania:rune3.name=Rune der Lucht -item.botania:rune4.name=Rune der Lente -item.botania:rune5.name=Rune der Zomer -item.botania:rune6.name=Rune der Herfst -item.botania:rune7.name=Rune der Winter -item.botania:rune8.name=Rune der Mana -item.botania:rune9.name=Rune der Lust -item.botania:rune10.name=Rune der Gulzigheid -item.botania:rune11.name=Rune der Hebzucht -item.botania:rune12.name=Rune der Luiheid -item.botania:rune13.name=Rune der Woede -item.botania:rune14.name=Rune der Jaloezie -item.botania:rune15.name=Rune der Ijdelheid +item.botania:rune_water.name=Rune der Water +item.botania:rune_fire.name=Rune der Vuur +item.botania:rune_earth.name=Rune der Aarde +item.botania:rune_air.name=Rune der Lucht +item.botania:rune_spring.name=Rune der Lente +item.botania:rune_summer.name=Rune der Zomer +item.botania:rune_autumn.name=Rune der Herfst +item.botania:rune_winter.name=Rune der Winter +item.botania:rune_mana.name=Rune der Mana +item.botania:rune_lust.name=Rune der Lust +item.botania:rune_gluttony.name=Rune der Gulzigheid +item.botania:rune_greed.name=Rune der Hebzucht +item.botania:rune_sloth.name=Rune der Luiheid +item.botania:rune_wrath.name=Rune der Woede +item.botania:rune_envy.name=Rune der Jaloezie +item.botania:rune_pride.name=Rune der Ijdelheid item.botania:signalFlare.name=Signaalpistool item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index ddbcbca8a..e12f953f6 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1350,22 +1350,22 @@ item.botania:lens_messenger.name=Lentes de Mana: Mensageira item.botania:lens_messenger.short=Mensageira item.botania:lens_tripwire.name=Lentes de Mana: Fio de armadilha item.botania:lens_tripwire.short=Fio de armadilha -item.botania:rune0.name=Runa da Água -item.botania:rune1.name=Runa do Fogo -item.botania:rune2.name=Runa da Terra -item.botania:rune3.name=Runa do Ar -item.botania:rune4.name=Runa da Primavera -item.botania:rune5.name=Runa do Verão -item.botania:rune6.name=Runa do Outono -item.botania:rune7.name=Runa do Inverno -item.botania:rune8.name=Runa de Mana -item.botania:rune9.name=Runa do Desejo -item.botania:rune10.name=Runa da Gula -item.botania:rune11.name=Runa da Ganância -item.botania:rune12.name=Runa da Preguiça -item.botania:rune13.name=Runa do Ódio -item.botania:rune14.name=Runa da Inveja -item.botania:rune15.name=Runa do Orgulho +item.botania:rune_water.name=Runa da Água +item.botania:rune_fire.name=Runa do Fogo +item.botania:rune_earth.name=Runa da Terra +item.botania:rune_air.name=Runa do Ar +item.botania:rune_spring.name=Runa da Primavera +item.botania:rune_summer.name=Runa do Verão +item.botania:rune_autumn.name=Runa do Outono +item.botania:rune_winter.name=Runa do Inverno +item.botania:rune_mana.name=Runa de Mana +item.botania:rune_lust.name=Runa do Desejo +item.botania:rune_gluttony.name=Runa da Gula +item.botania:rune_greed.name=Runa da Ganância +item.botania:rune_sloth.name=Runa da Preguiça +item.botania:rune_wrath.name=Runa do Ódio +item.botania:rune_envy.name=Runa da Inveja +item.botania:rune_pride.name=Runa do Orgulho item.botania:signalFlare.name=Fagulhas Sinalizadoras item.botania:manaTablet.name=Tablete de Mana item.botania:manaGun.name=Disparador de Mana diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index c35d7e479..705d448b9 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -602,22 +602,22 @@ item.botania:manaPetal12.name=Коричневый лепесток маны item.botania:manaPetal13.name=Зелёный лепесток маны item.botania:manaPetal14.name=Красный лепесток маны item.botania:manaPetal15.name=Чёрный лепесток маны -item.botania:rune0.name=Руна воды -item.botania:rune1.name=Руна огня -item.botania:rune2.name=Руна земли -item.botania:rune3.name=Руна воздуха -item.botania:rune4.name=Руна весны -item.botania:rune5.name=Руна лета -item.botania:rune6.name=Руна осени -item.botania:rune7.name=Руна зимы -item.botania:rune8.name=Руна маны -item.botania:rune9.name=Руна похоти -item.botania:rune10.name=Руна обжорства -item.botania:rune11.name=Руна жадности -item.botania:rune12.name=Руна лени -item.botania:rune13.name=Руна гнева -item.botania:rune14.name=Руна зависти -item.botania:rune15.name=Руна гордости +item.botania:rune_water.name=Руна воды +item.botania:rune_fire.name=Руна огня +item.botania:rune_earth.name=Руна земли +item.botania:rune_air.name=Руна воздуха +item.botania:rune_spring.name=Руна весны +item.botania:rune_summer.name=Руна лета +item.botania:rune_autumn.name=Руна осени +item.botania:rune_winter.name=Руна зимы +item.botania:rune_mana.name=Руна маны +item.botania:rune_lust.name=Руна похоти +item.botania:rune_gluttony.name=Руна обжорства +item.botania:rune_greed.name=Руна жадности +item.botania:rune_sloth.name=Руна лени +item.botania:rune_wrath.name=Руна гнева +item.botania:rune_envy.name=Руна зависти +item.botania:rune_pride.name=Руна гордости item.botania:signalFlare.name=Сигнальная ракета item.botania:manaTablet.name=Планшет маны item.botania:manaGun.name=Излучатель diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index cb3b55aa4..663e9df0e 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1347,22 +1347,22 @@ item.botania:lens_messenger.name=魔力透镜:信使 item.botania:lens_messenger.short=信使 item.botania:lens_tripwire.name=魔力透镜:绊线 item.botania:lens_tripwire.short=绊线 -item.botania:rune0.name=水之符文 -item.botania:rune1.name=火之符文 -item.botania:rune2.name=地之符文 -item.botania:rune3.name=风之符文 -item.botania:rune4.name=春之符文 -item.botania:rune5.name=夏之符文 -item.botania:rune6.name=秋之符文 -item.botania:rune7.name=冬之符文 -item.botania:rune8.name=魔力符文 -item.botania:rune9.name=欲望符文 -item.botania:rune10.name=暴食符文 -item.botania:rune11.name=贪婪符文 -item.botania:rune12.name=懒惰符文 -item.botania:rune13.name=暴怒符文 -item.botania:rune14.name=嫉妒符文 -item.botania:rune15.name=傲慢符文 +item.botania:rune_water.name=水之符文 +item.botania:rune_fire.name=火之符文 +item.botania:rune_earth.name=地之符文 +item.botania:rune_air.name=风之符文 +item.botania:rune_spring.name=春之符文 +item.botania:rune_summer.name=夏之符文 +item.botania:rune_autumn.name=秋之符文 +item.botania:rune_winter.name=冬之符文 +item.botania:rune_mana.name=魔力符文 +item.botania:rune_lust.name=欲望符文 +item.botania:rune_gluttony.name=暴食符文 +item.botania:rune_greed.name=贪婪符文 +item.botania:rune_sloth.name=懒惰符文 +item.botania:rune_wrath.name=暴怒符文 +item.botania:rune_envy.name=嫉妒符文 +item.botania:rune_pride.name=傲慢符文 item.botania:signalFlare.name=信号弹 item.botania:manaTablet.name=魔力石板 item.botania:manaGun.name=魔力脉冲枪 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index dafedfc99..012532b75 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1313,22 +1313,22 @@ item.botania:lens_firework.name=瑪那透鏡:喜慶 item.botania:lens_firework.short=喜慶 item.botania:lens_flare.name=瑪那透鏡:閃耀 item.botania:lens_flare.short=閃耀 -item.botania:rune0.name=水之符文 -item.botania:rune1.name=火之符文 -item.botania:rune2.name=地之符文 -item.botania:rune3.name=風之符文 -item.botania:rune4.name=春之符文 -item.botania:rune5.name=夏之符文 -item.botania:rune6.name=秋之符文 -item.botania:rune7.name=冬之符文 -item.botania:rune8.name=魔力符文 -item.botania:rune9.name=慾望符文 -item.botania:rune10.name=暴食符文 -item.botania:rune11.name=貪婪符文 -item.botania:rune12.name=懶惰符文 -item.botania:rune13.name=暴怒符文 -item.botania:rune14.name=嫉妒符文 -item.botania:rune15.name=傲慢符文 +item.botania:rune_water.name=水之符文 +item.botania:rune_fire.name=火之符文 +item.botania:rune_earth.name=地之符文 +item.botania:rune_air.name=風之符文 +item.botania:rune_spring.name=春之符文 +item.botania:rune_summer.name=夏之符文 +item.botania:rune_autumn.name=秋之符文 +item.botania:rune_winter.name=冬之符文 +item.botania:rune_mana.name=魔力符文 +item.botania:rune_lust.name=慾望符文 +item.botania:rune_gluttony.name=暴食符文 +item.botania:rune_greed.name=貪婪符文 +item.botania:rune_sloth.name=懶惰符文 +item.botania:rune_wrath.name=暴怒符文 +item.botania:rune_envy.name=嫉妒符文 +item.botania:rune_pride.name=傲慢符文 item.botania:signalFlare.name=信號彈 item.botania:manaTablet.name=瑪那石板 item.botania:manaGun.name=瑪那脈衝槍 diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index 12533783b..5449dc6d0 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -139,15 +139,104 @@ "name": "runes", "conditions": [{ "condition": "killed_by_player" }], "rolls": { "min": 1, "max": 6 }, - "entries": [{ - "conditions": [{ "condition": "random_chance", "chance": 0.3 }], - "type": "item", - "name": "botania:rune", - "functions": [ - { "function": "set_data", "data": { "min": 0, "max": 15 } }, - { "function": "set_count", "count": { "min": 2, "max": 4 } } - ] - }] + "entries": [ + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_water", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_fire", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_earth", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_air", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_spring", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_summer", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_autumn", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_winter", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_mana", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_lust", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_gluttony", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_greed", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_sloth", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_wrath", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_envy", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + }, + { + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune_pride", + "functions": [{ "function": "set_count", "count": { "min": 2, "max": 4 } }] + } + ] }, { "name": "pinkinator",