Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed Aether music issues

Browse source 
Basically Minecraft music was overlapping Aether music and that's fixed
now.
This commit is contained in:
Kino 2017-11-27 22:46:38 -05:00
parent 2d4c695a32
commit b0945ccd17
6 changed files with 7 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
View file

@ -12,6 +12,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.legacy.aether.client.audio.music.AetherMusicTicker;
import com.legacy.aether.common.AetherConfig;
import com.legacy.aether.common.registry.sounds.SoundsAether;
public class AetherMusicHandler
@ -47,11 +48,14 @@ public class AetherMusicHandler
if (category == SoundCategory.MUSIC)
{
if (!sound.getSoundLocation().toString().contains("aether_legacy") && this.musicTicker.playingMusic())
if (this.mc.thePlayer != null && this.mc.thePlayer.dimension == AetherConfig.getAetherDimensionID())
{
event.setResultSound(null);
if (!sound.getSoundLocation().toString().contains("aether_legacy") && (this.musicTicker.playingMusic() || !this.musicTicker.playingMusic()))
{
event.setResultSound(null);
return;
return;
}
}
}
else if (category == SoundCategory.RECORDS)

20
src/main/java/com/legacy/aether/common/entities/particles/EntityBlueFX.java
View file

@ -1,20 +0,0 @@
package com.legacy.aether.common.entities.particles;
import net.minecraft.client.particle.ParticlePortal;
import net.minecraft.world.World;
public class EntityBlueFX extends ParticlePortal
{
public EntityBlueFX(World world, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed)
{
super(world, xCoord, yCoord, zCoord, xSpeed, ySpeed, zSpeed);
float f = this.rand.nextFloat() * 0.6F + 0.4F;
this.particleRed = this.particleGreen = this.particleBlue = 1.0F * f;
this.particleRed *= 0.2F;
this.particleGreen *= 0.2F;
}
}

18
src/main/java/com/legacy/aether/common/entities/particles/EntityCrystalFX.java
View file

@ -1,18 +0,0 @@
package com.legacy.aether.common.entities.particles;
import net.minecraft.client.particle.ParticlePortal;
import net.minecraft.world.World;
public class EntityCrystalFX extends ParticlePortal
{
public EntityCrystalFX(World world, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed)
{
super(world, xCoord, yCoord, zCoord, xSpeed, ySpeed, zSpeed);
this.particleBlue = 0.7450980392156863F;
this.particleRed = 0.0F;
this.particleGreen = 0.6450980392156863F;
}
}

18
src/main/java/com/legacy/aether/common/entities/particles/EntityGoldenFX.java
View file

@ -1,18 +0,0 @@
package com.legacy.aether.common.entities.particles;
import net.minecraft.client.particle.ParticlePortal;
import net.minecraft.world.World;
public class EntityGoldenFX extends ParticlePortal
{
public EntityGoldenFX(World world, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed)
{
super(world, xCoord, yCoord, zCoord, xSpeed, ySpeed, zSpeed);
this.particleBlue = 0.0F;
this.particleRed = 0.976F;
this.particleGreen = 0.7450980392156863F;
}
}

18
src/main/java/com/legacy/aether/common/entities/particles/EntityHolidayFX.java
View file

@ -1,18 +0,0 @@
package com.legacy.aether.common.entities.particles;
import net.minecraft.client.particle.ParticlePortal;
import net.minecraft.world.World;
public class EntityHolidayFX extends ParticlePortal
{
public EntityHolidayFX(World world, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed)
{
super(world, xCoord, yCoord, zCoord, xSpeed, ySpeed, zSpeed);
this.particleRed = 1F;
this.particleGreen = 1F;
this.particleBlue = 1F;
}
}

36
src/main/java/com/legacy/aether/common/registry/objects/AetherAchievement.java
View file

@ -1,36 +0,0 @@
package com.legacy.aether.common.registry.objects;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextFormatting;
public class AetherAchievement extends Achievement
{
public AetherAchievement(String name, String desc, int length, int width, ItemStack stack, Achievement parentAchievement)
{
super(name, desc, length, width, stack, parentAchievement);
}
public AetherAchievement(String name, String desc, int length, int width, Item item, Achievement parentAchievement)
{
this(name, desc, length, width, new ItemStack(item), parentAchievement);
}
public AetherAchievement(String name, String desc, int length, int width, Block block, Achievement parentAchievement)
{
this(name, desc, length, width, new ItemStack(block), parentAchievement);
}
@Override
public ITextComponent getStatName()
{
ITextComponent ichatcomponent = super.getStatName();
ichatcomponent.getStyle().setColor(TextFormatting.AQUA);
return ichatcomponent;
}
}