% Tried to adjust the name of IC2 Hot Water.

$ Fixed OreDicting ore Sodium Hydroxide if GT dusts are detected.
$ Fixed bad oredict look-up for RP1 cell.
$ Rewrote how GT++ Materials look for existing fluids and cells during generation, hopefully this didn't break any existing cells or fluids. (Please investigate log after loading a world)

1 files changed, 12 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index a0a684d3c6..b3372e8bde 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -15,6 +15,7 @@ import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -239,11 +240,16 @@ public class PollutionUtils {
 				if (CD != null) {
 					Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(CD);
+					MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(CD);
 					ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1);
 					if (ItemUtils.checkForInvalidItems(cellCD)) {
 						Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
 						MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
 					}
+					else {
+						Logger.INFO("[PollutionCompat] Did not find carbon dioxide cell, registering new component.");
+						new BaseItemCell(MISC_MATERIALS.CARBON_DIOXIDE);
+					}
 				}
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
@@ -252,11 +258,16 @@ public class PollutionUtils {
 				if (CM != null) {
 					Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(CM);
+					MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(CM);
 					ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1);
 					if (ItemUtils.checkForInvalidItems(cellCD)) {
-						Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
+						Logger.INFO("[PollutionCompat] Found carbon monoxide cell, registering component.");
 						MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
 					}
+					else {
+						Logger.INFO("[PollutionCompat] Did not find carbon monoxide cell, registering new component.");
+						new BaseItemCell(MISC_MATERIALS.CARBON_MONOXIDE);
+					}
 				}
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false);