From 86b600dfaeb28aef88907d6db16aca43137fdcfb Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 21 Mar 2023 15:20:57 +0100 Subject: Implemented sound for compacts (#149) --- dependencies.gradle | 2 +- .../blocks/tileEntity/base/LargeFusionComputer.java | 9 +++++++++ .../blocks/tileEntity/base/LargeFusionComputerPP.java | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 33e0262c2c..1af6700929 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.03:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.09:dev') compile('com.github.GTNewHorizons:StructureLib:1.1.12:dev') compile("com.github.GTNewHorizons:ModularUI:1.0.31:dev") compile('com.github.GTNewHorizons:bartworks:0.5.131:dev') 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()); } } @@ -555,6 +559,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return false; } + @Override + protected ResourceLocation getActivitySound() { + return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + } + @Override public String[] getInfoData() { String tier = hatchTier() == 6 ? EnumChatFormatting.RED + "I" + 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()); } } @@ -538,6 +542,11 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul return false; } + @Override + protected ResourceLocation getActivitySound() { + return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation; + } + @Override public String[] getInfoData() { String tier = hatchTier() == 9 ? EnumChatFormatting.BLUE + "IV" + EnumChatFormatting.RESET -- cgit