diff --git a/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java b/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java deleted file mode 100644 index ccebf4e6e..000000000 --- a/src/main/java/net/minecraftforge/fml/common/BukkitPluginRef.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Forge Mod Loader - * Copyright (c) 2012-2013 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v2.1 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * - * Contributors: - * cpw - implementation - */ - -package net.minecraftforge.fml.common; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Declare a variable to be populated by a Bukkit Plugin proxy instance if the bukkit coremod - * is available. It can only be applied to field typed as {@link BukkitProxy} - * Generally it should be used in conjunction with {@link Mod#bukkitPlugin()} specifying the - * plugin to load. - * - * @author cpw - * - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface BukkitPluginRef -{ - /** - * A reference (possibly version specific) to a Bukkit Plugin by name, using the name@versionbound - * specification. If this is a bukkit enabled environment the field annotated by this - * will be populated with a {@link BukkitProxy} instance if possible. This proxy will be gotten by - * reflectively calling the "getModProxy" method on the bukkit plugin instance. - * @return The name of the plugin which we will inject into this field - */ - String value(); -} diff --git a/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java b/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java deleted file mode 100644 index 5af5f56fa..000000000 --- a/src/main/java/net/minecraftforge/fml/common/BukkitProxy.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Forge Mod Loader - * Copyright (c) 2012-2013 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v2.1 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * - * Contributors: - * cpw - implementation - */ - -package net.minecraftforge.fml.common; - -/** - * A marker interface for retrieving a proxy to a bukkit plugin. - * Fields associated with {@link BukkitPluginRef} annotations should - * declare this type and cast down if the target is available (not null) - * @author cpw - * - */ -public interface BukkitProxy -{ -} diff --git a/src/main/java/net/minecraftforge/fml/common/IASMHook.java b/src/main/java/net/minecraftforge/fml/common/IASMHook.java deleted file mode 100644 index cad89b3ce..000000000 --- a/src/main/java/net/minecraftforge/fml/common/IASMHook.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Forge Mod Loader - * Copyright (c) 2012-2013 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v2.1 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * - * Contributors: - * cpw - implementation - */ - -package net.minecraftforge.fml.common; - -import org.objectweb.asm.tree.ClassNode; - -public interface IASMHook { - /** - * Inject the {@link Mod} class node into this instance. This allows retrieval from custom - * attributes or other artifacts in your mod class - * - * @param modClassNode The mod class - * @return optionally some code generated classes that will be injected into the classloader - */ - ClassNode[] inject(ClassNode modClassNode); - /** - * Allow mods to manipulate classes loaded from this {@link Mod}'s jar file. The {@link Mod} - * class is always guaranteed to be called first. - * The node state should be changed in place. - * - * @param node The class being loaded - */ - void modifyClass(String className, ClassNode node); -} diff --git a/src/main/java/net/minecraftforge/fml/common/Mod.java b/src/main/java/net/minecraftforge/fml/common/Mod.java index 1236d97b5..0460ffb43 100644 --- a/src/main/java/net/minecraftforge/fml/common/Mod.java +++ b/src/main/java/net/minecraftforge/fml/common/Mod.java @@ -128,16 +128,6 @@ public @interface Mod * @return A version range as specified by the maven version range specification or the empty string */ String acceptableSaveVersions() default ""; - /** - * An optional bukkit plugin that will be injected into the bukkit plugin framework if - * this mod is loaded into the FML framework and the bukkit coremod is present. - * Instances of the bukkit plugin can be obtained via the {@link BukkitPluginRef} annotation on fields. - * - * This may be implemented by a bukkit integration. It is not provided with vanilla FML or MinecraftForge. - * - * @return The name of the plugin to load for this mod - */ - String bukkitPlugin() default ""; /** * Specifying this field allows for a mod to expect a signed jar with a fingerprint matching this value. * The fingerprint should be SHA-1 encoded, lowercase with ':' removed. An empty value indicates that @@ -169,16 +159,6 @@ public @interface Mod */ String modLanguageAdapter() default ""; - /** - * NOT YET IMPLEMENTED.
- * An optional ASM hook class, that can be used to apply ASM to classes loaded from this mod. It is also given - * the ASM tree of the class declaring {@link Mod} to do with what it will. - * - * @return The name of a class to be loaded and executed. Must implement {@link IASMHook}. - */ - @Deprecated - String asmHookClass() default ""; - /** * If your mod doesn't have a runtime persistent effect on the state of the game, and can be disabled without side effects * (minimap mods, graphical tweak mods) then you can set true here and receive the FMLDeactivationEvent to perform deactivation