mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Fixed HolidayManager
This commit is contained in:
1 parent
faf63dfebc
commit
99fc98faf5
5 files changed
+53
-32
No files matched your search
@@ -7,10 +7,10 @@ import java.util.List;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.MekanismConfig.client;
|
||||
import mekanism.common.Mekanism;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public final class HolidayManager
|
||||
{
|
||||
@@ -50,7 +50,7 @@ public final class HolidayManager
|
||||
} catch(Exception e) {}
|
||||
}
|
||||
|
||||
public static String filterSound(String sound)
|
||||
public static ResourceLocation filterSound(ResourceLocation sound)
|
||||
{
|
||||
if(!client.holidays)
|
||||
{
|
||||
@@ -83,7 +83,7 @@ public final class HolidayManager
|
||||
|
||||
public abstract void onEvent(EntityPlayer player);
|
||||
|
||||
public String filterSound(String sound)
|
||||
public ResourceLocation filterSound(ResourceLocation sound)
|
||||
{
|
||||
return sound;
|
||||
}
|
||||
@@ -91,12 +91,12 @@ public final class HolidayManager
|
||||
|
||||
private static class Christmas extends Holiday
|
||||
{
|
||||
private String[] nutcracker = new String[] {"holiday/Nutcracker1.ogg", "holiday/Nutcracker2.ogg", "holiday/Nutcracker3.ogg", "holiday/Nutcracker4.ogg", "holiday/Nutcracker5.ogg"};
|
||||
private String[] nutcracker = new String[] {"christmas.1", "christmas.2", "christmas.3", "christmas.4", "christmas.5"};
|
||||
|
||||
@Override
|
||||
public YearlyDate getDate()
|
||||
{
|
||||
return new YearlyDate(12, 25);
|
||||
return new YearlyDate(1, 8);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -113,27 +113,27 @@ public final class HolidayManager
|
||||
}
|
||||
|
||||
@Override
|
||||
public String filterSound(String sound)
|
||||
public ResourceLocation filterSound(ResourceLocation sound)
|
||||
{
|
||||
if(sound.equals("Chamber.ogg"))
|
||||
if(sound.toString().contains("machine.enrichment"))
|
||||
{
|
||||
return nutcracker[0];
|
||||
return new ResourceLocation(sound.toString().replace("machine.enrichment", nutcracker[0]));
|
||||
}
|
||||
else if(sound.equals("MetallurgicInfuser.ogg"))
|
||||
else if(sound.equals("machine.metalinfuser"))
|
||||
{
|
||||
return nutcracker[1];
|
||||
return new ResourceLocation(sound.toString().replace("machine.metalinfuser", nutcracker[1]));
|
||||
}
|
||||
else if(sound.equals("PurificationChamber.ogg"))
|
||||
else if(sound.equals("machine.purification"))
|
||||
{
|
||||
return nutcracker[2];
|
||||
return new ResourceLocation(sound.toString().replace("machine.purification", nutcracker[2]));
|
||||
}
|
||||
else if(sound.equals("Smelter.ogg"))
|
||||
else if(sound.equals("machine.smelter"))
|
||||
{
|
||||
return nutcracker[3];
|
||||
return new ResourceLocation(sound.toString().replace("machine.smelter", nutcracker[3]));
|
||||
}
|
||||
else if(sound.equals("HeatGenerator.ogg"))
|
||||
else if(sound.equals("machine.dissolution"))
|
||||
{
|
||||
return nutcracker[4];
|
||||
return new ResourceLocation(sound.toString().replace("machine.dissolution", nutcracker[4]));
|
||||
}
|
||||
|
||||
return sound;
|
||||
|
||||
@@ -6,8 +6,8 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TileSound extends Sound implements IResettableSound {
|
||||
|
||||
public class TileSound extends Sound implements IResettableSound
|
||||
{
|
||||
IHasSound source;
|
||||
|
||||
boolean beginFadeOut;
|
||||
|
||||
@@ -1,20 +1,38 @@
|
||||
package mekanism.common.tile;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.MekanismConfig.usage;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.api.gas.*;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.api.gas.GasTank;
|
||||
import mekanism.api.gas.GasTransmission;
|
||||
import mekanism.api.gas.IGasHandler;
|
||||
import mekanism.api.gas.IGasItem;
|
||||
import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.util.StackUtils;
|
||||
import mekanism.common.*;
|
||||
import mekanism.client.HolidayManager;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.SideData;
|
||||
import mekanism.common.Tier.FactoryTier;
|
||||
import mekanism.common.base.*;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.IEjector;
|
||||
import mekanism.common.base.IFactory.RecipeType;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.base.SoundWrapper;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
@@ -31,10 +49,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection
|
||||
{
|
||||
@@ -896,7 +912,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
|
||||
for(RecipeType type : RecipeType.values())
|
||||
{
|
||||
sounds[type.ordinal()] = new SoundWrapper(this, this, type.getSound());
|
||||
sounds[type.ordinal()] = new SoundWrapper(this, this, HolidayManager.filterSound(type.getSound()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,8 @@ package mekanism.common.tile;
|
||||
|
||||
import mekanism.api.MekanismConfig.client;
|
||||
import mekanism.api.Pos3D;
|
||||
import mekanism.client.HolidayManager;
|
||||
import mekanism.client.sound.ISoundSource;
|
||||
import mekanism.client.sound.SoundHandler;
|
||||
import mekanism.client.sound.TileSound;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IHasSound;
|
||||
import mekanism.common.base.SoundWrapper;
|
||||
@@ -31,8 +30,8 @@ public abstract class TileEntityNoisyElectricBlock extends TileEntityElectricBlo
|
||||
public TileEntityNoisyElectricBlock(String soundPath, String name, double maxEnergy)
|
||||
{
|
||||
super(name, maxEnergy);
|
||||
|
||||
soundURL = new ResourceLocation("mekanism", "tile." + soundPath);
|
||||
|
||||
soundURL = HolidayManager.filterSound(new ResourceLocation("mekanism", "tile." + soundPath));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user