hiding the empty material and production

liplum · Jun 4, 2024 · 8b540dd · 8b540dd
1 parent 35aaae4
commit 8b540dd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/lib/src/multicraft/TmiRecipeEntry.java b/lib/src/multicraft/TmiRecipeEntry.java
@@ -44,24 +44,39 @@ public Seq<tmi.recipe.Recipe> parse(@NotNull MultiCrafter crafter) {
         .setBlock(getWrap(crafter))
         .setTime(recipe.craftTime);
       for (ItemStack stack : recipe.input.items) {
-        tmiRecipe.addMaterial(getWrap(stack.item), stack.amount);
+        if (stack.amount > 0) {
+          tmiRecipe.addMaterial(getWrap(stack.item), stack.amount);
+        }
       }
       for (LiquidStack stack : recipe.input.fluids) {
-        tmiRecipe.addMaterial(getWrap(stack.liquid), stack.amount);
+        if (stack.amount > 0) {
+          tmiRecipe.addMaterial(getWrap(stack.liquid), stack.amount).setPersecFormat();
+        }
+      }
+      if (recipe.input.heat > 0) {
+        tmiRecipe.addMaterial(HeatMark.INSTANCE, recipe.input.heat);
+      }
+      if (recipe.input.power > 0) {
+        tmiRecipe.addMaterial(PowerMark.INSTANCE, recipe.input.power).setPersecFormat();
       }
-      tmiRecipe.addMaterial(HeatMark.INSTANCE, recipe.input.heat);
-      tmiRecipe.addMaterial(PowerMark.INSTANCE, recipe.input.power);
-
       // output
       for (ItemStack stack : recipe.output.items) {
-        tmiRecipe.addProduction(getWrap(stack.item), stack.amount);
+        if (stack.amount > 0) {
+          tmiRecipe.addProduction(getWrap(stack.item), stack.amount);
+        }
       }
       for (LiquidStack stack : recipe.output.fluids) {
-        tmiRecipe.addProduction(getWrap(stack.liquid), stack.amount);
+        if (stack.amount > 0) {
+          tmiRecipe.addProduction(getWrap(stack.liquid), stack.amount).setPersecFormat();
+        }
       }
 
-      tmiRecipe.addProduction(HeatMark.INSTANCE, recipe.output.heat);
-      tmiRecipe.addProduction(PowerMark.INSTANCE, recipe.output.power);
+      if (recipe.output.heat > 0) {
+        tmiRecipe.addProduction(HeatMark.INSTANCE, recipe.output.heat);
+      }
+      if (recipe.output.heat > 0) {
+        tmiRecipe.addProduction(PowerMark.INSTANCE, recipe.output.power).setPersecFormat();
+      }
       result.add(tmiRecipe);
     }
 

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -22,7 +22,7 @@ mindustry {
     mods {
         worksWith {
             add fromTask ":js:jar"
-            add java "3Snake3/Sapphirium"
+//            add java "3Snake3/Sapphirium"
             add java "EB-wilson/TooManyItems"
             // add local "$buildDir/sapphirium-erekir.zip"
             // add local "$buildDir/units-mod.zip"