diff options
| author | miozune <miozune@gmail.com> | 2024-09-28 20:16:09 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 11:16:09 +0000 |
| commit | 6b1f145f5028f1bc92cf478e5963224e7d94b5cd (patch) | |
| tree | 2227de40c6c806bd59c430e973a07dda8d9f1c1f /src/main/java/goodgenerator | |
| parent | 254a3bc734648c97e136f67d714dcf5a4f8a3df9 (diff) | |
| download | GT5-Unofficial-6b1f145f5028f1bc92cf478e5963224e7d94b5cd.tar.gz GT5-Unofficial-6b1f145f5028f1bc92cf478e5963224e7d94b5cd.tar.bz2 GT5-Unofficial-6b1f145f5028f1bc92cf478e5963224e7d94b5cd.zip | |
Unify machine sound loop to use SoundResource (#3289)
Diffstat (limited to 'src/main/java/goodgenerator')
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java | 5 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java index 7eef5abfe5..cac24ea97c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.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; @@ -534,8 +533,8 @@ public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreci @SideOnly(Side.CLIENT) @Override - protected ResourceLocation getActivitySoundLoop() { - return SoundResource.GT_MACHINES_MULTI_PRECISE_LOOP.resourceLocation; + protected SoundResource getActivitySoundLoop() { + return SoundResource.GT_MACHINES_MULTI_PRECISE_LOOP; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java index d07597418f..72ced183c3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.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.ChunkCoordIntPair; import net.minecraftforge.common.util.ForgeDirection; @@ -358,7 +357,7 @@ public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 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 |