mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-18 11:29:30 +00:00
Merge branch 'master' into endercore
Conflicts: src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java src/main/java/crazypants/enderio/config/Config.java src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java src/main/java/crazypants/enderio/machine/PacketProgress.java src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java src/main/java/crazypants/enderio/machine/tank/TileTank.java src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java src/main/java/crazypants/gui/GuiContainerBase.java src/main/java/crazypants/util/BlockCoord.java
This commit is contained in:
commit
6324c7ee69
61 files changed
+1006
-512
No files matched your search
@@ -213,11 +213,15 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
|
||||
public float getPitch() {
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
protected boolean shouldPlaySound() {
|
||||
return isActive() && !isInvalid();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private void updateSound() {
|
||||
if(Config.machineSoundsEnabled && hasSound()) {
|
||||
if(isActive() && !isInvalid()) {
|
||||
if(shouldPlaySound()) {
|
||||
if(sound == null) {
|
||||
sound = new MachineSound(soundRes, xCoord + 0.5f, yCoord + 0.5f, zCoord + 0.5f, getVolume(), getPitch());
|
||||
FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound);
|
||||
|
||||
Reference in new issue
Block a user