diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-24 07:01:27 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-24 07:01:27 +1000 |
| commit | b44d061f6ca95236a873bb0835d0e2fd77b96851 (patch) | |
| tree | 818807e7b6c95854017a87f3f9384fd32b04043e /src/Java/gtPlusPlus/core/common | |
| parent | c40825297fc1008c72bfebca09af9aabe15c2832 (diff) | |
| download | GT5-Unofficial-b44d061f6ca95236a873bb0835d0e2fd77b96851.tar.gz GT5-Unofficial-b44d061f6ca95236a873bb0835d0e2fd77b96851.tar.bz2 GT5-Unofficial-b44d061f6ca95236a873bb0835d0e2fd77b96851.zip | |
$ Tried to fix GT ItemList values being called too early when certain mods are loaded, causing them to not be loaded when GT++ is running PreInit().
$ Rewrote system that Autogenerates Recipes for Materials, migrating all recipes to be generated in PostInit() stage now.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
| -rw-r--r-- | src/Java/gtPlusPlus/core/common/CommonProxy.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 8a1ef34b68..de0cfe4711 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -7,6 +7,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.Entity; +import gregtech.api.enums.ItemList; + import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ChunkManager; @@ -21,6 +23,7 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; @@ -34,6 +37,7 @@ import net.minecraftforge.common.ForgeChunkManager; public class CommonProxy { public static Meta_GT_Proxy GtProxy; + private boolean mFluidsGenerated = false; public CommonProxy(){ //Should Register Gregtech Materials I've Made @@ -92,7 +96,10 @@ public class CommonProxy { Logger.INFO("[Proxy] Calling Render registrator."); registerRenderThings(); - + if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) { + Material.generateQueuedFluids(); + mFluidsGenerated = true; + } } public void init(final FMLInitializationEvent e) { @@ -100,7 +107,15 @@ public class CommonProxy { if (CORE.DEBUG){ DEBUG_INIT.registerHandlers(); } - + if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) { + Material.generateQueuedFluids(); + mFluidsGenerated = true; + } + else { + Logger.INFO("[ERROR] Did not generate fluids at all."); + Logger.WARNING("[ERROR] Did not generate fluids at all."); + Logger.ERROR("[ERROR] Did not generate fluids at all."); + } CI.init(); /** |