From eb6fa3c3ae9580d958ef046a853354e71e539758 Mon Sep 17 00:00:00 2001
From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:35:10 +0800
Subject: fix decompose recipe (#227)

* prefer to use dust instead of fluid in decompose recipe

* sa

Former-commit-id: f3cd61eb988ae59fd7cf712f3520685de42ee769
---
 .../material/werkstoff_loaders/recipe/CellLoader.java     | 11 ++++++-----
 .../material/werkstoff_loaders/recipe/DustLoader.java     | 15 ++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
index a1de8695a0..32e72c96e6 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java
@@ -60,12 +60,13 @@ public class CellLoader implements IWerkstoffRunnable {
             for (Pair<ISubTagContainer, Integer> container :
                     werkstoff.getContents().getValue().toArray(new Pair[0])) {
                 if (container.getKey() instanceof Materials) {
-                    if (((Materials) container.getKey()).hasCorrespondingGas()
-                            || ((Materials) container.getKey()).hasCorrespondingFluid()
-                            || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) {
-                        FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000 * container.getValue());
+                    if ((((Materials) container.getKey()).hasCorrespondingGas()
+                                    || ((Materials) container.getKey()).hasCorrespondingFluid()
+                                    || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID)
+                            && ((Materials) container.getKey()).getDust(0) == null) {
+                        FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000L * container.getValue());
                         if (tmpFl == null || tmpFl.getFluid() == null) {
-                            tmpFl = ((Materials) container.getKey()).getFluid(1000 * container.getValue());
+                            tmpFl = ((Materials) container.getKey()).getFluid(1000L * container.getValue());
                         }
                         flOutputs.add(tmpFl);
                         if (flOutputs.size() > 1) {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
index 324e7905e8..3abe76739a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
@@ -61,12 +61,13 @@ public class DustLoader implements IWerkstoffRunnable {
                 for (Pair<ISubTagContainer, Integer> container :
                         werkstoff.getContents().getValue().toArray(new Pair[0])) {
                     if (container.getKey() instanceof Materials) {
-                        if (((Materials) container.getKey()).getGas(0) != null
-                                || ((Materials) container.getKey()).getFluid(0) != null
-                                || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) {
-                            FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000 * container.getValue());
+                        if ((((Materials) container.getKey()).getGas(0) != null
+                                        || ((Materials) container.getKey()).getFluid(0) != null
+                                        || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID)
+                                && ((Materials) container.getKey()).getDust(0) == null) {
+                            FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000L * container.getValue());
                             if (tmpFl == null || tmpFl.getFluid() == null) {
-                                tmpFl = ((Materials) container.getKey()).getFluid(1000 * container.getValue());
+                                tmpFl = ((Materials) container.getKey()).getFluid(1000L * container.getValue());
                             }
                             flOutputs.add(tmpFl);
                             if (flOutputs.size() > 1) {
@@ -90,9 +91,9 @@ public class DustLoader implements IWerkstoffRunnable {
                                         && (((Materials) container.getKey()).getMolten(0) != null
                                                 || ((Materials) container.getKey()).getSolid(0) != null)) {
                                     FluidStack tmpFl =
-                                            ((Materials) container.getKey()).getMolten(1000 * container.getValue());
+                                            ((Materials) container.getKey()).getMolten(1000L * container.getValue());
                                     if (tmpFl == null || tmpFl.getFluid() == null) {
-                                        tmpFl = ((Materials) container.getKey()).getSolid(1000 * container.getValue());
+                                        tmpFl = ((Materials) container.getKey()).getSolid(1000L * container.getValue());
                                     }
                                     flOutputs.add(tmpFl);
                                     if (flOutputs.size() > 1) {
-- 
cgit