Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New sounds for multi #3139

Merged
merged 31 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bdcb3ed
Add sound for Mega Vacuum Freezer
evgengoldwar Sep 9, 2024
b689b45
Add sound for Ore Washer Plant
evgengoldwar Sep 9, 2024
a9dd040
Add sound for Precise
evgengoldwar Sep 9, 2024
5d17459
Add sound for Vacuum Freezer
evgengoldwar Sep 9, 2024
3178266
Add sound for ExtremeEntityCrusher
evgengoldwar Sep 9, 2024
6c9e340
Add sound for Cutting Machine
evgengoldwar Sep 9, 2024
42e59c4
Add sound for Arc Furnace
evgengoldwar Sep 9, 2024
97d600a
Add sound for Mega Industrial Apiary
evgengoldwar Sep 9, 2024
ef465bd
Add sound for Algae
evgengoldwar Sep 9, 2024
fd64f6c
Add sound for Thermal Centrifuge
evgengoldwar Sep 9, 2024
76418c2
Add sound for Sifter
evgengoldwar Sep 9, 2024
12d87c8
Add sound for Eye Of Harmony
evgengoldwar Sep 9, 2024
1f94b86
Add sounds
evgengoldwar Sep 9, 2024
5974d2d
Merge branch 'master' into AddedNewSoundForMulti
Dream-Master Sep 9, 2024
96dee89
Apply Spotless
evgengoldwar Sep 9, 2024
956113f
Merge branch 'master' into AddedNewSoundForMulti
Dream-Master Sep 10, 2024
3dbfeb4
Merge branch 'master' into AddedNewSoundForMulti
Dream-Master Sep 10, 2024
1bee72a
Added new sounds and rename old
evgengoldwar Sep 21, 2024
3c1dbc4
Add sound for Volcanus
evgengoldwar Sep 21, 2024
8e98d6f
Add sound for EBF
evgengoldwar Sep 21, 2024
3ef2f87
Add sound for Forge of Gods
evgengoldwar Sep 21, 2024
b19dda5
Add sound for Cryogenic Freezer
evgengoldwar Sep 21, 2024
3bf7ffd
Add sound for Large Turbine
evgengoldwar Sep 21, 2024
e355c35
Add sound for MEGA EBF
evgengoldwar Sep 21, 2024
554c52f
Add sound for Oil rig
evgengoldwar Sep 21, 2024
859a235
Add sound for QFT
evgengoldwar Sep 21, 2024
8857a0f
Apply spotless
evgengoldwar Sep 21, 2024
6f3ad73
Fix sound arc furnace
evgengoldwar Sep 21, 2024
7c84d6c
Merge branch 'master' into AddedNewSoundForMulti
boubou19 Sep 22, 2024
106e580
Apply spotless
evgengoldwar Sep 22, 2024
a928442
Merge branch 'master' into AddedNewSoundForMulti
Dream-Master Sep 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
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;
Expand All @@ -48,10 +49,13 @@
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;
Expand Down Expand Up @@ -428,4 +432,10 @@ public boolean supportsBatchMode() {
public boolean supportsVoidProtection() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_MEGA_BLAST_FURNACE_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
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;
Expand All @@ -47,9 +48,12 @@
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;
Expand Down Expand Up @@ -530,4 +534,10 @@ public boolean supportsBatchMode() {
public boolean supportsVoidProtection() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_MULTI_MEGA_VACUUM_FREEZER_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand All @@ -41,13 +42,16 @@
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import goodgenerator.api.recipe.GoodGeneratorRecipeMaps;
import goodgenerator.client.GUI.GGUITextures;
import goodgenerator.loader.Loaders;
import goodgenerator.util.DescTextLocalization;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GTUITextures;
import gregtech.api.interfaces.IIconContainer;
Expand Down Expand Up @@ -528,4 +532,10 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
+ EnumChatFormatting.RESET);
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_MULTI_PRECISE_LOOP.resourceLocation;
}

}
21 changes: 21 additions & 0 deletions src/main/java/gregtech/api/enums/SoundResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,27 @@ public enum SoundResource {
GT_SPRAYCAN_LOCK(244, GregTech.ID, "items.spraycan_lock"),
GT_SPRAYCAN_UNLOCK(245, GregTech.ID, "items.spraycan_unlock"),

GT_MACHINES_MULTI_PRECISE_LOOP(244, GregTech.ID, "machines.MTEPreciseAssembler"),
GT_MACHINES_MULTI_ORE_WASHER_PLANT_LOOP(245, GregTech.ID, "machines.MTEIndustrialWashPlant"),
GT_MACHINES_MULTI_MEGA_VACUUM_FREEZER_LOOP(246, GregTech.ID, "machines.MTEMegaVacuumFreezer"),
GT_MACHINES_MULTI_VACUUM_FREEZER_LOOP(247, GregTech.ID, "machines.MTEVacuumFreezer"),
GT_MACHINES_EXTREME_ENTITY_CRUSHER_LOOP(248, GregTech.ID, "machines.MTEExtremeEntityCrusher"),
GT_MACHINES_CUTTING_MACHINE_LOOP(249, GregTech.ID, "machines.MTEIndustrialCuttingMachine"),
GT_MACHINES_ARC_FURNACE_LOOP(250, GregTech.ID, "machines.MTEIndustrialArcFurnace"),
GT_MACHINES_MEGA_INDUSTRIAL_APIARY_LOOP(251, GregTech.ID, "machines.MTEMegaIndustrialApiary"),
GT_MACHINES_ALGAE_LOOP(252, GregTech.ID, "machines.MTEAlgaePondBase"),
GT_MACHINES_THERMAL_CENTRIFUGE_LOOP(253, GregTech.ID, "machines.MTEIndustrialThermalCentrifuge"),
GT_MACHINES_SIFTER_LOOP(254, GregTech.ID, "machines.MTEIndustrialSifter"),
GT_MACHINES_EYE_OF_HARMONY_LOOP(255, GregTech.ID, "machines.MTEEyeOfHarmony"),
GT_MACHINES_EBF_LOOP(256, GregTech.ID, "machines.MTEElectricBlastFurnace"),
GT_MACHINES_ADV_FREEZER_LOOP(257, GregTech.ID, "machines.MTEIndustrialVacuumFreezer"),
GT_MACHINES_GOD_FORGE_LOOP(258, GregTech.ID, "machines.MTEForgeOfGods"),
GT_MACHINES_MEGA_BLAST_FURNACE_LOOP(259, GregTech.ID, "machines.MTEMegaBlastFurnace"),
GT_MACHINES_OIL_DRILL_LOOP(260, GregTech.ID, "machines.MTEOilDrillBase"),
GT_MACHINES_QUANTUM_FORCE_TRANSFORMER_LOOP(261, GregTech.ID, "machines.MTEQuantumForceTransformer"),
GT_MACHINES_ADV_EBF_LOOP(262, GregTech.ID, "machines.MTEAdvEBF"),
GT_MACHINES_LARGE_TURBINES_LOOP(263, GregTech.ID, "machines.MTELargeTurbine"),

GUI_BUTTON_DOWN(-1, GregTech.ID, "gui.buttonDown"),
GUI_BUTTON_UP(-1, GregTech.ID, "gui.buttonUp"),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
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;
Expand All @@ -39,10 +40,13 @@
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.GTMod;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.Materials;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.fluid.IFluidStore;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -395,4 +399,10 @@ public boolean supportsInputSeparation() {
public boolean supportsBatchMode() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_EBF_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
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.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
Expand All @@ -41,7 +42,10 @@
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.Dyes;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.MetaGeneratedTool;
Expand Down Expand Up @@ -472,4 +476,10 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
if (mMachine) return -1;
return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 2, 2, 1, elementBudget, env, false, true);
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_LARGE_TURBINES_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
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;
Expand All @@ -43,6 +44,8 @@
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.ITexture;
Expand Down Expand Up @@ -486,4 +489,10 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve
public boolean supportsVoidProtection() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_OIL_DRILL_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@
import java.util.List;

import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;

import com.google.common.collect.ImmutableList;
import com.gtnewhorizon.structurelib.structure.IStructureElement;
import com.gtnewhorizon.structurelib.structure.StructureUtility;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -159,4 +163,10 @@ public boolean supportsVoidProtection() {
public boolean supportsBatchMode() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_MULTI_VACUUM_FREEZER_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand All @@ -33,6 +34,8 @@
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;
Expand Down Expand Up @@ -212,11 +215,6 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
return false;
}

@Override
protected SoundResource getProcessStartSound() {
return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP;
}

@Override
protected IIconContainer getActiveOverlay() {
return TexturesGtBlock.oMCDIndustrialArcFurnaceActive;
Expand Down Expand Up @@ -357,4 +355,10 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
+ StatCollector.translateToLocal("GT5U.GTPP_MULTI_ARC_FURNACE.mode." + (tag.getBoolean("mode") ? 1 : 0))
+ EnumChatFormatting.RESET);
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_ARC_FURNACE_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand All @@ -33,6 +34,9 @@
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.gui.modularui.GTUITextures;
import gregtech.api.interfaces.IIconContainer;
Expand Down Expand Up @@ -267,4 +271,10 @@ public void getWailaBody(ItemStack itemStack, List<String> currentTip, IWailaDat
+ StatCollector.translateToLocal("GT5U.GTPP_MULTI_CUTTING_MACHINE.mode." + tag.getInteger("mode"))
+ EnumChatFormatting.RESET);
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_CUTTING_MACHINE_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@
import java.util.Random;

import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.ForgeDirection;

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.enums.SoundResource;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -206,4 +210,10 @@ public boolean explodesOnComponentBreak(final ItemStack aStack) {
public boolean isOverclockerUpgradable() {
return true;
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_SIFTER_LOOP.resourceLocation;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@

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;
Expand Down Expand Up @@ -181,4 +185,10 @@ public byte getCasingMeta() {
public byte getCasingTextureIndex() {
return (byte) TAE.GTPP_INDEX(16);
}

@SideOnly(Side.CLIENT)
@Override
protected ResourceLocation getActivitySoundLoop() {
return SoundResource.GT_MACHINES_THERMAL_CENTRIFUGE_LOOP.resourceLocation;
}
}
Loading