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,6 +10,9 @@
******************************************************************************/
package forestry.energy;
import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -28,9 +31,11 @@ import forestry.plugins.ForestryPluginUids;
@ForestryPlugin(pluginID = ForestryPluginUids.ENERGY, name = "Energy", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.energy.description")
public class PluginEnergy extends BlankForestryPlugin {
@SuppressWarnings("NullableProblems")
@SidedProxy(clientSide = "forestry.energy.proxy.ProxyEnergyClient", serverSide = "forestry.energy.proxy.ProxyEnergy")
public static ProxyEnergy proxy;
@Nullable
public static BlockRegistryEnergy blocks;
@Override
@@ -40,6 +45,7 @@ public class PluginEnergy extends BlankForestryPlugin {
@Override
public void doInit() {
Preconditions.checkState(blocks != null);
blocks.peatEngine.init();
blocks.biogasEngine.init();
@@ -51,6 +57,7 @@ public class PluginEnergy extends BlankForestryPlugin {
@Override
public void registerRecipes() {
super.registerRecipes();
Preconditions.checkState(blocks != null);
RecipeUtil.addRecipe(new ItemStack(blocks.peatEngine),
"###",