diff --git a/.gitignore b/.gitignore index 183f9f6d7..cd98f146d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,14 @@ output Mekanism*.jar MDK.zip +/run +/gradle +*.bat +*.classpath +*.project +/.settings *.mtl *.blend1 *.blend2 +/bin diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 128b2c79b..37a5cb9af 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -17,7 +17,7 @@ public class MekanismAPI { for(ItemInfo i : cardboardBoxIgnore) { - if(i.block == item && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) + if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) { return false; } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 70b260991..bb1bd6162 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -16,6 +16,7 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.network.PacketTileEntity; @@ -158,7 +159,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 1fe9af3db..8f72f20f5 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; -import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; @@ -13,15 +12,13 @@ import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -132,7 +129,7 @@ public class GuiChemicalInfuser extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis > 114 && xAxis < 132 && yAxis > 13 && yAxis < 21) { @@ -140,7 +137,7 @@ public class GuiChemicalInfuser extends GuiMekanism data.add(1); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 38a29bcc5..cb3249dec 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; -import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; @@ -15,15 +14,13 @@ import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -123,7 +120,7 @@ public class GuiChemicalWasher extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index e7a561256..fef8469ef 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.common.IInvConfiguration; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; @@ -254,19 +254,19 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tile), guiId)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT, Coord4D.get(tile))); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile))); } } @@ -278,7 +278,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65) { - mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button)); } @@ -289,7 +289,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i)); } } @@ -301,7 +301,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i)); } } diff --git a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java index 317cf046f..748f16b1b 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -67,7 +67,7 @@ public class GuiConfigurationTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tileEntity), 9)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index cea3744b7..3ca2f8f5d 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -135,8 +135,8 @@ public class GuiDictionary extends GuiMekanism itemType.stackSize = 1; oreDictNames = MekanismUtils.getOreDictName(itemType); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - + playClickSound(); + return; } } @@ -159,7 +159,7 @@ public class GuiDictionary extends GuiMekanism oreDictNames = new ArrayList(); } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index bc7fca51e..cfecad42e 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -8,7 +8,7 @@ import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.miner.ThreadMinerSearch.State; import mekanism.common.network.PacketDigitalMinerGui; @@ -293,7 +293,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); ArrayList data = new ArrayList(); data.add(0); @@ -303,7 +303,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); ArrayList data = new ArrayList(); data.add(1); @@ -313,7 +313,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); ArrayList data = new ArrayList(); data.add(5); @@ -323,7 +323,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); ArrayList data = new ArrayList(); data.add(9); @@ -371,7 +371,7 @@ public class GuiDigitalMiner extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index c65190902..368d3ba7c 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.miner.MItemStackFilter; import mekanism.common.miner.MMaterialFilter; @@ -172,17 +172,17 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(filter instanceof MItemStackFilter) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i)); } else if(filter instanceof MOreDictFilter) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i)); } else if(filter instanceof MMaterialFilter) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i)); } } @@ -191,25 +191,25 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 4)); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 67 && yAxis <= 78) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); setRadius(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 92 && yAxis <= 103) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); setMinY(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 117 && yAxis <= 128) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); setMaxY(); } diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index f49e15423..ad5b1c765 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -58,7 +58,7 @@ public class GuiElectricChest extends GuiMekanism if(!isBlock) { - mc.sndManager.playSoundFX("random.chestclosed", 1.0F, 1.0F); + mc.theWorld.playSoundEffect(tileEntity.xCoord + 0.5, tileEntity.yCoord + 0.5, tileEntity.zCoord + 0.5, "random.chestopen", 0.5f, mc.theWorld.rand.nextFloat() * 0.1F + 0.9F); } } @@ -119,7 +119,7 @@ public class GuiElectricChest extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); if(isBlock) { diff --git a/src/main/java/mekanism/client/gui/GuiElement.java b/src/main/java/mekanism/client/gui/GuiElement.java index 83b6d6346..52d448245 100644 --- a/src/main/java/mekanism/client/gui/GuiElement.java +++ b/src/main/java/mekanism/client/gui/GuiElement.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.tileentity.TileEntity; @@ -66,6 +67,11 @@ public abstract class GuiElement { return guiObj.getFont(); } + + protected void playClickSound() + { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } public abstract void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight); diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 0f2bc5159..c0c5ace59 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; @@ -107,7 +107,7 @@ public class GuiMFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index b8689fe7d..b3bb98c18 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MItemStackFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -198,7 +198,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } @@ -222,7 +222,7 @@ public class GuiMItemStackFilter extends GuiMekanism filter.itemType = null; } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index b7b0bf500..98c2f76d8 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MMaterialFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -198,7 +198,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } @@ -222,7 +222,7 @@ public class GuiMMaterialFilter extends GuiMekanism filter.materialItem = null; } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 150105e2c..c4a0c6939 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MOreDictFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -262,13 +262,13 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); setOreDictKey(); } } diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 4ee54dac9..07c32e9bb 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -9,13 +9,15 @@ import mekanism.common.IInvConfiguration; import mekanism.common.SideData; import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.TileEntityContainerBlock; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -186,4 +188,9 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper { return fontRendererObj; } + + protected void playClickSound() + { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 5aefa543f..6ac87542d 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -10,7 +10,7 @@ import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityMetallurgicInfuser; @@ -121,7 +121,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index 2e6e96c7d..86e57d7c0 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -1,10 +1,10 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; @@ -121,14 +121,14 @@ public class GuiPasswordEnter extends GuiScreen if(passwordField.getText() == null || passwordField.getText() == "") { displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.fieldsEmpty"); - mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); ticker = 30; } else if(!getPassword().equals(passwordField.getText())) { displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.invalid"); passwordField.setText(""); - mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); ticker = 30; } else { @@ -142,7 +142,7 @@ public class GuiPasswordEnter extends GuiScreen Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, true, false)); } - mc.sndManager.playSoundFX("mekanism:etc.Success", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Success", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 3881d8bf4..3b19b0a15 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.common.IElectricChest; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; diff --git a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java index ee875260b..c8416bcdc 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java @@ -1,18 +1,22 @@ package mekanism.client.gui; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketDigitUpdate; import mekanism.common.network.PacketPortableTeleport; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import sun.net.www.content.text.plain; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -99,25 +103,25 @@ public class GuiPortableTeleporter extends GuiScreen { Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0))); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } else if(xAxis > 62 && xAxis < 76 && yAxis > 44 && yAxis < 58) { Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1))); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } else if(xAxis > 101 && xAxis < 115 && yAxis > 44 && yAxis < 58) { Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2))); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } else if(xAxis > 140 && xAxis < 154 && yAxis > 44 && yAxis < 58) { Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3))); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } } diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index e20691130..7a0a56801 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -3,11 +3,10 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -73,7 +72,7 @@ public class GuiRedstoneControl extends GuiElement RedstoneControl current = control.getControlType(); int ordinalToSet = current.ordinal() < (RedstoneControl.values().length-1) ? current.ordinal()+1 : 0; - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRedstoneControl(Coord4D.get(tileEntity), RedstoneControl.values()[ordinalToSet])); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index e5847f554..095ce2356 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -103,29 +103,29 @@ public class GuiRobitCrafting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, entityId, 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 50450782d..90e0fa340 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -103,29 +103,29 @@ public class GuiRobitInventory extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 6ea31b541..e9a117f9d 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -38,7 +38,7 @@ public class GuiRobitMain extends GuiMekanism private void toggleNameChange() { displayNameChange = !displayNameChange; - confirmName.drawButton = displayNameChange; + confirmName.visible = displayNameChange; nameChangeField.setFocused(displayNameChange); } @@ -71,7 +71,7 @@ public class GuiRobitMain extends GuiMekanism buttonList.clear(); buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, MekanismUtils.localize("gui.confirm"))); - confirmName.drawButton = displayNameChange; + confirmName.visible = displayNameChange; nameChangeField = new GuiTextField(fontRendererObj, guiWidth + 48, guiHeight + 21, 80, 12); nameChangeField.setMaxStringLength(12); @@ -266,51 +266,51 @@ public class GuiRobitMain extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.FOLLOW, robit.getEntityId())); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); toggleNameChange(); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GO_HOME, robit.getEntityId())); mc.displayGuiScreen(null); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.DROP_PICKUP, robit.getEntityId())); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index b17fed838..a278e9743 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -15,7 +14,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -147,31 +145,31 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 70f61ab6e..3651a4918 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -110,29 +110,29 @@ public class GuiRobitSmelting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 494106d8a..2cf08c9b0 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; @@ -11,15 +10,13 @@ import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -157,7 +154,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index d1985941e..10e541328 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerSalinationController; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntitySalinationController; @@ -156,7 +156,7 @@ public class GuiSalinationController extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/GuiSortingTab.java index f00c4b6f3..103bd2c97 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/GuiSortingTab.java @@ -3,12 +3,11 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -71,7 +70,7 @@ public class GuiSortingTab extends GuiElement ArrayList data = new ArrayList(); data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index d0f5dfa93..6a06930e1 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -107,7 +107,7 @@ public class GuiTFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 9c97c3708..12f657e24 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -295,7 +295,7 @@ public class GuiTItemStackFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } @@ -313,12 +313,12 @@ public class GuiTItemStackFilter extends GuiMekanism filter.itemType = null; } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); filter.sizeMode = !filter.sizeMode; } } @@ -330,7 +330,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 9b0c43aec..ce94da0a8 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -3,7 +3,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; @@ -226,7 +226,7 @@ public class GuiTMaterialFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } @@ -250,7 +250,7 @@ public class GuiTMaterialFilter extends GuiMekanism filter.materialItem = null; } - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } @@ -261,7 +261,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 8a0c80f77..97a0f7909 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -6,7 +6,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; @@ -289,13 +289,13 @@ public class GuiTOreDictFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); setOreDictKey(); } } @@ -307,7 +307,7 @@ public class GuiTOreDictFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { - mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + // TODO Not sure how to play custom sounds mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); if(button == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 82b7dd279..2dc155d19 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityTeleporter; @@ -67,7 +67,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitOne = getIncrementedNumber(tileEntity.code.digitOne); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis > 62 && xAxis < 76 && yAxis > 44 && yAxis < 58) { @@ -76,7 +76,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitTwo = getIncrementedNumber(tileEntity.code.digitTwo); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis > 101 && xAxis < 115 && yAxis > 44 && yAxis < 58) { @@ -85,7 +85,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitThree = getIncrementedNumber(tileEntity.code.digitThree); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } else if(xAxis > 140 && xAxis < 154 && yAxis > 44 && yAxis < 58) { @@ -94,7 +94,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitFour = getIncrementedNumber(tileEntity.code.digitFour); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); } } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index eefa6b1bb..02ec378f7 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -2,11 +2,10 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.IUpgradeTile; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketRemoveUpgrade; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -81,13 +80,13 @@ public class GuiUpgradeManagement extends GuiElement { if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)0)); } if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) { - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + playClickSound(); Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)1)); }