From 4a38c5955dfa24785d495e77bbfd86118449c88b Mon Sep 17 00:00:00 2001 From: evgengoldwar <69961523+evgengoldwar@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:13:55 +0300 Subject: New sounds for multi (#3139) Co-authored-by: Martin Robertz Co-authored-by: boubou19 --- .../multis/mega/MTEMegaBlastFurnace.java | 10 ++ .../multis/mega/MTEMegaVacuumFreezer.java | 10 ++ .../blocks/tileEntity/MTEPreciseAssembler.java | 10 ++ .../java/gregtech/api/enums/SoundResource.java | 21 +++ .../machines/multi/MTEElectricBlastFurnace.java | 10 ++ .../machines/multi/MTELargeTurbine.java | 10 ++ .../machines/multi/MTEOilDrillBase.java | 9 ++ .../machines/multi/MTEVacuumFreezer.java | 10 ++ .../multi/processing/MTEIndustrialArcFurnace.java | 14 +- .../processing/MTEIndustrialCuttingMachine.java | 10 ++ .../multi/processing/MTEIndustrialSifter.java | 10 ++ .../processing/MTEIndustrialThermalCentrifuge.java | 10 ++ .../processing/MTEIndustrialVacuumFreezer.java | 10 ++ .../multi/processing/MTEIndustrialWashPlant.java | 10 ++ .../multi/processing/advanced/MTEAdvEBF.java | 10 ++ .../production/MTEQuantumForceTransformer.java | 8 + .../multi/production/algae/MTEAlgaePondBase.java | 9 ++ .../multiblock/MTEExtremeEntityCrusher.java | 8 + .../multiblock/MTEMegaIndustrialApiary.java | 7 + .../metaTileEntity/multi/MTEEyeOfHarmony.java | 8 + .../thing/metaTileEntity/multi/MTEForgeOfGods.java | 8 + src/main/resources/assets/gregtech/sounds.json | 180 +++++++++++++++++++++ .../resources/assets/gregtech/sounds/MTEAdvEBF.ogg | Bin 0 -> 268538 bytes .../assets/gregtech/sounds/MTEAlgaePondBase.ogg | Bin 0 -> 1074942 bytes .../gregtech/sounds/MTEElectricBlastFurnace.ogg | Bin 0 -> 236961 bytes .../gregtech/sounds/MTEExtremeEntityCrusher.ogg | Bin 0 -> 197534 bytes .../assets/gregtech/sounds/MTEEyeOfHarmony.ogg | Bin 0 -> 180071 bytes .../assets/gregtech/sounds/MTEForgeOfGods.ogg | Bin 0 -> 922187 bytes .../gregtech/sounds/MTEIndustrialArcFurnace.ogg | Bin 0 -> 587610 bytes .../sounds/MTEIndustrialCuttingMachine.ogg | Bin 0 -> 507373 bytes .../assets/gregtech/sounds/MTEIndustrialSifter.ogg | Bin 0 -> 1728602 bytes .../sounds/MTEIndustrialThermalCentrifuge.ogg | Bin 0 -> 988224 bytes .../gregtech/sounds/MTEIndustrialVacuumFreezer.ogg | Bin 0 -> 368344 bytes .../gregtech/sounds/MTEIndustrialWashPlant.ogg | Bin 0 -> 1075503 bytes .../assets/gregtech/sounds/MTELargeTurbine.ogg | Bin 0 -> 739943 bytes .../assets/gregtech/sounds/MTEMegaBlastFurnace.ogg | Bin 0 -> 227073 bytes .../gregtech/sounds/MTEMegaIndustrialApiary.ogg | Bin 0 -> 779325 bytes .../gregtech/sounds/MTEMegaVacuumFreezer.ogg | Bin 0 -> 368336 bytes .../assets/gregtech/sounds/MTEOilDrillBase.ogg | Bin 0 -> 369334 bytes .../assets/gregtech/sounds/MTEPreciseAssembler.ogg | Bin 0 -> 415904 bytes .../gregtech/sounds/MTEQuantumForceTransformer.ogg | Bin 0 -> 915773 bytes .../assets/gregtech/sounds/MTEVacuumFreezer.ogg | Bin 0 -> 368430 bytes .../assets/gregtech/sounds/MultiAlgaeFLoop.ogg | Bin 0 -> 1074983 bytes .../gregtech/sounds/MultiArcFurnaceFLoop.ogg | Bin 0 -> 459957 bytes .../gregtech/sounds/MultiCuttingMachineFLoop.ogg | Bin 0 -> 533622 bytes .../sounds/MultiExtremeEntityCrusherFLoop.ogg | Bin 0 -> 430146 bytes .../gregtech/sounds/MultiEyeOfHarmonyFLoop.ogg | Bin 0 -> 337251 bytes .../sounds/MultiMegaIndustrialApiaryFLoop.ogg | Bin 0 -> 390727 bytes .../gregtech/sounds/MultiMegaVacuumFreezerLoop.ogg | Bin 0 -> 351595 bytes .../assets/gregtech/sounds/MultiOreWasherPlant.ogg | Bin 0 -> 1075366 bytes .../assets/gregtech/sounds/MultiPreciseLoop.ogg | Bin 0 -> 411873 bytes .../assets/gregtech/sounds/MultiSifterFLoop.ogg | Bin 0 -> 1628577 bytes .../sounds/MultiThermalCentrifugeFLoop.ogg | Bin 0 -> 763795 bytes .../assets/gregtech/sounds/MultiVacuumFreezer.ogg | Bin 0 -> 368259 bytes 54 files changed, 387 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/gregtech/sounds/MTEAdvEBF.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEAlgaePondBase.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEElectricBlastFurnace.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEExtremeEntityCrusher.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEEyeOfHarmony.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEForgeOfGods.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialArcFurnace.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialCuttingMachine.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialSifter.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialThermalCentrifuge.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialVacuumFreezer.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEIndustrialWashPlant.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTELargeTurbine.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEMegaBlastFurnace.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEMegaIndustrialApiary.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEMegaVacuumFreezer.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEOilDrillBase.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEPreciseAssembler.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEQuantumForceTransformer.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MTEVacuumFreezer.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiAlgaeFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiArcFurnaceFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiCuttingMachineFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiExtremeEntityCrusherFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiEyeOfHarmonyFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiMegaIndustrialApiaryFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiMegaVacuumFreezerLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiOreWasherPlant.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiPreciseLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiSifterFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiThermalCentrifugeFLoop.ogg create mode 100644 src/main/resources/assets/gregtech/sounds/MultiVacuumFreezer.ogg (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 3f5b053b96..12d36dd944 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -36,6 +36,7 @@ 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; @@ -48,10 +49,13 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.API.BorosilicateGlass; import bartworks.common.configs.Configuration; import bartworks.util.BWUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -428,4 +432,10 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase public boolean supportsVoidProtection() { return true; } + + @SideOnly(Side.CLIENT) + @Override + protected ResourceLocation getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MEGA_BLAST_FURNACE_LOOP.resourceLocation; + } } 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 a24f5d4b7e..fdc0a465cf 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -37,6 +37,7 @@ 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; @@ -47,9 +48,12 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.common.configs.Configuration; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -530,4 +534,10 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase { public boolean supportsBatchMode() { return true; } + + @SideOnly(Side.CLIENT) + @Override + protected ResourceLocation getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MULTI_VACUUM_FREEZER_LOOP.resourceLocation; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java index 20802032a0..9c2c9153ea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java @@ -24,6 +24,7 @@ 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; @@ -33,6 +34,8 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; @@ -212,11 +215,6 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase public boolean isOverclockerUpgradable() { return true; } + + @SideOnly(Side.CLIENT) + @Override + protected ResourceLocation getActivitySoundLoop() { + return SoundResource.GT_MACHINES_SIFTER_LOOP.resourceLocation; + } } 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 c212fbadd2..75ddb73c46 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,13 +13,17 @@ 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; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTechAPI; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -181,4 +185,10 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase implements ISurviva public boolean supportsInputSeparation() { return true; } + + @SideOnly(Side.CLIENT) + @Override + protected ResourceLocation getActivitySoundLoop() { + return SoundResource.GT_MACHINES_ADV_EBF_LOOP.resourceLocation; + } } 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 b3f3f2b136..ceeba543e8 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,6 +33,7 @@ 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; @@ -53,6 +54,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -936,4 +938,10 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase imple public boolean getDefaultHasMaintenanceChecks() { return false; } + + @SideOnly(Side.CLIENT) + @Override + protected ResourceLocation getActivitySoundLoop() { + return SoundResource.GT_MACHINES_ALGAE_LOOP.resourceLocation; + } } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index 7268f9f3cd..7d01c51eba 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -63,6 +63,7 @@ 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; @@ -108,6 +109,7 @@ import crazypants.enderio.EnderIO; import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; @@ -776,6 +778,12 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase