diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 80e62e223..655d492fe 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -22,7 +22,8 @@ public final class BotaniaSoundEvents { public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); - public static final SoundEvent enchanterBlock = getRegisteredSoundEvent("botania:enchanterBlock"); + public static final SoundEvent enchanterFade = getRegisteredSoundEvent("botania:enchanterForm"); + public static final SoundEvent enchanterForm = getRegisteredSoundEvent("botania:enchanterFade"); public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index ba3a89227..4aa7ea7ad 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -155,7 +155,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { float blue = (float) Math.random(); Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } - worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 10F); + worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 4d09365f1..311be693d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -21,7 +21,8 @@ public final class ModSounds { "botania:divaCharm", "botania:divinationRod", "botania:doit", - "botania:enchanterBlock", + "botania:enchanterForm", + "botania:enchanterFade", "botania:enchanterEnchant", "botania:endoflame", "botania:equipBauble", diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 98b57cad2..5f836e7dd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -109,7 +109,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null && !par3World.isRemote) { par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 0.6F); + par3World.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a9d5048e1..08ff8eece 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3869,16 +3869,17 @@ botania.subtitle.bifrostRod=Rod of the Bifrost hums botania.subtitle.blackLotus=Black Lotus dissolves botania.subtitle.dash=Player dashes forward botania.subtitle.ding=Wand of the Forest dings -botania.subtitle.divaCharm=todo -botania.subtitle.divinationRod=todo +botania.subtitle.divaCharm=Charm of the Diva echoes +botania.subtitle.divinationRod=Rod of the Plentiful Mantle hums botania.subtitle.doit=DO IT!! -botania.subtitle.enchanterBlock=todo +botania.subtitle.enchanterForm=Mana Enchanter forms +botania.subtitle.enchanterFade=Mana Enchanter fades botania.subtitle.enchanterEnchant=Mana Enchanter finishes botania.subtitle.endoflame=Endoflame ignites item botania.subtitle.equipBauble=Bauble is equipped -botania.subtitle.gaiaTrap=todo -botania.subtitle.goldenLaurel=todo -botania.subtitle.holyCloak=todo +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 botania.subtitle.lexiconPage=Lexica Botania page turns @@ -3892,10 +3893,10 @@ botania.subtitle.runeAltarCraft=Runic Altar finishes botania.subtitle.runeAltarStart=Runic Altar starts botania.subtitle.spreaderFire=Spreader shoots mana botania.subtitle.starcaller=Stars descend from the sky -botania.subtitle.terraBlade=todo +botania.subtitle.terraBlade=Terrasteel Sword actives botania.subtitle.terraformRod=Land is terrraformed botania.subtitle.terraPickMode=Terrasteel Pick powers up botania.subtitle.terrasteelCraft=Terrasteel finishes botania.subtitle.thermalily=Thermalily consumes lava -botania.subtitle.unholyCloak=todo +botania.subtitle.unholyCloak=Cloak of Sin activates botania.subtitle.way=And his name is.... JOHN CENA!!! \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 1cd03c641..0423aaf1e 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -12,7 +12,8 @@ "divaCharm": { "category": "player", "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, "divinationRod": { "category": "player", "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, "doit": { "category": "block", "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, - "enchanterBlock": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterBlock" }, + "enchanterFade": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, + "enchanterForm": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, "enchanterEnchant": { "category": "block", "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, "endoflame": { "category": "block", "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, "equipBauble": { "category": "player", "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" },