Revert "Use generics for Chromosome type, begin unifying code"

This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
This commit is contained in:
mezz committed 2016-03-03 20:50:38 -08:00
1 parent 87f2dc0a0a
commit efcab41e04
217 files changed
+2408 -3136

No files matched your search

@@ -142,12 +142,12 @@ public class PluginManager {
if (plugin.canBeDisabled()) {
if (!isEnabled(config, plugin)) {
iterator.remove();
Log.info("Plugin disabled: {}", plugin);
Log.info("Plugin disabled: {0}", plugin);
continue;
}
if (!plugin.isAvailable()) {
iterator.remove();
Log.info("Plugin {} failed to load: {}", plugin, plugin.getFailMessage());
Log.info("Plugin {0} failed to load: {1}", 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 {} is missing dependencies: {}", pluginId, dependencies);
Log.warning("Plugin {0} is missing dependencies: {1}", pluginId, dependencies);
}
}
} while (changed);
@@ -199,24 +199,24 @@ public class PluginManager {
configurePlugins(forestryPlugins);
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Setup Start: {}", plugin);
Log.debug("Setup Start: {0}", plugin);
plugin.setupAPI();
plugin.registerItemsAndBlocks();
Log.debug("Setup Complete: {}", plugin);
Log.debug("Setup Complete: {0}", plugin);
}
stage = Stage.SETUP_DISABLED;
for (IForestryPlugin plugin : unloadedPlugins) {
Log.debug("Disabled-Setup Start: {}", plugin);
Log.debug("Disabled-Setup Start: {0}", plugin);
plugin.disabledSetupAPI();
Log.debug("Disabled-Setup Complete: {}", plugin);
Log.debug("Disabled-Setup Complete: {0}", plugin);
}
}
public static void runPreInit() {
stage = Stage.PRE_INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Pre-Init Start: {}", plugin);
Log.debug("Pre-Init Start: {0}", 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: {}", plugin);
Log.debug("Pre-Init Complete: {0}", plugin);
}
}
public static void runInit() {
stage = Stage.INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Init Start: {}", plugin);
Log.debug("Init Start: {0}", plugin);
plugin.doInit();
plugin.registerRecipes();
Log.debug("Init Complete: {}", plugin);
Log.debug("Init Complete: {0}", plugin);
}
}
public static void runPostInit() {
stage = Stage.POST_INIT;
for (IForestryPlugin plugin : loadedPlugins) {
Log.debug("Post-Init Start: {}", plugin);
Log.debug("Post-Init Start: {0}", plugin);
plugin.postInit();
Log.debug("Post-Init Complete: {}", plugin);
Log.debug("Post-Init Complete: {0}", plugin);
}
stage = Stage.FINISHED;