Start update to 1.8.9

Fix all references to cpw.mods.fml namespace
This commit is contained in:
Ben Spiers committed 2016-01-14 19:22:48 +00:00
1 parent e747937760
commit 9b8d9d92d6
422 files changed
+941 -982

No files matched your search

@@ -13,8 +13,8 @@ import java.util.Random;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public enum EnumColor {
@@ -10,8 +10,8 @@ package buildcraft.api.core;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IIconProvider {
@@ -8,5 +8,5 @@
*/
@API(apiVersion = "2.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core")
package buildcraft.api.core;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -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;
@@ -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;
@@ -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;
@@ -6,5 +6,5 @@
package cofh.api.energy;
import cofh.api.CoFHAPIProps;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -6,5 +6,5 @@
package cofh.api.item;
import cofh.api.CoFHAPIProps;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -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;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|FileSystem", apiVersion="1.65" )
package dan200.computercraft.api.filesystem;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|Lua", apiVersion="1.65" )
package dan200.computercraft.api.lua;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|Media", apiVersion="1.65" )
package dan200.computercraft.api.media;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API", apiVersion="1.65" )
package dan200.computercraft.api;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|Peripheral", apiVersion="1.65" )
package dan200.computercraft.api.peripheral;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -7,4 +7,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|Redstone", apiVersion="1.65" )
package dan200.computercraft.api.redstone;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API( owner="ComputerCraft", provides="ComputerCraft|API|Turtle", apiVersion="1.65" )
package dan200.computercraft.api.turtle;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+4 -4
View File
@@ -7,10 +7,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Base agriculture crop.
+2 -2
View File
@@ -6,8 +6,8 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.world.biome.BiomeGenBase;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.common.BiomeDictionary.Type;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.crops;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.energy.event;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.energy;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.energy.prefab;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.energy.tile;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -4,7 +4,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.world.World;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.event.world.WorldEvent;
+1 -1
View File
@@ -5,7 +5,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.event.world.WorldEvent;
+1 -1
View File
@@ -2,7 +2,7 @@ package ic2.api.event;
import net.minecraft.world.World;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.event.world.WorldEvent;
@@ -3,7 +3,7 @@ package ic2.api.event;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.event.world.WorldEvent;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.event;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+2 -2
View File
@@ -2,8 +2,8 @@ package ic2.api.info;
import net.minecraft.util.DamageSource;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.LoaderState;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.LoaderState;
public class Info {
public static IEnergyValueProvider itemEnergy;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.info;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+2 -2
View File
@@ -3,8 +3,8 @@ package ic2.api.item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface ILatheItem {
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.item;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.network;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.reactor;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.recipe;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.tile;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -1,4 +1,4 @@
@API(apiVersion="1.0", owner="IC2", provides="IC2API")
package ic2.api.util;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
+1 -1
View File
@@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack;
* Interface to access functions exposed by Inventory Tweaks
* <p/>
* The main @Mod instance of the mod implements this interface, so a refernce to it can
* be obtained via @Instance("inventorytweaks") or methods in cpw.mods.fml.common.Loader
* be obtained via @Instance("inventorytweaks") or methods in net.minecraftforge.fml.common.Loader
* <p/>
* All of these functions currently have no effect if called on a dedicated server.
*/
+1 -1
View File
@@ -1,6 +1,6 @@
package li.cil.oc.api;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -1,7 +1,7 @@
package li.cil.oc.api.component;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import li.cil.oc.api.Persistable;
import li.cil.oc.api.network.ManagedEnvironment;
import net.minecraft.entity.player.EntityPlayer;
@@ -5,7 +5,7 @@
* components, which would otherwise require reflection or linking against the
* mod itself.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Component",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.driver.item;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import li.cil.oc.api.event.RobotRenderEvent;
import li.cil.oc.api.internal.Robot;
import net.minecraft.item.ItemStack;
@@ -4,7 +4,7 @@
* These interfaces allow specializing item drivers to provide static data,
* that is without creating an actual environment.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Driver|Item",
apiVersion = API.VERSION)
@@ -4,7 +4,7 @@
* Drivers are used to add items and third party blocks to the internal network,
* which is mostly used to make components wrapping them available to computers.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Driver",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
import li.cil.oc.api.network.Node;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -1,7 +1,7 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Event;
import li.cil.oc.api.driver.EnvironmentHost;
import java.util.HashMap;
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import li.cil.oc.api.internal.Agent;
import net.minecraft.entity.Entity;
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import li.cil.oc.api.internal.Agent;
import net.minecraft.world.World;
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.Event;
import li.cil.oc.api.internal.Agent;
/**
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import li.cil.oc.api.internal.Agent;
import net.minecraftforge.common.util.ForgeDirection;
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import li.cil.oc.api.internal.Agent;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -1,6 +1,6 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import li.cil.oc.api.driver.item.UpgradeRenderer;
import li.cil.oc.api.internal.Agent;
import li.cil.oc.api.internal.Robot;
@@ -2,7 +2,7 @@
* Events dispatched by OpenComputers to allow other mods to hook into some
* of its functionality.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Event",
apiVersion = API.VERSION)
@@ -13,7 +13,7 @@
* that can be added as component nodes to the network, so they can be used
* from computers).
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|FileSystem",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.internal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import li.cil.oc.api.driver.EnvironmentHost;
import li.cil.oc.api.network.Environment;
import net.minecraft.inventory.ISidedInventory;
@@ -13,7 +13,7 @@
* used inside the specified environment (where the environment class may
* be assignable to one of the interfaces in this package).
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Internal",
apiVersion = API.VERSION)
@@ -16,7 +16,7 @@
* implemented, but merely to allow accessing some mod internals in a regulated
* fashion, such as {@link li.cil.oc.api.internal.Robot}.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Machine",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.manual;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Allows defining a renderer for a manual tab.
@@ -5,7 +5,7 @@
* other mod that may choose to add its documentation to it, such as addon
* mods.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Manual",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.network;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
@@ -14,7 +14,7 @@ import java.lang.annotation.Target;
* couple of methods to the programs running computers.
* <p/>
* This is an interface instead of an annotation, to allow stripping via the
* ever so handy {@link cpw.mods.fml.common.Optional} annotation, meaning there
* ever so handy {@link net.minecraftforge.fml.common.Optional} annotation, meaning there
* will be no strong dependency on OpenComputers.
* <p/>
* Classes implementing this interface will be expanded with the methods
@@ -4,7 +4,7 @@
* This mainly involves the (purely server-side!) network that is spanned over
* all of OpenComputers' components, including blocks and items alike.
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Network",
apiVersion = API.VERSION)
+1 -1
View File
@@ -34,7 +34,7 @@
* </dd>
* </dl>
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Core",
apiVersion = API.VERSION)
@@ -1,7 +1,7 @@
package li.cil.oc.api.prefab;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import li.cil.oc.api.manual.TabIconRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper;
@@ -1,7 +1,7 @@
package li.cil.oc.api.prefab;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import li.cil.oc.api.manual.TabIconRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
@@ -7,7 +7,7 @@
* while leaving them in the same package with the same name and then ship them
* with your mod!
*/
@cpw.mods.fml.common.API(
@net.minecraftforge.fml.common.API(
owner = API.ID_OWNER,
provides = "OpenComputersAPI|Prefab",
apiVersion = API.VERSION)
@@ -1,3 +1,3 @@
@API(apiVersion="1.2",owner="Waila",provides="WailaAPI")
package mcp.mobius.waila.api;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;
@@ -1,5 +1,5 @@
@API(apiVersion = "1.0", owner = "GalacticraftCore", provides = "Galacticraft API")
package micdoodle8.mods.galacticraft.api;
import cpw.mods.fml.common.API;
import net.minecraftforge.fml.common.API;