From 0e6951ee53bbc8fdd7227bdf14c59f70a58d090a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 5 Jan 2017 09:55:18 -0600 Subject: [PATCH] Same as previous commit but for the sounds --- .../botania/api/sound/BotaniaSoundEvents.java | 88 +++++++++---------- src/main/resources/assets/botania/sounds.json | 64 +++++++------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 2e9938229..7fcc8042c 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -9,53 +9,53 @@ import net.minecraft.util.SoundEvent; */ public final class BotaniaSoundEvents { - public static final SoundEvent airRod = getRegisteredSoundEvent("botania:airRod"); - public static final SoundEvent agricarnation = getRegisteredSoundEvent("botania:agricarnation"); - public static final SoundEvent altarCraft = getRegisteredSoundEvent("botania:altarCraft"); - public static final SoundEvent babylonAttack = getRegisteredSoundEvent("botania:babylonAttack"); - public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("botania:babylonSpawn"); - public static final SoundEvent bellows = getRegisteredSoundEvent("botania:bellows"); - public static final SoundEvent bifrostRod = getRegisteredSoundEvent("botania:bifrostRod"); - public static final SoundEvent blackLotus = getRegisteredSoundEvent("botania:blackLotus"); - public static final SoundEvent dash = getRegisteredSoundEvent("botania:dash"); - public static final SoundEvent ding = getRegisteredSoundEvent("botania:ding"); - 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 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"); - public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("botania:gaiaTrap"); - public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("botania:goldenLaurel"); - public static final SoundEvent holyCloak = getRegisteredSoundEvent("botania:holyCloak"); - public static final SoundEvent laputaStart = getRegisteredSoundEvent("botania:laputaStart"); - public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("botania:lexiconOpen"); - public static final SoundEvent lexiconPage = getRegisteredSoundEvent("botania:lexiconPage"); - public static final SoundEvent lightRelay = getRegisteredSoundEvent("botania:lightRelay"); - public static final SoundEvent manaBlaster = getRegisteredSoundEvent("botania:manaBlaster"); - public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("botania:manaPoolCraft"); - public static final SoundEvent missile = getRegisteredSoundEvent("botania:missile"); - public static final SoundEvent orechid = getRegisteredSoundEvent("botania:orechid"); - public static final SoundEvent potionCreate = getRegisteredSoundEvent("botania:potionCreate"); - public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("botania:runeAltarCraft"); - public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("botania:runeAltarStart"); - public static final SoundEvent spreaderFire = getRegisteredSoundEvent("botania:spreaderFire"); - public static final SoundEvent starcaller = getRegisteredSoundEvent("botania:starcaller"); - public static final SoundEvent terraBlade = getRegisteredSoundEvent("botania:terraBlade"); - public static final SoundEvent terraformRod = getRegisteredSoundEvent("botania:terraformRod"); - public static final SoundEvent terraPickMode = getRegisteredSoundEvent("botania:terraPickMode"); - public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("botania:terrasteelCraft"); - public static final SoundEvent thermalily = getRegisteredSoundEvent("botania:thermalily"); - public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); - public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); + public static final SoundEvent airRod = getRegisteredSoundEvent("airrod"); + public static final SoundEvent agricarnation = getRegisteredSoundEvent("agricarnation"); + public static final SoundEvent altarCraft = getRegisteredSoundEvent("altarcraft"); + public static final SoundEvent babylonAttack = getRegisteredSoundEvent("babylonattack"); + public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("babylonspawn"); + public static final SoundEvent bellows = getRegisteredSoundEvent("bellows"); + public static final SoundEvent bifrostRod = getRegisteredSoundEvent("bifrostrod"); + public static final SoundEvent blackLotus = getRegisteredSoundEvent("blacklotus"); + public static final SoundEvent dash = getRegisteredSoundEvent("dash"); + public static final SoundEvent ding = getRegisteredSoundEvent("ding"); + public static final SoundEvent divaCharm = getRegisteredSoundEvent("divacharm"); + public static final SoundEvent divinationRod = getRegisteredSoundEvent("divinationrod"); + public static final SoundEvent doit = getRegisteredSoundEvent("doit"); + public static final SoundEvent enchanterFade = getRegisteredSoundEvent("enchanterform"); + public static final SoundEvent enchanterForm = getRegisteredSoundEvent("enchanterfade"); + public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("enchanterenchant"); + public static final SoundEvent endoflame = getRegisteredSoundEvent("endoflame"); + public static final SoundEvent equipBauble = getRegisteredSoundEvent("equipbauble"); + public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("gaiatrap"); + public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("goldenlaurel"); + public static final SoundEvent holyCloak = getRegisteredSoundEvent("holycloak"); + public static final SoundEvent laputaStart = getRegisteredSoundEvent("laputastart"); + public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("lexiconopen"); + public static final SoundEvent lexiconPage = getRegisteredSoundEvent("lexiconpage"); + public static final SoundEvent lightRelay = getRegisteredSoundEvent("lightrelay"); + public static final SoundEvent manaBlaster = getRegisteredSoundEvent("manablaster"); + public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("manapoolcraft"); + public static final SoundEvent missile = getRegisteredSoundEvent("missile"); + public static final SoundEvent orechid = getRegisteredSoundEvent("orechid"); + public static final SoundEvent potionCreate = getRegisteredSoundEvent("potioncreate"); + public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("runealtarcraft"); + public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("runealtarstart"); + public static final SoundEvent spreaderFire = getRegisteredSoundEvent("spreaderfire"); + public static final SoundEvent starcaller = getRegisteredSoundEvent("starcaller"); + public static final SoundEvent terraBlade = getRegisteredSoundEvent("terrablade"); + public static final SoundEvent terraformRod = getRegisteredSoundEvent("terraformrod"); + public static final SoundEvent terraPickMode = getRegisteredSoundEvent("terrapickmode"); + public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("terrasteelcraft"); + public static final SoundEvent thermalily = getRegisteredSoundEvent("thermalily"); + public static final SoundEvent unholyCloak = getRegisteredSoundEvent("unholycloak"); + public static final SoundEvent way = getRegisteredSoundEvent("way"); - public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("botania:music.gaia1"); - public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); + public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("music.gaia1"); + public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("music.gaia2"); private static SoundEvent getRegisteredSoundEvent(String name) { - return SoundEvent.REGISTRY.getObject(new ResourceLocation(name)); + return SoundEvent.REGISTRY.getObject(new ResourceLocation("botania", name)); } private BotaniaSoundEvents() {} diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 49e44dff1..fa6587fb8 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,46 +1,46 @@ { - "airRod": { "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, + "airrod": { "sounds":["botania:airrod"], "subtitle": "botania.subtitle.airRod" }, "agricarnation": { "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, - "altarCraft": { "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, - "babylonAttack": { "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, - "babylonSpawn": { "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, + "altarcraft": { "sounds":["botania:altarcraft"], "subtitle": "botania.subtitle.altarCraft" }, + "babylonattack": { "sounds":["botania:babylonattack"], "subtitle": "botania.subtitle.babylonAttack" }, + "babylonspawn": { "sounds":["botania:babylonspawn"], "subtitle": "botania.subtitle.babylonSpawn" }, "bellows": { "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, - "bifrostRod": { "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, - "blackLotus": { "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, + "bifrostrod": { "sounds":["botania:bifrostrod"], "subtitle": "botania.subtitle.bifrostRod" }, + "blacklotus": { "sounds":["botania:blacklotus"], "subtitle": "botania.subtitle.blackLotus" }, "dash": { "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, "ding": { "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, - "divaCharm": { "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, - "divinationRod": { "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, + "divacharm": { "sounds":["botania:divacharm"], "subtitle": "botania.subtitle.divaCharm" }, + "divinationrod": { "sounds":["botania:divinationrod"], "subtitle": "botania.subtitle.divinationROd" }, "doit": { "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, - "enchanterFade": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, - "enchanterForm": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, - "enchanterEnchant": { "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, + "enchanterfade": { "sounds":["botania:enchanterblock"], "subtitle": "botania.subtitle.enchanterForm" }, + "enchanterform": { "sounds":["botania:enchanterblock"], "subtitle": "botania.subtitle.enchanterFade" }, + "enchanterenchant": { "sounds":["botania:enchanterenchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, "endoflame": { "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, - "equipBauble": { "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, - "gaiaTrap": { "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, - "goldenLaurel": { "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, - "holyCloak": { "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, - "laputaStart": { "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, - "lexiconOpen": { "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, - "lexiconPage": { "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, - "lightRelay": { "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, - "manaBlaster": { "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, - "manaPoolCraft": { "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, + "equipbauble": { "sounds":["botania:equipbauble"], "subtitle": "botania.subtitle.equipBauble" }, + "gaiatrap": { "sounds":["botania:gaiatrap"], "subtitle": "botania.subtitle.gaiaTrap" }, + "goldenlaurel": { "sounds":["botania:goldenlaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, + "holycloak": { "sounds":["botania:holycloak"], "subtitle": "botania.subtitle.holyCloak" }, + "laputastart": { "sounds":["botania:laputastart"], "subtitle": "botania.subtitle.laputaStart" }, + "lexiconopen": { "sounds":["botania:lexiconopen"], "subtitle": "botania.subtitle.lexiconOpen" }, + "lexiconpage": { "sounds":["botania:lexiconpage"], "subtitle": "botania.subtitle.lexiconPage" }, + "lightrelay": { "sounds":["botania:lightrelay"], "subtitle": "botania.subtitle.lightRelay" }, + "manablaster": { "sounds":["botania:manablaster"], "subtitle": "botania.subtitle.manaBlaster" }, + "manapoolcraft": { "sounds":["botania:manapoolcraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, "missile": { "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, "orechid": { "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, - "potionCreate": { "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, - "runeAltarCraft": { "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, - "runeAltarStart": { "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, - "spreaderFire": { "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, + "potioncreate": { "sounds":["botania:potioncreate"], "subtitle": "botania.subtitle.potionCreate" }, + "runealtarcraft": { "sounds":["botania:runealtarcraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, + "runealtarstart": { "sounds":["botania:runealtarstart"], "subtitle": "botania.subtitle.runeAltarStart" }, + "spreaderfire": { "sounds":["botania:spreaderfire"], "subtitle": "botania.subtitle.spreaderFire" }, "starcaller": { "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, - "terraBlade": { "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, - "terraformRod": { "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, - "terraPickMode": { "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, - "terrasteelCraft": { "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, + "terrablade": { "sounds":["botania:terrablade"], "subtitle": "botania.subtitle.terraBlade" }, + "terraformrod": { "sounds":["botania:terraformrod"], "subtitle": "botania.subtitle.terraformRod" }, + "terrapickmode": { "sounds":["botania:terrapickmode"], "subtitle": "botania.subtitle.terraPickMode" }, + "terrasteelcraft": { "sounds":["botania:terrasteelcraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, "thermalily": { "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, - "unholyCloak": { "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, + "unholycloak": { "sounds":["botania:unholycloak"], "subtitle": "botania.subtitle.unholyCloak" }, "way": { "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, - "music.gaia1": { "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, - "music.gaia2": { "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } + "music.gaia1": { "sounds":[{"name": "botania:music/endureemptiness", "stream": true}] }, + "music.gaia2": { "sounds":[{"name": "botania:music/fightforquiescence", "stream": true}] } } \ No newline at end of file