Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 'origin/background-music' and fix conflicts

Browse source
This commit is contained in:
Runemoro 2018-01-18 22:42:07 -05:00
commit 7011b7d751
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -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 = ""

12
src/main/java/org/dimdev/dimdoors/shared/world/limbo/WorldProviderLimbo.java
View file

@ -1,7 +1,9 @@
package org.dimdev.dimdoors.shared.world.limbo;
import net.minecraft.client.audio.MusicTicker;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
@ -9,16 +11,20 @@ import net.minecraft.world.DimensionType;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.biome.BiomeProviderSingle;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.dimdev.ddutils.Location;
import org.dimdev.ddutils.render.CloudRenderBlank;
import org.dimdev.dimdoors.DimDoors;
import org.dimdev.dimdoors.shared.blocks.ModBlocks;
import org.dimdev.dimdoors.shared.sound.ModSounds;
import org.dimdev.dimdoors.shared.world.ModBiomes;
import org.dimdev.dimdoors.shared.world.ModDimensions;
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() {
@ -114,4 +120,10 @@ public class WorldProviderLimbo extends WorldProvider {
public boolean doesXZShowFog(int x, int z) {
return true;
}
@Override
@SideOnly(Side.CLIENT)
public MusicTicker.MusicType getMusicType() {
return music;
}
}