Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix sound pool loader and change texture map refs

Browse source
This commit is contained in:
MachineMuse 2013-08-06 18:11:58 -06:00
parent 18caee4cb5
commit 570409371a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/net/machinemuse/general/sound/Musique.scala
View file

@ -38,7 +38,7 @@ object Musique {
def playerSound(player: EntityPlayer, soundname: String, volume: Float, pitch: Float = 1.0f, continuous: Boolean = true) {
try {
if ((FMLCommonHandler.instance.getEffectiveSide eq Side.CLIENT) && (Config.useSounds())) {
if ((FMLCommonHandler.instance.getEffectiveSide eq Side.CLIENT) && Config.useSounds()) {
val pitch: Float = 1.0f
val unknownflag = true
val soundid = makeSoundString(player, soundname)
@ -61,7 +61,7 @@ object Musique {
def stopPlayerSound(player: EntityPlayer, soundname: String) {
try {
if ((FMLCommonHandler.instance.getEffectiveSide eq Side.CLIENT) && (Config.useSounds())) {
if ((FMLCommonHandler.instance.getEffectiveSide eq Side.CLIENT) && Config.useSounds()) {
val soundid = makeSoundString(player, soundname)
val vol = soundsystem.getVolume(soundid) - 0.1f
if (vol > 0) {

4
src/minecraft/net/machinemuse/general/sound/SoundLoader.java
View file

@ -9,8 +9,8 @@ public class SoundLoader {
/**
* Sounds
*/
private static final String SOUND_RESOURCE_LOCATION = "mods/mmmPowersuits/sound/";
private static final String SOUND_PREFIX = "mods.mmmPowersuits.sound.";
private static final String SOUND_RESOURCE_LOCATION = "assets/powersuits/sound/";
private static final String SOUND_PREFIX = "assets.powersuits.sound.";
public static String[] soundFiles = {
SOUND_RESOURCE_LOCATION + "Glider.ogg",

6
src/minecraft/net/machinemuse/utils/render/MuseRenderer.java
View file

@ -42,11 +42,11 @@ public abstract class MuseRenderer {
protected static SwirlyMuseCircle selectionCircle;
private static String TEXTURE_MAP = "/gui/items.png";
private static String TEXTURE_MAP = "items.png";
private static Stack<String> texturestack = new Stack<String>();
public static final String ITEM_TEXTURE_QUILT = "/gui/items.png";
public static final String BLOCK_TEXTURE_QUILT = "/terrain.png";
public static final String ITEM_TEXTURE_QUILT = "items.png";
public static final String BLOCK_TEXTURE_QUILT = "terrain.png";
public static final String ICON_PREFIX = "powersuits:";
/**