Remove old deprecated and legacy methods

This commit is contained in:
mezz committed 2015-04-22 21:58:26 -07:00
1 parent cb6e4620fa
commit 8dedba4f16
33 files changed
+67 -383

No files matched your search

@@ -169,14 +169,14 @@ public class PluginApiculture extends ForestryPlugin {
public static int ticksPerBeeWorkCycle = 550;
public static boolean apiarySideSensitive = false;
public static boolean fancyRenderedBees = false;
private ArrayList<IHiveDrop> forestDrops;
private ArrayList<IHiveDrop> meadowsDrops;
private ArrayList<IHiveDrop> desertDrops;
private ArrayList<IHiveDrop> jungleDrops;
private ArrayList<IHiveDrop> endDrops;
private ArrayList<IHiveDrop> snowDrops;
private ArrayList<IHiveDrop> swampDrops;
private ArrayList<IHiveDrop> swarmDrops;
private final List<IHiveDrop> forestDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> meadowsDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> desertDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> jungleDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> endDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> snowDrops = new ArrayList<IHiveDrop>();
private final List<IHiveDrop> swampDrops = new ArrayList<IHiveDrop>();
/**
* See {@link IBeeRoot} for details
*/
@@ -195,7 +195,6 @@ public class PluginApiculture extends ForestryPlugin {
HiveManager.hiveRegistry = hiveRegistry = new HiveRegistry();
HiveManager.genHelper = new HiveGenHelper();
createHiveDropArrays();
FlowerManager.flowerRegistry = new FlowerRegistry();
@@ -781,37 +780,6 @@ public class PluginApiculture extends ForestryPlugin {
return beeItem;
}
@SuppressWarnings({"unchecked", "rawtypes"})
@Deprecated // deprecated since 3.1. remove when BeeManager.hiveDrops is removed
private void createHiveDropArrays() {
BeeManager.hiveDrops = new ArrayList[8];
forestDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[0] = forestDrops;
meadowsDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[1] = meadowsDrops;
desertDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[2] = desertDrops;
jungleDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[3] = jungleDrops;
endDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[4] = endDrops;
snowDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[5] = snowDrops;
swampDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[6] = swampDrops;
swarmDrops = new ArrayList<IHiveDrop>();
BeeManager.hiveDrops[7] = swarmDrops;
}
private static void createHives() {
hiveRegistry.registerHive(HiveRegistry.forest, HiveDescription.FOREST);
hiveRegistry.registerHive(HiveRegistry.meadows, HiveDescription.MEADOWS);
@@ -89,9 +89,7 @@ public class PluginCore extends ForestryPlugin {
ChipsetManager.solderManager = new ItemSolderingIron.SolderManager();
CircuitRegistry circuitRegistry = new CircuitRegistry();
ChipsetManager.circuitRegistry = circuitRegistry;
circuitRegistry.initialize();
ChipsetManager.circuitRegistry = new CircuitRegistry();
AlleleRegistry alleleRegistry = new AlleleRegistry();
AlleleManager.alleleRegistry = alleleRegistry;
@@ -32,7 +32,6 @@ import forestry.api.storage.ICrateRegistry;
import forestry.api.storage.StorageManager;
import forestry.core.GameMode;
import forestry.core.circuits.Circuit;
import forestry.core.circuits.CircuitId;
import forestry.core.circuits.CircuitLayout;
import forestry.core.config.Config;
import forestry.core.config.Configuration;
@@ -174,12 +173,6 @@ public class PluginIC2 extends ForestryPlugin {
ICircuitLayout layoutEngineTin = new CircuitLayout("engine.tin");
ChipsetManager.circuitRegistry.registerLayout(layoutEngineTin);
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_CHOKE_I, "forestry.energyChoke1");
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.FIRE_DAMPENER_I, "forestry.energyDampener1");
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_EFFICIENCY_I, "forestry.energyEfficiency1");
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_BOOST_I, "forestry.energyBoost1");
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_BOOST_II, "forestry.energyBoost2");
}
@Override
@@ -68,6 +68,7 @@ import forestry.core.items.ItemCrated;
import forestry.core.network.GuiId;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StackUtils;
import forestry.factory.gadgets.MachineCarpenter;
import forestry.storage.BackpackDefinition;
import forestry.storage.BackpackHelper;
import forestry.storage.CrateRegistry;
@@ -185,12 +186,13 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl
}
public static void createCrateRecipes() {
MachineCarpenter.RecipeManager carpenterManager = (MachineCarpenter.RecipeManager) RecipeManagers.carpenterManager;
for (ItemCrated crate : crates) {
ItemStack itemStack = new ItemStack(crate);
if (crate.usesOreDict()) {
RecipeManagers.carpenterManager.addCratingWithOreDict(itemStack);
carpenterManager.addCratingWithOreDict(itemStack);
} else {
RecipeManagers.carpenterManager.addCrating(itemStack);
carpenterManager.addCrating(itemStack);
}
}
}