diff options
author | Maxim <maxim235@gmx.de> | 2023-03-21 15:20:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-21 15:20:57 +0100 |
commit | 86b600dfaeb28aef88907d6db16aca43137fdcfb (patch) | |
tree | 6c89d5b7820a6e9a96e8f35ef845dd9aaedb1dd9 /src/main/java/goodgenerator/blocks/tileEntity/base | |
parent | cf1811a94826e81410b6d130fad40baed22ad3c1 (diff) | |
download | GT5-Unofficial-86b600dfaeb28aef88907d6db16aca43137fdcfb.tar.gz GT5-Unofficial-86b600dfaeb28aef88907d6db16aca43137fdcfb.tar.bz2 GT5-Unofficial-86b600dfaeb28aef88907d6db16aca43137fdcfb.zip |
Implemented sound for compacts (#149)
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity/base')
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 9 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index b9b5369166..8316d051f2 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; 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; @@ -31,6 +32,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -332,6 +334,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti aBaseMetaTileEntity .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); + } else { + soundMagic(getActivitySound()); } } @@ -556,6 +560,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } @Override + protected ResourceLocation getActivitySound() { + return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + } + + @Override public String[] getInfoData() { String tier = hatchTier() == 6 ? EnumChatFormatting.RED + "I" + EnumChatFormatting.RESET : hatchTier() == 7 ? EnumChatFormatting.YELLOW + "II" + EnumChatFormatting.RESET diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index 6e8ced640b..e004d19816 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; 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; @@ -31,6 +32,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -331,6 +333,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul aBaseMetaTileEntity .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); + } else { + soundMagic(getActivitySound()); } } @@ -539,6 +543,11 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul } @Override + protected ResourceLocation getActivitySound() { + return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + } + + @Override public String[] getInfoData() { String tier = hatchTier() == 9 ? EnumChatFormatting.BLUE + "IV" + EnumChatFormatting.RESET : EnumChatFormatting.GOLD + "V" + EnumChatFormatting.RESET; |