mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
More big sound work
This commit is contained in:
1 parent
41be14fad4
commit
da6cbeb46d
37 files changed
+519
-272
No files matched your search
@@ -5,9 +5,13 @@ import io.netty.buffer.ByteBuf;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.Pos3D;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.client.sound.IHasSound;
|
||||
import mekanism.client.sound.ISoundSource;
|
||||
import mekanism.client.sound.SoundTile;
|
||||
import mekanism.client.sound.TestSound;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.SideData;
|
||||
import mekanism.common.base.IActiveState;
|
||||
@@ -20,15 +24,19 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.tile.component.TileComponentEjector;
|
||||
import mekanism.common.tile.component.TileComponentUpgrade;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
|
||||
import net.minecraft.client.audio.ISound;
|
||||
import net.minecraft.client.audio.ISound.AttenuationType;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.Optional.Interface;
|
||||
import cpw.mods.fml.common.Optional.Method;
|
||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
||||
|
||||
@Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft")
|
||||
public abstract class TileEntityBasicMachine extends TileEntityElectricBlock implements IElectricMachine, IPeripheral, IActiveState, IInvConfiguration, IUpgradeTile, IHasSound, IRedstoneControl
|
||||
public abstract class TileEntityBasicMachine extends TileEntityNoisyElectricBlock implements IElectricMachine, IPeripheral, IInvConfiguration, IUpgradeTile, IRedstoneControl
|
||||
{
|
||||
/** This machine's side configuration. */
|
||||
public byte[] sideConfig;
|
||||
@@ -36,9 +44,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp
|
||||
/** An arraylist of SideData for this machine. */
|
||||
public ArrayList<SideData> sideOutputs = new ArrayList<SideData>();
|
||||
|
||||
/** The bundled URL of this machine's sound effect */
|
||||
public String soundURL;
|
||||
|
||||
/** How much energy this machine uses per tick. */
|
||||
public double ENERGY_PER_TICK;
|
||||
|
||||
@@ -80,10 +85,9 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp
|
||||
*/
|
||||
public TileEntityBasicMachine(String soundPath, String name, ResourceLocation location, double perTick, int ticksRequired, double maxEnergy)
|
||||
{
|
||||
super(name, maxEnergy);
|
||||
super("machine." + soundPath, name, maxEnergy);
|
||||
ENERGY_PER_TICK = perTick;
|
||||
TICKS_REQUIRED = ticksRequired;
|
||||
soundURL = soundPath;
|
||||
guiLocation = location;
|
||||
isActive = false;
|
||||
}
|
||||
@@ -291,18 +295,6 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp
|
||||
return facing;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSoundPath()
|
||||
{
|
||||
return soundURL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getVolumeMultiplier()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderUpdate()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user