From 9b8d9d92d641901f07e6879010e434ab67d38b2a Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 14 Jan 2016 19:22:48 +0000 Subject: [PATCH] Start update to 1.8.9 Fix all references to cpw.mods.fml namespace --- build.gradle | 14 ++----- build.properties | 6 +-- .../java/buildcraft/api/core/EnumColor.java | 4 +- .../buildcraft/api/core/IIconProvider.java | 4 +- .../buildcraft/api/core/package-info.java | 2 +- .../buildcraft/api/fuels/package-info.java | 2 +- src/api/java/buildcraft/api/package-info.java | 2 +- .../buildcraft/api/tools/package-info.java | 2 +- .../java/cofh/api/energy/package-info.java | 2 +- src/api/java/cofh/api/item/package-info.java | 2 +- src/api/java/cofh/api/package-info.java | 2 +- .../api/filesystem/package-info.java | 2 +- .../computercraft/api/lua/package-info.java | 2 +- .../computercraft/api/media/package-info.java | 2 +- .../computercraft/api/package-info.java | 2 +- .../api/peripheral/package-info.java | 2 +- .../api/redstone/package-info.java | 2 +- .../api/turtle/package-info.java | 2 +- src/api/java/ic2/api/crops/CropCard.java | 8 ++-- src/api/java/ic2/api/crops/Crops.java | 4 +- src/api/java/ic2/api/crops/package-info.java | 2 +- .../ic2/api/energy/event/package-info.java | 2 +- src/api/java/ic2/api/energy/package-info.java | 2 +- .../java/ic2/api/energy/prefab/BasicSink.java | 2 +- .../ic2/api/energy/prefab/BasicSource.java | 2 +- .../ic2/api/energy/prefab/package-info.java | 2 +- .../ic2/api/energy/tile/package-info.java | 2 +- .../java/ic2/api/event/ExplosionEvent.java | 2 +- src/api/java/ic2/api/event/LaserEvent.java | 2 +- src/api/java/ic2/api/event/PaintEvent.java | 2 +- .../java/ic2/api/event/RetextureEvent.java | 2 +- src/api/java/ic2/api/event/package-info.java | 2 +- src/api/java/ic2/api/info/Info.java | 4 +- src/api/java/ic2/api/info/package-info.java | 2 +- src/api/java/ic2/api/item/ILatheItem.java | 4 +- src/api/java/ic2/api/item/package-info.java | 2 +- .../java/ic2/api/network/package-info.java | 2 +- src/api/java/ic2/api/package-info.java | 2 +- .../java/ic2/api/reactor/package-info.java | 2 +- src/api/java/ic2/api/recipe/package-info.java | 2 +- src/api/java/ic2/api/tile/package-info.java | 2 +- src/api/java/ic2/api/util/package-info.java | 2 +- src/api/java/invtweaks/api/InvTweaksAPI.java | 2 +- src/api/java/li/cil/oc/api/IMC.java | 2 +- .../li/cil/oc/api/component/TextBuffer.java | 4 +- .../li/cil/oc/api/component/package-info.java | 2 +- .../oc/api/driver/item/UpgradeRenderer.java | 4 +- .../cil/oc/api/driver/item/package-info.java | 2 +- .../li/cil/oc/api/driver/package-info.java | 2 +- .../oc/api/event/FileSystemAccessEvent.java | 4 +- .../li/cil/oc/api/event/GeolyzerEvent.java | 4 +- .../oc/api/event/RobotAttackEntityEvent.java | 2 +- .../oc/api/event/RobotBreakBlockEvent.java | 2 +- .../java/li/cil/oc/api/event/RobotEvent.java | 2 +- .../li/cil/oc/api/event/RobotMoveEvent.java | 2 +- .../oc/api/event/RobotPlaceBlockEvent.java | 2 +- .../li/cil/oc/api/event/RobotRenderEvent.java | 2 +- .../li/cil/oc/api/event/package-info.java | 2 +- .../java/li/cil/oc/api/fs/package-info.java | 2 +- .../java/li/cil/oc/api/internal/Robot.java | 4 +- .../li/cil/oc/api/internal/package-info.java | 2 +- .../li/cil/oc/api/machine/package-info.java | 2 +- .../li/cil/oc/api/manual/TabIconRenderer.java | 4 +- .../li/cil/oc/api/manual/package-info.java | 2 +- .../cil/oc/api/network/SidedEnvironment.java | 4 +- .../cil/oc/api/network/SimpleComponent.java | 2 +- .../li/cil/oc/api/network/package-info.java | 2 +- src/api/java/li/cil/oc/api/package-info.java | 2 +- .../api/prefab/ItemStackTabIconRenderer.java | 4 +- .../oc/api/prefab/TextureTabIconRenderer.java | 4 +- .../li/cil/oc/api/prefab/package-info.java | 2 +- .../mcp/mobius/waila/api/package-info.java | 2 +- .../mods/galacticraft/api/package-info.java | 2 +- .../codechicken/core/launch/DepLoader.java | 10 ++--- src/main/java/mekanism/api/Coord4D.java | 2 +- src/main/java/mekanism/api/MekanismAPI.java | 2 +- src/main/java/mekanism/api/Range4D.java | 2 +- .../mekanism/api/energy/package-info.java | 2 +- .../java/mekanism/api/gas/GasNetwork.java | 4 +- .../java/mekanism/api/gas/package-info.java | 2 +- .../mekanism/api/infuse/package-info.java | 2 +- .../mekanism/api/lasers/package-info.java | 2 +- src/main/java/mekanism/api/package-info.java | 2 +- .../mekanism/api/reactor/package-info.java | 2 +- .../mekanism/api/recipe/package-info.java | 2 +- .../api/transmitters/DynamicNetwork.java | 4 +- .../TransmitterNetworkRegistry.java | 10 ++--- .../api/transmitters/package-info.java | 2 +- .../java/mekanism/api/util/package-info.java | 2 +- .../mekanism/client/CapeBufferDownload.java | 4 +- .../client/ClientConnectionHandler.java | 8 ++-- .../mekanism/client/ClientPlayerTracker.java | 8 ++-- .../java/mekanism/client/ClientProxy.java | 16 ++++---- .../mekanism/client/ClientTickHandler.java | 12 +++--- .../mekanism/client/MekanismKeyHandler.java | 14 +++---- .../mekanism/client/SparkleAnimation.java | 4 +- .../mekanism/client/ThreadClientUpdate.java | 4 +- .../mekanism/client/entity/EntityLaser.java | 4 +- .../mekanism/client/gui/ConfigGuiFactory.java | 2 +- .../gui/GuiAdvancedElectricMachine.java | 4 +- .../mekanism/client/gui/GuiChanceMachine.java | 4 +- .../client/gui/GuiChemicalCrystallizer.java | 4 +- .../gui/GuiChemicalDissolutionChamber.java | 4 +- .../client/gui/GuiChemicalInfuser.java | 4 +- .../gui/GuiChemicalInjectionChamber.java | 4 +- .../client/gui/GuiChemicalOxidizer.java | 4 +- .../client/gui/GuiChemicalWasher.java | 4 +- .../java/mekanism/client/gui/GuiCombiner.java | 4 +- .../java/mekanism/client/gui/GuiCredits.java | 4 +- .../java/mekanism/client/gui/GuiCrusher.java | 4 +- .../mekanism/client/gui/GuiDictionary.java | 4 +- .../mekanism/client/gui/GuiDigitalMiner.java | 4 +- .../client/gui/GuiDigitalMinerConfig.java | 4 +- .../mekanism/client/gui/GuiDynamicTank.java | 4 +- .../mekanism/client/gui/GuiElectricChest.java | 6 +-- .../client/gui/GuiElectricMachine.java | 4 +- .../mekanism/client/gui/GuiElectricPump.java | 4 +- .../client/gui/GuiElectrolyticSeparator.java | 4 +- .../client/gui/GuiEnergizedSmelter.java | 4 +- .../mekanism/client/gui/GuiEnergyCube.java | 4 +- .../client/gui/GuiEnrichmentChamber.java | 4 +- .../client/gui/GuiEntangledBlock.java | 4 +- .../java/mekanism/client/gui/GuiFactory.java | 4 +- .../client/gui/GuiFluidicPlenisher.java | 4 +- .../java/mekanism/client/gui/GuiGasTank.java | 4 +- .../client/gui/GuiInductionMatrix.java | 4 +- .../client/gui/GuiLaserAmplifier.java | 4 +- .../client/gui/GuiLogisticalSorter.java | 4 +- .../mekanism/client/gui/GuiMFilterSelect.java | 4 +- .../client/gui/GuiMItemStackFilter.java | 4 +- .../client/gui/GuiMMaterialFilter.java | 4 +- .../mekanism/client/gui/GuiMModIDFilter.java | 4 +- .../client/gui/GuiMOreDictFilter.java | 4 +- .../mekanism/client/gui/GuiMatrixStats.java | 4 +- .../client/gui/GuiMekanismConfig.java | 10 ++--- .../client/gui/GuiMetallurgicInfuser.java | 4 +- .../client/gui/GuiOredictionificator.java | 4 +- .../gui/GuiOredictionificatorFilter.java | 4 +- .../client/gui/GuiOsmiumCompressor.java | 4 +- src/main/java/mekanism/client/gui/GuiPRC.java | 4 +- .../mekanism/client/gui/GuiPasswordEnter.java | 4 +- .../client/gui/GuiPasswordModify.java | 4 +- .../mekanism/client/gui/GuiPortableTank.java | 4 +- .../client/gui/GuiPrecisionSawmill.java | 4 +- .../client/gui/GuiPurificationChamber.java | 4 +- .../mekanism/client/gui/GuiRobitCrafting.java | 4 +- .../client/gui/GuiRobitInventory.java | 4 +- .../mekanism/client/gui/GuiRobitMain.java | 4 +- .../mekanism/client/gui/GuiRobitRepair.java | 4 +- .../client/gui/GuiRotaryCondensentrator.java | 4 +- .../mekanism/client/gui/GuiSeismicReader.java | 4 +- .../client/gui/GuiSeismicVibrator.java | 4 +- .../client/gui/GuiSideConfiguration.java | 4 +- .../gui/GuiSolarEvaporationController.java | 4 +- .../client/gui/GuiSolarNeutronActivator.java | 4 +- .../mekanism/client/gui/GuiTFilterSelect.java | 4 +- .../client/gui/GuiTItemStackFilter.java | 4 +- .../client/gui/GuiTMaterialFilter.java | 4 +- .../mekanism/client/gui/GuiTModIDFilter.java | 4 +- .../client/gui/GuiTOreDictFilter.java | 4 +- .../mekanism/client/gui/GuiTeleporter.java | 4 +- .../client/gui/GuiTransporterConfig.java | 4 +- .../client/gui/GuiUpgradeManagement.java | 4 +- .../client/gui/element/GuiBucketIO.java | 4 +- .../client/gui/element/GuiConfigTypeTab.java | 4 +- .../gui/element/GuiContainerEditMode.java | 4 +- .../client/gui/element/GuiDetectionTab.java | 4 +- .../client/gui/element/GuiElement.java | 4 +- .../client/gui/element/GuiEnergyInfo.java | 4 +- .../client/gui/element/GuiMatrixTab.java | 4 +- .../client/gui/element/GuiPowerBar.java | 4 +- .../client/gui/element/GuiProgress.java | 4 +- .../client/gui/element/GuiRateBar.java | 4 +- .../client/gui/element/GuiScrollList.java | 4 +- .../gui/element/GuiSideConfigurationTab.java | 4 +- .../client/gui/element/GuiSortingTab.java | 4 +- .../gui/element/GuiTransporterConfigTab.java | 4 +- .../mekanism/client/model/ModelBalloon.java | 4 +- .../mekanism/client/model/ModelChargepad.java | 4 +- .../model/ModelChemicalCrystallizer.java | 4 +- .../ModelChemicalDissolutionChamber.java | 4 +- .../client/model/ModelChemicalInfuser.java | 4 +- .../client/model/ModelChemicalOxidizer.java | 4 +- .../client/model/ModelChemicalWasher.java | 4 +- .../client/model/ModelDigitalMiner.java | 4 +- .../client/model/ModelElectricPump.java | 4 +- .../model/ModelElectrolyticSeparator.java | 4 +- .../client/model/ModelEnergyCube.java | 4 +- .../client/model/ModelFlamethrower.java | 4 +- .../client/model/ModelFluidicPlenisher.java | 4 +- .../mekanism/client/model/ModelGasMask.java | 4 +- .../mekanism/client/model/ModelGasTank.java | 4 +- .../mekanism/client/model/ModelJetpack.java | 4 +- .../client/model/ModelLaserAmplifier.java | 4 +- .../client/model/ModelLogisticalSorter.java | 4 +- .../client/model/ModelMetallurgicInfuser.java | 4 +- .../client/model/ModelObsidianTNT.java | 4 +- .../client/model/ModelPortableTank.java | 4 +- .../ModelPressurizedReactionChamber.java | 4 +- .../mekanism/client/model/ModelRobit.java | 4 +- .../model/ModelRotaryCondensentrator.java | 4 +- .../mekanism/client/model/ModelScubaTank.java | 4 +- .../client/model/ModelSeismicVibrator.java | 4 +- .../client/model/ModelTransporterBox.java | 4 +- .../client/render/MekanismRenderer.java | 6 +-- .../client/render/ModelCustomArmor.java | 4 +- .../client/render/RenderPartTransmitter.java | 4 +- .../client/render/RenderTickHandler.java | 10 ++--- .../render/block/BasicRenderingHandler.java | 6 +-- .../render/block/CTMRenderingHandler.java | 2 +- .../render/block/MachineRenderingHandler.java | 6 +-- .../render/block/PlasticRenderingHandler.java | 6 +-- .../client/render/block/TextureSubmap.java | 2 +- .../client/render/block/TextureVirtual.java | 4 +- .../client/render/entity/RenderBalloon.java | 4 +- .../client/render/entity/RenderFlame.java | 4 +- .../entity/RenderObsidianTNTPrimed.java | 4 +- .../client/render/entity/RenderRobit.java | 4 +- .../render/item/ItemRenderingHandler.java | 6 +-- .../render/particle/EntityJetpackFlameFX.java | 6 +-- .../render/particle/EntityJetpackSmokeFX.java | 6 +-- .../client/render/tileentity/RenderBin.java | 4 +- .../render/tileentity/RenderChargepad.java | 4 +- .../RenderChemicalCrystallizer.java | 4 +- .../RenderChemicalDissolutionChamber.java | 4 +- .../tileentity/RenderConfigurableMachine.java | 6 +-- .../render/tileentity/RenderDigitalMiner.java | 4 +- .../render/tileentity/RenderDynamicTank.java | 4 +- .../tileentity/RenderElectricChest.java | 4 +- .../render/tileentity/RenderElectricPump.java | 4 +- .../RenderElectrolyticSeparator.java | 4 +- .../render/tileentity/RenderEnergyCube.java | 4 +- .../tileentity/RenderFluidicPlenisher.java | 4 +- .../render/tileentity/RenderGasTank.java | 4 +- .../client/render/tileentity/RenderLaser.java | 4 +- .../tileentity/RenderLaserAmplifier.java | 4 +- .../tileentity/RenderLogisticalSorter.java | 4 +- .../tileentity/RenderMetallurgicInfuser.java | 4 +- .../render/tileentity/RenderObsidianTNT.java | 4 +- .../tileentity/RenderOredictionificator.java | 4 +- .../render/tileentity/RenderPortableTank.java | 4 +- .../RenderPressurizedReactionChamber.java | 4 +- .../RenderRotaryCondensentrator.java | 4 +- .../RenderSalinationController.java | 4 +- .../tileentity/RenderSeismicVibrator.java | 4 +- .../RenderSolarNeutronActivator.java | 4 +- .../client/sound/FlamethrowerSound.java | 4 +- .../mekanism/client/sound/GasMaskSound.java | 4 +- .../client/sound/IResettableSound.java | 4 +- .../mekanism/client/sound/ISoundSource.java | 4 +- .../mekanism/client/sound/JetpackSound.java | 4 +- .../mekanism/client/sound/PlayerSound.java | 4 +- .../java/mekanism/client/sound/Sound.java | 4 +- .../mekanism/client/sound/SoundHandler.java | 4 +- .../java/mekanism/client/sound/TileSound.java | 4 +- .../mekanism/client/voice/VoiceClient.java | 4 +- .../mekanism/client/voice/VoiceInput.java | 4 +- .../mekanism/client/voice/VoiceOutput.java | 4 +- src/main/java/mekanism/common/CTMData.java | 4 +- .../common/CommonPlayerTickHandler.java | 8 ++-- .../mekanism/common/CommonPlayerTracker.java | 8 ++-- .../java/mekanism/common/CommonProxy.java | 10 ++--- .../common/CommonWorldTickHandler.java | 8 ++-- .../java/mekanism/common/CoreGuiHandler.java | 2 +- .../java/mekanism/common/EnergyNetwork.java | 4 +- .../java/mekanism/common/FluidNetwork.java | 4 +- .../java/mekanism/common/FuelHandler.java | 2 +- .../java/mekanism/common/HeatNetwork.java | 2 +- src/main/java/mekanism/common/IMCHandler.java | 6 +-- .../mekanism/common/InventoryNetwork.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 38 +++++++++---------- .../java/mekanism/common/MekanismBlocks.java | 4 +- .../java/mekanism/common/MekanismItems.java | 4 +- .../java/mekanism/common/PacketHandler.java | 10 ++--- .../java/mekanism/common/asm/LoadingHook.java | 2 +- .../common/base/IAdvancedBoundingBlock.java | 4 +- .../mekanism/common/base/IEnergyWrapper.java | 4 +- .../java/mekanism/common/base/IHasSound.java | 4 +- .../mekanism/common/base/SoundWrapper.java | 4 +- .../mekanism/common/block/BlockBasic.java | 6 +-- .../mekanism/common/block/BlockBounding.java | 4 +- .../common/block/BlockCardboardBox.java | 4 +- .../common/block/BlockEnergyCube.java | 4 +- .../mekanism/common/block/BlockGasTank.java | 6 +-- .../mekanism/common/block/BlockMachine.java | 4 +- .../common/block/BlockObsidianTNT.java | 4 +- .../java/mekanism/common/block/BlockOre.java | 4 +- .../mekanism/common/block/BlockPlastic.java | 4 +- .../common/block/BlockPlasticFence.java | 4 +- .../java/mekanism/common/block/BlockSalt.java | 4 +- .../transporter/TransporterManager.java | 2 +- .../mekanism/common/entity/EntityBalloon.java | 6 +-- .../mekanism/common/entity/EntityFlame.java | 2 +- .../mekanism/common/entity/EntityRobit.java | 2 +- .../common/integration/CCPeripheral.java | 2 +- .../common/integration/MekanismHooks.java | 6 +-- .../common/integration/OreDictManager.java | 2 +- .../common/integration/WailaDataProvider.java | 4 +- .../common/item/ItemAtomicDisassembler.java | 2 +- .../mekanism/common/item/ItemBalloon.java | 4 +- .../mekanism/common/item/ItemBlockBasic.java | 4 +- .../common/item/ItemBlockCardboardBox.java | 6 +-- .../common/item/ItemBlockEnergyCube.java | 10 ++--- .../common/item/ItemBlockMachine.java | 10 ++--- .../mekanism/common/item/ItemBlockOre.java | 4 +- .../common/item/ItemBlockPlastic.java | 4 +- .../common/item/ItemConfigurator.java | 6 +-- .../mekanism/common/item/ItemEnergized.java | 6 +-- .../common/item/ItemFlamethrower.java | 4 +- .../mekanism/common/item/ItemFreeRunners.java | 12 +++--- .../mekanism/common/item/ItemGasMask.java | 6 +-- .../mekanism/common/item/ItemJetpack.java | 4 +- .../mekanism/common/item/ItemMekanism.java | 3 +- .../java/mekanism/common/item/ItemRobit.java | 4 +- .../mekanism/common/item/ItemScubaTank.java | 4 +- .../mekanism/common/item/ItemUpgrade.java | 4 +- .../common/multipart/ItemGlowPanel.java | 4 +- .../common/multipart/ItemPartTransmitter.java | 4 +- .../common/multipart/MultipartMekanism.java | 2 +- .../common/multipart/PartGlowPanel.java | 4 +- .../common/multipart/PartHeatTransmitter.java | 4 +- .../multipart/PartLogisticalTransporter.java | 4 +- .../common/multipart/PartMechanicalPipe.java | 4 +- .../common/multipart/PartPressurizedTube.java | 4 +- .../common/multipart/PartSidedPipe.java | 4 +- .../common/multipart/PartUniversalCable.java | 10 ++--- .../common/network/PacketBoxBlacklist.java | 6 +-- .../common/network/PacketConfigSync.java | 6 +-- .../network/PacketConfigurationUpdate.java | 6 +-- .../network/PacketConfiguratorState.java | 6 +-- .../network/PacketContainerEditMode.java | 6 +-- .../common/network/PacketDataRequest.java | 8 ++-- .../common/network/PacketDigitalMinerGui.java | 12 +++--- .../common/network/PacketDropperUse.java | 6 +-- .../common/network/PacketEditFilter.java | 8 ++-- .../network/PacketElectricBowState.java | 6 +-- .../common/network/PacketElectricChest.java | 6 +-- .../network/PacketFlamethrowerData.java | 6 +-- .../common/network/PacketJetpackData.java | 6 +-- .../mekanism/common/network/PacketKey.java | 6 +-- .../network/PacketLogisticalSorterGui.java | 12 +++--- .../common/network/PacketNewFilter.java | 8 ++-- .../network/PacketOredictionificatorGui.java | 12 +++--- .../network/PacketPortableTankState.java | 6 +-- .../network/PacketPortableTeleporter.java | 8 ++-- .../common/network/PacketPortalFX.java | 6 +-- .../common/network/PacketRedstoneControl.java | 6 +-- .../common/network/PacketRemoveUpgrade.java | 6 +-- .../mekanism/common/network/PacketRobit.java | 6 +-- .../common/network/PacketScubaTankData.java | 6 +-- .../common/network/PacketSimpleGui.java | 12 +++--- .../common/network/PacketTileEntity.java | 8 ++-- .../network/PacketTransmitterUpdate.java | 6 +-- .../network/PacketWalkieTalkieState.java | 6 +-- .../mekanism/common/recipe/BinRecipe.java | 6 +-- .../tile/TileEntityAdvancedBoundingBlock.java | 6 +-- .../common/tile/TileEntityBasicBlock.java | 4 +- .../mekanism/common/tile/TileEntityBin.java | 2 +- .../common/tile/TileEntityChargepad.java | 4 +- .../common/tile/TileEntityCrusher.java | 4 +- .../common/tile/TileEntityDigitalMiner.java | 4 +- .../common/tile/TileEntityElectricBlock.java | 2 +- .../tile/TileEntityEnrichmentChamber.java | 4 +- .../common/tile/TileEntityFactory.java | 4 +- .../common/tile/TileEntityInductionPort.java | 6 +-- .../common/tile/TileEntityMultiblock.java | 4 +- .../tile/TileEntityNoisyElectricBlock.java | 4 +- .../tile/TileEntityPrecisionSawmill.java | 4 +- .../TileEntitySolarEvaporationController.java | 4 +- .../common/tile/TileEntityTeleporter.java | 6 +-- .../mekanism/common/util/MekanismUtils.java | 4 +- .../common/voice/VoiceConnection.java | 2 +- .../mekanism/common/world/GenHandler.java | 2 +- .../client/BlockRenderingHandler.java | 6 +-- .../client/GeneratorsClientProxy.java | 8 ++-- .../client/gui/GeneratorsGuiFactory.java | 2 +- .../client/gui/GuiBioGenerator.java | 4 +- .../generators/client/gui/GuiFuelTab.java | 4 +- .../client/gui/GuiGasGenerator.java | 4 +- .../client/gui/GuiGeneratorsConfig.java | 2 +- .../client/gui/GuiHeatGenerator.java | 4 +- .../generators/client/gui/GuiHeatTab.java | 4 +- .../client/gui/GuiNeutronCapture.java | 4 +- .../client/gui/GuiReactorController.java | 4 +- .../generators/client/gui/GuiReactorFuel.java | 4 +- .../generators/client/gui/GuiReactorHeat.java | 4 +- .../client/gui/GuiReactorLogicAdapter.java | 4 +- .../client/gui/GuiReactorStats.java | 4 +- .../client/gui/GuiSolarGenerator.java | 4 +- .../generators/client/gui/GuiStatTab.java | 4 +- .../generators/client/gui/GuiWindTurbine.java | 4 +- .../client/model/ModelGasGenerator.java | 4 +- .../client/model/ModelHeatGenerator.java | 4 +- .../render/RenderAdvancedSolarGenerator.java | 14 ++----- .../client/render/RenderBioGenerator.java | 13 ++----- .../client/render/RenderGasGenerator.java | 13 ++----- .../client/render/RenderHeatGenerator.java | 13 ++----- .../client/render/RenderReactor.java | 13 ++----- .../client/render/RenderSolarGenerator.java | 9 +---- .../client/render/RenderWindTurbine.java | 9 +---- .../generators/common/GeneratorsBlocks.java | 4 +- .../common/GeneratorsCommonProxy.java | 4 +- .../common/GeneratorsGuiHandler.java | 2 +- .../generators/common/GeneratorsItems.java | 4 +- .../common/GeneratorsPacketHandler.java | 10 ++--- .../generators/common/MekanismGenerators.java | 22 +++++------ .../common/block/BlockGenerator.java | 4 +- .../generators/common/block/BlockReactor.java | 4 +- .../container/ContainerReactorController.java | 4 +- .../common/item/ItemBlockGenerator.java | 10 ++--- .../common/item/ItemBlockReactor.java | 4 +- .../common/network/PacketGeneratorsGui.java | 12 +++--- .../common/tile/TileEntityGenerator.java | 4 +- .../common/tile/TileEntitySolarGenerator.java | 4 +- .../common/tile/TileEntityWindTurbine.java | 4 +- .../reactor/TileEntityReactorController.java | 4 +- .../tools/client/gui/GuiToolsConfig.java | 10 ++--- .../tools/client/gui/ToolsGuiFactory.java | 2 +- .../mekanism/tools/common/MekanismTools.java | 18 ++++----- .../mekanism/tools/common/ToolsItems.java | 4 +- .../tools/item/ItemMekanismArmor.java | 4 +- .../mekanism/tools/item/ItemMekanismHoe.java | 6 +-- 422 files changed, 941 insertions(+), 982 deletions(-) diff --git a/build.gradle b/build.gradle index 55153e63d..c69f99ab3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ defaultTasks 'fullBuild' buildscript { repositories { - mavenCentral() + jcenter() maven { name = "forge" url = "http://files.minecraftforge.net/maven" @@ -13,7 +13,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } @@ -37,7 +37,7 @@ idea { } } -apply plugin: 'forge' +apply plugin: 'net.minecraftforge.gradle.forge' // Define properties file ext.configFile = file "build.properties" @@ -49,13 +49,6 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } -dependencies { - compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" - compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev" - compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" - compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.CCC_version}:dev" -} - version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUILD_NUMBER ?: "homebaked") archivesBaseName = "MekanismAll" libsDirName = "../output" @@ -65,6 +58,7 @@ targetCompatibility = '1.7' minecraft { version = config.minecraft_version + "-" + config.forge_version + mappings = "stable_20" } processResources diff --git a/build.properties b/build.properties index d2a61e32c..c7202dc4f 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ -minecraft_version=1.7.10 -forge_version=10.13.4.1448-1.7.10 +minecraft_version=1.8.9 +forge_version=11.15.0.1697 FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=8.1.8 +mod_version=9.0 diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index 2147e7261..2f7763911 100755 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -13,8 +13,8 @@ import java.util.Random; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumColor { diff --git a/src/api/java/buildcraft/api/core/IIconProvider.java b/src/api/java/buildcraft/api/core/IIconProvider.java index fa8657e64..876977cb2 100755 --- a/src/api/java/buildcraft/api/core/IIconProvider.java +++ b/src/api/java/buildcraft/api/core/IIconProvider.java @@ -10,8 +10,8 @@ package buildcraft.api.core; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IIconProvider { diff --git a/src/api/java/buildcraft/api/core/package-info.java b/src/api/java/buildcraft/api/core/package-info.java index 39784d31f..a4168fd62 100755 --- a/src/api/java/buildcraft/api/core/package-info.java +++ b/src/api/java/buildcraft/api/core/package-info.java @@ -8,5 +8,5 @@ */ @API(apiVersion = "2.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api.core; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/fuels/package-info.java b/src/api/java/buildcraft/api/fuels/package-info.java index eca72994c..69b7546ba 100755 --- a/src/api/java/buildcraft/api/fuels/package-info.java +++ b/src/api/java/buildcraft/api/fuels/package-info.java @@ -8,5 +8,5 @@ */ @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels") package buildcraft.api.fuels; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/package-info.java b/src/api/java/buildcraft/api/package-info.java index 81c35570f..7e7b2739e 100755 --- a/src/api/java/buildcraft/api/package-info.java +++ b/src/api/java/buildcraft/api/package-info.java @@ -8,5 +8,5 @@ */ @API(apiVersion = "1.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/tools/package-info.java b/src/api/java/buildcraft/api/tools/package-info.java index 538e11eae..b3bebb661 100755 --- a/src/api/java/buildcraft/api/tools/package-info.java +++ b/src/api/java/buildcraft/api/tools/package-info.java @@ -8,5 +8,5 @@ */ @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tools") package buildcraft.api.tools; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/cofh/api/energy/package-info.java b/src/api/java/cofh/api/energy/package-info.java index 7379702b8..880844fca 100644 --- a/src/api/java/cofh/api/energy/package-info.java +++ b/src/api/java/cofh/api/energy/package-info.java @@ -6,5 +6,5 @@ package cofh.api.energy; import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/cofh/api/item/package-info.java b/src/api/java/cofh/api/item/package-info.java index 49608fd13..c05530025 100644 --- a/src/api/java/cofh/api/item/package-info.java +++ b/src/api/java/cofh/api/item/package-info.java @@ -6,5 +6,5 @@ package cofh.api.item; import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/cofh/api/package-info.java b/src/api/java/cofh/api/package-info.java index 08ff5fcb6..1aec468f0 100644 --- a/src/api/java/cofh/api/package-info.java +++ b/src/api/java/cofh/api/package-info.java @@ -5,5 +5,5 @@ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI") package cofh.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/filesystem/package-info.java b/src/api/java/dan200/computercraft/api/filesystem/package-info.java index 02bb7ea62..606369d54 100644 --- a/src/api/java/dan200/computercraft/api/filesystem/package-info.java +++ b/src/api/java/dan200/computercraft/api/filesystem/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|FileSystem", apiVersion="1.65" ) package dan200.computercraft.api.filesystem; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/lua/package-info.java b/src/api/java/dan200/computercraft/api/lua/package-info.java index 9ea59b6fa..0e3fe6ddc 100644 --- a/src/api/java/dan200/computercraft/api/lua/package-info.java +++ b/src/api/java/dan200/computercraft/api/lua/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Lua", apiVersion="1.65" ) package dan200.computercraft.api.lua; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/media/package-info.java b/src/api/java/dan200/computercraft/api/media/package-info.java index ec0695fbb..3d4eb54cd 100644 --- a/src/api/java/dan200/computercraft/api/media/package-info.java +++ b/src/api/java/dan200/computercraft/api/media/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Media", apiVersion="1.65" ) package dan200.computercraft.api.media; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/package-info.java b/src/api/java/dan200/computercraft/api/package-info.java index 5c16faf4c..a14c187c8 100644 --- a/src/api/java/dan200/computercraft/api/package-info.java +++ b/src/api/java/dan200/computercraft/api/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API", apiVersion="1.65" ) package dan200.computercraft.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/peripheral/package-info.java b/src/api/java/dan200/computercraft/api/peripheral/package-info.java index c3ee64845..f1ffda8b6 100644 --- a/src/api/java/dan200/computercraft/api/peripheral/package-info.java +++ b/src/api/java/dan200/computercraft/api/peripheral/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Peripheral", apiVersion="1.65" ) package dan200.computercraft.api.peripheral; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/redstone/package-info.java b/src/api/java/dan200/computercraft/api/redstone/package-info.java index fa59ad32b..1a3b4183b 100644 --- a/src/api/java/dan200/computercraft/api/redstone/package-info.java +++ b/src/api/java/dan200/computercraft/api/redstone/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Redstone", apiVersion="1.65" ) package dan200.computercraft.api.redstone; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/turtle/package-info.java b/src/api/java/dan200/computercraft/api/turtle/package-info.java index 13a832fcc..17215adaa 100644 --- a/src/api/java/dan200/computercraft/api/turtle/package-info.java +++ b/src/api/java/dan200/computercraft/api/turtle/package-info.java @@ -1,4 +1,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Turtle", apiVersion="1.65" ) package dan200.computercraft.api.turtle; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java index 091b9ad24..ac2f832b9 100644 --- a/src/api/java/ic2/api/crops/CropCard.java +++ b/src/api/java/ic2/api/crops/CropCard.java @@ -7,10 +7,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Base agriculture crop. diff --git a/src/api/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java index a11059a91..6907e3c31 100644 --- a/src/api/java/ic2/api/crops/Crops.java +++ b/src/api/java/ic2/api/crops/Crops.java @@ -6,8 +6,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.common.BiomeDictionary.Type; diff --git a/src/api/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java index 04b825392..6d4a180d1 100644 --- a/src/api/java/ic2/api/crops/package-info.java +++ b/src/api/java/ic2/api/crops/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.crops; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java index 40db6f8a1..25ed85d13 100644 --- a/src/api/java/ic2/api/energy/event/package-info.java +++ b/src/api/java/ic2/api/energy/event/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.energy.event; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java index 81d0bfeda..26bd21e31 100644 --- a/src/api/java/ic2/api/energy/package-info.java +++ b/src/api/java/ic2/api/energy/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.energy; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java index 48de06135..b1f219e1e 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSink.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSink.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java index 011e8cd39..e8d7da1f7 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/ic2/api/energy/prefab/package-info.java b/src/api/java/ic2/api/energy/prefab/package-info.java index c38f7e0e6..f640ee1de 100644 --- a/src/api/java/ic2/api/energy/prefab/package-info.java +++ b/src/api/java/ic2/api/energy/prefab/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.energy.prefab; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/energy/tile/package-info.java b/src/api/java/ic2/api/energy/tile/package-info.java index 3c60323ae..565a16e14 100644 --- a/src/api/java/ic2/api/energy/tile/package-info.java +++ b/src/api/java/ic2/api/energy/tile/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.energy.tile; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java index c2df41952..a2ad98eaf 100644 --- a/src/api/java/ic2/api/event/ExplosionEvent.java +++ b/src/api/java/ic2/api/event/ExplosionEvent.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/api/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java index 6d5ea2804..974964123 100644 --- a/src/api/java/ic2/api/event/LaserEvent.java +++ b/src/api/java/ic2/api/event/LaserEvent.java @@ -5,7 +5,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/api/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java index c6565c229..caa2aee28 100644 --- a/src/api/java/ic2/api/event/PaintEvent.java +++ b/src/api/java/ic2/api/event/PaintEvent.java @@ -2,7 +2,7 @@ package ic2.api.event; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/api/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java index d530578c8..cf431496e 100644 --- a/src/api/java/ic2/api/event/RetextureEvent.java +++ b/src/api/java/ic2/api/event/RetextureEvent.java @@ -3,7 +3,7 @@ package ic2.api.event; import net.minecraft.block.Block; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/api/java/ic2/api/event/package-info.java b/src/api/java/ic2/api/event/package-info.java index d331b924d..71ba156af 100644 --- a/src/api/java/ic2/api/event/package-info.java +++ b/src/api/java/ic2/api/event/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.event; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java index 3b5a54426..7be58fca3 100644 --- a/src/api/java/ic2/api/info/Info.java +++ b/src/api/java/ic2/api/info/Info.java @@ -2,8 +2,8 @@ package ic2.api.info; import net.minecraft.util.DamageSource; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.LoaderState; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState; public class Info { public static IEnergyValueProvider itemEnergy; diff --git a/src/api/java/ic2/api/info/package-info.java b/src/api/java/ic2/api/info/package-info.java index 59936e5e6..ecd40e27d 100644 --- a/src/api/java/ic2/api/info/package-info.java +++ b/src/api/java/ic2/api/info/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.info; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java index 2baffc8f9..3963c6f7e 100644 --- a/src/api/java/ic2/api/item/ILatheItem.java +++ b/src/api/java/ic2/api/item/ILatheItem.java @@ -3,8 +3,8 @@ package ic2.api.item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface ILatheItem { diff --git a/src/api/java/ic2/api/item/package-info.java b/src/api/java/ic2/api/item/package-info.java index 44ecdce97..e02ec6e11 100644 --- a/src/api/java/ic2/api/item/package-info.java +++ b/src/api/java/ic2/api/item/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.item; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java index 25ea29e1e..f31d2033e 100644 --- a/src/api/java/ic2/api/network/package-info.java +++ b/src/api/java/ic2/api/network/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.network; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/package-info.java b/src/api/java/ic2/api/package-info.java index e6f15228a..51f09d297 100644 --- a/src/api/java/ic2/api/package-info.java +++ b/src/api/java/ic2/api/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java index 5194aee03..b500c3d34 100644 --- a/src/api/java/ic2/api/reactor/package-info.java +++ b/src/api/java/ic2/api/reactor/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.reactor; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java index 44e70e79a..54b01a44e 100644 --- a/src/api/java/ic2/api/recipe/package-info.java +++ b/src/api/java/ic2/api/recipe/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.recipe; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java index 5ebc76e24..17bcde171 100644 --- a/src/api/java/ic2/api/tile/package-info.java +++ b/src/api/java/ic2/api/tile/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.tile; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java index 4dd2d93b1..8fe79432f 100644 --- a/src/api/java/ic2/api/util/package-info.java +++ b/src/api/java/ic2/api/util/package-info.java @@ -1,4 +1,4 @@ @API(apiVersion="1.0", owner="IC2", provides="IC2API") package ic2.api.util; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/invtweaks/api/InvTweaksAPI.java b/src/api/java/invtweaks/api/InvTweaksAPI.java index 33f259e4d..6bdb84a93 100755 --- a/src/api/java/invtweaks/api/InvTweaksAPI.java +++ b/src/api/java/invtweaks/api/InvTweaksAPI.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; * Interface to access functions exposed by Inventory Tweaks *

* The main @Mod instance of the mod implements this interface, so a refernce to it can - * be obtained via @Instance("inventorytweaks") or methods in cpw.mods.fml.common.Loader + * be obtained via @Instance("inventorytweaks") or methods in net.minecraftforge.fml.common.Loader *

* All of these functions currently have no effect if called on a dedicated server. */ diff --git a/src/api/java/li/cil/oc/api/IMC.java b/src/api/java/li/cil/oc/api/IMC.java index 39beb10e3..9a0fb3f31 100755 --- a/src/api/java/li/cil/oc/api/IMC.java +++ b/src/api/java/li/cil/oc/api/IMC.java @@ -1,6 +1,6 @@ package li.cil.oc.api; -import cpw.mods.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/api/java/li/cil/oc/api/component/TextBuffer.java b/src/api/java/li/cil/oc/api/component/TextBuffer.java index 3104c90ae..e258e2f15 100755 --- a/src/api/java/li/cil/oc/api/component/TextBuffer.java +++ b/src/api/java/li/cil/oc/api/component/TextBuffer.java @@ -1,7 +1,7 @@ package li.cil.oc.api.component; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import li.cil.oc.api.Persistable; import li.cil.oc.api.network.ManagedEnvironment; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/li/cil/oc/api/component/package-info.java b/src/api/java/li/cil/oc/api/component/package-info.java index 615dd621d..229794703 100755 --- a/src/api/java/li/cil/oc/api/component/package-info.java +++ b/src/api/java/li/cil/oc/api/component/package-info.java @@ -5,7 +5,7 @@ * components, which would otherwise require reflection or linking against the * mod itself. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Component", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java b/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java index ec1e0201c..4d9cfb343 100755 --- a/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java +++ b/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java @@ -1,7 +1,7 @@ package li.cil.oc.api.driver.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import li.cil.oc.api.event.RobotRenderEvent; import li.cil.oc.api.internal.Robot; import net.minecraft.item.ItemStack; diff --git a/src/api/java/li/cil/oc/api/driver/item/package-info.java b/src/api/java/li/cil/oc/api/driver/item/package-info.java index 6c2d9fc02..24a730120 100755 --- a/src/api/java/li/cil/oc/api/driver/item/package-info.java +++ b/src/api/java/li/cil/oc/api/driver/item/package-info.java @@ -4,7 +4,7 @@ * These interfaces allow specializing item drivers to provide static data, * that is without creating an actual environment. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Driver|Item", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/driver/package-info.java b/src/api/java/li/cil/oc/api/driver/package-info.java index 168e5d364..7a3ee423c 100755 --- a/src/api/java/li/cil/oc/api/driver/package-info.java +++ b/src/api/java/li/cil/oc/api/driver/package-info.java @@ -4,7 +4,7 @@ * Drivers are used to add items and third party blocks to the internal network, * which is mostly used to make components wrapping them available to computers. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Driver", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java b/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java index 97d0518af..b80cb6891 100755 --- a/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java +++ b/src/api/java/li/cil/oc/api/event/FileSystemAccessEvent.java @@ -1,7 +1,7 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; import li.cil.oc.api.network.Node; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java b/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java index 52c9ab02a..1f01e7d0e 100755 --- a/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java +++ b/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java @@ -1,7 +1,7 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; import li.cil.oc.api.driver.EnvironmentHost; import java.util.HashMap; diff --git a/src/api/java/li/cil/oc/api/event/RobotAttackEntityEvent.java b/src/api/java/li/cil/oc/api/event/RobotAttackEntityEvent.java index 9d647ebd3..d4b7b64f7 100755 --- a/src/api/java/li/cil/oc/api/event/RobotAttackEntityEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotAttackEntityEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.internal.Agent; import net.minecraft.entity.Entity; diff --git a/src/api/java/li/cil/oc/api/event/RobotBreakBlockEvent.java b/src/api/java/li/cil/oc/api/event/RobotBreakBlockEvent.java index 2630e95ee..f7f9f88a6 100755 --- a/src/api/java/li/cil/oc/api/event/RobotBreakBlockEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotBreakBlockEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.internal.Agent; import net.minecraft.world.World; diff --git a/src/api/java/li/cil/oc/api/event/RobotEvent.java b/src/api/java/li/cil/oc/api/event/RobotEvent.java index 0173809df..b5eb2c13c 100755 --- a/src/api/java/li/cil/oc/api/event/RobotEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; import li.cil.oc.api.internal.Agent; /** diff --git a/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java b/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java index 909628058..0ef239f5e 100755 --- a/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotMoveEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.internal.Agent; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/li/cil/oc/api/event/RobotPlaceBlockEvent.java b/src/api/java/li/cil/oc/api/event/RobotPlaceBlockEvent.java index 10b32b963..83681d8d6 100755 --- a/src/api/java/li/cil/oc/api/event/RobotPlaceBlockEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotPlaceBlockEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.internal.Agent; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java b/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java index 3eb48ce78..75f36b4da 100755 --- a/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java @@ -1,6 +1,6 @@ package li.cil.oc.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Cancelable; import li.cil.oc.api.driver.item.UpgradeRenderer; import li.cil.oc.api.internal.Agent; import li.cil.oc.api.internal.Robot; diff --git a/src/api/java/li/cil/oc/api/event/package-info.java b/src/api/java/li/cil/oc/api/event/package-info.java index 04a5d19ec..7fe9fe75e 100755 --- a/src/api/java/li/cil/oc/api/event/package-info.java +++ b/src/api/java/li/cil/oc/api/event/package-info.java @@ -2,7 +2,7 @@ * Events dispatched by OpenComputers to allow other mods to hook into some * of its functionality. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Event", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/fs/package-info.java b/src/api/java/li/cil/oc/api/fs/package-info.java index 394969fb7..d1e3c5f2f 100755 --- a/src/api/java/li/cil/oc/api/fs/package-info.java +++ b/src/api/java/li/cil/oc/api/fs/package-info.java @@ -13,7 +13,7 @@ * that can be added as component nodes to the network, so they can be used * from computers). */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|FileSystem", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/internal/Robot.java b/src/api/java/li/cil/oc/api/internal/Robot.java index 30eda3ced..16e71d5fb 100755 --- a/src/api/java/li/cil/oc/api/internal/Robot.java +++ b/src/api/java/li/cil/oc/api/internal/Robot.java @@ -1,7 +1,7 @@ package li.cil.oc.api.internal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import li.cil.oc.api.driver.EnvironmentHost; import li.cil.oc.api.network.Environment; import net.minecraft.inventory.ISidedInventory; diff --git a/src/api/java/li/cil/oc/api/internal/package-info.java b/src/api/java/li/cil/oc/api/internal/package-info.java index 769993c1b..ad700a273 100755 --- a/src/api/java/li/cil/oc/api/internal/package-info.java +++ b/src/api/java/li/cil/oc/api/internal/package-info.java @@ -13,7 +13,7 @@ * used inside the specified environment (where the environment class may * be assignable to one of the interfaces in this package). */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Internal", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/machine/package-info.java b/src/api/java/li/cil/oc/api/machine/package-info.java index e9dfb589b..97807dcc8 100755 --- a/src/api/java/li/cil/oc/api/machine/package-info.java +++ b/src/api/java/li/cil/oc/api/machine/package-info.java @@ -16,7 +16,7 @@ * implemented, but merely to allow accessing some mod internals in a regulated * fashion, such as {@link li.cil.oc.api.internal.Robot}. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Machine", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/manual/TabIconRenderer.java b/src/api/java/li/cil/oc/api/manual/TabIconRenderer.java index 45b3a329f..ee7af3a74 100755 --- a/src/api/java/li/cil/oc/api/manual/TabIconRenderer.java +++ b/src/api/java/li/cil/oc/api/manual/TabIconRenderer.java @@ -1,7 +1,7 @@ package li.cil.oc.api.manual; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Allows defining a renderer for a manual tab. diff --git a/src/api/java/li/cil/oc/api/manual/package-info.java b/src/api/java/li/cil/oc/api/manual/package-info.java index 81ae1eec8..1cdeae847 100755 --- a/src/api/java/li/cil/oc/api/manual/package-info.java +++ b/src/api/java/li/cil/oc/api/manual/package-info.java @@ -5,7 +5,7 @@ * other mod that may choose to add its documentation to it, such as addon * mods. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Manual", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/network/SidedEnvironment.java b/src/api/java/li/cil/oc/api/network/SidedEnvironment.java index 8c7dce15f..0103670cb 100755 --- a/src/api/java/li/cil/oc/api/network/SidedEnvironment.java +++ b/src/api/java/li/cil/oc/api/network/SidedEnvironment.java @@ -1,7 +1,7 @@ package li.cil.oc.api.network; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/li/cil/oc/api/network/SimpleComponent.java b/src/api/java/li/cil/oc/api/network/SimpleComponent.java index 178941945..4d46610c7 100755 --- a/src/api/java/li/cil/oc/api/network/SimpleComponent.java +++ b/src/api/java/li/cil/oc/api/network/SimpleComponent.java @@ -14,7 +14,7 @@ import java.lang.annotation.Target; * couple of methods to the programs running computers. *

