diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 6188ad714..b096e3d7b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -256,7 +256,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.unholyCloak); addItem(ModItems.balanceCloak); addItem(ModItems.goddessCharm); - addItem(ModItems.goldLaurel); addItem(ModItems.divaCharm); addItem(ModItems.thirdEye); addItem(ModItems.flightTiara); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 76983f0a3..4d6b2d4e9 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -118,7 +118,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeKnocbackBelt; public static IRecipe recipeIcePendant; public static IRecipe recipeFirePendant; - public static IRecipe recipeGoldenLaurel; public static IRecipe recipeTinyPlanetBlock; public static IRecipe recipeAlchemyCatalyst; public static IRecipe recipeOpenCrate; @@ -783,14 +782,6 @@ public final class ModCraftingRecipes { 'F', LibOreDict.RUNE[1]); recipeFirePendant = BotaniaAPI.getLatestAddedRecipe(); - // Golden Laurel Crown Recipe - addOreDictRecipe(new ItemStack(ModItems.goldLaurel), - "G G", "LEL", "LLL", - 'G', "ingotGold", - 'L', "treeLeaves", - 'E', LibOreDict.LIFE_ESSENCE); - recipeGoldenLaurel = BotaniaAPI.getLatestAddedRecipe(); - // Tiny Planet Block Recipe addOreDictRecipe(new ItemStack(ModBlocks.tinyPlanet), "SSS", "SPS", "SSS", diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 07bc4b1db..afbb24c7c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -44,7 +44,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm; -import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; @@ -169,7 +168,6 @@ public final class ModItems { public static Item knockbackBelt; public static Item icePendant; public static Item lavaPendant; - public static Item goldLaurel; public static Item magnetRing; public static Item waterRing; public static Item miningRing; @@ -324,7 +322,6 @@ public final class ModItems { knockbackBelt = new ItemKnockbackBelt(); icePendant = new ItemIcePendant(); lavaPendant = new ItemLavaPendant(); - goldLaurel = new ItemGoldenLaurel(); magnetRing = new ItemMagnetRing(); waterRing = new ItemWaterRing(); miningRing = new ItemMiningRing(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java deleted file mode 100644 index 7bdfa6f02..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ /dev/null @@ -1,83 +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 @ [Apr 27, 2014, 8:49:01 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.bauble; - -import baubles.api.BaubleType; -import baubles.api.BaublesApi; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { - - public ItemGoldenLaurel() { - super(LibItemNames.GOLDEN_LAUREL); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerDeath(LivingDeathEvent event) { - if(event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack headgear = BaublesApi.getBaublesHandler(player).getStackInSlot(4); - - if(!headgear.isEmpty() && headgear.getItem() == this) { - event.setCanceled(true); - player.setHealth(player.getMaxHealth()); - player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6)); - player.sendMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F); - BaublesApi.getBaublesHandler(player).setStackInSlot(4, ItemStack.EMPTY); - } - } - } - - @Override - public BaubleType getBaubleType(ItemStack itemstack) { - return BaubleType.HEAD; - } - - @Override - @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { - if(type == RenderType.HEAD) { - boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty(); - Helper.translateToHeadLevel(player); - Helper.defaultTransforms(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - GlStateManager.translate(0F, -3.2F, -1.825F); - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.scale(1.625F, 1.625F, 1.625F); - GlStateManager.rotate(-80F, 1F, 0F, 0F); - if(armor) { - GlStateManager.scale(1.1F, 1.1F, 1.1F); - } - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); - } - } -} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 156806092..3227a8ab3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -236,7 +236,6 @@ public final class LexiconData { public static LexiconEntry knockbacklBelt; public static LexiconEntry icePendant; public static LexiconEntry lavaPendant; - public static LexiconEntry goldLaurel; public static LexiconEntry waterRing; public static LexiconEntry miningRing; public static LexiconEntry magnetRing; @@ -1177,10 +1176,6 @@ public final class LexiconData { lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFirePendant)); - goldLaurel = new AlfheimLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); - goldLaurel.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeGoldenLaurel)); - waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRing)); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index eb1df29e4..ec0c1431f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -53,7 +53,6 @@ public final class LibItemNames { public static final String KNOCKBACK_BELT = "knockbackBelt"; public static final String ICE_PENDANT = "icePendant"; public static final String LAVA_PENDANT = "lavaPendant"; - public static final String GOLDEN_LAUREL = "goldenLaurel"; public static final String MAGNET_RING = "magnetRing"; public static final String WATER_RING = "waterRing"; public static final String MINING_RING = "miningRing"; diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 282386055..dadd97b24 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -32,7 +32,6 @@ botaniamisc.filter1=Nur Items außerhalb von Rahmen aufsammeln botaniamisc.filter2=Alle Items aufsammeln botaniamisc.creativePool0=Kreatives Manabecken, hat unendlich Mana botaniamisc.creativePool1=Eines Egoisten würdig -botaniamisc.savedByLaurel=Dein goldener Lorbeerkranz zersplitterte, als er dich vor dem Tod rettete. botaniamisc.toolRank=%s&7-Rang # COLORS @@ -385,7 +384,6 @@ item.botania:knockbackBelt.name=Tektonikgürtel item.botania:icePendant.name=Schneeflockanhänger item.botania:lavaPendant.name=Pyroklastanhänger item.botania:lifeEssence.name=Essenz des Ewigen Lebens -item.botania:goldenLaurel.name=Goldener Lorbeerkranz item.botania:redstoneRoot.name=Redstone-Wurzel item.botania:magnetRing.name=Ring des Magnetismus item.botania:waterRing.name=Ring der Ozeane @@ -726,9 +724,6 @@ botania.entry.icePendant=Schneeflockanhänger # -- PYROCLAST PENDANT botania.entry.lavaPendant=Pyroklastanhänger -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Goldener Lorbeerkranz - # -- RING OF CHORDATA botania.entry.waterRing=Ring der Ozeane botania.page.waterRing1=Butter bei die Fische diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 93709ce2a..0178b41f3 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -38,7 +38,6 @@ botaniamisc.filter1=Pickup only items not in Frames botaniamisc.filter2=Pickup any items botaniamisc.creativePool0=Creative Mana Pool, has infinite Mana botaniamisc.creativePool1=Worthy of an Egoist -botaniamisc.savedByLaurel=Your Golden Laurel Crown shatters, as it saves you from death. botaniamisc.toolRank=%s&7 Rank botaniamisc.edition=%s Edition # ^ Leave this empty for no edition display @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=Tectonic Girdle item.botania:icePendant.name=Snowflake Pendant item.botania:lavaPendant.name=Pyroclast Pendant item.botania:lifeEssence.name=Gaia Spirit -item.botania:goldenLaurel.name=Golden Laurel Crown item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization item.botania:waterRing.name=Ring of Chordata @@ -3428,12 +3426,6 @@ botania.tagline.lavaPendant=Fire resistance, somewhat botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs low heat, while it's worn, if the wearer is caught on fire and is not directly standing on &1Fire&0, &1Lava&0 or anything else that can induce burning, they'll be extinguished. botania.page.lavaPendant1=Hanako could have used one of these -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Golden Laurel Crown -botania.tagline.goldenLaurel=Immunity to death, once -botania.page.goldenLaurel0=One of the uses for &1Gaia Spririts&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=People don't die if they are killed - # -- RING OF CHORDATA botania.entry.waterRing=Ring of Chordata botania.tagline.waterRing=Move super fast underwater @@ -3873,7 +3865,6 @@ botania.subtitle.enchanterEnchant=Mana Enchanter finishes botania.subtitle.endoflame=Endoflame ignites item botania.subtitle.equipBauble=Bauble is equipped botania.subtitle.gaiaTrap=Gaia Guardian's spell swooshes -botania.subtitle.goldenLaurel=Golden Laurel restores your life botania.subtitle.holyCloak=Cloak of Virtue activates botania.subtitle.laputaStart=Laputa Shard triggers botania.subtitle.lexiconOpen=Lexica Botania opens diff --git a/src/main/resources/assets/botania/lang/es_ar.lang b/src/main/resources/assets/botania/lang/es_ar.lang index dc352281b..d2c235181 100644 --- a/src/main/resources/assets/botania/lang/es_ar.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -31,7 +31,6 @@ botaniamisc.filter1=Recoge solamente los objetos que no están en los marcos. botaniamisc.filter2=Recoge todos los objetos. botaniamisc.creativePool0=Pileta de Maná de Creativo. Tiene Maná infinito. botaniamisc.creativePool1=Propio de un Egoista -botaniamisc.savedByLaurel=Tu Corona Dorada de Laurel se destruye y te salva de la muerte. botaniamisc.toolRank=%s&7 Rank botaniamisc.edition=%s Edition # ^ Leave this empty for no edition display diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 225ddc18a..6976c8077 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -35,8 +35,7 @@ botaniamisc.filter1=Recoge solamente los objetos que no están en los marcos. botaniamisc.filter2=Recoge todos los objetos. botaniamisc.creativePool0=Pila de maná de creativo. Tiene maná infinito. botaniamisc.creativePool1=Digno de un egoísta -botaniamisc.savedByLaurel=Tu corona de laurel dorado se destruye y te salva de la muerte. -botaniamisc.toolRank=Rango %s&7 +botaniamisc.toolRank=Rango %s&7 botaniamisc.edition=Edición %sª # ^ Leave this empty for no edition display botaniamisc.devEdition=Del escritor @@ -1173,7 +1172,6 @@ item.botania:knockbackBelt.name=Faja tectónica item.botania:icePendant.name=Colgante de copo de nieve item.botania:lavaPendant.name=Colgante piroclástico item.botania:lifeEssence.name=Espíritu de Gaia -item.botania:goldenLaurel.name=Corona de laurel dorado item.botania:redstoneRoot.name=Raiz de redstone item.botania:magnetRing.name=Anillo de magnetización item.botania:waterRing.name=Anillo de cordado @@ -2613,11 +2611,6 @@ botania.entry.lavaPendant=Colgante piroclástico botania.page.lavaPendant0=El &1colgante piroclástico&0 es un &4ornamento&0 que absorbe algo el calor mientras se lleva puesto. Si el portador se prende en llamas y no está sobre un &1fuego&0, &1lava&0 o cualquier cosa incendiaria, las llamas serán apagadas. botania.page.lavaPendant1=Hanako podría haber usado uno -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Corona de laurel dorado -botania.page.goldenLaurel0=Uno de los usos de los &1espíritus de Gaia&0 es conceder una capa de inmortalidad a aquel que los usa, al portar una &1corona de laurel dorado&0. Si el portador fuese a morir, la corona se romperá, regenerando toda la salud y otorgando un breve periodo de invencibilidad. -botania.page.goldenLaurel1=Un tema dado, probablemente Viridi - # -- RING OF CHORDATA botania.entry.waterRing=Anillo de cordado botania.page.waterRing0=El &1anillo de cordado&0 permite al portador nadar como un pez. Cuando está equipado, el portador es investido con la habilidad de acelerar a una velocidad decente bajo el agua. También concede al portador buena visión debajo del agua, y si hay &4maná&0, gastando un poco, concede la habilidad de respirar indefinidamente. diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 2047d238d..77c6a3759 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -34,7 +34,6 @@ botaniamisc.filter1=Ramassage seulement des éléments hors cadres botaniamisc.filter2=Ramassage de tous les éléments botaniamisc.creativePool0=Bassin de mana créatif, possède du mana à l'infini botaniamisc.creativePool1=Digne d'un égoïste -botaniamisc.savedByLaurel=Votre couronne de laurier d'or vole en éclats, dès qu'elle vous sauve de la mort. botaniamisc.toolRank=%s&7 rang botaniamisc.edition=%s édition # ^ Leave this empty for no edition display @@ -1033,7 +1032,6 @@ item.botania:knockbackBelt.name=Ceinture tectonique item.botania:icePendant.name=Pendentif du flocon de neige item.botania:lavaPendant.name=Pendentif du pyroclaste item.botania:lifeEssence.name=Esprit de Gaïa -item.botania:goldenLaurel.name=Couronne de laurier dorée item.botania:redstoneRoot.name=Racine de Redstone item.botania:magnetRing.name=Anneau de magnétisation item.botania:waterRing.name=Anneau des chordés diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 417dcaf89..8ece69042 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -33,8 +33,7 @@ botaniamisc.filter1=フレーム内のアイテム以外を拾う botaniamisc.filter2=すべてのアイテムを拾う botaniamisc.creativePool0=クリエイティブ用マナプール.無限にマナを保持する botaniamisc.creativePool1=エゴイスト向け -botaniamisc.savedByLaurel=金の月桂冠は砕けてしまった。あなたの身代わりとなって… -botaniamisc.toolRank=ランク %s&7 +botaniamisc.toolRank=ランク %s&7 botaniamisc.edition=%s 版 # ^ Leave this empty for no edition display botaniamisc.lexiconcover0=公式ガイドブック @@ -1198,7 +1197,6 @@ item.botania:knockbackBelt.name=地殻のガードル item.botania:icePendant.name=雪片のペンダント item.botania:lavaPendant.name=火砕物のペンダント item.botania:lifeEssence.name=ガイアの魂 -item.botania:goldenLaurel.name=黄金の月桂冠 item.botania:redstoneRoot.name=レッドストーンの根 item.botania:magnetRing.name=磁力の指輪 item.botania:waterRing.name=脊索動物の指輪 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index e7dab49a7..416107ea7 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -35,7 +35,6 @@ botaniamisc.filter1=프레임에 없는 아이템만 가져옵니다 botaniamisc.filter2=아무 아이템이나 가져옵니다 botaniamisc.creativePool0=크리에이티브 모드를 위한 마나 풀로써, 용량이 무한대입니다. botaniamisc.creativePool1=이기주의자에게 잘 어울립니다. -botaniamisc.savedByLaurel=골든 로렐 크라운은 죽음의 위기로부터 당신을 지키면서 동시에 소멸합니다. botaniamisc.toolRank=%s&7 랭크 botaniamisc.edition=%s 제본판 # ^ Leave this empty for no edition display @@ -1134,7 +1133,6 @@ item.botania:knockbackBelt.name=구조상 벨트 item.botania:icePendant.name=눈송이 펜던트 item.botania:lavaPendant.name=파이로클래스 펜던트 item.botania:lifeEssence.name=영원한 생명의 정수 -item.botania:goldenLaurel.name=골든 로렐 크라운 item.botania:redstoneRoot.name=레드스톤 뿌리 item.botania:magnetRing.name=자기력의 반지 item.botania:waterRing.name=난폭의 반지 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 6d3b7df5a..bb69625fe 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -34,7 +34,6 @@ botaniamisc.filter1=Alleen items buiten kader verzamelen botaniamisc.filter2=Alle items verzamelen botaniamisc.creativePool0=Creatieve Mana voorraad, heeft oneindig Mana botaniamisc.creativePool1=Waardig voor een egoïst -botaniamisc.savedByLaurel=Uw gouden lauwerkrans verbrijzeld wanneer hij je redt van de dood. botaniamisc.toolRank=%s&7 Rang botaniamisc.edition=%s Editie @@ -1266,7 +1265,6 @@ item.botania:knockbackBelt.name=Tektonische Gordel item.botania:icePendant.name=Sneeuwvlok Hanger item.botania:lavaPendant.name=Pyroclastische Hanger item.botania:lifeEssence.name=Geest van Gaia -item.botania:goldenLaurel.name=Gouden Laurierkroon item.botania:redstoneRoot.name=Redstone Wortel item.botania:magnetRing.name=Ring der Magnetisatie item.botania:waterRing.name=Ring der Oceanen @@ -3239,12 +3237,6 @@ botania.tagline.lavaPendant=Beperkte vuurbestendigheid botania.page.lavaPendant0=De &1Pyroclastische Hanger&0 is een &4Bauble&0 die warmte kan opnemen. Wanneer gedragen, als de drager vlam vat en niet staat op &1Vuur&0, &1Lava&0 of een andere brandstichter, zal hij geblust worden. botania.page.lavaPendant1=Hanako kon er wel eentje gebruiken -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Gouden Laurierkroon -botania.tagline.goldenLaurel=Ontsnap eenmalig aan de dood -botania.page.goldenLaurel0=Een toepassing van de &1Geest van Gaia&0 is het toevoegen van een laag onsterfelijkheid aan de drager. Door het dragen van een &1Gouden Laurierkroon&0, als de drager dood zou gaan, zal de kroon uiteenspatten, waarbij het leven hersteld wordt en de drager korte tijd onsterfelijk wordt. -botania.page.goldenLaurel1=Gouden Laurierkroon - # -- RING OF CHORDATA botania.entry.waterRing=Ring der Oceanen botania.tagline.waterRing=Zwem supersnel onderwater diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index ffa665156..7a4cc0b73 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -38,7 +38,6 @@ botaniamisc.filter1=Não coletar itens da moldura botaniamisc.filter2=Coletar tudo botaniamisc.creativePool0=Poço de Mana Criativo, possui Mana infinita botaniamisc.creativePool1=Perfeito para egoístas -botaniamisc.savedByLaurel=Sua Coroa Dourada de Laurel estilhaçou, enquanto te salvava da morte. botaniamisc.toolRank=Rank %s&7 botaniamisc.edition=%sª Edição # ^ Leave this empty for no edition display @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=Cinturão Tectônico item.botania:icePendant.name=Pingente do Floco de Neve item.botania:lavaPendant.name=Pingente do Piromântico item.botania:lifeEssence.name=Espírito de Gaia -item.botania:goldenLaurel.name=Coroa Dourada de Laurel item.botania:redstoneRoot.name=Raíz de Redstone item.botania:magnetRing.name=Anel Magnético item.botania:waterRing.name=Anel dos Cordados diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 928a548c7..e662dd7c0 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -33,7 +33,6 @@ botaniamisc.filter1=Собирать только предметы без рам botaniamisc.filter2=Собирать любые предметы botaniamisc.creativePool0=Творческий бассейн маны, бесконечная мана botaniamisc.creativePool1=Достоин эгоиста -botaniamisc.savedByLaurel=Ваш золотой лавровый венец исчезает, спасая Вас от смерти. botaniamisc.toolRank=Ранг: %s&7 botaniamisc.edition=Издание %s # ^ Leave this empty for no edition display @@ -659,7 +658,6 @@ item.botania:knockbackBelt.name=Тектонический пояс item.botania:icePendant.name=Кулон со снежинкой item.botania:lavaPendant.name=Пирокластический кулон item.botania:lifeEssence.name=Дух Гайи -item.botania:goldenLaurel.name=Золотой лавровый венок item.botania:redstoneRoot.name=Красный корень item.botania:magnetRing.name=Кольцо магнетизма item.botania:waterRing.name=Кольцо хордовых @@ -1483,11 +1481,6 @@ botania.entry.lavaPendant=Пирокластический кулон botania.page.lavaPendant0=&1Пирокластический кулон&0 - это &4фенечка&0, которая при ношении поглощает немного тепла. Если владелец подожжен и не стоит прямо на &1Огне&0, &1Лаве&0 или чем-то другом, поддерживающем горение, он будет потушен. botania.page.lavaPendant1=Ханако мог бы использовать один из них -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Золотой лавровый венок -botania.page.goldenLaurel0=Одним из применений &1Духа Гайи&0 является предоставление бессмертия носящему его игроку. &1Золотой лавровый венок&0 при смерти игрока развеется, но при этом всстановит всё здоровье и сделает бессмертным на короткий период. -botania.page.goldenLaurel1=С учетом темы, наверное Viridi - # -- RING OF CHORDATA botania.entry.waterRing=Кольцо хордовых botania.page.waterRing0=&1Кольцо хордовых&0 позволяет носителю плавать как рыба. Пока оно экипировано, носящий способен быстро плавать. Оно также даёт хорошее подводное зрение и, при наличии &4маны&0, способность дышать под водой. diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 825dfa485..8d0e23ac4 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -38,7 +38,6 @@ botaniamisc.filter1=只拾取物品展示框以外物品 botaniamisc.filter2=拾取所有物品 botaniamisc.creativePool0=创造模式魔力池,拥有无限魔力 botaniamisc.creativePool1=创造模式独享 -botaniamisc.savedByLaurel=你的金冠破碎了,但它救了你的命。 botaniamisc.toolRank=%s&7 级 botaniamisc.edition=第 %s 版 # ^ Leave this empty for no edition display @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=抗击腰带 item.botania:icePendant.name=雪花项链 item.botania:lavaPendant.name=火石项链 item.botania:lifeEssence.name=盖亚之魂 -item.botania:goldenLaurel.name=黄金桂冠 item.botania:redstoneRoot.name=红石根 item.botania:magnetRing.name=磁化指环 item.botania:waterRing.name=鱼泳指环 @@ -3416,12 +3414,6 @@ botania.tagline.lavaPendant=抵抗火焰...稍微的 botania.page.lavaPendant0=&1火石项链&0是个吸收少量热量 的&4饰品&0,若穿戴者着火且没有 直接处于&1火&0,&1岩浆&0或其他能引 起燃烧的地方,火就会被扑灭 . botania.page.lavaPendant1=花子本应用到这个 -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=黄金桂冠 -botania.tagline.goldenLaurel=一次性的免死金牌 -botania.page.goldenLaurel0=&1盖亚之魂&0的用途之一就是,赋 予使用者一层不死的保护,穿 戴&1黄金桂冠&0时,如果穿戴者即 将死亡桂冠就会破碎,回复他 们所有的生命值并附加短暂 的无敌效果. -botania.page.goldenLaurel1=考虑到主题,那就是自然女神 - # -- RING OF CHORDATA botania.entry.waterRing=鱼泳指环 botania.tagline.waterRing=水里游得更快! @@ -3831,7 +3823,6 @@ botania.subtitle.enchanterEnchant=魔力附魔结束 botania.subtitle.endoflame=火红莲燃烧物品 botania.subtitle.equipBauble=装备首饰 botania.subtitle.gaiaTrap=盖亚守卫者的符咒 -botania.subtitle.goldenLaurel=黄金桂冠恢复生命 botania.subtitle.holyCloak=神圣斗篷激活 botania.subtitle.laputaStart=拉普达碎片 激活 botania.subtitle.lexiconOpen=植物魔法辞典打开 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 5edbabef6..2ffb20ebe 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -34,7 +34,6 @@ botaniamisc.filter1=只拾取物品展示框以外物品 botaniamisc.filter2=拾取所有物品 botaniamisc.creativePool0=創造模式瑪那池,擁有無限瑪那 botaniamisc.creativePool1=創造模式獨享 -botaniamisc.savedByLaurel=你的金冠破碎了,但它救了你的命。 botaniamisc.toolRank=%s&7 級 botaniamisc.edition=第 %s 版 # ^ Leave this empty for no edition display @@ -1379,7 +1378,6 @@ item.botania:knockbackBelt.name=抗擊腰帶 item.botania:icePendant.name=雪花項鏈 item.botania:lavaPendant.name=火石項鏈 item.botania:lifeEssence.name=蓋亞之魂 -item.botania:goldenLaurel.name=黃金桂冠 item.botania:redstoneRoot.name=紅石根 item.botania:magnetRing.name=磁化指環 item.botania:waterRing.name=魚泳指環 @@ -3359,12 +3357,6 @@ botania.tagline.lavaPendant=抵抗火焰...稍微的 botania.page.lavaPendant0=&1火石項鏈&0是個吸收少量熱量 的&4飾品&0,若穿戴者著火且沒有 直接處於&1火&0,&1岩漿&0或其他能引 起燃燒的地方,火就會被撲滅 . botania.page.lavaPendant1=花子本應用到這個 -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=黃金桂冠 -botania.tagline.goldenLaurel=一次性的免死金牌 -botania.page.goldenLaurel0=&1蓋亞之魂&0的用途之一就是,賦 予使用者一層不死的保護,穿 戴&1黃金桂冠&0時,如果穿戴者即 將死亡桂冠就會破碎,回復他 們所有的生命值並附加短暫 的無敵效果. -botania.page.goldenLaurel1=考慮到主題,那就是自然女神 - # -- RING OF CHORDATA botania.entry.waterRing=魚泳指環 botania.tagline.waterRing=水裡游得更快! diff --git a/src/main/resources/assets/botania/models/item/goldenlaurel.json b/src/main/resources/assets/botania/models/item/goldenlaurel.json deleted file mode 100644 index 35ef53fac..000000000 --- a/src/main/resources/assets/botania/models/item/goldenlaurel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/goldenlaurel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/goldenlaurel.png b/src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/goldenlaurel.png rename to src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png