From 059d9614c1a4a2d50e0f7e21e68729e6723c18ee Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 27 Mar 2014 22:21:21 -0400 Subject: [PATCH] Another pass at the 1.7 update - more to come tomorrow --- .../java/com/pahimar/ee3/block/BlockEE.java | 1 + .../ee3/client/audio/SoundHandler.java | 32 +++++++++--------- .../handler/DrawBlockHighlightHandler.java | 4 ++- .../handler/ItemTooltipEventHandler.java | 4 ++- .../tileentity/TileEntityAludelRenderer.java | 5 +-- .../TileEntityGlassBellRenderer.java | 3 +- .../ee3/handler/ActionRequestHandler.java | 4 +-- .../pahimar/ee3/handler/ItemEventHandler.java | 7 ++-- .../ee3/handler/WorldEventHandler.java | 3 +- .../handler/WorldTransmutationHandler.java | 8 +++-- .../ee3/{sound => sounds}/chargeDown.ogg | Bin .../assets/ee3/{sound => sounds}/chargeUp.ogg | Bin .../assets/ee3/{sound => sounds}/destruct.ogg | Bin .../assets/ee3/{sound => sounds}/fail.ogg | Bin .../assets/ee3/{sound => sounds}/gust.ogg | Bin .../assets/ee3/{sound => sounds}/heal.ogg | Bin .../assets/ee3/{sound => sounds}/kinesis.ogg | Bin .../assets/ee3/{sound => sounds}/launch.ogg | Bin .../assets/ee3/{sound => sounds}/nova.ogg | Bin .../ee3/{sound => sounds}/ocarina/1_D2.ogg | Bin .../ee3/{sound => sounds}/ocarina/2_E2.ogg | Bin .../{sound => sounds}/ocarina/3_F2Sharp.ogg | Bin .../ee3/{sound => sounds}/ocarina/4_G2.ogg | Bin .../ee3/{sound => sounds}/ocarina/5_A2.ogg | Bin .../ee3/{sound => sounds}/ocarina/6_B2.ogg | Bin .../{sound => sounds}/ocarina/7_C3Sharp.ogg | Bin .../ee3/{sound => sounds}/ocarina/8_D3.ogg | Bin .../assets/ee3/{sound => sounds}/philball.ogg | Bin .../resources/assets/ee3/sounds/sounds.json | 17 ++++++++++ .../assets/ee3/{sound => sounds}/tock.ogg | Bin .../ee3/{sound => sounds}/transmute.ogg | Bin .../assets/ee3/{sound => sounds}/wall.ogg | Bin .../ee3/{sound => sounds}/waterball.ogg | Bin .../assets/ee3/{sound => sounds}/wind.ogg | Bin 34 files changed, 59 insertions(+), 29 deletions(-) rename src/main/resources/assets/ee3/{sound => sounds}/chargeDown.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/chargeUp.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/destruct.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/fail.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/gust.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/heal.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/kinesis.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/launch.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/nova.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/1_D2.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/2_E2.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/3_F2Sharp.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/4_G2.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/5_A2.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/6_B2.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/7_C3Sharp.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/ocarina/8_D3.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/philball.ogg (100%) create mode 100644 src/main/resources/assets/ee3/sounds/sounds.json rename src/main/resources/assets/ee3/{sound => sounds}/tock.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/transmute.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/wall.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/waterball.ogg (100%) rename src/main/resources/assets/ee3/{sound => sounds}/wind.ogg (100%) diff --git a/src/main/java/com/pahimar/ee3/block/BlockEE.java b/src/main/java/com/pahimar/ee3/block/BlockEE.java index 6d55754c..f23205bd 100644 --- a/src/main/java/com/pahimar/ee3/block/BlockEE.java +++ b/src/main/java/com/pahimar/ee3/block/BlockEE.java @@ -14,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import java.util.Random; diff --git a/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java b/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java index 97ac85e0..dd9065aa 100644 --- a/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java +++ b/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.client.audio; import com.pahimar.ee3.helper.LogHelper; import com.pahimar.ee3.lib.Sounds; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; /** @@ -13,24 +14,23 @@ import net.minecraftforge.client.event.sound.SoundLoadEvent; */ public class SoundHandler { - - @ForgeSubscribe + @SubscribeEvent public void onSoundLoad(SoundLoadEvent event) { - + // FIXME Load custom sounds into Minecraft // For each custom sound file we have defined in Sounds - for (String soundFile : Sounds.soundFiles) - { - // Try to add the custom sound file to the pool of sounds - try - { - event.manager.addSound(soundFile); - } - // If we cannot add the custom sound file to the pool, log the exception - catch (Exception e) - { - LogHelper.warn("Failed loading sound file: " + soundFile); - } - } +// for (String soundFile : Sounds.soundFiles) +// { +// // Try to add the custom sound file to the pool of sounds +// try +// { +// event.manager.addSound(soundFile); +// } +// // If we cannot add the custom sound file to the pool, log the exception +// catch (Exception e) +// { +// LogHelper.warn("Failed loading sound file: " + soundFile); +// } +// } } } diff --git a/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java index 48eb3d75..fdf15f69 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java @@ -3,11 +3,13 @@ package com.pahimar.ee3.client.handler; import com.pahimar.ee3.item.IChargeable; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -75,7 +77,7 @@ public class DrawBlockHighlightHandler return pulse; } - @ForgeSubscribe + @SubscribeEvent public void onDrawBlockHighlightEvent(DrawBlockHighlightEvent event) { /** diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index 76577ec4..c3016bca 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -3,6 +3,8 @@ package com.pahimar.ee3.client.handler; import com.pahimar.ee3.api.WrappedStack; import com.pahimar.ee3.emc.EmcRegistry; import com.pahimar.ee3.emc.EmcValue; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.event.entity.player.ItemTooltipEvent; @@ -23,7 +25,7 @@ public class ItemTooltipEventHandler private static DecimalFormat emcDecimalFormat = new DecimalFormat("###,###,###,###,###.###"); @SuppressWarnings("unused") - @ForgeSubscribe(priority = EventPriority.LOWEST) + @SubscribeEvent(priority = EventPriority.LOWEST) public void handleItemTooltipEvent(ItemTooltipEvent event) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java index 68e53f1c..1a6e5d2e 100644 --- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java +++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java @@ -14,6 +14,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; /** @@ -69,7 +70,7 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer */ GL11.glPushMatrix(); - TileEntity tileGlassBell = tileAludel.worldObj.getBlockTileEntity(tileAludel.xCoord, tileAludel.yCoord + 1, tileAludel.zCoord); + TileEntity tileGlassBell = tileAludel.getWorldObj().getTileEntity(tileAludel.xCoord, tileAludel.yCoord + 1, tileAludel.zCoord); if (tileGlassBell instanceof TileGlassBell) { @@ -78,7 +79,7 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer float scaleFactor = getGhostItemScaleFactor(tileAludel.outputItemStack); float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - EntityItem ghostEntityItem = new EntityItem(tileAludel.worldObj); + EntityItem ghostEntityItem = new EntityItem(tileAludel.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; ghostEntityItem.setEntityItemStack(tileAludel.outputItemStack); diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java index 78961795..cdfdd04c 100644 --- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java +++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java @@ -13,6 +13,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; /** @@ -78,7 +79,7 @@ public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer float scaleFactor = getGhostItemScaleFactor(tileGlassBell.outputItemStack); float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - EntityItem ghostEntityItem = new EntityItem(tileGlassBell.worldObj); + EntityItem ghostEntityItem = new EntityItem(tileGlassBell.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; ghostEntityItem.setEntityItemStack(tileGlassBell.outputItemStack); diff --git a/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java b/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java index 4b66cd04..c2da2db7 100644 --- a/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java +++ b/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java @@ -1,6 +1,7 @@ package com.pahimar.ee3.handler; import com.pahimar.ee3.event.ActionRequestEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * Equivalent-Exchange-3 @@ -11,8 +12,7 @@ import com.pahimar.ee3.event.ActionRequestEvent; */ public class ActionRequestHandler { - - @ForgeSubscribe + @SubscribeEvent public void onModActionEvent(ActionRequestEvent event) { diff --git a/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java b/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java index aa4251ab..f83c5904 100644 --- a/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java +++ b/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.handler; import com.pahimar.ee3.helper.ItemStackNBTHelper; import com.pahimar.ee3.lib.Strings; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.item.EntityItem; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; @@ -16,7 +17,7 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent; */ public class ItemEventHandler { - @ForgeSubscribe + @SubscribeEvent @SuppressWarnings("unused") public void onItemPickup(EntityItemPickupEvent event) { @@ -34,7 +35,7 @@ public class ItemEventHandler } } - @ForgeSubscribe + @SubscribeEvent @SuppressWarnings("unused") public void onItemToss(ItemTossEvent event) { @@ -52,7 +53,7 @@ public class ItemEventHandler } } - @ForgeSubscribe + @SubscribeEvent @SuppressWarnings("unused") public void onPlayerDrop(PlayerDropsEvent event) { diff --git a/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java b/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java index 249e7830..47aa0797 100644 --- a/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java +++ b/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java @@ -1,11 +1,12 @@ package com.pahimar.ee3.handler; import com.pahimar.ee3.helper.EmcInitializationHelper; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.world.WorldEvent; public class WorldEventHandler { - @ForgeSubscribe + @SubscribeEvent public void onWorldLoaded(WorldEvent.Load event) { EmcInitializationHelper.initEmcRegistry(); diff --git a/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java b/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java index 8cf45481..8b421218 100644 --- a/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java +++ b/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java @@ -1,5 +1,6 @@ package com.pahimar.ee3.handler; +import com.google.common.eventbus.Subscribe; import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.event.ActionEvent; import com.pahimar.ee3.event.ActionEvent.ActionResult; @@ -14,10 +15,13 @@ import com.pahimar.ee3.network.PacketTypeHandler; import com.pahimar.ee3.network.packet.PacketItemUpdate; import com.pahimar.ee3.network.packet.PacketSoundEvent; import com.pahimar.ee3.network.packet.PacketSpawnParticle; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; /** * Equivalent-Exchange-3 @@ -108,7 +112,7 @@ public class WorldTransmutationHandler actionRequestEvent = new ActionRequestEvent(thePlayer, actionEvent, originX + x, originY + y, originZ + z, sideHit); MinecraftForge.EVENT_BUS.post(actionRequestEvent); - if (actionRequestEvent.allowEvent != Result.DENY) + if (actionRequestEvent.allowEvent != Event.Result.DENY) { MinecraftForge.EVENT_BUS.post(actionEvent); } @@ -147,7 +151,7 @@ public class WorldTransmutationHandler } } - @ForgeSubscribe + @SubscribeEvent public void onWorldTransmutationEvent(WorldTransmutationEvent event) { diff --git a/src/main/resources/assets/ee3/sound/chargeDown.ogg b/src/main/resources/assets/ee3/sounds/chargeDown.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/chargeDown.ogg rename to src/main/resources/assets/ee3/sounds/chargeDown.ogg diff --git a/src/main/resources/assets/ee3/sound/chargeUp.ogg b/src/main/resources/assets/ee3/sounds/chargeUp.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/chargeUp.ogg rename to src/main/resources/assets/ee3/sounds/chargeUp.ogg diff --git a/src/main/resources/assets/ee3/sound/destruct.ogg b/src/main/resources/assets/ee3/sounds/destruct.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/destruct.ogg rename to src/main/resources/assets/ee3/sounds/destruct.ogg diff --git a/src/main/resources/assets/ee3/sound/fail.ogg b/src/main/resources/assets/ee3/sounds/fail.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/fail.ogg rename to src/main/resources/assets/ee3/sounds/fail.ogg diff --git a/src/main/resources/assets/ee3/sound/gust.ogg b/src/main/resources/assets/ee3/sounds/gust.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/gust.ogg rename to src/main/resources/assets/ee3/sounds/gust.ogg diff --git a/src/main/resources/assets/ee3/sound/heal.ogg b/src/main/resources/assets/ee3/sounds/heal.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/heal.ogg rename to src/main/resources/assets/ee3/sounds/heal.ogg diff --git a/src/main/resources/assets/ee3/sound/kinesis.ogg b/src/main/resources/assets/ee3/sounds/kinesis.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/kinesis.ogg rename to src/main/resources/assets/ee3/sounds/kinesis.ogg diff --git a/src/main/resources/assets/ee3/sound/launch.ogg b/src/main/resources/assets/ee3/sounds/launch.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/launch.ogg rename to src/main/resources/assets/ee3/sounds/launch.ogg diff --git a/src/main/resources/assets/ee3/sound/nova.ogg b/src/main/resources/assets/ee3/sounds/nova.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/nova.ogg rename to src/main/resources/assets/ee3/sounds/nova.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/1_D2.ogg b/src/main/resources/assets/ee3/sounds/ocarina/1_D2.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/1_D2.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/1_D2.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/2_E2.ogg b/src/main/resources/assets/ee3/sounds/ocarina/2_E2.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/2_E2.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/2_E2.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg b/src/main/resources/assets/ee3/sounds/ocarina/3_F2Sharp.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/3_F2Sharp.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/4_G2.ogg b/src/main/resources/assets/ee3/sounds/ocarina/4_G2.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/4_G2.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/4_G2.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/5_A2.ogg b/src/main/resources/assets/ee3/sounds/ocarina/5_A2.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/5_A2.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/5_A2.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/6_B2.ogg b/src/main/resources/assets/ee3/sounds/ocarina/6_B2.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/6_B2.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/6_B2.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg b/src/main/resources/assets/ee3/sounds/ocarina/7_C3Sharp.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/7_C3Sharp.ogg diff --git a/src/main/resources/assets/ee3/sound/ocarina/8_D3.ogg b/src/main/resources/assets/ee3/sounds/ocarina/8_D3.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/ocarina/8_D3.ogg rename to src/main/resources/assets/ee3/sounds/ocarina/8_D3.ogg diff --git a/src/main/resources/assets/ee3/sound/philball.ogg b/src/main/resources/assets/ee3/sounds/philball.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/philball.ogg rename to src/main/resources/assets/ee3/sounds/philball.ogg diff --git a/src/main/resources/assets/ee3/sounds/sounds.json b/src/main/resources/assets/ee3/sounds/sounds.json new file mode 100644 index 00000000..a30d9976 --- /dev/null +++ b/src/main/resources/assets/ee3/sounds/sounds.json @@ -0,0 +1,17 @@ +{ +"chargeDown": {"category": "master","sounds": [{"name": "chargeDown","stream": false}]}, +"chargeUp": {"category": "master","sounds": [{"name": "chargeUp","stream": false}]}, +"destruct": {"category": "master","sounds": [{"name": "destruct","stream": false}]}, +"fail": {"category": "master","sounds": [{"name": "fail","stream": false}]}, +"gust": {"category": "master","sounds": [{"name": "gust","stream": false}]}, +"heal": {"category": "master","sounds": [{"name": "heal","stream": false}]}, +"kinesis": {"category": "master","sounds": [{"name": "kinesis","stream": false}]}, +"launch": {"category": "master","sounds": [{"name": "launch","stream": false}]}, +"nova": {"category": "master","sounds": [{"name": "nova","stream": false}]}, +"philball": {"category": "master","sounds": [{"name": "philball","stream": false}]}, +"tock": {"category": "master","sounds": [{"name": "tock","stream": false}]}, +"transmute": {"category": "master","sounds": [{"name": "transmute","stream": false}]}, +"wall": {"category": "master","sounds": [{"name": "wall","stream": false}]}, +"waterball": {"category": "master","sounds": [{"name": "waterball","stream": false}]}, +"wind": {"category": "master","sounds": [{"name": "wind","stream": false}]} +} \ No newline at end of file diff --git a/src/main/resources/assets/ee3/sound/tock.ogg b/src/main/resources/assets/ee3/sounds/tock.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/tock.ogg rename to src/main/resources/assets/ee3/sounds/tock.ogg diff --git a/src/main/resources/assets/ee3/sound/transmute.ogg b/src/main/resources/assets/ee3/sounds/transmute.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/transmute.ogg rename to src/main/resources/assets/ee3/sounds/transmute.ogg diff --git a/src/main/resources/assets/ee3/sound/wall.ogg b/src/main/resources/assets/ee3/sounds/wall.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/wall.ogg rename to src/main/resources/assets/ee3/sounds/wall.ogg diff --git a/src/main/resources/assets/ee3/sound/waterball.ogg b/src/main/resources/assets/ee3/sounds/waterball.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/waterball.ogg rename to src/main/resources/assets/ee3/sounds/waterball.ogg diff --git a/src/main/resources/assets/ee3/sound/wind.ogg b/src/main/resources/assets/ee3/sounds/wind.ogg similarity index 100% rename from src/main/resources/assets/ee3/sound/wind.ogg rename to src/main/resources/assets/ee3/sounds/wind.ogg