* This is an interface instead of an annotation, to allow stripping via the - * ever so handy {@link cpw.mods.fml.common.Optional} annotation, meaning there + * ever so handy {@link net.minecraftforge.fml.common.Optional} annotation, meaning there * will be no strong dependency on OpenComputers. *

* Classes implementing this interface will be expanded with the methods diff --git a/src/api/java/li/cil/oc/api/network/package-info.java b/src/api/java/li/cil/oc/api/network/package-info.java index ef7ae77ed..4892d137c 100755 --- a/src/api/java/li/cil/oc/api/network/package-info.java +++ b/src/api/java/li/cil/oc/api/network/package-info.java @@ -4,7 +4,7 @@ * This mainly involves the (purely server-side!) network that is spanned over * all of OpenComputers' components, including blocks and items alike. */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Network", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/package-info.java b/src/api/java/li/cil/oc/api/package-info.java index 94fc3bdc2..f0d055739 100755 --- a/src/api/java/li/cil/oc/api/package-info.java +++ b/src/api/java/li/cil/oc/api/package-info.java @@ -34,7 +34,7 @@ * * */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Core", apiVersion = API.VERSION) diff --git a/src/api/java/li/cil/oc/api/prefab/ItemStackTabIconRenderer.java b/src/api/java/li/cil/oc/api/prefab/ItemStackTabIconRenderer.java index db8d43be4..74aed5f51 100755 --- a/src/api/java/li/cil/oc/api/prefab/ItemStackTabIconRenderer.java +++ b/src/api/java/li/cil/oc/api/prefab/ItemStackTabIconRenderer.java @@ -1,7 +1,7 @@ package li.cil.oc.api.prefab; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import li.cil.oc.api.manual.TabIconRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java b/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java index 0a382814b..cdb939dad 100755 --- a/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java +++ b/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java @@ -1,7 +1,7 @@ package li.cil.oc.api.prefab; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import li.cil.oc.api.manual.TabIconRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; diff --git a/src/api/java/li/cil/oc/api/prefab/package-info.java b/src/api/java/li/cil/oc/api/prefab/package-info.java index ba933b12c..306982259 100755 --- a/src/api/java/li/cil/oc/api/prefab/package-info.java +++ b/src/api/java/li/cil/oc/api/prefab/package-info.java @@ -7,7 +7,7 @@ * while leaving them in the same package with the same name and then ship them * with your mod! */ -@cpw.mods.fml.common.API( +@net.minecraftforge.fml.common.API( owner = API.ID_OWNER, provides = "OpenComputersAPI|Prefab", apiVersion = API.VERSION) diff --git a/src/api/java/mcp/mobius/waila/api/package-info.java b/src/api/java/mcp/mobius/waila/api/package-info.java index 5fc5aa6f3..d033e5588 100644 --- a/src/api/java/mcp/mobius/waila/api/package-info.java +++ b/src/api/java/mcp/mobius/waila/api/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion="1.2",owner="Waila",provides="WailaAPI") package mcp.mobius.waila.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/micdoodle8/mods/galacticraft/api/package-info.java b/src/api/java/micdoodle8/mods/galacticraft/api/package-info.java index 55ce1bae8..7272b5aa4 100644 --- a/src/api/java/micdoodle8/mods/galacticraft/api/package-info.java +++ b/src/api/java/micdoodle8/mods/galacticraft/api/package-info.java @@ -1,5 +1,5 @@ @API(apiVersion = "1.0", owner = "GalacticraftCore", provides = "Galacticraft API") package micdoodle8.mods.galacticraft.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/codechicken/core/launch/DepLoader.java b/src/main/java/codechicken/core/launch/DepLoader.java index 0032ed5cf..96e9d56b0 100644 --- a/src/main/java/codechicken/core/launch/DepLoader.java +++ b/src/main/java/codechicken/core/launch/DepLoader.java @@ -3,11 +3,11 @@ package codechicken.core.launch; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import cpw.mods.fml.common.versioning.ComparableVersion; -import cpw.mods.fml.relauncher.FMLInjectionData; -import cpw.mods.fml.relauncher.FMLLaunchHandler; -import cpw.mods.fml.relauncher.IFMLCallHook; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import net.minecraftforge.fml.common.versioning.ComparableVersion; +import net.minecraftforge.fml.relauncher.FMLInjectionData; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; +import net.minecraftforge.fml.relauncher.IFMLCallHook; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import net.minecraft.launchwrapper.LaunchClassLoader; import sun.misc.URLClassPath; import sun.net.util.URLUtil; diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 1a0f7e4d5..3faebc2ad 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -1,6 +1,6 @@ package mekanism.api; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index abdd6da5e..17ffd7c2a 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -8,7 +8,7 @@ import mekanism.api.util.BlockInfo; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; public class MekanismAPI { diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java index 40905a66d..ee55b1da9 100644 --- a/src/main/java/mekanism/api/Range4D.java +++ b/src/main/java/mekanism/api/Range4D.java @@ -1,7 +1,7 @@ package mekanism.api; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class Range4D { diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java index 8f3d3716e..0270f7ae1 100644 --- a/src/main/java/mekanism/api/energy/package-info.java +++ b/src/main/java/mekanism/api/energy/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|energy") package mekanism.api.energy; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index ea81d1210..e08f9c133 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -1,8 +1,8 @@ package mekanism.api.gas; import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.Event; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java index 4418451ff..08dcf8894 100644 --- a/src/main/java/mekanism/api/gas/package-info.java +++ b/src/main/java/mekanism/api/gas/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|gas") package mekanism.api.gas; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java index 871899688..c164b6638 100644 --- a/src/main/java/mekanism/api/infuse/package-info.java +++ b/src/main/java/mekanism/api/infuse/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse") package mekanism.api.infuse; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java index b45693745..b865d5546 100644 --- a/src/main/java/mekanism/api/lasers/package-info.java +++ b/src/main/java/mekanism/api/lasers/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|laser") package mekanism.api.lasers; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java index 2b9fcabca..7347248ca 100644 --- a/src/main/java/mekanism/api/package-info.java +++ b/src/main/java/mekanism/api/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|core") package mekanism.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/reactor/package-info.java b/src/main/java/mekanism/api/reactor/package-info.java index 6a00fc693..ae5812e65 100644 --- a/src/main/java/mekanism/api/reactor/package-info.java +++ b/src/main/java/mekanism/api/reactor/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor") package mekanism.api.reactor; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java index f166da475..6228719ea 100644 --- a/src/main/java/mekanism/api/recipe/package-info.java +++ b/src/main/java/mekanism/api/recipe/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe") package mekanism.api.recipe; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index ee4e8a2b7..9e15148b3 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -3,8 +3,8 @@ package mekanism.api.transmitters; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.Event; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 0f9c1c5fb..dd50a7e47 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -13,11 +13,11 @@ import org.apache.logging.log4j.Logger; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent; +import net.minecraftforge.fml.relauncher.Side; public class TransmitterNetworkRegistry { diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java index 06819e741..d8d5e092c 100644 --- a/src/main/java/mekanism/api/transmitters/package-info.java +++ b/src/main/java/mekanism/api/transmitters/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter") package mekanism.api.transmitters; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/api/util/package-info.java b/src/main/java/mekanism/api/util/package-info.java index e5253bcbc..594d76930 100644 --- a/src/main/java/mekanism/api/util/package-info.java +++ b/src/main/java/mekanism/api/util/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|util") package mekanism.api.util; -import cpw.mods.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index 079d8b94d..db571e4a3 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -13,8 +13,8 @@ import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CapeBufferDownload extends Thread diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index c8d4164b2..25e27534c 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -6,10 +6,10 @@ import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ClientConnectionHandler diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index c39d4dc9b..19dd65fde 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -2,10 +2,10 @@ package mekanism.client; import mekanism.common.Mekanism; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ClientPlayerTracker diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index dd6f6ddd3..fe43e5673 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -179,14 +179,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; -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.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Client proxy for the Mekanism mod. diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 87f9ac330..1b41957d6 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -1,12 +1,12 @@ package mekanism.client; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.IClientTicker; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 5b8a0cf9f..eb6b143e2 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,12 +1,12 @@ package mekanism.client; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.InputEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index b759b4dcc..fbb4e3394 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -9,8 +9,8 @@ import mekanism.api.MekanismConfig.general; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class SparkleAnimation diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index a6ee1b172..2a922bfc5 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -15,8 +15,8 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Thread that downloads the latest release of Mekanism. The older file is deleted and the newly downloaded file takes it's place. diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index cd716be47..cbaabf1b3 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -9,8 +9,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/ConfigGuiFactory.java b/src/main/java/mekanism/client/gui/ConfigGuiFactory.java index 48138f6bd..947e81730 100644 --- a/src/main/java/mekanism/client/gui/ConfigGuiFactory.java +++ b/src/main/java/mekanism/client/gui/ConfigGuiFactory.java @@ -4,7 +4,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class ConfigGuiFactory implements IModGuiFactory { diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 6b6a44d9f..c43072b5d 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -26,8 +26,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiAdvancedElectricMachine extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index a0122ca17..8844dc21a 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiChanceMachine extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 74bb6ed66..3c7af4813 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -40,8 +40,8 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiChemicalCrystallizer extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 657c36101..697221c70 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -23,8 +23,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 08ea8a8a2..ac8f56c70 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -28,8 +28,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index 49ad53994..c94fc277a 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiChemicalInjectionChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index a81931728..56f8c5046 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -23,8 +23,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 847fb2648..0bc489591 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -33,8 +33,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index 70dad2b1c..358e22677 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCombiner extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 81a20ac89..976198d1b 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -9,8 +9,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCredits extends GuiScreen diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index 0283f3aa8..e3557a5ad 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.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 134468833..3fc606e64 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -9,8 +9,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index a7baa0603..b169433e9 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -29,8 +29,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 99b342379..ce6963b14 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -30,8 +30,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index e35c6ed23..0d506c972 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -10,8 +10,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index f3cb18b60..d14d2aa45 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -17,9 +17,9 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 483be0b6b..3cfcc8f32 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiElectricMachine extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 9bbf12dc5..bb7a7a725 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -17,8 +17,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 a9148d533..c5ecc0045 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index b5857c959..1503e37af 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiEnergizedSmelter extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index cf2b207e6..8fb96356e 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -18,8 +18,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 3df82f662..0808c3f6f 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiEnrichmentChamber extends GuiElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index 5205709e3..bd964c041 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -12,8 +12,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index d11edd3d0..67a5f0ed7 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -22,8 +22,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiFactory extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 0e7186be5..23f608125 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -15,8 +15,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index eaa966d6b..10fb8c991 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -16,8 +16,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiGasTank extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 541ce1a96..941480bec 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -12,8 +12,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiInductionMatrix extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 6e088943b..3e603f250 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -23,8 +23,8 @@ import net.minecraft.util.IIcon; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiLaserAmplifier extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 22487318d..a80fe8087 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -36,8 +36,8 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiLogisticalSorter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 3f47a4bfd..ad3f546a2 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -12,8 +12,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 7c7444170..3919cd322 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -21,8 +21,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 20ea778b8..4fa0c249f 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -21,8 +21,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 25eadd27b..0c352fbd9 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMModIDFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index fa4037469..fbd8ca557 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMOreDictFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 57450ea28..4178a47a9 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -16,8 +16,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMatrixStats extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java index 546ade237..f6df2e751 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java @@ -8,11 +8,11 @@ import mekanism.common.util.LangUtils; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; -import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.GuiConfigEntries; -import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; -import cpw.mods.fml.client.config.IConfigElement; +import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfigEntries; +import net.minecraftforge.fml.client.config.GuiConfigEntries.CategoryEntry; +import net.minecraftforge.fml.client.config.IConfigElement; public class GuiMekanismConfig extends GuiConfig { diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index d78948e47..5f5307bb6 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -30,8 +30,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMetallurgicInfuser extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 6118d27cf..d9b1a33df 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -29,8 +29,8 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiOredictionificator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 6e17fc2e0..746585a32 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -24,8 +24,8 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiOredictionificatorFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index bd17dfa1e..02d63182e 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.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 64bd7324d..2665c1930 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -32,8 +32,8 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index f561849c0..3138e6966 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -16,8 +16,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 2876146f5..dd8c707fb 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -14,8 +14,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index 4412516a7..150b4cb34 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -13,8 +13,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java index 1b521b90b..abd085147 100644 --- a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java +++ b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityChanceMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPrecisionSawmill extends GuiChanceMachine diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index c33d40407..a0b7c801b 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPurificationChamber extends GuiAdvancedElectricMachine diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 3a1cf193f..18df82d02 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -10,8 +10,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index fa7d487de..b459eb1b9 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -10,8 +10,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 09019d650..cc159e4e9 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -12,8 +12,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index a9aad5289..c59583b17 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -19,8 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index c298569b5..91c017e47 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -34,8 +34,8 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRotaryCondensentrator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index f685f3008..e5e86688c 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -16,8 +16,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Rectangle; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSeismicReader extends GuiScreen diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index e8c59a1b3..3190c0cc7 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -11,8 +11,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 1d4bb32a7..e2a4d5b34 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -30,8 +30,8 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSideConfiguration extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java index e4ce3a3b2..5edc7b979 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java @@ -17,8 +17,8 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSolarEvaporationController extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index afe63c4b3..db53d6e6a 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -20,8 +20,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSolarNeutronActivator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index dbeb6e0b1..1c3dcdea4 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -12,8 +12,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 63e67eaca..529fb6dc2 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -20,8 +20,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 7037bad0c..2dd439f50 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -22,8 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 112ffe817..2570fb1d8 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -29,8 +29,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTModIDFilter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index ebcda29c7..6b071e97a 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -24,8 +24,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index e40ac8acb..9cff11cab 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -34,8 +34,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTeleporter extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index a5c288aee..18d33c93f 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -27,8 +27,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTransporterConfig extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 53d863684..0692a701d 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -17,8 +17,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java index 79774736c..863baa5c8 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java @@ -4,8 +4,8 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java index 69aa43e87..2bc489d2e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -9,8 +9,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiConfigTypeTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index b265d4c7a..71a98cfc2 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -12,8 +12,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiContainerEditMode extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java index e83778fba..4a186b13f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java @@ -14,8 +14,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiDetectionTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 712c425e3..db8ce0943 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -12,8 +12,8 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public abstract class GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index d51ed1d9e..cc5a4def1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -6,8 +6,8 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 4166ca8b8..64885eb8b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -11,8 +11,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMatrixTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java index 8ba61a3fb..9c5bfd00f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -6,8 +6,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiPowerBar extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java index cc03c0ae0..ce2bc7323 100644 --- a/src/main/java/mekanism/client/gui/element/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -4,8 +4,8 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiRateBar.java b/src/main/java/mekanism/client/gui/element/GuiRateBar.java index e6c1d450b..1043b9091 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRateBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiRateBar.java @@ -5,8 +5,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRateBar extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 647f85b7f..197c77173 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -11,8 +11,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiScrollList extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index a09df11d9..9cf30764e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -10,8 +10,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 69400f688..7b2d48122 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -13,8 +13,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSortingTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index f1e128ae9..c536857d5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -11,8 +11,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTransporterConfigTab extends GuiElement diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index d1a16c4ef..20f474d95 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -4,8 +4,8 @@ import mekanism.api.EnumColor; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index fe998d34a..cea4d1716 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index fc6e4c91d..2758b10e2 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalCrystallizer extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 9d21c26e9..fce9839e7 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalDissolutionChamber extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 28cd2dd62..881177eec 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index f6dc605ab..331ef28a8 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 82f2251e1..5877174c3 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalWasher extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 8c20ea876..645752840 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 0c442b82a..06bd1b587 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectricPump extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index ab6a84ec3..6fd70f870 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.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 33382ee42..8a7de3a7f 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelFlamethrower.java b/src/main/java/mekanism/client/model/ModelFlamethrower.java index c6e72f986..149a458f4 100644 --- a/src/main/java/mekanism/client/model/ModelFlamethrower.java +++ b/src/main/java/mekanism/client/model/ModelFlamethrower.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFlamethrower extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java index 979b27e06..fbfef097c 100644 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFluidicPlenisher extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index bcdbe9725..2f104d9f0 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index 595b1c2a9..ad697ac9b 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index d5f5a0122..56739c2bf 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java index 344391899..559ca73d8 100644 --- a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java +++ b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLaserAmplifier extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index 8979bda3c..31d110140 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.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 496ec04a4..4c25f09e3 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.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 574c63811..261a5139f 100644 --- a/src/main/java/mekanism/client/model/ModelObsidianTNT.java +++ b/src/main/java/mekanism/client/model/ModelObsidianTNT.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelObsidianTNT extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelPortableTank.java index 297e199fc..2f96347ea 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelPortableTank.java @@ -4,8 +4,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelPortableTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index 5a8226c28..3432e7ee2 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelPressurizedReactionChamber extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index d6a3a1eb5..505d5f118 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -5,8 +5,8 @@ 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java index c52693ee9..5aae78256 100644 --- a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelRotaryCondensentrator extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelScubaTank.java b/src/main/java/mekanism/client/model/ModelScubaTank.java index 963eb82b1..8b51e0d48 100644 --- a/src/main/java/mekanism/client/model/ModelScubaTank.java +++ b/src/main/java/mekanism/client/model/ModelScubaTank.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelScubaTank extends ModelBase diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index e27dd6bf5..da2c80d1d 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/model/ModelTransporterBox.java b/src/main/java/mekanism/client/model/ModelTransporterBox.java index 9d756e558..4215d3e26 100644 --- a/src/main/java/mekanism/client/model/ModelTransporterBox.java +++ b/src/main/java/mekanism/client/model/ModelTransporterBox.java @@ -2,8 +2,8 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelTransporterBox extends ModelBase diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index e9b752ff6..49b72abce 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -43,9 +43,9 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MekanismRenderer diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index d908e0984..9f57b860b 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -14,8 +14,8 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index aa2f6cb33..932b78cee 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -55,8 +55,8 @@ import codechicken.lib.render.TextureUtils.IIconSelfRegister; import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPartTransmitter implements IIconSelfRegister diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 6c467d7ee..af0027a0b 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -23,11 +23,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderTickHandler diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 92b665ac6..080d9f27d 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -9,9 +9,9 @@ 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; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java index 431b2f901..8746bdd91 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -11,7 +11,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; /** * CTM ISBRH adapted from Chisel diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 4c3d0ba69..d1c8252d0 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -34,9 +34,9 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 4e0c7e917..769dad675 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -9,9 +9,9 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler diff --git a/src/main/java/mekanism/client/render/block/TextureSubmap.java b/src/main/java/mekanism/client/render/block/TextureSubmap.java index a103cdfa7..817b7850a 100644 --- a/src/main/java/mekanism/client/render/block/TextureSubmap.java +++ b/src/main/java/mekanism/client/render/block/TextureSubmap.java @@ -3,7 +3,7 @@ package mekanism.client.render.block; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; /** * Multi-texture class adapted from Chisel diff --git a/src/main/java/mekanism/client/render/block/TextureVirtual.java b/src/main/java/mekanism/client/render/block/TextureVirtual.java index 2dfba26e1..6bc921a6a 100644 --- a/src/main/java/mekanism/client/render/block/TextureVirtual.java +++ b/src/main/java/mekanism/client/render/block/TextureVirtual.java @@ -1,8 +1,8 @@ package mekanism.client.render.block; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Texture component class adapted from Chisel diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 1250ef591..9263594b8 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -11,8 +11,8 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index be6f6b847..5aa5d8e95 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -7,8 +7,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index d6385a48d..23f53ee7f 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -10,8 +10,8 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index 2cb6c6bbf..de4b41033 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderRobit extends RenderLiving diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index f25da80c0..68fe3428d 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -65,9 +65,9 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ItemRenderingHandler implements IItemRenderer diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index cbfa5c1cd..b9d50b8cb 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFlameFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityJetpackFlameFX extends EntityFlameFX diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index b7609ecd6..bcf428949 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -4,9 +4,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityJetpackSmokeFX extends EntitySmokeFX diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 5834a1e1b..f92f95514 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 d95105987..2ede54600 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 483650f29..7d02fd1a9 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index d269af136..c272ab09a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index cb22c77ef..2189f6ad4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -24,9 +24,9 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import codechicken.lib.math.MathHelper; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderConfigurableMachine extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 24c40c04d..24fc8b6c4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 54444d7a5..56e297e51 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -18,8 +18,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java index 2e661fc50..835b662b7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index b852e29c6..19f31a938 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index c3eefb923..e22294e6a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 4baa2f368..5a07c1d7e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -11,8 +11,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java index 344b6dc4b..dc6a87588 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 67206eedc..4ff5cef35 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java index 8efcb8a6d..fa9e5220d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 0c60be021..0456b81d6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 0a0416bb0..38aa8d385 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index f0bab79e8..3fa182d1f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java index 321ff39e7..9d5898e1c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java b/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java index 8ba3e9569..4e796a436 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java @@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderOredictionificator extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java index 1179a1367..f53de591b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java @@ -15,8 +15,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index 0c8a43068..433e9ea19 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index 41ec74148..ad888c9e6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java index 6cb3c2101..7950cdb21 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java @@ -16,8 +16,8 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index f0b965fe7..7f1061831 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -8,8 +8,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index 48d496478..73f673a73 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -11,8 +11,8 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer diff --git a/src/main/java/mekanism/client/sound/FlamethrowerSound.java b/src/main/java/mekanism/client/sound/FlamethrowerSound.java index 651bc55aa..f4df9cac7 100644 --- a/src/main/java/mekanism/client/sound/FlamethrowerSound.java +++ b/src/main/java/mekanism/client/sound/FlamethrowerSound.java @@ -4,8 +4,8 @@ import mekanism.client.ClientTickHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class FlamethrowerSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/GasMaskSound.java b/src/main/java/mekanism/client/sound/GasMaskSound.java index de4a81529..8032bbae4 100644 --- a/src/main/java/mekanism/client/sound/GasMaskSound.java +++ b/src/main/java/mekanism/client/sound/GasMaskSound.java @@ -5,8 +5,8 @@ import mekanism.common.item.ItemGasMask; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GasMaskSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/IResettableSound.java b/src/main/java/mekanism/client/sound/IResettableSound.java index 77acdb93d..e913bc9a8 100644 --- a/src/main/java/mekanism/client/sound/IResettableSound.java +++ b/src/main/java/mekanism/client/sound/IResettableSound.java @@ -1,8 +1,8 @@ package mekanism.client.sound; import net.minecraft.client.audio.ITickableSound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public interface IResettableSound extends ITickableSound diff --git a/src/main/java/mekanism/client/sound/ISoundSource.java b/src/main/java/mekanism/client/sound/ISoundSource.java index 894ef8aa5..03208a9f5 100644 --- a/src/main/java/mekanism/client/sound/ISoundSource.java +++ b/src/main/java/mekanism/client/sound/ISoundSource.java @@ -3,8 +3,8 @@ package mekanism.client.sound; import mekanism.api.Pos3D; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface ISoundSource { diff --git a/src/main/java/mekanism/client/sound/JetpackSound.java b/src/main/java/mekanism/client/sound/JetpackSound.java index 5548cb978..aced97a31 100644 --- a/src/main/java/mekanism/client/sound/JetpackSound.java +++ b/src/main/java/mekanism/client/sound/JetpackSound.java @@ -5,8 +5,8 @@ import mekanism.common.item.ItemJetpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class JetpackSound extends PlayerSound diff --git a/src/main/java/mekanism/client/sound/PlayerSound.java b/src/main/java/mekanism/client/sound/PlayerSound.java index e2253aea3..566815af2 100644 --- a/src/main/java/mekanism/client/sound/PlayerSound.java +++ b/src/main/java/mekanism/client/sound/PlayerSound.java @@ -2,8 +2,8 @@ package mekanism.client.sound; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public abstract class PlayerSound extends Sound implements IResettableSound diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 2ea23d890..32b41ff21 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -4,8 +4,8 @@ import mekanism.api.MekanismConfig.client; import net.minecraft.client.audio.ISound; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Generic ISound class with lots of constructor functionality. diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 5134985ee..f735d36ab 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -13,8 +13,8 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * SoundHandler - a class that handles all Sounds used by Mekanism. diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index 261fcb359..d7916ad11 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -2,8 +2,8 @@ package mekanism.client.sound; import mekanism.common.base.IHasSound; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class TileSound extends Sound implements IResettableSound diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 3cc58e32f..121b77d0c 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -10,8 +10,8 @@ import java.net.Socket; import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.sound.sampled.AudioFormat; diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index 4147eae88..5fb5c3aeb 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -3,8 +3,8 @@ package mekanism.client.voice; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index 01c5e609f..76f50f2f8 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -2,8 +2,8 @@ package mekanism.client.voice; import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; diff --git a/src/main/java/mekanism/common/CTMData.java b/src/main/java/mekanism/common/CTMData.java index 0c9858c7e..dd4c0a707 100644 --- a/src/main/java/mekanism/common/CTMData.java +++ b/src/main/java/mekanism/common/CTMData.java @@ -12,8 +12,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class CTMData { diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 679bb311e..cd4d74bd6 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -13,10 +13,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; +import net.minecraftforge.fml.relauncher.Side; public class CommonPlayerTickHandler { diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 438bd523a..cc15776f9 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -9,10 +9,10 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; public class CommonPlayerTracker { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index cf63ef433..2724acacf 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -118,11 +118,11 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.FMLInjectionData; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.FMLInjectionData; /** * Common proxy for the Mekanism mod. diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 323f8857b..bcc6d32f9 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -9,10 +9,10 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.multiblock.MultiblockManager; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; +import net.minecraftforge.fml.relauncher.Side; public class CommonWorldTickHandler { diff --git a/src/main/java/mekanism/common/CoreGuiHandler.java b/src/main/java/mekanism/common/CoreGuiHandler.java index fdf9f934d..f4f9e8968 100644 --- a/src/main/java/mekanism/common/CoreGuiHandler.java +++ b/src/main/java/mekanism/common/CoreGuiHandler.java @@ -2,7 +2,7 @@ package mekanism.common; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.IGuiHandler; /** * Client and server GUI hander for Mekanism. diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index c2c9918ca..a8a8d149e 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -17,8 +17,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.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 096797f3a..c8f344e24 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -1,7 +1,7 @@ package mekanism.common; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.Event; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index 275353a10..455156ece 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -8,7 +8,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.FluidContainerRegistry; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -import cpw.mods.fml.common.ModAPIManager; +import net.minecraftforge.fml.common.ModAPIManager; public class FuelHandler { diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index 1621721fc..f6bb1a11d 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -10,7 +10,7 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class HeatNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/IMCHandler.java b/src/main/java/mekanism/common/IMCHandler.java index 4a3a49fd1..1979fb79e 100644 --- a/src/main/java/mekanism/common/IMCHandler.java +++ b/src/main/java/mekanism/common/IMCHandler.java @@ -10,9 +10,9 @@ import mekanism.common.recipe.inputs.MachineInput; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.util.RecipeUtils; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.registry.GameRegistry; public class IMCHandler { diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 7ef23db57..fb67007e0 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class InventoryNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 543433fdb..4a56264cf 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -115,25 +115,25 @@ import codechicken.multipart.handler.MultipartProxy; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -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; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; /** * Mekanism - a Minecraft mod diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index bddb156d0..4c49652da 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -20,8 +20,8 @@ import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1; import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2; diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 49726061d..389d2b738 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -39,8 +39,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder("Mekanism") public class MekanismItems diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 03e85ab3b..e56467553 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -73,11 +73,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; /** * Mekanism packet handler. As always, use packets sparingly! diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index e84895469..02271d486 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -2,7 +2,7 @@ package mekanism.common.asm; import java.util.Map; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import codechicken.core.launch.DepLoader; diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index dab93a94e..7b5693a0a 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -1,8 +1,8 @@ package mekanism.common.base; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 6c7757a00..556281024 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -1,8 +1,8 @@ package mekanism.common.base; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; diff --git a/src/main/java/mekanism/common/base/IHasSound.java b/src/main/java/mekanism/common/base/IHasSound.java index d1d29fc19..4d9e12ebe 100644 --- a/src/main/java/mekanism/common/base/IHasSound.java +++ b/src/main/java/mekanism/common/base/IHasSound.java @@ -1,7 +1,7 @@ package mekanism.common.base; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Implement this if your TileEntity has a specific sound. diff --git a/src/main/java/mekanism/common/base/SoundWrapper.java b/src/main/java/mekanism/common/base/SoundWrapper.java index c7f97df65..a2de95df5 100644 --- a/src/main/java/mekanism/common/base/SoundWrapper.java +++ b/src/main/java/mekanism/common/base/SoundWrapper.java @@ -5,8 +5,8 @@ import mekanism.client.sound.IResettableSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.SoundHandler; import mekanism.client.sound.TileSound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class SoundWrapper { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d2a115d19..59cf27389 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1,9 +1,9 @@ package mekanism.common.block; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 08b575d65..da0c0c6d4 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -1,7 +1,7 @@ package mekanism.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 386e49549..67b1664f6 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -21,8 +21,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockCardboardBox extends BlockContainer { diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 75ff04913..392ad374b 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -1,8 +1,8 @@ package mekanism.common.block; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.energy.IEnergizedItem; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index af2e6f2d5..b9babd43a 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -25,9 +25,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e1c49a94d..2b1e1190d 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1,8 +1,8 @@ package mekanism.common.block; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 93b1cc174..ab3a31341 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -15,8 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockObsidianTNT extends Block { diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index 538383975..c6d6be874 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -11,8 +11,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Block class for handling multiple ore block IDs. diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 3942a9395..e95e92220 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -17,8 +17,8 @@ import net.minecraft.item.ItemStack; 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPlastic extends Block { diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index ce0565398..2c9744a95 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack; 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPlasticFence extends BlockFence { diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index 6a7de0ba7..4b7bbe49a 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -9,8 +9,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSalt extends Block { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 31014f76d..5fbf363d2 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -import cpw.mods.fml.common.Loader; +import net.minecraftforge.fml.common.Loader; public class TransporterManager { diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 00525290e..e647a2648 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -1,8 +1,8 @@ package mekanism.common.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.EnumColor; diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 08541091d..26202800f 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -1,6 +1,6 @@ package mekanism.common.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 4defbd6b3..0d9bbcd0e 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -38,7 +38,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; -import cpw.mods.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.Interface; import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.ElectricItem; diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index bfd0ed303..d9f2f697e 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -1,6 +1,6 @@ package mekanism.common.integration; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 03f34659c..f2a1108bb 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -1,8 +1,8 @@ package mekanism.common.integration; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.common.event.FMLInterModComms; import dan200.computercraft.api.ComputerCraftAPI; import ic2.api.recipe.*; import li.cil.oc.api.Driver; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index c81eb330c..ab04d5313 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Method; public final class OreDictManager { diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 7695f6263..f65a68d2d 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.Method; @Interface(iface = "mcp.mobius.waila.api.IWailaDataProvider", modid = "Waila") public class WailaDataProvider implements IWailaDataProvider diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index d06d9a204..25f3e33ba 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -25,7 +25,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.UseHoeEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; +import net.minecraftforge.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 90ffafe19..85f29915e 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 03f1be292..745c1cac8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 2473f140c..b17ef258d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -20,9 +20,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; 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; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBlockCardboardBox extends ItemBlock { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 23f7ca534..c0e5feb2b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -33,11 +33,11 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 53e49dcac..c0e06f666 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,11 +1,11 @@ package mekanism.common.item; import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index cd24ccc5a..80a98518a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Item class for handling multiple ore block IDs. diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index ceaa791a2..e6fe91051 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 4d3a9edfe..16b39745d 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -33,9 +33,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 0a0fdf657..637cb211e 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -14,9 +14,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index b017a55ff..f9e7e3131 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index b206c66d7..623c73f47 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -24,12 +24,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index e647f251c..37460c8c3 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -13,9 +13,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; 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; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGasMask extends ItemArmor { diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index b2dcab535..f2ef481a6 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -26,8 +26,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index 81cd58200..4f95dc53f 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -2,7 +2,6 @@ package mekanism.common.item; import mekanism.common.Mekanism; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; public class ItemMekanism extends Item @@ -13,9 +12,11 @@ public class ItemMekanism extends Item setCreativeTab(Mekanism.tabMekanism); } +/* @Override public void registerIcons(IIconRegister register) { itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", "")); } +*/ } diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 84bdbe9ec..ac4b24dc2 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -15,8 +15,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemRobit extends ItemEnergized implements ISustainedInventory { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 153d4c4e7..88c0e045f 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -23,8 +23,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.EnumHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemScubaTank extends ItemArmor implements IGasItem { diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index b8b5e67aa..999ba4909 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -9,8 +9,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index c630d584a..dc08212c1 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -6,8 +6,8 @@ import codechicken.microblock.HollowMicroblock; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 21d6e9eec..f00af7938 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -28,8 +28,8 @@ import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemPartTransmitter extends JItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 0ce30db92..313f4bb62 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -5,7 +5,7 @@ import mekanism.common.Tier; import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLInterModComms; import codechicken.microblock.BlockMicroMaterial; import codechicken.microblock.MicroMaterialRegistry; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 34f7f3ffe..4b536a992 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -13,8 +13,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; diff --git a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java index 8ca7678ff..38c9fdf4f 100644 --- a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java @@ -4,8 +4,8 @@ import codechicken.lib.colour.ColourRGBA; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index b26e82183..226b0d276 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -37,8 +37,8 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PartLogisticalTransporter extends PartTransmitter implements ITransporterTile { diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 6d1e22b1f..17f96c5bf 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -1,8 +1,8 @@ package mekanism.common.multipart; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; import mekanism.common.FluidNetwork; diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 80237cd0d..9d60bb916 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -1,8 +1,8 @@ package mekanism.common.multipart; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.gas.*; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 50d940194..787dacecf 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -49,8 +49,8 @@ import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TSlottedPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, INeighborTileChange { diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 648fa3118..5314207e7 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -3,11 +3,11 @@ package mekanism.common.multipart; import codechicken.lib.vec.Vector3; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import ic2.api.energy.tile.IEnergySource; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 738da38f6..d380c78c5 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -6,9 +6,9 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import net.minecraft.block.Block; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 0fe54b856..2e8ef7314 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -10,9 +10,9 @@ import mekanism.common.Tier; import mekanism.common.base.IModule; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketConfigSync implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 04c0827d4..550425af1 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -20,9 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketConfigurationUpdate implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index 6f0bacd7f..14c058ac4 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -6,9 +6,9 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketConfiguratorState implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketContainerEditMode.java b/src/main/java/mekanism/common/network/PacketContainerEditMode.java index 8eee7ea6d..eca3f83b1 100644 --- a/src/main/java/mekanism/common/network/PacketContainerEditMode.java +++ b/src/main/java/mekanism/common/network/PacketContainerEditMode.java @@ -8,9 +8,9 @@ import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 9da254b5a..3a81f1b75 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -17,10 +17,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 931d3b7d4..9d3caf196 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -25,12 +25,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketDropperUse.java b/src/main/java/mekanism/common/network/PacketDropperUse.java index 48f9d0872..fbb234a33 100644 --- a/src/main/java/mekanism/common/network/PacketDropperUse.java +++ b/src/main/java/mekanism/common/network/PacketDropperUse.java @@ -7,9 +7,9 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.ITankManager.DropperHandler; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketDropperUse implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 23c12a26f..d4d3d12c4 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -18,10 +18,10 @@ import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilte import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketEditFilter implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 10ab0c739..9ea81b74a 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -5,9 +5,9 @@ import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 032110c1a..58d1e7665 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -14,9 +14,9 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index 99e677123..46e418b11 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -1,8 +1,8 @@ package mekanism.common.network; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index cdd88d370..b28980222 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -8,9 +8,9 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index d700a6932..5e3d8e144 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -4,9 +4,9 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey.KeyMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index a5dcb9ac4..76a4da268 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -20,12 +20,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 42964cac9..125c128ed 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -18,10 +18,10 @@ import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilte import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketNewFilter implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index 391e8946e..f2d1fe472 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -20,12 +20,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PacketOredictionificatorGui implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketPortableTankState.java b/src/main/java/mekanism/common/network/PacketPortableTankState.java index 28069cde4..cad2d1928 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTankState.java +++ b/src/main/java/mekanism/common/network/PacketPortableTankState.java @@ -5,9 +5,9 @@ import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 25ba6a6f0..d19f9fb92 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -1,9 +1,9 @@ package mekanism.common.network; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.Range4D; diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index da959db99..271ed13ba 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -7,9 +7,9 @@ import mekanism.common.PacketHandler; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 7c54789b0..b3754a7e0 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -8,9 +8,9 @@ import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 2561a404b..8eacca589 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -9,9 +9,9 @@ import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index 77a6d09d3..b50eabf63 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -6,9 +6,9 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketRobit.RobitMessage; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index ba59226ca..2207b1fb5 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -7,9 +7,9 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 367d4f2bb..643803dfb 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -10,12 +10,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index ea7597acf..3550d4de7 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -11,10 +11,10 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketTileEntity implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index e0a255640..a4a83a567 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -25,9 +25,9 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index 130de17a1..b366c9c2a 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -5,9 +5,9 @@ import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 3c3a0b7cc..d8d9ad669 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -10,9 +10,9 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class BinRecipe implements IRecipe { diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index ccf6c13d0..2b2ff7a1a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -1,9 +1,9 @@ package mekanism.common.tile; import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 454d23d24..1f19dd506 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.Method; @Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2") public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 8d8889e9a..0810e83d4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.Interface; import io.netty.buffer.ByteBuf; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index d8fb06bc7..68318100f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -23,8 +23,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index ce2f4b68b..8a1c7d31c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -7,8 +7,8 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityCrusher extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 08e24843b..214659ba7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1,7 +1,7 @@ package mekanism.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 6a6060e14..2a1205294 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -20,7 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Method; public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IEnergyWrapper { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index 5a7dbfdad..783f4bdf3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -7,8 +7,8 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 9639d09bd..6201061b5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -49,8 +49,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 8e5cf4f58..8bf7b9a15 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -30,9 +30,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 1f7b2f721..87042de66 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class TileEntityMultiblock> extends TileEntityContainerBlock implements IMultiblock { diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index cb1dd772f..72f4f184b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -9,8 +9,8 @@ import mekanism.common.base.IHasSound; import mekanism.common.base.SoundWrapper; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class TileEntityNoisyElectricBlock extends TileEntityElectricBlock implements IHasSound, ISoundSource, IActiveState { diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index b98c9b23a..feddd113d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -10,8 +10,8 @@ import mekanism.common.recipe.machines.SawmillRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityPrecisionSawmill extends TileEntityChanceMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index 3e46ee8c1..b6bfd52bc 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -31,8 +31,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySolarEvaporationController extends TileEntitySolarEvaporationBlock implements IActiveState, ITankManager { diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 352d0db8a..4faa93be8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -1,8 +1,8 @@ package mekanism.common.tile; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 6cb6dba1d..a37948be4 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -2,8 +2,8 @@ package mekanism.common.util; import buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.registry.GameData; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.registry.GameData; import ic2.api.energy.EnergyNet; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 0d3027295..b61e9fb22 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -15,7 +15,7 @@ import mekanism.common.item.ItemWalkieTalkie; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class VoiceConnection extends Thread { diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 487353a5a..8d1afb319 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -11,7 +11,7 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderEnd; import net.minecraft.world.gen.ChunkProviderHell; import net.minecraft.world.gen.feature.WorldGenMinable; -import cpw.mods.fml.common.IWorldGenerator; +import net.minecraftforge.fml.common.IWorldGenerator; public class GenHandler implements IWorldGenerator { diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 7421edcf7..fd12d1461 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -16,9 +16,9 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index a20ec41f6..5412508d5 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -32,10 +32,10 @@ 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; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GeneratorsClientProxy extends GeneratorsCommonProxy diff --git a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java index 924cb9b54..bc28d95a9 100644 --- a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java +++ b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java @@ -4,7 +4,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class GeneratorsGuiFactory implements IModGuiFactory { diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 113717db2..4bf1b76cb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -18,8 +18,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java index c346d5891..b72e8c676 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java @@ -11,8 +11,8 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 140cc889f..a81b08556 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -21,8 +21,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index 3bd5c60de..587fae7d6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -4,7 +4,7 @@ import mekanism.common.Mekanism; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; -import cpw.mods.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfig; /** * Created by ben on 27/06/14. diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index d9d9c8160..d38fccdc8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -22,8 +22,8 @@ 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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java index de136a874..46978d793 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java @@ -11,8 +11,8 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 575a2063e..aa9e9d731 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -17,8 +17,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 52022b484..7a70ec4a7 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -15,8 +15,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 355de7149..993adf2a5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -31,8 +31,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiReactorFuel extends GuiMekanism diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index e06baa379..d14ad3cf3 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -32,8 +32,8 @@ import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index 4c0be034c..ec6ae0432 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -19,8 +19,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiReactorLogicAdapter extends GuiMekanism diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 4b7732071..73d9cc9c1 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -20,8 +20,8 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index c93d6718f..3ee81ed6c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -17,8 +17,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java index db1cc9308..7a643fe31 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java @@ -11,8 +11,8 @@ import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index 2cbd08946..282e9176a 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -20,8 +20,8 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java index 7b3325fee..fb3771b07 100644 --- a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasGenerator 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 245bab043..4aac9f782 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 4d634eee4..eceae94bd 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -6,24 +6,18 @@ import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer +public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { private ModelAdvancedSolarGenerator model = new ModelAdvancedSolarGenerator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityAdvancedSolarGenerator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityAdvancedSolarGenerator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityAdvancedSolarGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 3a856510a..5886da30f 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -15,13 +15,13 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderBioGenerator extends TileEntitySpecialRenderer +public class RenderBioGenerator extends TileEntitySpecialRenderer { private ModelBioGenerator model = new ModelBioGenerator(); @@ -30,12 +30,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer private static final int stages = 40; @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityBioGenerator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityBioGenerator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityBioGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index 9c975ed0a..6fde9bce3 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -7,23 +7,18 @@ import mekanism.generators.common.tile.TileEntityGasGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderGasGenerator extends TileEntitySpecialRenderer +public class RenderGasGenerator extends TileEntitySpecialRenderer { private ModelGasGenerator model = new ModelGasGenerator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityGasGenerator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityGasGenerator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityGasGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index 8b9866218..35250bdd3 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -7,23 +7,18 @@ import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderHeatGenerator extends TileEntitySpecialRenderer +public class RenderHeatGenerator extends TileEntitySpecialRenderer { private ModelHeatGenerator model = new ModelHeatGenerator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityHeatGenerator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityHeatGenerator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityHeatGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/client/render/RenderReactor.java b/src/main/java/mekanism/generators/client/render/RenderReactor.java index abd1ccaf5..d0730ea27 100644 --- a/src/main/java/mekanism/generators/client/render/RenderReactor.java +++ b/src/main/java/mekanism/generators/client/render/RenderReactor.java @@ -10,23 +10,18 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderReactor extends TileEntitySpecialRenderer +public class RenderReactor extends TileEntitySpecialRenderer { private ModelEnergyCore core = new ModelEnergyCore(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityReactorController)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityReactorController tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityReactorController tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.isBurning()) { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index 59a244546..9e6c0f301 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -10,17 +10,12 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -public class RenderSolarGenerator extends TileEntitySpecialRenderer +public class RenderSolarGenerator extends TileEntitySpecialRenderer { private ModelSolarGenerator model = new ModelSolarGenerator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntitySolarGenerator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntitySolarGenerator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntitySolarGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java index f4629764c..a08045ed3 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java @@ -11,17 +11,12 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -public class RenderWindTurbine extends TileEntitySpecialRenderer +public class RenderWindTurbine extends TileEntitySpecialRenderer { private ModelWindTurbine model = new ModelWindTurbine(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityWindTurbine)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityWindTurbine tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityWindTurbine tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index 31d4ee751..42ce9d3a3 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -6,8 +6,8 @@ import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder("MekanismGenerators") public class GeneratorsBlocks diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 63099c4c0..215b0118e 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -28,8 +28,8 @@ 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.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; /** * Common proxy for the Mekanism Generators module. diff --git a/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java b/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java index 52ad81925..507d92ec7 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java +++ b/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java @@ -2,7 +2,7 @@ package mekanism.generators.common; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.IGuiHandler; /** * Client and server GUI hander for Mekanism. diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index e91174693..a48646df8 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -3,8 +3,8 @@ package mekanism.generators.common; import mekanism.common.item.ItemMekanism; import mekanism.generators.common.item.ItemHohlraum; import net.minecraft.item.Item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder("MekanismGenerators") public class GeneratorsItems diff --git a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java b/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java index 8ee96c4e7..6869a4592 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java +++ b/src/main/java/mekanism/generators/common/GeneratorsPacketHandler.java @@ -12,11 +12,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 130eaf489..a702ef857 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -2,17 +2,17 @@ package mekanism.generators.common; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 0e609af53..255f18336 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -1,8 +1,8 @@ package mekanism.generators.common.block; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.ItemAttacher; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 1c6434fc3..1ba001501 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -1,8 +1,8 @@ package mekanism.generators.common.block; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index 775dba5d5..331214f3f 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -10,8 +10,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerReactorController extends Container { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 634c4df71..342f83d75 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -28,11 +28,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index e59f664c4..e237cf458 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -11,8 +11,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java b/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java index 21fe4fcc2..6257da6eb 100644 --- a/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java +++ b/src/main/java/mekanism/generators/common/network/PacketGeneratorsGui.java @@ -10,12 +10,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 5b830fa8c..aeef8f24d 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,7 +1,7 @@ package mekanism.generators.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index c6d4996ca..a2a9c8043 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -12,8 +12,8 @@ import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySolarGenerator extends TileEntityGenerator { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index f11d794d7..33a97eac8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -1,7 +1,7 @@ package mekanism.generators.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index df5d6745d..10b35edc3 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -29,8 +29,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityReactorController extends TileEntityReactorBlock implements IActiveState, IHasSound, ISoundSource { diff --git a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java index 1f165cc13..7a60a0f15 100644 --- a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java +++ b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java @@ -8,11 +8,11 @@ import mekanism.common.util.LangUtils; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; -import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.GuiConfigEntries; -import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; -import cpw.mods.fml.client.config.IConfigElement; +import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfigEntries; +import net.minecraftforge.fml.client.config.GuiConfigEntries.CategoryEntry; +import net.minecraftforge.fml.client.config.IConfigElement; /** * Created by ben on 27/06/14. diff --git a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java index 12d1ac6ba..263aa2fe5 100644 --- a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java +++ b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java @@ -4,7 +4,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class ToolsGuiFactory implements IModGuiFactory { diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 2fdda0e63..e881e773f 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,14 +1,14 @@ package mekanism.tools.common; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 0c0977b67..96ab62ad0 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -11,8 +11,8 @@ import mekanism.tools.item.ItemMekanismSword; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder("MekanismTools") public class ToolsItems diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 7b9574edb..c3198054d 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -17,8 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMekanismArmor extends ItemArmor { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 16979370f..41b58736a 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -13,9 +13,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; 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; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMekanismHoe extends ItemMekanism {