aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/common
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-03-08 21:27:30 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-03-08 21:27:30 +0000
commit15beaef7c208a5ec84c7ef92288c50e39387cdbd (patch)
tree54e9531c866891a0be286c703dd35dd8b7785ded /src/Java/gtPlusPlus/core/common
parent11494f1b654a9088896e3e282267e90bb912fde6 (diff)
downloadGT5-Unofficial-15beaef7c208a5ec84c7ef92288c50e39387cdbd.tar.gz
GT5-Unofficial-15beaef7c208a5ec84c7ef92288c50e39387cdbd.tar.bz2
GT5-Unofficial-15beaef7c208a5ec84c7ef92288c50e39387cdbd.zip
% Allowed Hand-Pumps to function on all Tanks again & also allowed GT output slots. Closes #423.
% Adjusted Generic Bucket handling of Textures and Colouring. $ Fixed several issues with Hand-Pump logic, Fixes #353. $ Fixed load issues with FluidFactory.java.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 03b643abdb..7d4644f275 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.entity.InternalEntityRegistry;
import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
import gtPlusPlus.core.entity.monster.EntitySickBlaze;
import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.fluids.FluidFactory;
import gtPlusPlus.core.handler.BookHandler;
import gtPlusPlus.core.handler.BurnableFuelHandler;
import gtPlusPlus.core.handler.COMPAT_HANDLER;
@@ -81,7 +82,7 @@ public class CommonProxy {
ModItems.init();
ModBlocks.init();
CI.preInit();
-
+ FluidFactory.preInit();
COMPAT_IntermodStaging.preInit(e);
BookHandler.run();
// Registration of entities and renderers
@@ -117,6 +118,7 @@ public class CommonProxy {
Logger.ERROR("[ERROR] Did not generate fluids at all.");
}
CI.init();
+ FluidFactory.init();
/**
* Register the Event Handlers.
@@ -158,6 +160,7 @@ public class CommonProxy {
public void postInit(final FMLPostInitializationEvent e) {
Logger.INFO("Cleaning up, doing postInit.");
PlayerCache.initCache();
+ FluidFactory.postInit();
// Make Burnables burnable
if (!CORE.burnables.isEmpty()) {