From f8daf5f68ce3db15a198ab7d472b5a544d6a8cbe Mon Sep 17 00:00:00 2001 From: Waterpicker <Waterpickerenternity@gmail.com> Date: Thu, 18 Jan 2018 19:26:08 -0600 Subject: [PATCH 1/2] Updated to to 2598 forge for per dimension music types. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ea1b0f08..f7c07f1d 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { String baseversion = "3.0.0" // Set beta to 0 after changing this int beta = 4 // Set this to 0 for a non-beta release ext.mcversion = "1.12.2" -ext.forgeversion = "14.23.1.2589" +ext.forgeversion = "14.23.1.2598" String mcpversion = "snapshot_20180113" String suffix = "" From 61487a14ab2cc4d9faaab41271f899100021fc79 Mon Sep 17 00:00:00 2001 From: Waterpicker <Waterpickerenternity@gmail.com> Date: Thu, 18 Jan 2018 21:23:01 -0600 Subject: [PATCH 2/2] Looping Background Music in Limbo works --- .../world/limbodimension/WorldProviderLimbo.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java b/src/main/java/org/dimdev/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java index 8a448f0f..ec301d81 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java +++ b/src/main/java/org/dimdev/dimdoors/shared/world/limbodimension/WorldProviderLimbo.java @@ -1,10 +1,15 @@ package org.dimdev.dimdoors.shared.world.limbodimension; +import net.minecraft.client.audio.MusicTicker; +import net.minecraft.util.SoundEvent; +import net.minecraftforge.client.EnumHelperClient; +import net.minecraftforge.common.util.EnumHelper; import org.dimdev.dimdoors.DimDoors; import org.dimdev.ddutils.render.CloudRenderBlank; import org.dimdev.dimdoors.shared.blocks.BlockFabric; import org.dimdev.dimdoors.shared.blocks.ModBlocks; import org.dimdev.ddutils.Location; +import org.dimdev.dimdoors.shared.sound.ModSounds; import org.dimdev.dimdoors.shared.world.ModDimensions; import org.dimdev.dimdoors.shared.world.ModBiomes; import net.minecraft.entity.Entity; @@ -20,6 +25,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class WorldProviderLimbo extends WorldProvider { + @SideOnly(Side.CLIENT) + public static final MusicTicker.MusicType music = EnumHelper.addEnum(MusicTicker.MusicType.class, "limbo", new Class[] { SoundEvent.class, int.class, int.class }, ModSounds.CREEPY, 0,0); @Override public void init() { @@ -115,4 +122,12 @@ public class WorldProviderLimbo extends WorldProvider { public boolean doesXZShowFog(int x, int z) { return true; } + + @Override + @SideOnly(Side.CLIENT) + public MusicTicker.MusicType getMusicType() { + System.out.println("Derp " + (music != null) + ); + return music; + } }