From 5a11a58346d39392e87c8a4820ab72989ca942ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 19:50:23 -0600 Subject: [PATCH] cpw.mods.fml to net.minecraftforge.fml --- .../java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../vazkii/botania/api/boss/IBotaniaBoss.java | 4 +-- .../api/boss/IBotaniaBossWithShader.java | 4 +-- .../api/corporea/CorporeaRequestEvent.java | 4 +-- .../ICorporeaAutoCompleteController.java | 4 +-- .../botania/api/internal/DummyPage.java | 4 +-- .../api/internal/IInternalMethodHandler.java | 4 +-- .../botania/api/item/IBaubleRender.java | 4 +-- .../IWireframeCoordinateListProvider.java | 4 +-- .../api/item/TinyPotatoRenderEvent.java | 6 ++--- .../botania/api/lexicon/LexiconEntry.java | 4 +-- .../botania/api/lexicon/LexiconPage.java | 4 +-- .../component/MultiblockComponent.java | 4 +-- .../java/vazkii/botania/api/mana/ILens.java | 4 +-- .../botania/api/mana/ManaNetworkEvent.java | 2 +- .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/ElvenPortalUpdateEvent.java | 2 +- .../botania/api/subtile/SubTileEntity.java | 4 +-- .../botania/api/wand/ICoordBoundItem.java | 4 +-- .../vazkii/botania/api/wand/ITileBound.java | 4 +-- .../vazkii/botania/api/wiki/WikiHooks.java | 4 +-- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BotaniaPlayerController.java | 4 +-- .../core/handler/BoundTileRenderer.java | 2 +- .../core/handler/ClientTickHandler.java | 8 +++--- .../handler/ContributorFancinessHandler.java | 2 +- .../handler/CorporeaAutoCompleteHandler.java | 8 +++--- .../client/core/handler/DebugHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 6 ++--- .../handler/ItemsRemainingRenderHandler.java | 4 +-- .../client/core/handler/LightningHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 2 +- .../handler/SubTileRadiusRenderHandler.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/core/handler/TooltipHandler.java | 4 +-- .../client/core/helper/ShaderHelper.java | 2 +- .../client/core/proxy/ClientProxy.java | 18 ++++++------- .../botania/client/core/proxy/GuiFactory.java | 2 +- .../java/vazkii/botania/client/fx/FXWisp.java | 2 +- .../client/gui/GuiAchievementsHacky.java | 2 +- .../botania/client/gui/GuiBotaniaConfig.java | 2 +- .../client/render/block/InterpolatedIcon.java | 6 ++--- .../client/render/block/RenderAltar.java | 2 +- .../client/render/block/RenderAvatar.java | 2 +- .../client/render/block/RenderBellows.java | 2 +- .../client/render/block/RenderBrewery.java | 2 +- .../client/render/block/RenderCocoon.java | 2 +- .../block/RenderCorporeaCrystalCube.java | 2 +- .../render/block/RenderCorporeaIndex.java | 2 +- .../render/block/RenderDoubleFlower.java | 2 +- .../render/block/RenderFloatingFlower.java | 2 +- .../client/render/block/RenderHourglass.java | 2 +- .../render/block/RenderIncensePlate.java | 2 +- .../client/render/block/RenderPool.java | 2 +- .../client/render/block/RenderPump.java | 2 +- .../client/render/block/RenderPylon.java | 2 +- .../render/block/RenderSpawnerClaw.java | 2 +- .../render/block/RenderSpecialFlower.java | 2 +- .../client/render/block/RenderSpreader.java | 2 +- .../render/block/RenderTeruTeruBozu.java | 2 +- .../client/render/block/RenderTinyPotato.java | 2 +- .../botania/client/render/item/RenderBow.java | 2 +- .../java/vazkii/botania/common/Botania.java | 26 +++++++++---------- .../achievement/AchievementTriggerer.java | 6 ++--- .../common/achievement/ModAchievements.java | 2 +- .../botania/common/block/BlockAltar.java | 2 +- .../botania/common/block/BlockBifrost.java | 6 ++--- .../botania/common/block/BlockCamo.java | 4 +-- .../botania/common/block/BlockDreamwood.java | 2 +- .../common/block/BlockEnchantedSoil.java | 6 ++--- .../botania/common/block/BlockFelPumpkin.java | 6 ++--- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockGaiaHead.java | 6 ++--- .../botania/common/block/BlockGhostRail.java | 8 +++--- .../botania/common/block/BlockLightRelay.java | 2 +- .../botania/common/block/BlockLivingrock.java | 2 +- .../botania/common/block/BlockLivingwood.java | 2 +- .../vazkii/botania/common/block/BlockMod.java | 6 ++--- .../common/block/BlockModContainer.java | 6 ++--- .../common/block/BlockModDoubleFlower.java | 2 +- .../botania/common/block/BlockModFlower.java | 6 ++--- .../botania/common/block/BlockOpenCrate.java | 2 +- .../common/block/BlockPistonRelay.java | 10 +++---- .../botania/common/block/BlockPlatform.java | 2 +- .../botania/common/block/BlockPylon.java | 4 +-- .../botania/common/block/BlockSolidVines.java | 2 +- .../common/block/BlockSpecialFlower.java | 2 +- .../botania/common/block/BlockStorage.java | 6 ++--- .../botania/common/block/ModBlocks.java | 4 +-- .../common/block/decor/Block18Stone.java | 2 +- .../common/block/decor/BlockBlaze.java | 4 +-- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/decor/BlockCustomBrick.java | 2 +- .../block/decor/BlockEndStoneBrick.java | 2 +- .../block/decor/BlockFloatingFlower.java | 4 +-- .../common/block/decor/BlockManaBeacon.java | 2 +- .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockModMushroom.java | 8 +++--- .../common/block/decor/BlockPavement.java | 6 ++--- .../common/block/decor/BlockPetalBlock.java | 2 +- .../common/block/decor/BlockPrismarine.java | 8 +++--- .../common/block/decor/BlockReeds.java | 6 ++--- .../common/block/decor/BlockSeaLamp.java | 2 +- .../common/block/decor/BlockShimmerrock.java | 6 ++--- .../block/decor/BlockShimmerwoodPlanks.java | 6 ++--- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../common/block/decor/BlockUnstable.java | 2 +- .../decor/biomestone/BlockBiomeStone.java | 2 +- .../block/decor/panes/BlockBifrostPane.java | 6 ++--- .../block/decor/panes/BlockModPane.java | 6 ++--- .../decor/quartz/BlockSpecialQuartz.java | 6 ++--- .../decor/quartz/BlockSpecialQuartzSlab.java | 4 +-- .../block/decor/slabs/BlockLivingSlab.java | 4 +-- .../block/decor/slabs/BlockModSlab.java | 6 ++--- .../block/decor/stairs/BlockModStairs.java | 2 +- .../block/decor/walls/BlockModWall.java | 2 +- .../block/decor/walls/BlockVariantWall.java | 2 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../common/block/string/BlockRedString.java | 4 +-- .../string/BlockRedStringInterceptor.java | 2 +- .../functional/SubTileHeiseiDream.java | 2 +- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 2 +- .../functional/SubTileSpectranthemum.java | 4 +-- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 2 +- .../subtile/generating/SubTileNarslimmus.java | 4 +-- .../botania/common/block/tile/TileCocoon.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 8 +++--- .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 4 +-- .../common/brew/potion/PotionEmptiness.java | 4 +-- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../botania/common/brew/potion/PotionMod.java | 4 +-- .../common/brew/potion/PotionSoulCross.java | 2 +- .../common/core/handler/AliasHandler.java | 6 ++--- .../core/handler/BiomeDecorationHandler.java | 6 ++--- .../core/handler/CommonTickHandler.java | 12 ++++----- .../common/core/handler/ConfigHandler.java | 8 +++--- .../common/core/handler/IMCHandler.java | 2 +- .../core/handler/InternalMethodHandler.java | 2 +- .../core/handler/ManaNetworkHandler.java | 2 +- .../common/core/handler/PixieHandler.java | 2 +- .../common/core/handler/SheddingHandler.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 2 +- .../common/core/helper/ObfuscationHelper.java | 2 +- .../botania/common/core/helper/Vector3.java | 4 +-- .../common/core/proxy/CommonProxy.java | 18 ++++++------- .../common/core/version/VersionChecker.java | 8 +++--- .../common/crafting/ModCraftingRecipes.java | 4 +-- .../common/entity/EntityDoppleganger.java | 6 ++--- .../common/entity/EntityMagicMissile.java | 2 +- .../common/entity/EntityThrowableCopy.java | 4 +-- .../botania/common/entity/ModEntities.java | 2 +- .../botania/common/item/ItemAncientWill.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 6 ++--- .../botania/common/item/ItemCacophonium.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 10 +++---- .../botania/common/item/ItemFlowerBag.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 12 ++++----- .../botania/common/item/ItemKeepIvy.java | 8 +++--- .../botania/common/item/ItemManaCookie.java | 6 ++--- .../botania/common/item/ItemManaGun.java | 6 ++--- .../vazkii/botania/common/item/ItemMod.java | 6 ++--- .../botania/common/item/ItemPhantomInk.java | 2 +- .../botania/common/item/ItemPoolMinecart.java | 2 +- .../botania/common/item/ItemRegenIvy.java | 12 ++++----- .../botania/common/item/ItemSextant.java | 4 +-- .../botania/common/item/ItemSpellCloth.java | 6 ++--- .../common/item/ItemTemperanceStone.java | 4 +-- .../vazkii/botania/common/item/ItemVirus.java | 8 +++--- .../armor/elementium/ItemElementiumArmor.java | 4 +-- .../armor/manasteel/ItemManasteelArmor.java | 8 +++--- .../armor/manaweave/ItemManaweaveArmor.java | 4 +-- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +-- .../armor/terrasteel/ItemTerrasteelHelm.java | 6 ++--- .../item/equipment/bauble/ItemBauble.java | 6 ++--- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 8 +++--- .../equipment/bauble/ItemFlightTiara.java | 10 +++---- .../equipment/bauble/ItemGoldenLaurel.java | 8 +++--- .../item/equipment/bauble/ItemHolyCloak.java | 6 ++--- .../item/equipment/bauble/ItemItemFinder.java | 6 ++--- .../equipment/bauble/ItemKnockbackBelt.java | 4 +-- .../item/equipment/bauble/ItemMagnetRing.java | 6 ++--- .../item/equipment/bauble/ItemMonocle.java | 4 +-- .../bauble/ItemSuperLavaPendant.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 8 +++--- .../item/equipment/tool/ItemGlassPick.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 6 ++--- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 4 +-- .../tool/manasteel/ItemManasteelAxe.java | 6 ++--- .../tool/manasteel/ItemManasteelPick.java | 6 ++--- .../tool/manasteel/ItemManasteelShears.java | 6 ++--- .../tool/manasteel/ItemManasteelShovel.java | 8 +++--- .../tool/manasteel/ItemManasteelSword.java | 6 ++--- .../tool/terrasteel/ItemTerraAxe.java | 12 ++++----- .../tool/terrasteel/ItemTerraPick.java | 6 ++--- .../ItemElementiumHelmRevealing.java | 2 +- .../thaumcraft/ItemManaInkwell.java | 2 +- .../ItemManasteelHelmRevealing.java | 4 +-- .../ItemTerrasteelHelmRevealing.java | 2 +- .../botania/common/item/lens/ItemLens.java | 2 +- .../item/material/ItemManaResource.java | 6 ++--- .../common/item/record/ItemModRecord.java | 6 ++--- .../common/item/relic/ItemAesirRing.java | 4 +-- .../common/item/relic/ItemInfiniteFruit.java | 6 ++--- .../common/item/relic/ItemLokiRing.java | 6 ++--- .../common/item/relic/ItemOdinRing.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 6 ++--- .../botania/common/lexicon/RLexiconEntry.java | 4 +-- .../botania/common/lexicon/page/PageBrew.java | 4 +-- .../lexicon/page/PageCraftingRecipe.java | 6 ++--- .../common/lexicon/page/PageElvenRecipe.java | 4 +-- .../common/lexicon/page/PageEntity.java | 4 +-- .../common/lexicon/page/PageImage.java | 4 +-- .../lexicon/page/PageManaInfusionRecipe.java | 4 +-- .../common/lexicon/page/PageMultiblock.java | 4 +-- .../common/lexicon/page/PagePetalRecipe.java | 4 +-- .../common/lexicon/page/PageRecipe.java | 4 +-- .../common/lexicon/page/PageRuneRecipe.java | 4 +-- .../common/lexicon/page/PageShedding.java | 4 +-- .../common/lexicon/page/PageTerrasteel.java | 4 +-- .../botania/common/lexicon/page/PageText.java | 4 +-- .../common/lexicon/page/PageTutorial.java | 4 +-- .../botania/common/network/GuiHandler.java | 2 +- .../common/world/SkyblockWorldEvents.java | 2 +- 235 files changed, 489 insertions(+), 489 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8c627f937..522308fa6 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -55,7 +55,7 @@ import vazkii.botania.api.wiki.WikiHooks; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import cpw.mods.fml.common.Loader; +import net.minecraftforge.fml.common.Loader; public final class BotaniaAPI { diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index d337e6ae8..ff6dc710d 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -15,8 +15,8 @@ import java.awt.Rectangle; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.boss.IBossDisplayData; 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; /** * An extension of IBossDisplayData. This counts as a botania boss and as a normal diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index 82221d37e..e64dba2cb 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -11,8 +11,8 @@ package vazkii.botania.api.boss; import vazkii.botania.api.internal.ShaderCallback; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A Botania boss whose HP bar makes use of shaders. Shaders diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java index a55ef7b75..ea628ef56 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.corporea; -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; /** * Fired when a corporea request is initiated. Can be cancelled. diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index fc0a3e9b9..c02047dba 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.corporea; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * An interface for systems which may control if the item auto complete system should be active diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 843198c41..961ea6029 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -11,8 +11,8 @@ package vazkii.botania.api.internal; import vazkii.botania.api.lexicon.LexiconPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A dummy page. It does absolutely nothing and is only diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 9061812e2..54b000f40 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -32,8 +32,8 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any methods that refer to internal methods in Botania are here. diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 7cc492a39..10e01be8e 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -17,8 +17,8 @@ import net.minecraftforge.client.event.RenderPlayerEvent; 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; /** * A Bauble Item that implements this will be have hooks to render something on diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index ae0863ce7..056dec187 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * An item that implements this will allow for various wireframes to be drawn diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 8b51c2634..116671ab6 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -11,9 +11,9 @@ package vazkii.botania.api.item; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index fdbb55ed6..a8a1d10aa 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -17,8 +17,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; -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 LexiconEntry implements Comparable { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 9880b9e9e..7c70491d4 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import vazkii.botania.api.internal.IGuiLexiconEntry; -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 LexiconPage { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index b1a7d895f..b375e0ccf 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; 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; /** * A component of a multiblock, the normal one diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index d125e5729..38ea2fea4 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -11,8 +11,8 @@ package vazkii.botania.api.mana; 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; /** * Have an Item implement this to be counted as a lens for the mana spreader. diff --git a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java index 9116602c5..747b19379 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java @@ -12,7 +12,7 @@ package vazkii.botania.api.mana; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; public class ManaNetworkEvent extends Event { diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 305ab3b72..027ce0e85 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ @API(owner = "Botania", apiVersion = "67", provides = "BotaniaAPI") package vazkii.botania.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index 40d971359..df0235646 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; /** * An event fired when an Elven Portal TE updates. The portal's diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index da1ce2dc8..19aa48f85 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -26,8 +26,8 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index f7c8036d7..eb1d42737 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -2,8 +2,8 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * The item equivalent of ITileBound, renders when the diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 199390b5a..77c1ffcc7 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -11,8 +11,8 @@ package vazkii.botania.api.wand; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any TileEntity that implements this is technically bound diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index ae42fd82e..56c4ef22b 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; public class WikiHooks { diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 460e7363c..caf8b3b06 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -36,7 +36,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BaubleRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index a9610ad3a..eb18ab149 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -14,8 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import vazkii.botania.api.item.IExtendedPlayerController; -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 BotaniaPlayerController extends PlayerControllerMP implements IExtendedPlayerController { diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 968dbfdd6..efec93478 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -32,7 +32,7 @@ import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BoundTileRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 570cec57a..5eb939cf2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -26,10 +26,10 @@ import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.item.ItemTwigWand; -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.common.gameevent.TickEvent.RenderTickEvent; +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.common.gameevent.TickEvent.RenderTickEvent; public class ClientTickHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index d2d37409b..feb278878 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -35,7 +35,7 @@ import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.material.ItemManaResource; -import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 498f23bd2..72c4b4706 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -30,10 +30,10 @@ import org.lwjgl.input.Keyboard; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.lib.LibObfuscation; -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.ReflectionHelper; +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.ReflectionHelper; public class CorporeaAutoCompleteHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 01fb8924b..36362b371 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -26,7 +26,7 @@ import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class DebugHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 642808d40..c9386910d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -64,9 +64,9 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public final class HUDHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 4e41b8c15..c6a5c40d1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -23,8 +23,8 @@ import net.minecraft.util.EnumChatFormatting; 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; public final class ItemsRemainingRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index d66b638a3..3a4c8c574 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.client.core.handler.LightningHandler.LightningBolt.Segment import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class LightningHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index f60e46c43..37c8a3cb4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -35,7 +35,7 @@ import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class MultiblockRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 68460cabf..e612f8ebf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -30,7 +30,7 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SubTileRadiusRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 56179cc92..77d759dc8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public final class TooltipAdditionDisplayHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 6d1ae432e..ede1e06a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -17,8 +17,8 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ItemRegenIvy; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class TooltipHandler { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 1923a011b..a1e20449c 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -26,7 +26,7 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.fml.common.FMLLog; public final class ShaderHelper { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 530a2bd89..0f39d01b9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -171,15 +171,15 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.ItemSextant.MultiblockSextant; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; -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.FMLLog; -import cpw.mods.fml.common.Optional; -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.relauncher.ReflectionHelper; +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.FMLLog; +import net.minecraftforge.fml.common.Optional; +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.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 2a558708d..0794847af 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -15,7 +15,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import vazkii.botania.client.gui.GuiBotaniaConfig; -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class GuiFactory implements IModGuiFactory { diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 05ad91c98..d10323d99 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ObfuscationHelper; -import cpw.mods.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.FMLClientHandler; public class FXWisp extends EntityFX { diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 9891b66ed..547a7018f 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -15,7 +15,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; import vazkii.botania.common.achievement.ModAchievements; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class GuiAchievementsHacky extends GuiAchievements { diff --git a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java index 4f9d20e1b..77c2fe04c 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfig; public class GuiBotaniaConfig extends GuiConfig { diff --git a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java index dbe47f01b..e250a1c0e 100644 --- a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java +++ b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java @@ -16,9 +16,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.data.AnimationMetadataSection; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; // This is all vanilla code from 1.8, thanks to ganymedes01 porting it to 1.7 :D @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java index 2d1e6384e..15fbbed8e 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.common.block.tile.TileAltar; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderAltar implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java index f850e1237..4baa2d745 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileAvatar; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderAvatar implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java index a1e287418..e91eabe3e 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TileBellows; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderBellows implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java index aa2eefed3..08cb7f518 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.common.block.tile.TileBrewery; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderBrewery implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java index d74f04d17..9f886b08c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileCocoon; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCocoon implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java index 1225ae73d..53ee16218 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCorporeaCrystalCube implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java index 4eb43de55..e70f1b6f3 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCorporeaIndex implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java index d9a9ab80b..9a772343d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java @@ -17,7 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import vazkii.botania.client.lib.LibRenderIDs; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java index 4c569ce74..a97379407 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import vazkii.botania.client.lib.LibRenderIDs; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderFloatingFlower implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java index 5bb3d923c..95fbd226d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileHourglass; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderHourglass implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java index d487e4fa2..59b1ce678 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileIncensePlate; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderIncensePlate implements ISimpleBlockRenderingHandler{ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPool.java b/src/main/java/vazkii/botania/client/render/block/RenderPool.java index 29cc7cb51..0160ad9f9 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPool.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPool.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPool implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPump.java b/src/main/java/vazkii/botania/client/render/block/RenderPump.java index cbf99719f..beaadfed3 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPump.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPump.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TilePump; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPump implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java index aad8cfd19..2f4c2c89d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.common.block.tile.TilePylon; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPylon implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java index 6c1e45513..d02d7e6f1 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSpawnerClaw; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index 6de45bc66..a90e9711b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -19,7 +19,7 @@ import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMultiblockRenderHook { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java index 946dfdb6c..bb67f9a6a 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TileSpreader; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpreader implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java index d12f99eaa..a8925f94d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderTeruTeruBozu implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java index 2ba503369..bf5a5122b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTinyPotato; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderTinyPotato implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java index 8b22dc0da..776e843aa 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderBow.java @@ -20,7 +20,7 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class RenderBow implements IItemRenderer { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 180a609f7..151f73802 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -17,19 +17,19 @@ import vazkii.botania.common.integration.coloredlights.ILightHelper; import vazkii.botania.common.integration.coloredlights.LightHelperColored; import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; import vazkii.botania.common.lib.LibMisc; -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.ModAPIManager; -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.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; +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.ModAPIManager; +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.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index 0d67196f9..e5c32613e 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -12,9 +12,9 @@ package vazkii.botania.common.achievement; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; public final class AchievementTriggerer { diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 9db5d62dd..5e16c5322 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -21,7 +21,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibAchievementNames; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public final class ModAchievements { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index eb1c4b922..bf29f1ff6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -45,7 +45,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltar extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 8f2736bd7..3aa09c559 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -31,9 +31,9 @@ import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -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 BlockBifrost extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index ba831f15e..9dac8126f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -24,8 +24,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; -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 BlockCamo extends BlockModContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 5ed43a155..8c570787b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -7,7 +7,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockDreamwood extends BlockLivingwood { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 1c66aca3f..71e597b32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -32,9 +32,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -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 BlockEnchantedSoil extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index c22cf7d89..f87f8ac90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -29,9 +29,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -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 BlockFelPumpkin extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c50430429..efca3ee32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -41,7 +41,7 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 7d209302e..2f1e9deec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -20,9 +20,9 @@ import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGaiaHead extends BlockSkull { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 428ec97a5..984f13ebf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -26,10 +26,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 04e0d77c2..2d1748753 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e0b6e8621..017156b2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a9571b675..fbacb7a6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -29,7 +29,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e797d0c8f..4e4553d25 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -18,9 +18,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockMod extends Block { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index d1ff8357e..d19599960 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 9c6988974..529bbf0e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -41,7 +41,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 084e217c7..8ebf8141f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -38,9 +38,9 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b8a1c2d69..1c136f456 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -44,7 +44,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 80dfcdfe4..2e81885c3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -38,11 +38,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 75346747f..5ae575622 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 72ada7d10..f0eb91678 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -31,8 +31,8 @@ import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index f75af748e..1981166d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSolidVines extends BlockVine implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 4819abd34..58640dd02 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -46,7 +46,7 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bf35e1173..e0104455f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -28,9 +28,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 2f4c5c190..e597307be 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -173,8 +173,8 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModBlocks { diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index 6614a15d1..d5005f0b4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class Block18Stone extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index a627d1cde..483e6cb99 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -23,8 +23,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 147a5905d..83d2607d5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockBuriedPetals extends BlockModFlower { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 063738508..919aa5932 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockCustomBrick extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 22b476c67..6c2e265c1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index b86f54c7e..2572c1c39 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -43,8 +43,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 90d3d7a11..d8143da52 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 0b6a804dd..243bce860 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockManaFlame extends BlockModContainer { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index a7b4e36f3..46e51d48e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -38,10 +38,10 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index d13de732d..00d8f1f8a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -25,9 +25,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 1ee7e2982..8a6068d4f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPetalBlock extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 870ac12e3..fa696ebf5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -33,10 +33,10 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 0cfdf2cae..8484f6e32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -25,9 +25,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 381135096..8f868a740 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -21,7 +21,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockSeaLamp extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index c99f9c53e..724abac77 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -24,9 +24,9 @@ import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -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 BlockShimmerrock extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 3a45c951d..d1fdedc25 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -24,9 +24,9 @@ import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -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 BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 7ea7a8ea1..db5a17ca8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 6c3a99b0f..60843202f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockTinyPotato extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 32bc04b1e..a26bd40f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -31,7 +31,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockUnstable extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index bec935526..3cb3c3202 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBiomeStone extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 495e39016..b2758f4d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -16,9 +16,9 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.ModBlocks; -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 BlockBifrostPane extends BlockModPane { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 3d03e3c79..9b1e53355 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -21,9 +21,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 7773404ad..31e4dce0e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -28,9 +28,9 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index c26bbc8c1..7fd954b0e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -26,8 +26,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -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 BlockSpecialQuartzSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 573774843..4a113f588 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -2,8 +2,8 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.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; public abstract class BlockLivingSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index d6f502f61..948babdb3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -15,9 +15,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 82ad317d5..7394b4b66 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -10,7 +10,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModStairs extends BlockStairs implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index b0a3863b7..3ef9e4c7c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -25,7 +25,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModWall extends BlockWall implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 4c457bb44..76ef02052 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -18,7 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockVariantWall extends BlockModWall { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 3893d556c..b46e4b2a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -39,7 +39,7 @@ import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 6378abd45..b44106997 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -44,7 +44,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable, IPickupAchievement { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 79e7e35db..0f401ab9d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -22,7 +22,7 @@ import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockRFGenerator extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 8227d736f..98002e51b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -45,7 +45,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 1ec27f02c..38616bca8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -27,8 +27,8 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; -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 BlockRedString extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 6512281e1..58dbdbae5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -20,7 +20,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BlockRedStringInterceptor extends BlockRedString { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 0c66e7fdc..02bb03c6c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -25,7 +25,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileHeiseiDream extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 95d81b8e9..94563ead9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -21,7 +21,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTilePollidisiac extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index d05fefa14..21ad22c75 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -42,7 +42,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileRannuncarpus extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 733d35b97..19b0762c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -26,8 +26,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -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 SubTileSpectranthemum extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 07b01ed5f..19748fdef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -27,7 +27,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileTigerseye extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 74110d252..8a8a3f5e4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -24,7 +24,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 875fbb094..c062cebaf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -22,8 +22,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileNarslimmus extends SubTileGenerating { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 1dd09aed9..6f34dafff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,7 +22,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry; public class TileCocoon extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 81e97bb4e..7623268d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -24,7 +24,7 @@ import net.minecraft.util.WeightedRandom; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class TileSpawnerClaw extends TileMod implements IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index ca55eda1c..bedbbc469 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -39,10 +39,10 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.EventPriority; -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.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 59e76677f..78e7399e2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index 4f856911e..ebd052470 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionAllure extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 44eadad2b..f78cdedad 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -20,8 +20,8 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionBloodthirst extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 6d2b77ea0..187a15eda 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -19,8 +19,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionEmptiness extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index c9e26d3c1..da3fe88e1 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionFeatherfeet extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 1cf8dcfe2..3da24aa70 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -15,8 +15,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; -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 PotionMod extends Potion { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index 8498a6800..339b07aa2 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -16,7 +16,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionSoulCross extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index aad356ac8..e1ccd195e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -15,9 +15,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.registry.GameRegistry.Type; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.registry.GameRegistry.Type; public final class AliasHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index b5fa63798..9d5b33f03 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -19,9 +19,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BiomeDecorationHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 5ebadc969..806840428 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -11,12 +11,12 @@ package vazkii.botania.common.core.handler; import vazkii.botania.api.corporea.CorporeaHelper; -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.common.gameevent.TickEvent.WorldTickEvent; -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.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public final class CommonTickHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 34577a087..2007ffec4 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -17,10 +17,10 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class ConfigHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index a12ad98f9..5cf46f4b6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -7,7 +7,7 @@ import vazkii.botania.common.lib.LibMisc; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; public final class IMCHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index e181206aa..2ec2fbad4 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -63,7 +63,7 @@ import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; import buildcraft.api.transport.IPipeTile; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class InternalMethodHandler extends DummyMethodHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 54608e1c4..611183393 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -24,7 +24,7 @@ import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.common.core.helper.MathHelper; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class ManaNetworkHandler implements IManaNetwork { diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index bccd71985..770ae47d9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -13,7 +13,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PixieHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index aef3cbdd6..7ae085f17 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -32,7 +32,7 @@ import net.minecraftforge.common.config.Property; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java index 338bcaa74..bcf353fa6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java @@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SpawnerChangingHandler { diff --git a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java b/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java index 8bc4782b0..888c94623 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java @@ -13,7 +13,7 @@ package vazkii.botania.common.core.helper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ObfuscationHelper { diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 02c47ba54..5ae83df22 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -23,8 +23,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -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 Vector3 { diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 1249071e3..6968bfc07 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -66,15 +66,15 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; import vazkii.botania.common.world.WorldTypeSkyblock; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; public class CommonProxy { diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 9f4f5351b..b79e04e82 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -18,10 +18,10 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.StatCollector; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; public final class VersionChecker { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 056679651..aa22ac4c2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -37,8 +37,8 @@ import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModCraftingRecipes { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index dc82267ec..a570e6411 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -72,9 +72,9 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index e1ba272aa..04ff5862d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -28,7 +28,7 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class EntityMagicMissile extends EntityThrowable { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 38202c607..8f691f1d8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -24,8 +24,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; 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; // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index ad4625bc8..ba4492dd3 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -13,7 +13,7 @@ package vazkii.botania.common.entity; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; -import cpw.mods.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.EntityRegistry; public final class ModEntities { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 5001267df..fa2b52185 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -24,7 +24,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAncientWill extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 98cd2cd1c..677061992 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -39,9 +39,9 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index e5c52b05e..88c213065 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemCacophonium extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index dd13df4db..8b7befbd2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -60,11 +60,11 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index a57e00bfb..630049ea7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -28,7 +28,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemFlowerBag extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 35985a50a..bb55c1545 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -30,12 +30,12 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGrassSeeds extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 663dd323a..e680c1be1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -24,10 +24,10 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemKeepIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 04aa14620..e6d3e8317 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -23,9 +23,9 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 30a8c2ef3..ca7c5c6b9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -42,9 +42,9 @@ import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaGun extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 4e20174df..e8ddc0903 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -16,9 +16,9 @@ import net.minecraft.item.ItemStack; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMod extends Item { diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index c3a90547b..c125c2f0b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -14,7 +14,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemPhantomInk extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 248d72917..07dc38d8c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibItemNames; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index 20d725430..4db5c55ca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -17,12 +17,12 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.RegenIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -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.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +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.common.registry.GameRegistry; public class ItemRegenIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index d7b18914d..453fc5ffc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -28,8 +28,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -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 ItemSextant extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index d8782f5d5..af76e2698 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -17,9 +17,9 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSpellCloth extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 371d5a089..1cba481f7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -21,8 +21,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -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 ItemTemperanceStone extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 1ccca7d49..bd36dda17 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -31,10 +31,10 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemVirus extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 1809003cf..f8f4e003b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -3,8 +3,8 @@ package vazkii.botania.common.item.equipment.armor.elementium; import java.util.List; import baubles.common.Config; -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.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 5bda4fc87..f2c542de3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -39,10 +39,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 7e98e576d..d8bf7efe9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -26,8 +26,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -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 ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 5dc841814..b53472fda 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -22,8 +22,8 @@ import vazkii.botania.client.model.armor.ModelArmorTerrasteel; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -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 ItemTerrasteelArmor extends ItemManasteelArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 26e7dc5f0..e1262197a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -37,9 +37,9 @@ import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -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 ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 77bd4604a..060a69b65 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -31,9 +31,9 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index ce41f5347..7434d6693 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -35,7 +35,7 @@ import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index f0a21d180..7985529b0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -37,10 +37,10 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 46a887b48..3bcecf853 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -60,11 +60,11 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 278d9e285..c95a0ff2d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -29,10 +29,10 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -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.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 50776abf6..03bf2be4a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -30,9 +30,9 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -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 ItemHolyCloak extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 2acf57719..3f0e579d3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -48,9 +48,9 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemItemFinder extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 161bf42f4..b09fbba6c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -27,8 +27,8 @@ import baubles.api.BaubleType; import com.google.common.collect.Multimap; -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 ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index aa392fbca..36a125bd2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -35,9 +35,9 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -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 ItemMagnetRing extends ItemBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index f2af5e85e..e4fa13df1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -34,8 +34,8 @@ import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -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 ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index dc776b4ca..6a1942402 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 8eb097cbb..fc623b691 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -33,10 +33,10 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index f651eb977..c8bcb4f43 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemGlassPick extends ItemManasteelPick { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index c5ea853b9..656704801 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 0357892a3..4add7dded 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -20,7 +20,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumAxe extends ItemManasteelAxe { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 4ef76bb2a..b0b967e9c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -13,7 +13,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumPick extends ItemManasteelPick { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 00d373f29..f9b577319 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -20,8 +20,8 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; -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 ItemElementiumShears extends ItemManasteelShears { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 6d673dd6d..460c4b115 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 0682455c1..cd414e6e1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 17a2c650e..193127c12 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -35,9 +35,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 985a84a57..9fc888396 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -32,10 +32,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index dc7a7d226..da08c003d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -29,9 +29,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 24c275cbc..be741de0d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -33,12 +33,12 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 9d3a3e8e7..19be8f014 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -47,9 +47,9 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 7fdb8e56c..75de52678 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -18,7 +18,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index b7c1cea9f..68180eeb7 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -22,7 +22,7 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index dd9b80dea..adbdbbe4f 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -21,8 +21,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index c266bfad0..618e48c0c 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -18,7 +18,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index b43dad328..415a6dbfd 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -37,7 +37,7 @@ import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index a67ba651f..4e8b88ca5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -39,9 +39,9 @@ import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -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 ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 793dd4d7e..22fffed31 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -18,9 +18,9 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemModRecord extends ItemRecord { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index c523bb087..819b3293e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -38,8 +38,8 @@ import baubles.api.BaubleType; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 54ca07f67..88d5e515c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -21,9 +21,9 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 5f77e5635..93af5508d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -43,9 +43,9 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; -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 ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 650566022..f80edd9be 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -31,7 +31,7 @@ import baubles.common.lib.PlayerHandler; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index ebd0d40d6..615bb70dd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -41,9 +41,9 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -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 ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index 1980bbff5..c70aac15f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -15,8 +15,8 @@ import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.stats.Achievement; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -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 RLexiconEntry extends BLexiconEntry { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index c1e7ed883..ee0b2ab2b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -26,8 +26,8 @@ import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; -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 PageBrew extends PageRecipe implements ITwoNamedPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 69794f323..765017efe 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -33,9 +33,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageCraftingRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 5d87a62a0..db1a9e9f7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -22,8 +22,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.BlockAlfPortal; -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 PageElvenRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 89fba690d..97056a150 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -26,8 +26,8 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -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 PageEntity extends LexiconPage{ diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index c86a6004a..334392f95 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -19,8 +19,8 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -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 PageImage extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b959bb773..8d480c506 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -37,8 +37,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -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 PageManaInfusionRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index e7a7a612d..b1e76c269 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -35,8 +35,8 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; -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 PageMultiblock extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index f22c9680e..e8d7a1e08 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -31,8 +31,8 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -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 PagePetalRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index b21fdf062..74a01a192 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -32,8 +32,8 @@ import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -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 PageRecipe extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 7633ed9f2..8297d96b1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -24,8 +24,8 @@ import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -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 PageRuneRecipe extends PagePetalRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 7ba683c6d..2a7c7c4e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -35,8 +35,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.lib.LibResources; -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 PageShedding extends PageEntity { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index c5c0fc0e1..02be5d57c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -28,8 +28,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -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 PageTerrasteel extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index a9a221445..4f04dfa31 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -22,8 +22,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import com.google.common.base.Joiner; -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 PageText extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index b1c1b0725..f396350b8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -21,8 +21,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; -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 PageTutorial extends PageText { diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index c33d580f6..25619f4d6 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -18,7 +18,7 @@ import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibGuiIDs; -import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 37a91fcf6..3349bb33c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -31,7 +31,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SkyblockWorldEvents {