From 6b1f145f5028f1bc92cf478e5963224e7d94b5cd Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 28 Sep 2024 20:16:09 +0900 Subject: Unify machine sound loop to use SoundResource (#3289) --- .../multis/mega/MTEMegaBlastFurnace.java | 5 +- .../multis/mega/MTEMegaVacuumFreezer.java | 5 +- .../blocks/tileEntity/MTEPreciseAssembler.java | 5 +- .../tileEntity/base/MTELargeFusionComputer.java | 7 ++- .../java/gregtech/api/enums/SoundResource.java | 16 +++++- .../implementations/MTEMultiBlockBase.java | 11 ++-- .../machines/multi/MTEElectricBlastFurnace.java | 5 +- .../machines/multi/MTEFusionComputer.java | 5 +- .../machines/multi/MTELargeTurbine.java | 5 +- .../machines/multi/MTEMultiAutoclave.java | 5 +- .../tileentities/machines/multi/MTEMultiLathe.java | 5 +- .../machines/multi/MTEOilDrillBase.java | 5 +- .../machines/multi/MTEPlasmaForge.java | 5 +- .../machines/multi/MTEVacuumFreezer.java | 5 +- .../purification/MTEPurificationUnitClarifier.java | 5 +- .../MTEPurificationUnitFlocculation.java | 5 +- .../purification/MTEPurificationUnitOzonation.java | 5 +- .../MTEPurificationUnitPhAdjustment.java | 5 +- .../MTEPurificationUnitPlasmaHeater.java | 5 +- .../MTEPurificationUnitUVTreatment.java | 5 +- .../multi/processing/MTEIndustrialArcFurnace.java | 5 +- .../processing/MTEIndustrialCuttingMachine.java | 5 +- .../multi/processing/MTEIndustrialSifter.java | 5 +- .../processing/MTEIndustrialThermalCentrifuge.java | 5 +- .../processing/MTEIndustrialVacuumFreezer.java | 5 +- .../multi/processing/MTEIndustrialWashPlant.java | 5 +- .../multi/processing/advanced/MTEAdvEBF.java | 5 +- .../multi/processing/steam/MTESteamCentrifuge.java | 5 +- .../multi/processing/steam/MTESteamCompressor.java | 5 +- .../processing/steam/MTESteamForgeHammer.java | 5 +- .../multi/processing/steam/MTESteamMacerator.java | 5 +- .../multi/processing/steam/MTESteamMixer.java | 5 +- .../multi/processing/steam/MTESteamWasher.java | 5 +- .../multi/processing/steam/MTESteamWaterPump.java | 5 +- .../machines/multi/production/MTECyclotron.java | 5 +- .../production/MTEQuantumForceTransformer.java | 5 +- .../multi/production/algae/MTEAlgaePondBase.java | 5 +- .../multiblock/MTEExtremeEntityCrusher.java | 5 +- .../multiblock/MTEMegaIndustrialApiary.java | 5 +- .../metaTileEntity/multi/MTEActiveTransformer.java | 12 ++--- .../thing/metaTileEntity/multi/MTEDataBank.java | 12 ++--- .../metaTileEntity/multi/MTEEnergyInfuser.java | 12 ++--- .../metaTileEntity/multi/MTEEyeOfHarmony.java | 5 +- .../thing/metaTileEntity/multi/MTEForgeOfGods.java | 5 +- .../metaTileEntity/multi/MTENetworkSwitch.java | 12 ++--- .../metaTileEntity/multi/MTEQuantumComputer.java | 7 ++- .../thing/metaTileEntity/multi/base/SoundLoop.java | 59 ---------------------- .../multi/base/TTMultiblockBase.java | 39 ++------------ 48 files changed, 121 insertions(+), 256 deletions(-) delete mode 100644 src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoop.java (limited to 'src') diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index 12d36dd944..e43da001f0 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -36,7 +36,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -435,7 +434,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_MEGA_BLAST_FURNACE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MEGA_BLAST_FURNACE_LOOP; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java index fdc0a465cf..753e6a2d7e 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -37,7 +37,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -537,7 +536,7 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase 0); } else { - soundMagic(getActivitySoundLoop()); + doActivitySound(getActivitySoundLoop()); } } @@ -570,8 +569,8 @@ public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_FUSION_LOOP; } @Override diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 9de5c56015..f262dc2619 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -2,6 +2,7 @@ package gregtech.api.enums; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.TecTech; import java.util.EnumSet; import java.util.Locale; @@ -100,6 +101,10 @@ public enum SoundResource { GT_MACHINES_QUANTUM_FORCE_TRANSFORMER_LOOP(264, GregTech.ID, "machines.MTEQuantumForceTransformer"), GT_MACHINES_ADV_EBF_LOOP(265, GregTech.ID, "machines.MTEAdvEBF"), GT_MACHINES_LARGE_TURBINES_LOOP(266, GregTech.ID, "machines.MTELargeTurbine"), + TECTECH_MACHINES_FX_LOW_FREQ(267, TecTech.ID, "fx_lo_freq"), + TECTECH_MACHINES_FX_HIGH_FREQ(268, TecTech.ID, "fx_hi_freq"), + TECTECH_MACHINES_NOISE(269, TecTech.ID, "fx_noise"), + TECTECH_MACHINES_FX_WHOOUM(270, TecTech.ID, "fx_whooum"), GUI_BUTTON_DOWN(-1, GregTech.ID, "gui.buttonDown"), GUI_BUTTON_UP(-1, GregTech.ID, "gui.buttonUp"), @@ -346,7 +351,16 @@ public enum SoundResource { static { EnumSet.allOf(SoundResource.class) - .forEach(sound -> { if (sound.id >= 0) ID_SOUND_MAP.put(sound.id, sound); }); + .forEach(sound -> { + if (sound.id < 0) { + return; + } + + if (ID_SOUND_MAP.containsKey(sound.id)) { + throw new IllegalStateException(String.format("Sound ID %s is already occupied!", sound.id)); + } + ID_SOUND_MAP.put(sound.id, sound); + }); EnumSet.allOf(SoundResource.class) .forEach(sound -> RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java index b677f6ae24..5da5bff57d 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java @@ -32,7 +32,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; @@ -677,10 +676,14 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity } @SideOnly(Side.CLIENT) - protected void doActivitySound(ResourceLocation activitySound) { + protected void doActivitySound(SoundResource activitySound) { if (getBaseMetaTileEntity().isActive() && activitySound != null) { if (activitySoundLoop == null) { - activitySoundLoop = new GTSoundLoop(activitySound, getBaseMetaTileEntity(), false, true); + activitySoundLoop = new GTSoundLoop( + activitySound.resourceLocation, + getBaseMetaTileEntity(), + false, + true); Minecraft.getMinecraft() .getSoundHandler() .playSound(activitySoundLoop); @@ -710,7 +713,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity * @return Sound that will be looped for as long as the machine is doing a recipe */ @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySoundLoop() { + protected SoundResource getActivitySoundLoop() { return null; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java index be11e400fe..47e4b75cad 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEElectricBlastFurnace.java @@ -30,7 +30,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -402,7 +401,7 @@ public class MTEElectricBlastFurnace extends MTEAbstractMultiFurnace @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_MULTI_LATHE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MULTI_LATHE_LOOP; } private int mCasingAmount; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java index 35be525c51..721097d1c4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEOilDrillBase.java @@ -25,7 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.chunk.Chunk; @@ -492,7 +491,7 @@ public abstract class MTEOilDrillBase extends MTEDrillerBase implements IMetrics @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_OIL_DRILL_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_OIL_DRILL_LOOP; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java index df64db0554..0eb43414e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java @@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.util.ForgeDirection; @@ -1113,8 +1112,8 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase { @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_MULTI_VACUUM_FREEZER_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MULTI_VACUUM_FREEZER_LOOP; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java index 4cd654af28..c35511d951 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java @@ -21,7 +21,6 @@ import java.util.concurrent.ThreadLocalRandom; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -326,7 +325,7 @@ public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java index f59554171f..3f61f02cf0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java @@ -25,7 +25,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -559,7 +558,7 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_SIFTER_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_SIFTER_LOOP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java index 75ddb73c46..f9a366d66c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java @@ -13,7 +13,6 @@ import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -188,7 +187,7 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase implements ISurviva @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_ADV_EBF_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_ADV_EBF_LOOP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java index 52338322a3..fa2bc634d8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -408,8 +407,8 @@ public class MTESteamCentrifuge extends MTESteamMultiBase im @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_STEAM_CENTRIFUGE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_STEAM_CENTRIFUGE_LOOP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java index c8b441738b..1ead5a5ce3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -345,8 +344,8 @@ public class MTESteamCompressor extends MTESteamMultiBase im @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.IC2_MACHINES_COMPRESSOR_OP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.IC2_MACHINES_COMPRESSOR_OP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java index 01e719130e..2b06c12ece 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -285,8 +284,8 @@ public class MTESteamForgeHammer extends MTESteamMultiBase @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.RANDOM_ANVIL_USE.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.RANDOM_ANVIL_USE; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java index 0a94a3068e..7f126efd14 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -344,8 +343,8 @@ public class MTESteamMacerator extends MTESteamMultiBase impl @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.IC2_MACHINES_MACERATOR_OP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.IC2_MACHINES_MACERATOR_OP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java index 5ff2600847..44fd98c06d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -405,8 +404,8 @@ public class MTESteamMixer extends MTESteamMultiBase implements I @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_STEAM_CENTRIFUGE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_STEAM_CENTRIFUGE_LOOP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java index 4967ab4ee2..575db34e79 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -441,8 +440,8 @@ public class MTESteamWasher extends MTESteamMultiBase implements @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_STEAM_WASHER_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_STEAM_WASHER_LOOP; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java index ea0a78ccf0..f8a8384bf1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -376,8 +375,8 @@ public class MTESteamWaterPump extends MTESteamMultiBase impl @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_WATER_PUMP_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_WATER_PUMP_LOOP; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index 7f1098b8ac..4c313a3be3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -15,7 +15,6 @@ import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; @@ -139,8 +138,8 @@ public class MTECyclotron extends GTPPMultiBlockBase implements IS @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_FUSION_LOOP; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java index ceeba543e8..05a65afaf2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java @@ -33,7 +33,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; @@ -941,7 +940,7 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase imple @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_ALGAE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_ALGAE_LOOP; } } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index 7d01c51eba..4e90c2634c 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -63,7 +63,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraft.world.WorldProviderHell; @@ -780,8 +779,8 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase 0; setMufflers(active); } else { - soundMagic(getActivitySound()); + doActivitySound(getActivitySoundLoop()); } } -- cgit