Fix non-elemental plasma cells (#3543)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 11 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 3493e640ff..9417ea0aa3 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2648,9 +2648,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
             return;
         }
 
-        if (aMaterial.mHasPlasma) {
-            GTMod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial);
-        }
         if (aMaterial.mHasGas) {
             GTFluidFactory
                 .of(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, GAS, aMaterial.mGasTemp);
diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
index 7c14ff2f14..d974ace85e 100644
--- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
+++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java
@@ -701,7 +701,7 @@ public class MaterialsUEVplus {
         1.0F,
         8 * 2621440,
         26,
-        1 | 2 | 64 | 128,
+        1 | 2 | 32 | 64 | 128,
         70,
         0,
         70,
diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
index 32c2254374..e217c3994f 100644
--- a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
@@ -460,7 +460,6 @@ import static gregtech.common.items.IDMetaItem01.ZPM4;
 import static gregtech.common.items.IDMetaItem01.ZPM5;
 import static gregtech.common.items.IDMetaItem01.ZPM6;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -3511,15 +3510,16 @@ public class MetaGeneratedItem01 extends MetaGeneratedItemX32 {
     }
 
     public boolean isPlasmaCellUsed(OrePrefixes aPrefix, Materials aMaterial) {
-        Collection<GTRecipe> fusionRecipes = RecipeMaps.fusionRecipes.getAllRecipes();
-        if (aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { // Materials has a plasma fluid
-            for (GTRecipe recipe : fusionRecipes) { // Loop through fusion recipes
-                if (recipe.getFluidOutput(0) != null) { // Make sure fluid output can't be null (not sure if possible)
+        // Materials has a plasma fluid
+        if (aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) {
+            if (aMaterial.mHasPlasma) return true;
+            // Loop through fusion recipes
+            for (GTRecipe recipe : RecipeMaps.fusionRecipes.getAllRecipes()) {
+                // Make sure fluid output can't be null (not sure if possible)
+                if (recipe.getFluidOutput(0) != null) {
+                    // Fusion recipe output matches current plasma cell fluid
                     if (recipe.getFluidOutput(0)
-                        .isFluidEqual(aMaterial.getPlasma(1L))) return true; // Fusion recipe
-                                                                             // output matches
-                                                                             // current plasma
-                                                                             // cell fluid
+                        .isFluidEqual(aMaterial.getPlasma(1L))) return true;
                 }
             }
         }
diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
index 48921c3bc4..4324763bd3 100644
--- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
@@ -1471,7 +1471,7 @@ public class LoaderGTBlockFluid implements Runnable {
                     GTMod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto);
                 }
             }
-            if (tMaterial.mElement != null) {
+            if (tMaterial.mElement != null || tMaterial.mHasPlasma) {
                 GTMod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial);
             }
             if (tMaterial.hasCorrespondingFluid()) {