diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index f2b6c976b..ca686de0e 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -1,9 +1,6 @@ package mekanism.client; -import java.io.BufferedReader; -import java.io.InputStreamReader; import java.lang.reflect.Method; -import java.net.URL; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 0a4cfc654..45ccc2e3c 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,7 +1,6 @@ package mekanism.client; import mekanism.common.Mekanism; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 346b30419..9cef0f9fc 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -46,7 +46,6 @@ import mekanism.client.gui.GuiTeleporter; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; -import mekanism.client.render.RenderTickHandler; import mekanism.client.render.block.BasicRenderingHandler; import mekanism.client.render.block.MachineRenderingHandler; import mekanism.client.render.entity.RenderBalloon; @@ -136,7 +135,6 @@ import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index a99774f5e..17cdead6a 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -11,6 +11,7 @@ import mekanism.api.EnumColor; import mekanism.api.IClientTicker; import mekanism.client.sound.GasMaskSound; import mekanism.client.sound.JetpackSound; +import mekanism.client.sound.SoundHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; import mekanism.common.ObfuscatedNames; @@ -271,7 +272,7 @@ public class ClientTickHandler int newChan = item.getChannel(stack) < 9 ? item.getChannel(stack)+1 : 1; item.setChannel(stack, newChan); Mekanism.packetPipeline.sendToServer(new PacketWalkieTalkieState(newChan)); - Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + SoundHandler.playSound("mekanism:etc.Ding"); lastTickUpdate = true; } } @@ -289,7 +290,7 @@ public class ClientTickHandler { ((ItemJetpack)jetpack.getItem()).incrementMode(jetpack); Mekanism.packetPipeline.sendToServer(new PacketJetpackData(JetpackPacket.MODE, null, false)); - Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); + SoundHandler.playSound("mekanism:etc.Hydraulic"); lastTickUpdate = true; } } @@ -307,7 +308,7 @@ public class ClientTickHandler { ((ItemScubaTank)scubaTank.getItem()).toggleFlowing(scubaTank); Mekanism.packetPipeline.sendToServer(new PacketScubaTankData(ScubaTankPacket.MODE, null, false)); - Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); + SoundHandler.playSound("mekanism:etc.Hydraulic"); lastTickUpdate = true; } } diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index aff7e8419..21982ac33 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -5,7 +5,6 @@ import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey; import net.minecraft.client.Minecraft; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index c27476d35..2b4d451f1 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,7 +1,5 @@ package mekanism.client; -import java.util.EnumSet; - import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 3105f9522..28498a75a 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -6,8 +6,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 238e4b9a1..1827173e5 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -6,7 +6,6 @@ import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; 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; diff --git a/src/main/java/mekanism/client/gui/GuiBucketIO.java b/src/main/java/mekanism/client/gui/GuiBucketIO.java index eb603e56a..d7c5f8d5f 100644 --- a/src/main/java/mekanism/client/gui/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/GuiBucketIO.java @@ -2,7 +2,6 @@ package mekanism.client.gui; 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; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index d512f3310..eaad381aa 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; @@ -15,9 +14,8 @@ 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.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -26,7 +24,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -159,7 +156,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 8f72f20f5..a56004a3b 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -12,6 +12,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.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.network.PacketTileEntity; @@ -129,7 +130,7 @@ public class GuiChemicalInfuser extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis > 114 && xAxis < 132 && yAxis > 13 && yAxis < 21) { @@ -137,7 +138,7 @@ public class GuiChemicalInfuser extends GuiMekanism data.add(1); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index 10fb709cc..c97b1b496 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiChemicalInjectionChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index a84834c51..c3654e3b7 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -14,6 +14,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.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.network.PacketTileEntity; @@ -120,7 +121,7 @@ public class GuiChemicalWasher extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index 9811a280a..a5d002b28 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCombiner extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index ca3c5629b..d649e6c59 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -6,6 +6,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.IInvConfiguration; import mekanism.common.Mekanism; import mekanism.common.SideData; @@ -254,19 +255,19 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) { int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tile), guiId)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile), 0, 0)); } } @@ -278,7 +279,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button, 0)); } @@ -289,7 +290,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i)); } } @@ -301,7 +302,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); 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 748f16b1b..18dbcdc80 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui; @@ -67,7 +68,7 @@ public class GuiConfigurationTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tileEntity), 9)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index 8e76abd5e..0bc1d0493 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCrusher extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 3ca2f8f5d..9b541c799 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; +import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -135,7 +136,7 @@ public class GuiDictionary extends GuiMekanism itemType.stackSize = 1; oreDictNames = MekanismUtils.getOreDictName(itemType); - playClickSound(); + SoundHandler.playSound("gui.button.press"); return; } @@ -159,7 +160,7 @@ public class GuiDictionary extends GuiMekanism oreDictNames = new ArrayList(); } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index e1ec24ac8..08ca49baf 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -8,6 +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.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.miner.ThreadMinerSearch.State; @@ -293,7 +294,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); ArrayList data = new ArrayList(); data.add(0); @@ -303,7 +304,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); ArrayList data = new ArrayList(); data.add(1); @@ -313,7 +314,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); ArrayList data = new ArrayList(); data.add(5); @@ -323,7 +324,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); ArrayList data = new ArrayList(); data.add(9); @@ -371,7 +372,7 @@ public class GuiDigitalMiner extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 33f10d95c..3ca29dae3 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.miner.MItemStackFilter; @@ -172,17 +173,17 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(filter instanceof MItemStackFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i, 0)); } else if(filter instanceof MOreDictFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i, 0)); } else if(filter instanceof MMaterialFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i, 0)); } } @@ -191,25 +192,25 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 4, 0, 0)); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 67 && yAxis <= 78) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); setRadius(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 92 && yAxis <= 103) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); setMinY(); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 117 && yAxis <= 128) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); setMaxY(); } @@ -219,7 +220,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(10); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 8f1b77880..1ba3fa81f 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -1,11 +1,11 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; +import mekanism.client.sound.SoundHandler; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; @@ -13,7 +13,6 @@ import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -119,7 +118,7 @@ public class GuiElectricChest extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); if(isBlock) { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index ef21dab11..c9df4e452 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -5,14 +5,11 @@ import java.util.List; import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; 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.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 3be00de47..021da7f27 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -3,14 +3,12 @@ package mekanism.client.gui; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 86dcddc14..6a75b3ddc 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -13,8 +13,8 @@ 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.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -99,7 +99,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism data.add((byte)0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { @@ -107,7 +107,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism data.add((byte)1); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/client/gui/GuiElement.java b/src/main/java/mekanism/client/gui/GuiElement.java index 52d448245..f76b06aa9 100644 --- a/src/main/java/mekanism/client/gui/GuiElement.java +++ b/src/main/java/mekanism/client/gui/GuiElement.java @@ -5,10 +5,8 @@ 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; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -67,11 +65,6 @@ 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/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index c00fa7711..9bf2e749e 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiEnergizedSmelter extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java index 80f4d3078..96d629411 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java @@ -3,8 +3,6 @@ package mekanism.client.gui; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; - -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java index 174c99407..ce5177f4e 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java @@ -4,7 +4,6 @@ import java.util.List; 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; diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 75d287290..ebf4105a9 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiEnrichmentChamber extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/GuiFluidGauge.java index b40abc324..be7441765 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/GuiFluidGauge.java @@ -1,8 +1,6 @@ package mekanism.client.gui; import mekanism.common.util.MekanismUtils; - -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/client/gui/GuiGasGauge.java b/src/main/java/mekanism/client/gui/GuiGasGauge.java index de36f8ff1..c0cbe05ff 100644 --- a/src/main/java/mekanism/client/gui/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGasGauge.java @@ -2,8 +2,6 @@ package mekanism.client.gui; import mekanism.api.gas.GasTank; import mekanism.common.util.MekanismUtils; - -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index c0d826c9a..d0574a8cb 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity; @@ -82,7 +83,7 @@ public class GuiGasTank extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiGauge.java b/src/main/java/mekanism/client/gui/GuiGauge.java index 61bce6a7d..293c8c0a6 100644 --- a/src/main/java/mekanism/client/gui/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGauge.java @@ -3,12 +3,8 @@ package mekanism.client.gui; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; public abstract class GuiGauge extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 164135d16..3fe9439cc 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; @@ -161,17 +162,17 @@ public class GuiLogisticalSorter extends GuiMekanism if(filter instanceof TItemStackFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i, 0)); } else if(filter instanceof TOreDictFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i, 0)); } else if(filter instanceof TMaterialFilter) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i, 0)); } } @@ -184,7 +185,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(1); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) @@ -193,7 +194,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(2); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } @@ -209,7 +210,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(button); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); + SoundHandler.playSound("mekanism:etc.Ding"); } } diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 244909eb2..8e4702211 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui; @@ -107,7 +108,7 @@ public class GuiMFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index b717c1058..4f4f571ff 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MItemStackFilter; @@ -198,7 +199,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } @@ -222,7 +223,7 @@ public class GuiMItemStackFilter extends GuiMekanism filter.itemType = null; } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 664652c53..ee1a5a961 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MMaterialFilter; @@ -198,7 +199,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } @@ -222,7 +223,7 @@ public class GuiMMaterialFilter extends GuiMekanism filter.materialItem = null; } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 2505737c1..bac4c0829 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MOreDictFilter; @@ -262,13 +263,13 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); setOreDictKey(); } } diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 424d170aa..f159b84ea 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -9,15 +9,12 @@ 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; @@ -188,9 +185,4 @@ 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 b2a9a69ac..1cd9a6d98 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -10,6 +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.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity; @@ -121,7 +122,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index bbe3e853e..33c90ca31 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiOsmiumCompressor extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 71d48563e..3e8e8a36c 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -11,9 +11,9 @@ import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; public class GuiPRC extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java index 560a858ab..e20f9871e 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java @@ -1,18 +1,16 @@ package mekanism.client.gui; +import mekanism.client.sound.SoundHandler; 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; @@ -102,25 +100,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))); - Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + SoundHandler.playSound("gui.button.press"); } 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))); - Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + SoundHandler.playSound("gui.button.press"); } 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))); - Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + SoundHandler.playSound("gui.button.press"); } 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))); - Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/client/gui/GuiProgress.java b/src/main/java/mekanism/client/gui/GuiProgress.java index c26e73bab..2f90c4ea7 100644 --- a/src/main/java/mekanism/client/gui/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/GuiProgress.java @@ -1,10 +1,7 @@ package mekanism.client.gui; -import mekanism.common.tile.TileEntityElectricBlock; 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; diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index 4944e5e5c..06585c5e3 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPurificationChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiRecipeType.java b/src/main/java/mekanism/client/gui/GuiRecipeType.java index 9092bc418..e5461eb4b 100644 --- a/src/main/java/mekanism/client/gui/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/GuiRecipeType.java @@ -3,8 +3,6 @@ package mekanism.client.gui; 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; public class GuiRecipeType extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index 7a0a56801..4fcff47dc 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.Mekanism; @@ -72,7 +73,7 @@ public class GuiRedstoneControl extends GuiElement RedstoneControl current = control.getControlType(); int ordinalToSet = current.ordinal() < (RedstoneControl.values().length-1) ? current.ordinal()+1 : 0; - playClickSound(); + SoundHandler.playSound("gui.button.press"); 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 837001d7c..97a1fc98d 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -1,7 +1,7 @@ package mekanism.client.gui; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -103,29 +103,29 @@ public class GuiRobitCrafting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, entityId, null)); 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 c41bb6934..87ab925ca 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -1,7 +1,7 @@ package mekanism.client.gui; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit; @@ -103,29 +103,29 @@ public class GuiRobitInventory extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId(), null)); 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 575f24455..797ff7a39 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -1,7 +1,7 @@ package mekanism.client.gui; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit; @@ -266,51 +266,51 @@ public class GuiRobitMain extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.FOLLOW, robit.getEntityId(), 0, null)); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); toggleNameChange(); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GO_HOME, robit.getEntityId(), 0, null)); mc.displayGuiScreen(null); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.DROP_PICKUP, robit.getEntityId(), 0, null)); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 140d56610..b2bc311ca 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import java.util.List; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit; @@ -147,31 +148,31 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index b6df585ea..8e1d8359b 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -1,7 +1,7 @@ package mekanism.client.gui; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit; @@ -110,29 +110,29 @@ public class GuiRobitSmelting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId(), null)); 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 b4bc4ca01..121b1d3d4 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -10,6 +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.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity; @@ -154,7 +155,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 10e541328..926c10ec3 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerSalinationController; import mekanism.common.network.PacketTileEntity; @@ -156,7 +157,7 @@ public class GuiSalinationController extends GuiMekanism data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSlot.java b/src/main/java/mekanism/client/gui/GuiSlot.java index 21beeca66..053212757 100644 --- a/src/main/java/mekanism/client/gui/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/GuiSlot.java @@ -2,8 +2,6 @@ package mekanism.client.gui; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; public class GuiSlot extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/GuiSortingTab.java index 103bd2c97..d63f7cfca 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/GuiSortingTab.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityFactory; @@ -70,7 +71,7 @@ public class GuiSortingTab extends GuiElement ArrayList data = new ArrayList(); data.add(0); Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 05bc06306..98f1f00de 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; @@ -107,7 +108,7 @@ public class GuiTFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 166396726..220d777fd 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; @@ -295,7 +296,7 @@ public class GuiTItemStackFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } @@ -313,12 +314,12 @@ public class GuiTItemStackFilter extends GuiMekanism filter.itemType = null; } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); filter.sizeMode = !filter.sizeMode; } } diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 0d3a9c747..9aa67d089 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; @@ -226,7 +227,7 @@ public class GuiTMaterialFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } @@ -250,7 +251,7 @@ public class GuiTMaterialFilter extends GuiMekanism filter.materialItem = null; } - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index e33ed6766..dadc42dd5 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; @@ -289,13 +290,13 @@ public class GuiTOreDictFilter extends GuiMekanism { if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0, 0, 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); setOreDictKey(); } } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index cc4388021..2d398a402 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.network.PacketTileEntity; @@ -67,7 +68,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitOne = getIncrementedNumber(tileEntity.code.digitOne); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis > 62 && xAxis < 76 && yAxis > 44 && yAxis < 58) { @@ -76,7 +77,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitTwo = getIncrementedNumber(tileEntity.code.digitTwo); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis > 101 && xAxis < 115 && yAxis > 44 && yAxis < 58) { @@ -85,7 +86,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitThree = getIncrementedNumber(tileEntity.code.digitThree); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } else if(xAxis > 140 && xAxis < 154 && yAxis > 44 && yAxis < 58) { @@ -94,7 +95,7 @@ public class GuiTeleporter extends GuiMekanism Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitFour = getIncrementedNumber(tileEntity.code.digitFour); - playClickSound(); + SoundHandler.playSound("gui.button.press"); } } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 02ec378f7..5d97331fc 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.network.PacketRemoveUpgrade; @@ -80,13 +81,13 @@ public class GuiUpgradeManagement extends GuiElement { if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)0)); } if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) { - playClickSound(); + SoundHandler.playSound("gui.button.press"); Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)1)); } diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 34cde2b37..55083bec4 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -1,11 +1,10 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; + +import org.lwjgl.opengl.GL11; public class ModelArmoredJetpack extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index 567c9d3f4..c312595f5 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -1,11 +1,10 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; + +import org.lwjgl.opengl.GL11; public class ModelAtomicDisassembler extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index 610729801..dab4fb017 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,10 +1,11 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.api.EnumColor; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelBoxSelectiveFace.java b/src/main/java/mekanism/client/model/ModelBoxSelectiveFace.java index f36ee01d8..d760acf8b 100644 --- a/src/main/java/mekanism/client/model/ModelBoxSelectiveFace.java +++ b/src/main/java/mekanism/client/model/ModelBoxSelectiveFace.java @@ -1,10 +1,10 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.PositionTextureVertex; import net.minecraft.client.model.TexturedQuad; import net.minecraft.client.renderer.Tessellator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelBoxSelectiveFace diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 9e449fd2e..fe998d34a 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -1,10 +1,9 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index b941e47ef..9519791fd 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,10 +1,11 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 36470106e..434e29a32 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -3,7 +3,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 8310cd79d..0c442b82a 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -2,7 +2,6 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 5eb466223..ab6a84ec3 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -1,9 +1,9 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectrolyticSeparator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index aa7c9b343..bccffea10 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,10 +1,10 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelFreeRunners.java b/src/main/java/mekanism/client/model/ModelFreeRunners.java index 4fff69ecc..ad59b4883 100644 --- a/src/main/java/mekanism/client/model/ModelFreeRunners.java +++ b/src/main/java/mekanism/client/model/ModelFreeRunners.java @@ -2,7 +2,6 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelFreeRunners extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index 3ba2dd4fc..595b1c2a9 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -1,10 +1,9 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index 59d332279..fc065cd10 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,11 +1,10 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLogisticalSorter extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index 058015dda..496ec04a4 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -1,9 +1,9 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelMetallurgicInfuser extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelObsidianTNT.java b/src/main/java/mekanism/client/model/ModelObsidianTNT.java index a244091f9..574c63811 100644 --- a/src/main/java/mekanism/client/model/ModelObsidianTNT.java +++ b/src/main/java/mekanism/client/model/ModelObsidianTNT.java @@ -1,10 +1,9 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelObsidianTNT extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java b/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java index 95ad8325e..fb20ac4eb 100644 --- a/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java +++ b/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java @@ -1,8 +1,5 @@ package mekanism.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -15,6 +12,9 @@ import net.minecraft.client.renderer.Tessellator; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelRendererSelectiveFace { diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 69cb9dd11..6796e0798 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,13 +1,14 @@ package mekanism.client.model; +import mekanism.client.render.MekanismRenderer; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.client.render.MekanismRenderer; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index 731a1c152..78a3d0c86 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -1,63 +1,22 @@ package mekanism.client.render; -import java.util.HashMap; import java.util.Map; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.client.model.ModelTransporterBox; -import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.item.ItemConfigurator; -import mekanism.common.multipart.PartDiversionTransporter; import mekanism.common.multipart.PartGlowPanel; -import mekanism.common.multipart.PartLogisticalTransporter; -import mekanism.common.multipart.PartMechanicalPipe; -import mekanism.common.multipart.PartPressurizedTube; -import mekanism.common.multipart.PartSidedPipe; -import mekanism.common.multipart.PartSidedPipe.ConnectionType; -import mekanism.common.multipart.PartTransmitter; -import mekanism.common.multipart.PartUniversalCable; -import mekanism.common.multipart.TransmitterType; -import mekanism.common.multipart.TransmitterType.Size; -import mekanism.common.transporter.TransporterStack; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.common.util.TransporterUtils; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import org.lwjgl.opengl.GL11; - import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; -import codechicken.lib.lighting.LightMatrix; import codechicken.lib.lighting.LightModel; -import codechicken.lib.lighting.LightModel.Light; import codechicken.lib.render.CCModel; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.ColourMultiplier; import codechicken.lib.render.TextureUtils; import codechicken.lib.render.TextureUtils.IIconSelfRegister; -import codechicken.lib.render.uv.UV; import codechicken.lib.render.uv.IconTransformation; -import codechicken.lib.vec.Rotation; -import codechicken.lib.vec.Transformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index e172c1a00..586537b8b 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -1,6 +1,5 @@ package mekanism.client.render; -import java.util.EnumSet; import java.util.HashSet; import java.util.Random; import java.util.Set; diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 5140ef515..51a4e5ce5 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,7 +1,6 @@ package mekanism.client.render.entity; import mekanism.client.model.ModelObsidianTNT; -import mekanism.common.Mekanism; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -9,7 +8,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.src.FMLRenderAccessLibrary; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 05a1bd62f..96c439baf 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -1,9 +1,5 @@ package mekanism.client.render.tileentity; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; @@ -11,6 +7,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 21f4c7ab0..0c08cb083 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -1,9 +1,5 @@ package mekanism.client.render.tileentity; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; @@ -11,6 +7,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectricPump extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 3e6a1464e..79b1885ba 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -1,7 +1,5 @@ package mekanism.client.render.tileentity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; @@ -11,6 +9,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index b595bf439..2ca6467e3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -8,7 +8,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index faad61772..f1a96863e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -1,13 +1,14 @@ package mekanism.client.render.tileentity; -import org.lwjgl.opengl.GL11; - import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 142194b1b..4c302bf33 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -18,9 +18,11 @@ import mekanism.client.HolidayManager; import mekanism.client.MekanismClient; import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundCategory; import net.minecraft.client.gui.GuiOptions; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkEvent; @@ -322,6 +324,11 @@ public class SoundHandler { return Minecraft.getMinecraft().sndManager.sndSystem; } + + public static void playSound(String sound) + { + Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation(sound), 1.0F)); + } @SubscribeEvent public void onChunkUnload(ChunkEvent.Unload event) diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index f755c131d..075606878 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ChatComponentText; public class CommandMekanism extends CommandBase { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 41c9623ea..1a2e742bf 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -80,7 +80,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.FMLInjectionData; -import cpw.mods.fml.relauncher.Side; /** * Common proxy for the Mekanism mod. diff --git a/src/main/java/mekanism/common/ConnectedTextureRenderer.java b/src/main/java/mekanism/common/ConnectedTextureRenderer.java index 19c56e3c8..d8e930feb 100644 --- a/src/main/java/mekanism/common/ConnectedTextureRenderer.java +++ b/src/main/java/mekanism/common/ConnectedTextureRenderer.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.Map; import mekanism.api.Coord4D; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index b83b228d6..85138a5c2 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -18,15 +18,15 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerEmitter; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; public class EnergyNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 5331d4c7b..c2265a3ea 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -15,13 +15,13 @@ import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; public class FluidNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d7dcf83b1..a1d12c5eb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -89,33 +89,10 @@ import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.MultipartMekanism; -import mekanism.common.network.PacketBoxBlacklist; -import mekanism.common.network.PacketConfigSync; -import mekanism.common.network.PacketConfigurationUpdate; -import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketDataRequest; -import mekanism.common.network.PacketDigitUpdate; -import mekanism.common.network.PacketDigitalMinerGui; -import mekanism.common.network.PacketEditFilter; -import mekanism.common.network.PacketElectricBowState; -import mekanism.common.network.PacketElectricChest; -import mekanism.common.network.PacketJetpackData; -import mekanism.common.network.PacketKey; -import mekanism.common.network.PacketLogisticalSorterGui; -import mekanism.common.network.PacketNewFilter; import mekanism.common.network.PacketPipeline; -import mekanism.common.network.PacketPortableTeleport; -import mekanism.common.network.PacketPortalFX; -import mekanism.common.network.PacketRedstoneControl; -import mekanism.common.network.PacketRemoveUpgrade; -import mekanism.common.network.PacketRobit; -import mekanism.common.network.PacketScubaTankData; -import mekanism.common.network.PacketSimpleGui; -import mekanism.common.network.PacketStatusUpdate; -import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.PacketType; -import mekanism.common.network.PacketWalkieTalkieState; import mekanism.common.recipe.BinRecipe; import mekanism.common.recipe.MekanismRecipe; import mekanism.common.recipe.RecipeHandler; @@ -132,7 +109,6 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -141,9 +117,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.common.config.Configuration; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -155,11 +130,10 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import codechicken.multipart.handler.MultipartProxy; - -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -170,6 +144,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index ceb225d20..bf4e6f25f 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 398a698be..3fd1c50e7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -11,7 +11,6 @@ import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity; import mekanism.common.tank.TankUpdateProtocol; diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index e11cdb620..d6a997221 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -11,7 +11,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index f3bfcdc30..0492ccce5 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -1,14 +1,9 @@ package mekanism.common.block; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.tile.IEnergyTile; - import java.util.List; import java.util.Random; import mekanism.api.energy.IEnergizedItem; -import mekanism.api.transmitters.IGridTransmitter; -import mekanism.client.ClientProxy; import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.ItemAttacher; @@ -16,10 +11,8 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEnergyCube; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -37,7 +30,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.MinecraftForge; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 16d95649d..2374701a9 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -7,9 +7,7 @@ import mekanism.common.ISustainedInventory; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityGasTank; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 4905767d3..94aa395c4 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -19,7 +19,6 @@ import mekanism.common.ISustainedTank; import mekanism.common.IUpgradeManagement; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 392863003..fe37074a0 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -10,7 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 208b0a6b4..43893b7bf 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -1,11 +1,9 @@ package mekanism.common.block; -import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,12 +11,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index b0cdb565b..8179736a8 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -1,7 +1,6 @@ package mekanism.common.block; import mekanism.common.Mekanism; - import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 94805cac7..0a1300d4f 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -12,16 +12,10 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 077f88e50..6fe422cee 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -10,6 +10,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; +import mekanism.client.sound.SoundHandler; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; import mekanism.common.RobitAIFollow; @@ -266,7 +267,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine onItemPickup(item, item.getEntityItem().stackSize); item.setDead(); - playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + SoundHandler.playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); break; } @@ -285,7 +286,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine item.setDead(); } - playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + SoundHandler.playSound("random.pop", 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); break; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 835f636ce..1db193a7e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -7,7 +7,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index e923438fd..1b6c362e2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 96196b22d..82e7c4c9a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -1,15 +1,13 @@ package mekanism.common.inventory.container; -import mekanism.common.inventory.slot.SlotElectricChest; -import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index 989fe3529..664a0c0d6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -1,8 +1,8 @@ package mekanism.common.inventory.container; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectricMachine; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index c3bb19df5..f47acc965 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -1,7 +1,7 @@ package mekanism.common.inventory.container; -import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index ae1a74fa2..35a35cc07 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -1,12 +1,12 @@ package mekanism.common.inventory.container; -import mekanism.common.Tier; import mekanism.common.IFactory.RecipeType; +import mekanism.common.Tier; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityFactory; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index c0abc1b95..3e15e8425 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -2,9 +2,9 @@ package mekanism.common.inventory.container; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfusionInput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index 3306be0dc..caa26ffc9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -7,7 +7,6 @@ import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java index 07db5e61b..3bc87aa20 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java @@ -1,6 +1,5 @@ package mekanism.common.inventory.container; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntitySalinationController; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 8dee7af3b..4e3b7f696 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -20,10 +20,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event.Result; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.UseHoeEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; public class ItemAtomicDisassembler extends ItemEnergized { diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index da63c7195..6bbc9c23c 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -7,12 +7,10 @@ import mekanism.api.EnumColor; import mekanism.api.Pos3D; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index e123d38f8..80b117dcb 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -18,8 +18,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 5d3eb309d..1816b3390 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,7 +1,6 @@ package mekanism.common.item; import mekanism.api.EnumColor; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index b3e2df897..1c3851c4b 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -9,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index a1db438d6..0708e9797 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import cofh.api.energy.IEnergyContainerItem; public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 38ea0b955..f21728d03 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -5,7 +5,6 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; -import cofh.api.energy.IEnergyContainerItem; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.client.render.ModelCustomArmor; @@ -24,11 +23,11 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index b11658756..d024bfb52 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -10,10 +10,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 5badc57f0..068e42271 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index be03b30f7..264490e20 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -22,8 +22,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 337d7b205..3e976ebfd 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index bb23c83d8..135d7ade5 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -4,7 +4,6 @@ import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 5e502a5d6..fe87cadb9 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -2,8 +2,8 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.common.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index ec0e0b04e..c7bea1f3a 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -9,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemWalkieTalkie extends ItemMekanism { diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 182ea73d9..03399514f 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -4,15 +4,12 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 16784ae0f..aebcd1394 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -1,7 +1,6 @@ package mekanism.common.multipart; import mekanism.common.Tier; - import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 206b4fc99..ddc09b908 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -7,7 +7,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; import mekanism.common.FluidNetwork; import mekanism.common.Tier; -import mekanism.common.Tier.PipeTier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index c7baa7c8a..c9298e2f2 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -5,12 +5,9 @@ import java.util.Set; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTransmission; -import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; -import mekanism.common.EnergyNetwork; -import mekanism.common.FluidNetwork; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index db4708ae8..b36443242 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -1,6 +1,5 @@ package mekanism.common.multipart; -import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import java.util.List; @@ -16,14 +15,12 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index 5d2675da5..05c458e17 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -1,7 +1,6 @@ package mekanism.common.multipart; import mekanism.api.transmitters.TransmissionType; - import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/network/MekanismPacket.java b/src/main/java/mekanism/common/network/MekanismPacket.java index 59570fb81..87c97080b 100644 --- a/src/main/java/mekanism/common/network/MekanismPacket.java +++ b/src/main/java/mekanism/common/network/MekanismPacket.java @@ -1,12 +1,8 @@ package mekanism.common.network; -import java.io.DataOutputStream; - -import com.google.common.io.ByteArrayDataInput; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; /** * AbstractPacket class. Should be the parent of all packets wishing to use the diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 07607fb40..2d5743a5c 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -2,16 +2,10 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; - -import java.io.DataOutputStream; - import mekanism.api.ItemInfo; import mekanism.api.MekanismAPI; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; public class PacketBoxBlacklist extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 7d87efaa7..4b18c2149 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -1,15 +1,10 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.common.IModule; import mekanism.common.Mekanism; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketConfigSync extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 7ce94e68e..c3821f8a6 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -3,7 +3,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import java.io.DataOutputStream; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -16,11 +15,8 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.io.ByteArrayDataInput; - public class PacketConfigurationUpdate extends MekanismPacket { public Coord4D coord4D; diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 09f89e017..1b94a7b56 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -1,6 +1,8 @@ package mekanism.common.network; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -12,11 +14,6 @@ import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.FMLCommonHandler; public class PacketDataRequest extends MekanismPacket diff --git a/src/main/java/mekanism/common/network/PacketDigitUpdate.java b/src/main/java/mekanism/common/network/PacketDigitUpdate.java index 353a7cf6f..c4a76b89f 100644 --- a/src/main/java/mekanism/common/network/PacketDigitUpdate.java +++ b/src/main/java/mekanism/common/network/PacketDigitUpdate.java @@ -1,15 +1,10 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.common.item.ItemPortableTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketDigitUpdate extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index e47d8bcb1..069e8b498 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -1,6 +1,8 @@ package mekanism.common.network; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -21,11 +23,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 838ef02d4..3bbe31d01 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -14,9 +14,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; public class PacketElectricChest extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 8a336bc21..a26d311b7 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -2,9 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; - -import java.io.DataOutputStream; - import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 6f00697fb..50d93506c 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -1,7 +1,7 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.Coord4D; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTFilterSelect; @@ -18,11 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 4888957ae..bdc80eec5 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -1,6 +1,8 @@ package mekanism.common.network; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,11 +15,6 @@ import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.FMLCommonHandler; public class PacketNewFilter extends MekanismPacket diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleport.java b/src/main/java/mekanism/common/network/PacketPortableTeleport.java index 411406130..3c123e6eb 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleport.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleport.java @@ -1,5 +1,7 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.ObfuscatedNames; @@ -12,11 +14,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; public class PacketPortableTeleport extends MekanismPacket diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index 1f1fdd8ea..4aa537f1b 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -1,15 +1,12 @@ package mekanism.common.network; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.util.Random; import mekanism.api.Coord4D; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketPortalFX extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 53c25adc7..8492bd535 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -1,17 +1,12 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketRedstoneControl extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 366bfd8ea..ac548c8ec 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -1,7 +1,7 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.Coord4D; import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; @@ -9,11 +9,6 @@ import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketRemoveUpgrade extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index d62401f5e..a03717cdb 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -6,9 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; public class PacketRobit extends MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index 1d0f997eb..82fe155ca 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -2,9 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; - -import java.io.DataOutputStream; - import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 56d7a463d..c83734801 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -1,8 +1,7 @@ package mekanism.common.network; -import java.io.DataOutputStream; - -import mekanism.api.Coord4D; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasRegistry; @@ -12,17 +11,10 @@ import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.google.common.io.ByteArrayDataInput; - -import cpw.mods.fml.common.FMLCommonHandler; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - public class PacketTransmitterUpdate extends MekanismPacket { public PacketType packetType; diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index 8ce84b425..f214cba5a 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -1,15 +1,10 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.common.item.ItemWalkieTalkie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketWalkieTalkieState extends MekanismPacket { diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index fb9ba7cd2..54b680714 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,7 +4,6 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index e594c4dda..b125a231e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -19,8 +19,8 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; -import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IPowerReceptor, IEnergyTile, IStrictEnergyStorage, IEnergyHandler, IPeripheral, IFilterAccess diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 3a9df20f5..1f000ffc4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -14,8 +14,8 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.peripheral.IComputerAccess; public abstract class TileEntityChanceMachine extends TileEntityBasicMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index db0f49e23..71fb44afa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -1,14 +1,11 @@ package mekanism.common.tile; -import java.util.EnumSet; import java.util.Map; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; public class TileEntityCrusher extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index c20907ea0..a30909c3f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -10,11 +10,9 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.peripheral.IComputerAccess; public abstract class TileEntityElectricMachine extends TileEntityBasicMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index b4308ea5a..6dbf5ef93 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -7,7 +7,6 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index c343185fb..5e56d04ad 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -6,7 +6,6 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; -import net.minecraft.util.ResourceLocation; public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 73d39a150..6f1596a94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -10,7 +10,6 @@ import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachine diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 41d21d0de..ba3a62eab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -9,8 +9,6 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.util.ResourceLocation; - public class TileEntityPrecisionSawmill extends TileEntityChanceMachine { public TileEntityPrecisionSawmill() diff --git a/src/main/java/mekanism/common/transporter/TransporterManager.java b/src/main/java/mekanism/common/transporter/TransporterManager.java index 58b8be92e..c8ef81345 100644 --- a/src/main/java/mekanism/common/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/transporter/TransporterManager.java @@ -5,8 +5,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.EnumColor; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.common.IInvConfiguration; import mekanism.common.tile.TileEntityBin; import mekanism.common.transporter.TransporterStack.Path; diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 368f91b2a..c337b5ff8 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -5,7 +5,6 @@ import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import java.util.ArrayList; -import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 1cfdd3f7d..03eba1279 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -46,7 +46,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -70,7 +69,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import cpw.mods.fml.server.FMLServerHandler; /** * Utilities used by Mekanism. All miscellaneous methods are located here. diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index cf6c17476..54ccbdb66 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -1,21 +1,27 @@ package mekanism.generators.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.client.model.*; +import mekanism.generators.client.model.ModelAdvancedSolarGenerator; +import mekanism.generators.client.model.ModelBioGenerator; +import mekanism.generators.client.model.ModelHeatGenerator; +import mekanism.generators.client.model.ModelHydrogenGenerator; +import mekanism.generators.client.model.ModelSolarGenerator; +import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 1283134c1..1f3aebc49 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,17 +1,31 @@ package mekanism.generators.client; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mekanism.generators.client.gui.*; -import mekanism.generators.client.render.*; +import mekanism.generators.client.gui.GuiBioGenerator; +import mekanism.generators.client.gui.GuiHeatGenerator; +import mekanism.generators.client.gui.GuiHydrogenGenerator; +import mekanism.generators.client.gui.GuiSolarGenerator; +import mekanism.generators.client.gui.GuiWindTurbine; +import mekanism.generators.client.render.RenderAdvancedSolarGenerator; +import mekanism.generators.client.render.RenderBioGenerator; +import mekanism.generators.client.render.RenderHeatGenerator; +import mekanism.generators.client.render.RenderHydrogenGenerator; +import mekanism.generators.client.render.RenderSolarGenerator; +import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; -import mekanism.generators.common.tile.*; +import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GeneratorsClientProxy extends GeneratorsCommonProxy diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index 3e12dee15..a2264d7dd 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -3,13 +3,10 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.ListUtils; -import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.GuiPowerBar; @@ -23,8 +20,8 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; - import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index 107882f0c..d1d9515d7 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelAdvancedSolarGenerator extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 52091620e..245bab043 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -1,10 +1,9 @@ package mekanism.generators.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase diff --git a/src/main/java/mekanism/generators/client/model/ModelHydrogenGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHydrogenGenerator.java index 23db6d443..d86258609 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHydrogenGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHydrogenGenerator.java @@ -2,7 +2,6 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index a45c61326..3cbd40ff2 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -2,7 +2,6 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelSolarGenerator extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java b/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java index a621e4f23..0d3990918 100644 --- a/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java +++ b/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java @@ -2,7 +2,6 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class ModelWindTurbine extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 28de487d9..6b3e9a9e6 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -10,11 +10,9 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; -import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 88f394289..7d5ea70f0 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -1,13 +1,22 @@ package mekanism.generators.common; -import cpw.mods.fml.common.registry.GameRegistry; import mekanism.common.Mekanism; -import mekanism.generators.common.inventory.container.*; -import mekanism.generators.common.tile.*; +import mekanism.generators.common.inventory.container.ContainerBioGenerator; +import mekanism.generators.common.inventory.container.ContainerHeatGenerator; +import mekanism.generators.common.inventory.container.ContainerHydrogenGenerator; +import mekanism.generators.common.inventory.container.ContainerSolarGenerator; +import mekanism.generators.common.inventory.container.ContainerWindTurbine; +import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; /** * Common proxy for the Mekanism Generators module. diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 1bcdfc88d..43805f45a 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -1,16 +1,27 @@ package mekanism.generators.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Random; + import mekanism.api.energy.IEnergizedItem; -import mekanism.common.*; +import mekanism.common.IActiveState; +import mekanism.common.IBoundingBlock; +import mekanism.common.ISpecialBounds; +import mekanism.common.ISustainedInventory; +import mekanism.common.ISustainedTank; +import mekanism.common.ItemAttacher; +import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.*; +import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -27,9 +38,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; -import java.util.Random; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple generator block IDs. diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 9a8ae97cf..024f3589b 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -1,10 +1,10 @@ package mekanism.generators.common.item; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; + +import java.util.List; + import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.common.ISustainedInventory; @@ -16,7 +16,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -29,7 +28,9 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.input.Keyboard; -import java.util.List; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Item class for handling multiple generator block IDs. diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index fef4ad35d..a90def698 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -6,8 +6,8 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; -import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityWindTurbine extends TileEntityGenerator implements IBoundingBlock { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 685e33e5e..f90885fb5 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -10,7 +10,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java index b8dabc968..49bfa92e9 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java @@ -3,7 +3,6 @@ package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; public class ItemMekanismAxe extends ItemMekanismTool diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 38775868d..3e63be61d 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -7,12 +7,11 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event.Result; import net.minecraftforge.event.entity.player.UseHoeEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java index 0bae1d207..1e3ed45ad 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java @@ -3,7 +3,6 @@ package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; public class ItemMekanismPickaxe extends ItemMekanismTool diff --git a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java index 2b3f895e7..f8c43b91b 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismShovel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismShovel.java @@ -2,7 +2,6 @@ package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; public class ItemMekanismShovel extends ItemMekanismTool diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index dadb32037..845f8bb88 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; diff --git a/src/main/resources/assets/mekanism/sounds.json b/src/main/resources/assets/mekanism/sounds.json index 37737cc26..9c9964136 100644 --- a/src/main/resources/assets/mekanism/sounds.json +++ b/src/main/resources/assets/mekanism/sounds.json @@ -1,10 +1,10 @@ { - "Beep": {"category": "master","sounds": [{"name": "Beep","stream": false}]}, - "Click": {"category": "master","sounds": [{"name": "Click","stream": false}]}, - "Ding": {"category": "master","sounds": [{"name": "Ding","stream": false}]}, - "Error": {"category": "master","sounds": [{"name": "Error","stream": false}]}, - "GasMask": {"category": "master","sounds": [{"name": "GasMask","stream": false}]}, - "Hydraulic": {"category": "master","sounds": [{"name": "Hydraulic","stream": false}]}, - "Pop": {"category": "master","sounds": [{"name": "Pop","stream": false}]}, - "Success": {"category": "master","sounds": [{"name": "Success","stream": false}]} + "etc.Beep": {"category": "master","sounds": [{"name": "etc/Beep","stream": false}]}, + "etc.Click": {"category": "master","sounds": [{"name": "etc/Click","stream": false}]}, + "etc.Ding": {"category": "master","sounds": [{"name": "etc/Ding","stream": false}]}, + "etc.Error": {"category": "master","sounds": [{"name": "etc/Error","stream": false}]}, + "etc.GasMask": {"category": "master","sounds": [{"name": "etc/GasMask","stream": false}]}, + "etc.Hydraulic": {"category": "master","sounds": [{"name": "etc/Hydraulic","stream": false}]}, + "etc.Pop": {"category": "master","sounds": [{"name": "etc/Pop","stream": false}]}, + "etc.Success": {"category": "master","sounds": [{"name": "etc/Success","stream": false}]} } \ No newline at end of file