Strip deprecated code
This commit is contained in:
parent
d2509a70b7
commit
ba5165f86b
|
@ -222,6 +222,7 @@ public class ModLoader
|
||||||
* @param fileToAdd The new image
|
* @param fileToAdd The new image
|
||||||
* @return The 'icon index' in the main image that the new image will be applied to
|
* @return The 'icon index' in the main image that the new image will be applied to
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
@SideOnly(CLIENT)
|
@SideOnly(CLIENT)
|
||||||
public static int addOverride(String fileToOverride, String fileToAdd)
|
public static int addOverride(String fileToOverride, String fileToAdd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
/*
|
|
||||||
* The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
* Software Foundation; either version 2.1 of the License, or any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
||||||
* A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
|
|
||||||
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
package cpw.mods.fml.common;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deprecated without replacement, use vanilla DispenserRegistry code
|
|
||||||
*
|
|
||||||
* @author cpw
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public interface IDispenseHandler
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Return -1 if you don't want to dispense anything. the other values seem to have specific meanings
|
|
||||||
* to blockdispenser.
|
|
||||||
*
|
|
||||||
* @param x
|
|
||||||
* @param y
|
|
||||||
* @param z
|
|
||||||
* @param xVelocity
|
|
||||||
* @param zVelocity
|
|
||||||
* @param world
|
|
||||||
* @param item
|
|
||||||
* @param random
|
|
||||||
* @param entX
|
|
||||||
* @param entY
|
|
||||||
* @param entZ
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
int dispense(double x, double y, double z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
|
|
||||||
}
|
|
|
@ -1,45 +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 cpw.mods.fml.common;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Deprecated without replacement. Use vanilla DispenserRegistry code.
|
|
||||||
*
|
|
||||||
* @author cpw
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public interface IDispenserHandler
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Called to dispense an entity
|
|
||||||
* @param x
|
|
||||||
* @param y
|
|
||||||
* @param z
|
|
||||||
* @param xVelocity
|
|
||||||
* @param zVelocity
|
|
||||||
* @param world
|
|
||||||
* @param item
|
|
||||||
* @param random
|
|
||||||
* @param entX
|
|
||||||
* @param entY
|
|
||||||
* @param entZ
|
|
||||||
*/
|
|
||||||
int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
|
|
||||||
}
|
|
|
@ -28,16 +28,6 @@ public enum TickType {
|
||||||
* arg 0 : float "partial render time"
|
* arg 0 : float "partial render time"
|
||||||
*/
|
*/
|
||||||
RENDER,
|
RENDER,
|
||||||
/**
|
|
||||||
* Not fired
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
GUI,
|
|
||||||
/**
|
|
||||||
* Not fired
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
CLIENTGUI,
|
|
||||||
/**
|
/**
|
||||||
* server side
|
* server side
|
||||||
* Fired once as the world loads from disk
|
* Fired once as the world loads from disk
|
||||||
|
@ -69,8 +59,6 @@ public enum TickType {
|
||||||
{
|
{
|
||||||
if (this==CLIENT) return EnumSet.of(RENDER);
|
if (this==CLIENT) return EnumSet.of(RENDER);
|
||||||
if (this==RENDER) return EnumSet.of(CLIENT);
|
if (this==RENDER) return EnumSet.of(CLIENT);
|
||||||
if (this==GUI) return EnumSet.of(CLIENTGUI);
|
|
||||||
if (this==CLIENTGUI) return EnumSet.of(GUI);
|
|
||||||
return EnumSet.noneOf(TickType.class);
|
return EnumSet.noneOf(TickType.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,40 +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 cpw.mods.fml.common.modloader;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import cpw.mods.fml.common.IDispenseHandler;
|
|
||||||
import cpw.mods.fml.common.IDispenserHandler;
|
|
||||||
|
|
||||||
public class ModLoaderDispenseHelper implements IDispenserHandler
|
|
||||||
{
|
|
||||||
|
|
||||||
private BaseModProxy mod;
|
|
||||||
|
|
||||||
public ModLoaderDispenseHelper(BaseModProxy mod)
|
|
||||||
{
|
|
||||||
this.mod = mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY,
|
|
||||||
double entZ)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -34,8 +34,6 @@ import net.minecraft.src.TradeEntry;
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.common.ICraftingHandler;
|
import cpw.mods.fml.common.ICraftingHandler;
|
||||||
import cpw.mods.fml.common.IDispenseHandler;
|
|
||||||
import cpw.mods.fml.common.IDispenserHandler;
|
|
||||||
import cpw.mods.fml.common.IFuelHandler;
|
import cpw.mods.fml.common.IFuelHandler;
|
||||||
import cpw.mods.fml.common.IPickupNotifier;
|
import cpw.mods.fml.common.IPickupNotifier;
|
||||||
import cpw.mods.fml.common.IWorldGenerator;
|
import cpw.mods.fml.common.IWorldGenerator;
|
||||||
|
@ -189,12 +187,6 @@ public class ModLoaderHelper
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IDispenserHandler buildDispenseHelper(BaseModProxy mod)
|
|
||||||
{
|
|
||||||
return new ModLoaderDispenseHelper(mod);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static void buildEntityTracker(BaseModProxy mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,
|
public static void buildEntityTracker(BaseModProxy mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,
|
||||||
boolean sendVelocityInfo)
|
boolean sendVelocityInfo)
|
||||||
{
|
{
|
||||||
|
|
|
@ -337,12 +337,6 @@ public class ModLoaderModContainer implements ModContainer
|
||||||
return mod != null ? mod.getName() : modId;
|
return mod != null ? mod.getName() : modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static ModContainer findContainerFor(BaseModProxy mod)
|
|
||||||
{
|
|
||||||
return FMLCommonHandler.instance().findContainerFor(mod);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSortingRules()
|
public String getSortingRules()
|
||||||
{
|
{
|
||||||
|
@ -524,7 +518,6 @@ public class ModLoaderModContainer implements ModContainer
|
||||||
GameRegistry.registerFuelHandler(ModLoaderHelper.buildFuelHelper(mod));
|
GameRegistry.registerFuelHandler(ModLoaderHelper.buildFuelHelper(mod));
|
||||||
GameRegistry.registerCraftingHandler(ModLoaderHelper.buildCraftingHelper(mod));
|
GameRegistry.registerCraftingHandler(ModLoaderHelper.buildCraftingHelper(mod));
|
||||||
GameRegistry.registerPickupHandler(ModLoaderHelper.buildPickupHelper(mod));
|
GameRegistry.registerPickupHandler(ModLoaderHelper.buildPickupHelper(mod));
|
||||||
GameRegistry.registerDispenserHandler(ModLoaderHelper.buildDispenseHelper(mod));
|
|
||||||
NetworkRegistry.instance().registerChatListener(ModLoaderHelper.buildChatListener(mod));
|
NetworkRegistry.instance().registerChatListener(ModLoaderHelper.buildChatListener(mod));
|
||||||
NetworkRegistry.instance().registerConnectionHandler(ModLoaderHelper.buildConnectionHelper(mod));
|
NetworkRegistry.instance().registerConnectionHandler(ModLoaderHelper.buildConnectionHelper(mod));
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,6 @@ import com.google.common.collect.Sets.SetView;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.common.ICraftingHandler;
|
import cpw.mods.fml.common.ICraftingHandler;
|
||||||
import cpw.mods.fml.common.IDispenseHandler;
|
|
||||||
import cpw.mods.fml.common.IDispenserHandler;
|
|
||||||
import cpw.mods.fml.common.IFuelHandler;
|
import cpw.mods.fml.common.IFuelHandler;
|
||||||
import cpw.mods.fml.common.IPickupNotifier;
|
import cpw.mods.fml.common.IPickupNotifier;
|
||||||
import cpw.mods.fml.common.IPlayerTracker;
|
import cpw.mods.fml.common.IPlayerTracker;
|
||||||
|
@ -104,43 +102,6 @@ public class GameRegistry
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Deprecated without replacement. Use vanilla DispenserRegistry code
|
|
||||||
*
|
|
||||||
* @param handler
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void registerDispenserHandler(IDispenserHandler handler)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Deprecated without replacement. Use vanilla DispenserRegistry code
|
|
||||||
*
|
|
||||||
* @param handler
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void registerDispenserHandler(final IDispenseHandler handler)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Deprecated without replacement, use vanilla DispenserRegistry code
|
|
||||||
*
|
|
||||||
* @param world
|
|
||||||
* @param x
|
|
||||||
* @param y
|
|
||||||
* @param z
|
|
||||||
* @param xVelocity
|
|
||||||
* @param zVelocity
|
|
||||||
* @param item
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static int tryDispense(World world, int x, int y, int z, int xVelocity, int zVelocity, ItemStack item, Random random, double entX, double entY, double entZ)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* Internal method for creating an @Block instance
|
* Internal method for creating an @Block instance
|
||||||
* @param container
|
* @param container
|
||||||
|
|
Loading…
Reference in New Issue