AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 23:40:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

try again, jenkins

Browse Source
This commit is contained in:
Florian Nücke 2014-03-12 07:09:43 +01:00
parent 8b1db646d6
commit 4f28fd4c45
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/li/cil/oc/client/Sound.scala
View File

@ -2,20 +2,20 @@ package li.cil.oc.client
import cpw.mods.fml.client.FMLClientHandler import cpw.mods.fml.client.FMLClientHandler
import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.common.eventhandler.SubscribeEvent
import cpw.mods.fml.relauncher.ReflectionHelper
import java.net.{MalformedURLException, URLConnection, URLStreamHandler, URL}
import java.util.{TimerTask, Timer, UUID} import java.util.{TimerTask, Timer, UUID}
import li.cil.oc.common.tileentity import li.cil.oc.common.tileentity
import li.cil.oc.Settings import li.cil.oc.Settings
import net.minecraft.client.audio.{SoundPoolEntry, SoundCategory, SoundManager}
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.event.sound.SoundLoadEvent import net.minecraftforge.client.event.sound.SoundLoadEvent
import net.minecraftforge.event.world.{WorldEvent, ChunkEvent} import net.minecraftforge.event.world.{WorldEvent, ChunkEvent}
import paulscode.sound.{SoundSystem, SoundSystemConfig} import paulscode.sound.{SoundSystem, SoundSystemConfig}
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
import scala.collection.mutable import scala.collection.mutable
import net.minecraft.client.audio.{SoundCategory, SoundManager}
import cpw.mods.fml.relauncher.ReflectionHelper
import net.minecraft.util.ResourceLocation
import java.net.{MalformedURLException, URLConnection, URLStreamHandler, URL}
object Sound { object Sound {
val sources = mutable.Map.empty[TileEntity, (String, Float)] val sources = mutable.Map.empty[TileEntity, (String, Float)]
@ -48,7 +48,7 @@ object Sound {
if (Settings.get.soundVolume > 0) { if (Settings.get.soundVolume > 0) {
val resourceName = s"${Settings.resourceDomain}:$name" val resourceName = s"${Settings.resourceDomain}:$name"
val sound = Minecraft.getMinecraft.getSoundHandler.getSound(new ResourceLocation(resourceName)) val sound = Minecraft.getMinecraft.getSoundHandler.getSound(new ResourceLocation(resourceName))
val resource = sound.func_148720_g.getSoundPoolEntryLocation val resource = (sound.func_148720_g: SoundPoolEntry).getSoundPoolEntryLocation
sources.synchronized { sources.synchronized {
val (source, _) = sources.getOrElseUpdate(tileEntity, { val (source, _) = sources.getOrElseUpdate(tileEntity, {
val source = UUID.randomUUID.toString val source = UUID.randomUUID.toString