Use generics for Chromosome type, begin unifying code

This commit is contained in:
mezz committed 2016-02-27 00:14:22 -08:00
1 parent a8270ef365
commit 43e41034f6
217 files changed
+3148 -2417

No files matched your search

@@ -160,11 +160,11 @@ public class PluginApiculture extends BlankForestryPlugin {
AlleleManager.alleleRegistry.registerSpeciesRoot(BeeManager.beeRoot);
// Modes
BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.easy);
BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.normal);
BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hard);
BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hardcore);
BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.insane);
BeeManager.beeRoot.registerMode(BeekeepingMode.easy);
BeeManager.beeRoot.registerMode(BeekeepingMode.normal);
BeeManager.beeRoot.registerMode(BeekeepingMode.hard);
BeeManager.beeRoot.registerMode(BeekeepingMode.hardcore);
BeeManager.beeRoot.registerMode(BeekeepingMode.insane);
}
@Override
@@ -177,6 +177,8 @@ public class PluginApiculture extends BlankForestryPlugin {
public void preInit() {
super.preInit();
BeeDefinition.preInit();
MinecraftForge.EVENT_BUS.register(this);
blocks.apiculture.addDefinitions(BlockTypeApiculture.VALUES);
@@ -212,7 +214,7 @@ public class PluginApiculture extends BlankForestryPlugin {
}
}
List<IBeekeepingMode> beekeepingModes = BeeManager.beeRoot.getBeekeepingModes();
List<IBeekeepingMode> beekeepingModes = BeeManager.beeRoot.getModes();
String[] validBeekeepingModeNames = new String[beekeepingModes.size()];
for (int i = 0; i < beekeepingModes.size(); i++) {
validBeekeepingModeNames[i] = beekeepingModes.get(i).getName();
@@ -260,8 +262,6 @@ public class PluginApiculture extends BlankForestryPlugin {
createAlleles();
BeeDefinition.initBees();
AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.speciesArgrarian", BeeDefinition.AGRARIAN.getGenome().getPrimary());
// Hives
createHives();
registerBeehiveDrops();
@@ -50,8 +50,8 @@ import forestry.arboriculture.commands.CommandTree;
import forestry.arboriculture.genetics.TreeBranchDefinition;
import forestry.arboriculture.genetics.TreeDefinition;
import forestry.arboriculture.genetics.TreeFactory;
import forestry.arboriculture.genetics.TreeHelper;
import forestry.arboriculture.genetics.TreeMutationFactory;
import forestry.arboriculture.genetics.TreeRoot;
import forestry.arboriculture.genetics.TreekeepingMode;
import forestry.arboriculture.genetics.alleles.AlleleGrowth;
import forestry.arboriculture.genetics.alleles.AlleleLeafEffect;
@@ -94,15 +94,15 @@ public class PluginArboriculture extends BlankForestryPlugin {
TreeManager.woodItemAccess = new WoodItemAccess();
// Init tree interface
TreeManager.treeRoot = new TreeHelper();
TreeManager.treeRoot = new TreeRoot();
AlleleManager.alleleRegistry.registerSpeciesRoot(TreeManager.treeRoot);
// Modes
TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.easy);
TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.normal);
TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hard);
TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hardcore);
TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.insane);
TreeManager.treeRoot.registerMode(TreekeepingMode.easy);
TreeManager.treeRoot.registerMode(TreekeepingMode.normal);
TreeManager.treeRoot.registerMode(TreekeepingMode.hard);
TreeManager.treeRoot.registerMode(TreekeepingMode.hardcore);
TreeManager.treeRoot.registerMode(TreekeepingMode.insane);
}
@Override
@@ -80,9 +80,9 @@ public class PluginFluids extends BlankForestryPlugin {
}
} else {
GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock);
Log.warning("Pre-existing {0} fluid block detected, deferring to {1}:{2}, "
Log.warning("Pre-existing {} fluid block detected, deferring to {}:{}, "
+ "this may cause issues if the server/client have different mod load orders, "
+ "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name);
+ "recommended that you disable all but one instance of the fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name);
}
}
}
@@ -45,7 +45,7 @@ import forestry.lepidopterology.genetics.AlleleButterflyEffect;
import forestry.lepidopterology.genetics.ButterflyBranchDefinition;
import forestry.lepidopterology.genetics.ButterflyDefinition;
import forestry.lepidopterology.genetics.ButterflyFactory;
import forestry.lepidopterology.genetics.ButterflyHelper;
import forestry.lepidopterology.genetics.ButterflyRoot;
import forestry.lepidopterology.genetics.MothDefinition;
import forestry.lepidopterology.items.ItemButterflyGE;
import forestry.lepidopterology.items.ItemRegistryLepidopterology;
@@ -67,7 +67,7 @@ public class PluginLepidopterology extends BlankForestryPlugin {
@Override
public void setupAPI() {
ButterflyManager.butterflyRoot = new ButterflyHelper();
ButterflyManager.butterflyRoot = new ButterflyRoot();
AlleleManager.alleleRegistry.registerSpeciesRoot(ButterflyManager.butterflyRoot);
ButterflyManager.butterflyFactory = new ButterflyFactory();
@@ -142,12 +142,12 @@ public class PluginManager {
if (plugin.canBeDisabled()) {
if (!isEnabled(config, plugin)) {
iterator.remove();
Log.info("Plugin disabled: {0}", plugin);
Log.info("Plugin disabled: {}", plugin);
continue;
}
if (!plugin.isAvailable()) {
iterator.remove();
Log.info("Plugin {0} failed to load: {1}", plugin, plugin.getFailMessage());
Log.info("Plugin {} failed to load: {}", plugin, plugin.getFailMessage());
continue;
}
}
@@ -168,7 +168,7 @@ public class PluginManager {
ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class);
String pluginId = info.pluginID();
toLoad.remove(pluginId);
Log.warning("Plugin {0} is missing dependencies: {1}", pluginId, dependencies);
Log.warning("Plugin {} is missing dependencies: {}", pluginId, dependencies);
}
}
} while (changed);
@@ -199,24 +199,24 @@ public class PluginManager {
configurePlugins(forestryPlugins);
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Setup Start: {0}", plugin);
Log.debug("Setup Start: {}", plugin);
plugin.setupAPI();
plugin.registerItemsAndBlocks();
Log.debug("Setup Complete: {0}", plugin);
Log.debug("Setup Complete: {}", plugin);
}
stage = Stage.SETUP_DISABLED;
for (IForestryPlugin plugin : unloadedPlugins) {
Log.debug("Disabled-Setup Start: {0}", plugin);
Log.debug("Disabled-Setup Start: {}", plugin);
plugin.disabledSetupAPI();
Log.debug("Disabled-Setup Complete: {0}", plugin);
Log.debug("Disabled-Setup Complete: {}", plugin);
}
}
public static void runPreInit() {
stage = Stage.PRE_INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Pre-Init Start: {0}", plugin);
Log.debug("Pre-Init Start: {}", plugin);
registerHandlers(plugin);
plugin.preInit();
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.BUILDCRAFT_STATEMENTS)) {
@@ -226,26 +226,26 @@ public class PluginManager {
plugin.registerBackpackItems();
plugin.registerCrates();
}
Log.debug("Pre-Init Complete: {0}", plugin);
Log.debug("Pre-Init Complete: {}", plugin);
}
}
public static void runInit() {
stage = Stage.INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Init Start: {0}", plugin);
Log.debug("Init Start: {}", plugin);
plugin.doInit();
plugin.registerRecipes();
Log.debug("Init Complete: {0}", plugin);
Log.debug("Init Complete: {}", plugin);
}
}
public static void runPostInit() {
stage = Stage.POST_INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Post-Init Start: {0}", plugin);
Log.debug("Post-Init Start: {}", plugin);
plugin.postInit();
Log.debug("Post-Init Complete: {0}", plugin);
Log.debug("Post-Init Complete: {}", plugin);
}
stage = Stage.FINISHED;