From a9fbfbbe7453d12787ba7c32ccb093e13e3540f1 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 31 Dec 2014 05:17:47 -0800 Subject: [PATCH] Don't register fluids that are not Forestry's. #420 #422 --- src/main/java/forestry/core/fluids/Fluids.java | 2 ++ src/main/java/forestry/plugins/PluginFluids.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index d4c178690..0e91266bb 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -317,6 +317,8 @@ public enum Fluids { // Thermal Expansion COAL, PYROTHEUM; + public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD}; + private final String tag; private final int density, viscosity; private final Color color; diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index a27950d84..a523853ce 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -82,7 +82,7 @@ public class PluginFluids extends ForestryPlugin { @Override public void preInit() { - for (Fluids fluidType : Fluids.values()) { + for (Fluids fluidType : Fluids.forestryFluids) { createFluid(fluidType); } MinecraftForge.EVENT_BUS.register(getTextureHook()); @@ -145,7 +145,7 @@ public class PluginFluids extends ForestryPlugin { @Override public void postInit() { - for (Fluids fluidType : Fluids.values()) { + for (Fluids fluidType : Fluids.forestryFluids) { if (fluidType.getFluid() == null) throw new MissingFluidException(fluidType.getTag()); }