tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed PlayerSound fade effect

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-16 15:05:43 -04:00
parent 9db789674a
commit 71420a2550
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/client/sound/GasMaskSound.java
View file

@ -12,8 +12,8 @@ public class GasMaskSound extends PlayerSound
{
super(player, new ResourceLocation("mekanism", "item.gasMask"));
setFadeIn(30);
setFadeOut(10);
setFadeIn(10);
setFadeOut(5);
}
@Override

4
src/main/java/mekanism/client/sound/JetpackSound.java
View file

@ -12,8 +12,8 @@ public class JetpackSound extends PlayerSound
{
super(player, new ResourceLocation("mekanism", "item.jetpack"));
setFadeIn(30);
setFadeOut(10);
setFadeIn(10);
setFadeOut(5);
}
@Override

4
src/main/java/mekanism/client/sound/PlayerSound.java
View file

@ -45,13 +45,13 @@ public abstract class PlayerSound extends Sound implements IResettableSound
public PlayerSound setFadeIn(int fade)
{
fadeIn = Math.min(0, fade);
fadeIn = Math.max(0, fade);
return this;
}
public PlayerSound setFadeOut(int fade)
{
fadeOut = Math.min(0, fade);
fadeOut = Math.max(0, fade);
return this;
}

4
src/main/java/mekanism/generators/client/gui/GuiReactorController.java
View file

@ -50,8 +50,6 @@ public class GuiReactorController extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040);
if(tileEntity.getActive())
@ -61,6 +59,8 @@ public class GuiReactorController extends GuiMekanism
else {
fontRendererObj.drawString(MekanismUtils.localize("gui.incomplete"), 8, 16, 0x404040);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override