Change "cpw.mods.fml" to "net.minecraftforge.fml"

joschock · Jun 3, 2015 · 001ad17 · 001ad17
1 parent 3e3d449
commit 001ad17
Show file tree

Hide file tree

Showing 238 changed files with 504 additions and 504 deletions.
diff --git a/api/buildcraft/api/blocks/package-info.java b/api/buildcraft/api/blocks/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blocks")
 package buildcraft.api.blocks;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/blueprints/MappingRegistry.java b/api/buildcraft/api/blueprints/MappingRegistry.java
@@ -23,10 +23,10 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTTagShort;
-import cpw.mods.fml.common.FMLModContainer;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
+import net.minecraftforge.fml.common.FMLModContainer;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
 import net.minecraftforge.common.util.Constants;
 
 import buildcraft.api.core.BCLog;

diff --git a/api/buildcraft/api/blueprints/package-info.java b/api/buildcraft/api/blueprints/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.3", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
 package buildcraft.api.blueprints;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/boards/RedstoneBoardNBT.java b/api/buildcraft/api/boards/RedstoneBoardNBT.java
@@ -16,8 +16,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.Constants;
 
 public abstract class RedstoneBoardNBT<T> {

diff --git a/api/buildcraft/api/boards/package-info.java b/api/buildcraft/api/boards/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|boards")
 package buildcraft.api.boards;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java
@@ -13,8 +13,8 @@
 
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public enum EnumColor {
 

diff --git a/api/buildcraft/api/core/IIconProvider.java b/api/buildcraft/api/core/IIconProvider.java
@@ -10,8 +10,8 @@
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IIconProvider {
 

diff --git a/api/buildcraft/api/core/package-info.java b/api/buildcraft/api/core/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.5", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core")
 package buildcraft.api.core;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/crops/package-info.java b/api/buildcraft/api/crops/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|Core", provides = "BuildCraftAPI|crops")
 package buildcraft.api.crops;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/events/BlockInteractionEvent.java b/api/buildcraft/api/events/BlockInteractionEvent.java
@@ -10,8 +10,8 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-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;
 
 @Cancelable
 public class BlockInteractionEvent extends Event {

diff --git a/api/buildcraft/api/events/BlockPlacedDownEvent.java b/api/buildcraft/api/events/BlockPlacedDownEvent.java
@@ -10,8 +10,8 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-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;
 
 
 @Cancelable

diff --git a/api/buildcraft/api/events/PipePlacedEvent.java b/api/buildcraft/api/events/PipePlacedEvent.java
@@ -9,7 +9,7 @@
 package buildcraft.api.events;
 
 import net.minecraft.entity.player.EntityPlayer;
-import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 public class PipePlacedEvent extends Event {
 	public EntityPlayer player;

diff --git a/api/buildcraft/api/events/RobotPlacementEvent.java b/api/buildcraft/api/events/RobotPlacementEvent.java
@@ -10,8 +10,8 @@
 
 
 import net.minecraft.entity.player.EntityPlayer;
-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;
 
 @Cancelable
 public class RobotPlacementEvent extends Event {

diff --git a/api/buildcraft/api/events/package-info.java b/api/buildcraft/api/events/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|events")
 package buildcraft.api.events;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/facades/package-info.java b/api/buildcraft/api/facades/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|facades")
 package buildcraft.api.facades;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/filler/package-info.java b/api/buildcraft/api/filler/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "4.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler")
 package buildcraft.api.filler;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/fuels/package-info.java b/api/buildcraft/api/fuels/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels")
 package buildcraft.api.fuels;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/gates/package-info.java b/api/buildcraft/api/gates/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates")
 package buildcraft.api.gates;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/items/IItemCustomPipeRender.java b/api/buildcraft/api/items/IItemCustomPipeRender.java
@@ -1,8 +1,8 @@
 package buildcraft.api.items;
 
 import net.minecraft.item.ItemStack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IItemCustomPipeRender {
 	float getPipeRenderScale(ItemStack stack);

diff --git a/api/buildcraft/api/items/package-info.java b/api/buildcraft/api/items/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|items")
 package buildcraft.api.items;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/library/package-info.java b/api/buildcraft/api/library/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|library")
 package buildcraft.api.library;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/package-info.java b/api/buildcraft/api/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core")
 package buildcraft.api;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/power/package-info.java b/api/buildcraft/api/power/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.3", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|power")
 package buildcraft.api.power;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/recipes/package-info.java b/api/buildcraft/api/recipes/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
 package buildcraft.api.recipes;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/robots/IRobotOverlayItem.java b/api/buildcraft/api/robots/IRobotOverlayItem.java
@@ -2,8 +2,8 @@
 
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.item.ItemStack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IRobotOverlayItem {
     boolean isValidRobotOverlay(ItemStack stack);

diff --git a/api/buildcraft/api/robots/package-info.java b/api/buildcraft/api/robots/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|robotics")
 package buildcraft.api.robots;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/statements/IStatement.java b/api/buildcraft/api/statements/IStatement.java
@@ -10,8 +10,8 @@
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IStatement {
 	/**

diff --git a/api/buildcraft/api/statements/IStatementParameter.java b/api/buildcraft/api/statements/IStatementParameter.java
@@ -12,8 +12,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IStatementParameter {
 

diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java
@@ -16,8 +16,8 @@
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public final class StatementManager {

diff --git a/api/buildcraft/api/statements/package-info.java b/api/buildcraft/api/statements/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements")
 package buildcraft.api.statements;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/tablet/ITablet.java b/api/buildcraft/api/tablet/ITablet.java
@@ -1,7 +1,7 @@
 package buildcraft.api.tablet;
 
 import net.minecraft.nbt.NBTTagCompound;
-import cpw.mods.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.Side;
 
 public interface ITablet {
 	Side getSide();

diff --git a/api/buildcraft/api/tablet/package-info.java b/api/buildcraft/api/tablet/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tablet")
 package buildcraft.api.tablet;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/tiles/package-info.java b/api/buildcraft/api/tiles/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.2", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tiles")
 package buildcraft.api.tiles;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/tools/package-info.java b/api/buildcraft/api/tools/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tools")
 package buildcraft.api.tools;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/transport/package-info.java b/api/buildcraft/api/transport/package-info.java
@@ -8,5 +8,5 @@
  */
 @API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport")
 package buildcraft.api.transport;
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/api/buildcraft/api/transport/pluggable/PipePluggable.java b/api/buildcraft/api/transport/pluggable/PipePluggable.java
@@ -10,8 +10,8 @@
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.core.INBTStoreable;

diff --git a/api/cofh/api/energy/package-info.java b/api/cofh/api/energy/package-info.java
@@ -5,7 +5,7 @@
 @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
 package cofh.api.energy;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
 import cofh.api.CoFHAPIProps;
 
diff --git a/api/cofh/api/package-info.java b/api/cofh/api/package-info.java
@@ -5,5 +5,5 @@
 @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI")
 package cofh.api;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
 
diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java
@@ -32,20 +32,20 @@
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.stats.Achievement;
 import net.minecraft.world.World;
-import cpw.mods.fml.client.event.ConfigChangedEvent;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.MinecraftForge;

diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
@@ -31,19 +31,19 @@
 import net.minecraft.stats.Achievement;
 import net.minecraft.util.IIcon;
 
-import cpw.mods.fml.client.event.ConfigChangedEvent;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-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.FMLServerStartingEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+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.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;