From ec419edfe332696d7a30c2a26b4a9321a60e3f68 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 09:13:15 -0500 Subject: [PATCH] Fix sounds --- .../common/core/handler/ModSounds.java | 65 ++++++++++++++ .../common/core/proxy/CommonProxy.java | 4 +- .../botania/common/lib/LibObfuscation.java | 3 + .../resources/assets/botania/lang/en_US.lang | 41 +++++++++ src/main/resources/assets/botania/sounds.json | 84 +++++++++---------- 5 files changed, 153 insertions(+), 44 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/handler/ModSounds.java diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java new file mode 100644 index 000000000..5f4bbc715 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -0,0 +1,65 @@ +package vazkii.botania.common.core.handler; + +import net.minecraft.util.SoundEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public final class ModSounds { + + public static void init() { + try { + Method m = ReflectionHelper.findMethod(SoundEvent.class, null, LibObfuscation.REGISTER_SOUND, String.class); + m.invoke(null, "botania:airRod"); + m.invoke(null, "botania:agricarnation"); + m.invoke(null, "botania:altarCraft"); + m.invoke(null, "botania:babylonAttack"); + m.invoke(null, "botania:babylonSpawn"); + m.invoke(null, "botania:bellows"); + m.invoke(null, "botania:bifrostRod"); + m.invoke(null, "botania:blackLotus"); + m.invoke(null, "botania:dash"); + m.invoke(null, "botania:ding"); + m.invoke(null, "botania:divaCharm"); + m.invoke(null, "botania:divinationRod"); + m.invoke(null, "botania:doit"); + m.invoke(null, "botania:enchanterBlock"); + m.invoke(null, "botania:enchanterEnchant"); + m.invoke(null, "botania:endoflame"); + m.invoke(null, "botania:equipBauble"); + m.invoke(null, "botania:gaiaTrap"); + m.invoke(null, "botania:goldenLaurel"); + m.invoke(null, "botania:holyCloak"); + m.invoke(null, "botania:laputaStart"); + m.invoke(null, "botania:lexiconOpen"); + m.invoke(null, "botania:lexiconPage"); + m.invoke(null, "botania:lightRelay"); + m.invoke(null, "botania:manaBlaster"); + m.invoke(null, "botania:manaPoolCraft"); + m.invoke(null, "botania:missile"); + m.invoke(null, "botania:orechid"); + m.invoke(null, "botania:potionCreate"); + m.invoke(null, "botania:runeAltarCraft"); + m.invoke(null, "botania:runeAltarStart"); + m.invoke(null, "botania:spreaderFire"); + m.invoke(null, "botania:starcaller"); + m.invoke(null, "botania:terraBlade"); + m.invoke(null, "botania:terraformRod"); + m.invoke(null, "botania:terraPickMode"); + m.invoke(null, "botania:terrasteelCraft"); + m.invoke(null, "botania:thermalily"); + m.invoke(null, "botania:unholyCloak"); + m.invoke(null, "botania:way"); + m.invoke(null, "botania:music.gaia1"); + m.invoke(null, "botania:music.gaia2"); + } catch (IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); + } + } + + private ModSounds() {} + +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 8972fac73..935bdb6b6 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -21,7 +21,6 @@ import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; @@ -44,7 +43,6 @@ import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.command.CommandDownloadLatest; import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; import vazkii.botania.common.core.command.CommandSkyblockSpread; @@ -56,6 +54,7 @@ import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.SpawnerChangingHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModBrewRecipes; @@ -103,6 +102,7 @@ public class CommonProxy { ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); + ModSounds.init(); ModBlocks.init(); ModItems.init(); ModEntities.init(); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 0b0318ee4..77d7d7a1b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -105,4 +105,7 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; + // SoundEvent + public static final String[] REGISTER_SOUND = { "registerSound", "func_187502_a", "a" }; + } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1f085bb27..77e13aaa7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3858,3 +3858,44 @@ botania.page.banners1=Showcase of the various banners botania.entry.preventingDecay=Preventing Decay botania.tagline.preventingDecay=Preventing passive flowers' decay botania.page.preventingDecay0=no + +botania.subtitle.airRod=Rod of the Skies whooshes +botania.subtitle.agricarnation=Agricarnation glimmers +botania.subtitle.altarCraft=Petal Apothecary finishes +botania.subtitle.babylonAttack=Key of King's Law unleashed +botania.subtitle.babylonSpawn=Key of King's Law activated +botania.subtitle.bellows=Manatide Bellows hisses +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.doit=JUST DO IT!! +botania.subtitle.enchanterBlock=todo +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.laputaStart=Laputa Shard triggers +botania.subtitle.lexiconOpen=Lexica Botania opens +botania.subtitle.lexiconPage=Lexica Botania page turns +botania.subtitle.lightRelay=Luminizer whooshes +botania.subtitle.manaBlaster=Mana Blaster fires +botania.subtitle.manaPoolCraft=Mana Pool infuses +botania.subtitle.missile=todo +botania.subtitle.orechid=todo +botania.subtitle.potionCreate=Brewery finishes +botania.subtitle.runeAltarCraft=Runic Altar finishes +botania.subtitle.runeAltarStart=Runic Altar starts +botania.subtitle.spreaderFire=Spreader shoots mana +botania.subtitle.starcaller=todo +botania.subtitle.terraBlade=todo +botania.subtitle.terraformRod=todo +botania.subtitle.terraPickMode=Terrasteel Pick powers up +botania.subtitle.terrasteelCraft=Terrasteel finishes +botania.subtitle.thermalily=todo +botania.subtitle.unholyCloak=todo +botania.subtitle.way=todo \ 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 3f9bc9775..1cd03c641 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,45 +1,45 @@ { - "airRod": { "category": "player", "sounds":["airRod"] }, - "agricarnation": { "category": "block", "sounds":["agricarnation"] }, - "altarCraft": { "category": "block", "sounds":["altarCraft"] }, - "babylonAttack": { "category": "player", "sounds":["babylonAttack"] }, - "babylonSpawn": { "category": "player", "sounds":["babylonSpawn"] }, - "bellows": { "category": "block", "sounds":["bellows"] }, - "bifrostRod": { "category": "player", "sounds":["bifrostRod"] }, - "blackLotus": { "category": "block", "sounds":["blackLotus"] }, - "dash": { "category": "player", "sounds":["dash"] }, - "ding": { "category": "block", "sounds":["ding"] }, - "divaCharm": { "category": "player", "sounds":["divaCharm"] }, - "divinationRod": { "category": "player", "sounds":["divinationRod"] }, - "doit": { "category": "block", "sounds":["doit"] }, - "enchanterBlock": { "category": "block", "sounds":["enchanterBlock"] }, - "enchanterEnchant": { "category": "block", "sounds":["enchanterEnchant"] }, - "endoflame": { "category": "block", "sounds":["endoflame"] }, - "equipBauble": { "category": "player", "sounds":["equipBauble"] }, - "gaiaTrap": { "category": "hostile", "sounds":["gaiaTrap"] }, - "goldenLaurel": { "category": "player", "sounds":["goldenLaurel"] }, - "holyCloak": { "category": "player", "sounds":["holyCloak"] }, - "laputaStart": { "category": "player", "sounds":["laputaStart"] }, - "lexiconOpen": { "category": "master", "sounds":["lexiconOpen"] }, - "lexiconPage": { "category": "master", "sounds":["lexiconPage"] }, - "lightRelay": { "category": "block", "sounds":["lightRelay"] }, - "manaBlaster": { "category": "player", "sounds":["manaBlaster"] }, - "manaPoolCraft": { "category": "block", "sounds":["manaPoolCraft"] }, - "missile": { "category": "player", "sounds":["missile"] }, - "orechid": { "category": "block", "sounds":["orechid"] }, - "potionCreate": { "category": "block", "sounds":["potionCreate"] }, - "runeAltarCraft": { "category": "block", "sounds":["runeAltarCraft"] }, - "runeAltarStart": { "category": "block", "sounds":["runeAltarStart"] }, - "spreaderFire": { "category": "block", "sounds":["spreaderFire"] }, - "starcaller": { "category": "player", "sounds":["starcaller"] }, - "terraBlade": { "category": "player", "sounds":["terraBlade"] }, - "terraformRod": { "category": "player", "sounds":["terraformRod"] }, - "terraPickMode": { "category": "player", "sounds":["terraPickMode"] }, - "terrasteelCraft": { "category": "block", "sounds":["terrasteelCraft"] }, - "thermalily": { "category": "block", "sounds":["thermalily"] }, - "unholyCloak": { "category": "player", "sounds":["unholyCloak"] }, - "way": { "category": "master", "sounds":["way"] }, + "airRod": { "category": "player", "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, + "agricarnation": { "category": "block", "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, + "altarCraft": { "category": "block", "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, + "babylonAttack": { "category": "player", "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, + "babylonSpawn": { "category": "player", "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, + "bellows": { "category": "block", "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, + "bifrostRod": { "category": "player", "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, + "blackLotus": { "category": "block", "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, + "dash": { "category": "player", "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, + "ding": { "category": "block", "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, + "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" }, + "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" }, + "gaiaTrap": { "category": "hostile", "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, + "goldenLaurel": { "category": "player", "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, + "holyCloak": { "category": "player", "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, + "laputaStart": { "category": "player", "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, + "lexiconOpen": { "category": "master", "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, + "lexiconPage": { "category": "master", "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, + "lightRelay": { "category": "block", "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, + "manaBlaster": { "category": "player", "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, + "manaPoolCraft": { "category": "block", "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, + "missile": { "category": "player", "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, + "orechid": { "category": "block", "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, + "potionCreate": { "category": "block", "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, + "runeAltarCraft": { "category": "block", "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, + "runeAltarStart": { "category": "block", "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, + "spreaderFire": { "category": "block", "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, + "starcaller": { "category": "player", "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, + "terraBlade": { "category": "player", "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, + "terraformRod": { "category": "player", "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, + "terraPickMode": { "category": "player", "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, + "terrasteelCraft": { "category": "block", "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, + "thermalily": { "category": "block", "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, + "unholyCloak": { "category": "player", "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, + "way": { "category": "master", "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, - "music.gaia1": { "category": "record", "sounds":[{"name": "music/EndureEmptiness", "stream": true}] }, - "music.gaia2": { "category": "record", "sounds":[{"name": "music/FightForQuiescence", "stream": true}] } + "music.gaia1": { "category": "record", "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, + "music.gaia2": { "category": "record", "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } } \ No newline at end of file