diff --git a/src/main/java/resonantinduction/api/events/LaserEvent.java b/src/main/java/resonantinduction/api/events/LaserEvent.java index 87482999..b9915db3 100644 --- a/src/main/java/resonantinduction/api/events/LaserEvent.java +++ b/src/main/java/resonantinduction/api/events/LaserEvent.java @@ -20,7 +20,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; import universalelectricity.api.vector.Vector3; -import calclavia.lib.utility.WorldUtility; +import calclavia.lib.utility.inventory.InventoryUtility; /** * An event triggered by entities or tiles that create lasers @@ -266,7 +266,7 @@ public class LaserEvent extends Event items = event.items; for (ItemStack stack : items) { - WorldUtility.dropItemStack(world, vec.translate(0.5), stack, false); + InventoryUtility.dropItemStack(world, vec.translate(0.5), stack); } } } diff --git a/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java b/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java index 86cd90ff..075f19cb 100644 --- a/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java +++ b/src/main/java/resonantinduction/archaic/engineering/ItemHammer.java @@ -8,6 +8,7 @@ import net.minecraftforge.oredict.OreDictionary; import resonantinduction.api.recipe.MachineRecipes; import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.api.recipe.RecipeUtils.Resource; +import resonantinduction.core.Reference; import resonantinduction.core.prefab.item.ItemRI; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.inventory.InventoryUtility; @@ -54,6 +55,7 @@ public class ItemHammer extends ItemRI } } + world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, Reference.PREFIX + "hammer", 0.5f, 0.8f + (0.2f * world.rand.nextFloat())); player.addExhaustion(1); stack.damageItem(1, player); } diff --git a/src/main/java/resonantinduction/core/SoundHandler.java b/src/main/java/resonantinduction/core/SoundHandler.java index 8a40bb2b..263b1b87 100644 --- a/src/main/java/resonantinduction/core/SoundHandler.java +++ b/src/main/java/resonantinduction/core/SoundHandler.java @@ -17,7 +17,7 @@ public class SoundHandler { public static final SoundHandler INSTANCE = new SoundHandler(); - public static final String[] SOUND_FILES = { "grinder1.ogg", "grinder2.ogg", "grinder3.ogg", "grinder4.ogg", "electricshock1.ogg", "electricshock2.ogg", "electricshock3.ogg", "electricshock4.ogg", "electricshock5.ogg", "electricshock6.ogg", "electricshock7.ogg" }; + public static final String[] SOUND_FILES = { "hammer.ogg", "grinder1.ogg", "grinder2.ogg", "grinder3.ogg", "grinder4.ogg", "electricshock1.ogg", "electricshock2.ogg", "electricshock3.ogg", "electricshock4.ogg", "electricshock5.ogg", "electricshock6.ogg", "electricshock7.ogg" }; @ForgeSubscribe public void loadSoundEvents(SoundLoadEvent event) diff --git a/src/main/java/resonantinduction/electrical/armbot/TileArmbot.java b/src/main/java/resonantinduction/electrical/armbot/TileArmbot.java index be2d2894..02855c3b 100644 --- a/src/main/java/resonantinduction/electrical/armbot/TileArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/TileArmbot.java @@ -26,7 +26,7 @@ import calclavia.lib.network.IPacketReceiverWithID; import calclavia.lib.network.PacketHandler; import calclavia.lib.prefab.tile.TileElectrical; import calclavia.lib.utility.MathUtility; -import calclavia.lib.utility.WorldUtility; +import calclavia.lib.utility.inventory.InventoryUtility; import com.builtbroken.common.Pair; import com.google.common.io.ByteArrayDataInput; @@ -365,7 +365,7 @@ public class TileArmbot extends TileElectrical implements IMultiBlock, IArmbot, if (this.getHeldObject() instanceof ItemStack) { Vector3 handPosition = this.getHandPos(); - WorldUtility.dropItemStack(worldObj, handPosition, (ItemStack) this.getHeldObject(), false); + InventoryUtility.dropItemStack(worldObj, handPosition, (ItemStack) this.getHeldObject()); } this.grabbedObject = null; this.sendGrabItemToClient(); diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/BlockTank.java b/src/main/java/resonantinduction/mechanical/fluid/tank/BlockTank.java index 5cfdfc24..e0f0d5bf 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/tank/BlockTank.java +++ b/src/main/java/resonantinduction/mechanical/fluid/tank/BlockTank.java @@ -16,7 +16,7 @@ import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; import resonantinduction.mechanical.fluid.prefab.BlockFluidNetwork; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.FluidUtility; -import calclavia.lib.utility.WorldUtility; +import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -132,7 +132,7 @@ public class BlockTank extends BlockFluidNetwork } else { - WorldUtility.dropItemStack(world, new Vector3(x, y, z), dropStack, false); + InventoryUtility.dropItemStack(world, new Vector3(x, y, z), dropStack); } world.setBlockToAir(x, y, z); } diff --git a/src/main/resources/assets/resonantinduction/sound/hammer.ogg b/src/main/resources/assets/resonantinduction/sound/hammer.ogg new file mode 100644 index 00000000..01e00b90 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/sound/hammer.ogg differ