Fixed inputs getter

Closes GregTechCE#1439
TheDarkDnKTv · Oct 28, 2021 · 4c85780 · 4c85780
1 parent 7230afe
commit 4c85780
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java b/src/main/java/gregtech/api/recipes/crafttweaker/CTRecipe.java
@@ -33,10 +33,19 @@ public CTRecipe(RecipeMap<?> recipeMap, Recipe backingRecipe) {
     @ZenGetter("inputs")
     public List<InputIngredient> getInputs() {
         return this.backingRecipe.getInputs().stream()
+        	.filter(out -> out.getCount() > 0)
             .map(InputIngredient::new)
             .collect(Collectors.toList());
     }
 
+    @ZenGetter("nonConsumable")
+    public List<InputIngredient> getNonConsumableInputs() {
+    	return this.backingRecipe.getInputs().stream()
+			.filter(out -> out.getCount() < 1)
+			.map(InputIngredient::new)
+			.collect(Collectors.toList());
+    }
+
     @ZenGetter("outputs")
     public List<IItemStack> getOutputs() {
         return this.backingRecipe.getOutputs().stream()
@@ -50,7 +59,8 @@ public List<IItemStack> getResultItemOutputs(@Optional(valueLong = -1) long rand
             .map(MCItemStack::new)
             .collect(Collectors.toList());
     }
-
+
+    @Deprecated
     @ZenGetter("changedOutputs")
     public List<ChancedEntry> getChancedOutputs() {
         ArrayList<ChancedEntry> result = new ArrayList<>();

diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java b/src/main/java/gregtech/api/recipes/crafttweaker/InputIngredient.java
@@ -16,11 +16,13 @@
 public class InputIngredient implements IIngredient {
 
     private final IIngredient iingredient;
+    private final int amount;
 
     public InputIngredient(CountableIngredient backingIngredient) {
         iingredient = CraftTweakerMC
             .getIIngredient(backingIngredient.getIngredient())
-            .amount(backingIngredient.getCount());
+        	.amount(1);
+        amount = backingIngredient.getCount();
     }
 
     @Override
@@ -30,7 +32,7 @@ public String getMark() {
 
     @Override
     public int getAmount() {
-        return iingredient.getAmount();
+        return amount;
     }
 
     @Override