Update for 1.11. Missing assets, unstable.

This commit is contained in:
mezz committed 2016-12-22 16:47:56 -08:00
1 parent 30d7365518
commit 9611ae08ae
1145 files changed
+15561 -18107

No files matched your search

@@ -10,11 +10,6 @@
******************************************************************************/
package forestry.plugins;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import javax.annotation.Nonnull;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
@@ -25,21 +20,9 @@ import java.util.Locale;
import java.util.Random;
import java.util.Set;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.common.IFuelHandler;
import net.minecraftforge.fml.common.discovery.ASMDataTable;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import forestry.Forestry;
import forestry.api.core.ForestryAPI;
import forestry.core.IPickupHandler;
@@ -49,6 +32,19 @@ import forestry.core.PluginCore;
import forestry.core.network.IPacketRegistry;
import forestry.core.utils.Log;
import forestry.core.utils.Translator;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.common.IFuelHandler;
import net.minecraftforge.fml.common.discovery.ASMDataTable;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class PluginManager {
@@ -73,7 +69,6 @@ public class PluginManager {
FINISHED
}
@Nonnull
public static final Set<IForestryPlugin> configDisabledPlugins = new HashSet<>();
public static Stage getStage() {
@@ -113,16 +108,16 @@ public class PluginManager {
}
}
private static IForestryPlugin getPluginCore(@Nonnull List<IForestryPlugin> forestryPlugins) {
private static IForestryPlugin getPluginCore(List<IForestryPlugin> forestryPlugins) {
for (IForestryPlugin plugin : forestryPlugins) {
if (plugin instanceof PluginCore) {
return plugin;
}
}
return null;
throw new IllegalStateException("Could not find core plugin");
}
private static void configurePlugins(@Nonnull List<IForestryPlugin> forestryPlugins) {
private static void configurePlugins(List<IForestryPlugin> forestryPlugins) {
Locale locale = Locale.getDefault();
Locale.setDefault(Locale.ENGLISH);
@@ -297,7 +292,7 @@ public class PluginManager {
}
}
@Nonnull
public static List<ItemStack> getHiddenItems() {
List<ItemStack> hiddenItems = new ArrayList<>();
for (IForestryPlugin plugin : loadedPlugins) {
@@ -306,7 +301,7 @@ public class PluginManager {
return hiddenItems;
}
@Nonnull
public static Set<String> getLootPoolNames() {
Set<String> lootPoolNames = new HashSet<>();
for (IForestryPlugin plugin : loadedPlugins) {