diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 64f0d2e21..d89fb522f 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -32,6 +32,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.ForestryAPI; +import forestry.api.core.ForestryEvent; import forestry.core.EventHandlerCore; import forestry.core.climate.ClimateStates; import forestry.core.config.Config; @@ -104,6 +105,8 @@ public class Forestry { configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID); Config.load(event.getSide()); + MinecraftForge.EVENT_BUS.post(new ForestryEvent.PreInit(this, event)); + PluginManager.runSetup(event); String gameMode = Config.gameMode; diff --git a/src/main/java/forestry/api/core/ForestryEvent.java b/src/main/java/forestry/api/core/ForestryEvent.java index 5c4d6900c..d2b49ce89 100644 --- a/src/main/java/forestry/api/core/ForestryEvent.java +++ b/src/main/java/forestry/api/core/ForestryEvent.java @@ -5,13 +5,17 @@ ******************************************************************************/ package forestry.api.core; +import net.minecraft.entity.player.EntityPlayer; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.Event; + import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.common.eventhandler.Event; public abstract class ForestryEvent extends Event { @@ -53,6 +57,21 @@ public abstract class ForestryEvent extends Event { this.tracker = tracker; this.player = player; } + } + /** + * Posted before forestry registers all items and blocks. + */ + public static class PreInit extends ForestryEvent{ + /** + * The main mod instance for Forestry. + */ + public Object instance; + public final FMLPreInitializationEvent event; + + public PreInit(Object instance, FMLPreInitializationEvent event) { + this.instance = instance; + this.event = event; + } } } diff --git a/src/main/java/forestry/api/core/package-info.java b/src/main/java/forestry/api/core/package-info.java index 9adb764c4..ec1086adc 100644 --- a/src/main/java/forestry/api/core/package-info.java +++ b/src/main/java/forestry/api/core/package-info.java @@ -5,10 +5,11 @@ ******************************************************************************/ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -@API(apiVersion = "5.1.0", owner = "Forestry", provides = "ForestryAPI|core") +@API(apiVersion = "5.2.0", owner = "Forestry", provides = "ForestryAPI|core") package forestry.api.core; import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; import net.minecraftforge.fml.common.API; + +import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/forestry/greenhouse/multiblock/blocks/storage/GreenhouseProviderServer.java b/src/main/java/forestry/greenhouse/multiblock/blocks/storage/GreenhouseProviderServer.java index 2239d7963..7e90405ed 100644 --- a/src/main/java/forestry/greenhouse/multiblock/blocks/storage/GreenhouseProviderServer.java +++ b/src/main/java/forestry/greenhouse/multiblock/blocks/storage/GreenhouseProviderServer.java @@ -50,8 +50,8 @@ import forestry.greenhouse.network.packets.PacketGreenhouseData; public class GreenhouseProviderServer extends GreenhouseProvider { private static final List HANDLERS = new ArrayList<>(); - private static final int TIME_BETWEEN_UPDATES = 25; - private static final int UPDATE_DELAY = 50; + private static final int TIME_BETWEEN_UPDATES = 75; + private static final int UPDATE_DELAY = 150; private final Set unloadedChunks; @@ -231,6 +231,7 @@ public class GreenhouseProviderServer extends GreenhouseProvider { IErrorState errorState = handler.checkNeighborBlocks(storage, blockToCheck, newBlocksToCheck); if (errorState != null) { errorLogic.setCondition(true, errorState); + break; } blocksToCheck.addAll(newBlocksToCheck); if (blockToCheck instanceof IBlankBlock) { @@ -239,6 +240,7 @@ public class GreenhouseProviderServer extends GreenhouseProvider { if (positionHeight == -1) { errorLogic.setCondition(true, EnumErrorCode.NOT_CLOSED); //throw new GreenhouseException(Translator.translateToLocalFormatted("for.multiblock.greenhouse.error.roof.notclosed", position.getX(), position.getY(), position.getZ())).setPos(position); + break; } if (positionHeight > greenhouseHeight) { greenhouseHeight = positionHeight;