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.

Sign up for GitHub

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

Jump to bottom

Fix crash following refactor #78

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fix crash following refactor #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.111:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.35:dev')
api('com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.94-GTNH:dev')
api('com.github.GTNewHorizons:GTNHLib:0.5.11:dev')
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.62:dev") {transitive = false}
api('com.github.GTNewHorizons:GTNHLib:0.5.13:dev')
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.71:dev") {transitive = false}
}
15 changes: 3 additions & 12 deletions ...java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/TileEntitySpaceElevator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.World;
Expand Down Expand Up @@ -54,10 +53,9 @@
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 galaxyspace.core.register.GSBlocks;
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;
Expand All @@ -75,7 +73,6 @@
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
import micdoodle8.mods.galacticraft.core.util.WorldUtil;
import tectech.thing.gui.TecTechUITextures;
import tectech.thing.metaTileEntity.multi.MTEEnergyInfuser;
import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase;
import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture;

Expand Down Expand Up @@ -643,15 +640,9 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
}
}

/**
* Get the sound for when the machine is active
*
* @return Location of the sound
*/
@Override
@SideOnly(Side.CLIENT)
protected ResourceLocation getActivitySound() {
return MTEEnergyInfuser.activitySound;
protected SoundResource getActivitySoundLoop() {
return SoundResource.TECTECH_MACHINES_FX_WHOOUM;
}

// endregion
Expand Down