Allow Ingredient.with* operators to have empty ingredient inputs

CyclopsMC · Jun 24, 2024 · 9b52876 · 9b52876
1 parent 3aaa393
commit 9b52876
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/main/java/org/cyclops/integrateddynamics/core/evaluate/operator/Operators.java b/src/main/java/org/cyclops/integrateddynamics/core/evaluate/operator/Operators.java
@@ -3727,8 +3727,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
                 ValueObjectTypeIngredients.ValueIngredients value = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeInteger.ValueInteger index = variables.getValue(1, ValueTypes.INTEGER);
                 ValueObjectTypeItemStack.ValueItemStack itemStack = variables.getValue(2, ValueTypes.OBJECT_ITEMSTACK);
-                if (!value.getRawValue().isPresent()) {
-                    return value;
+                if (value.getRawValue().isEmpty()) {
+                    value = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = value.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsSingle<>(baseIngredients,
@@ -3744,8 +3744,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
                 ValueObjectTypeIngredients.ValueIngredients value = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeInteger.ValueInteger index = variables.getValue(1, ValueTypes.INTEGER);
                 ValueObjectTypeFluidStack.ValueFluidStack fluidStack = variables.getValue(2, ValueTypes.OBJECT_FLUIDSTACK);
-                if (!value.getRawValue().isPresent()) {
-                    return value;
+                if (value.getRawValue().isEmpty()) {
+                    value = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = value.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsSingle<>(baseIngredients,
@@ -3761,8 +3761,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
                 ValueObjectTypeIngredients.ValueIngredients value = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeInteger.ValueInteger index = variables.getValue(1, ValueTypes.INTEGER);
                 ValueTypeLong.ValueLong energy = variables.getValue(2, ValueTypes.LONG);
-                if (!value.getRawValue().isPresent()) {
-                    return value;
+                if (value.getRawValue().isEmpty()) {
+                    value = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = value.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsSingle<>(baseIngredients,
@@ -3777,8 +3777,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
             .function(variables -> {
                 ValueObjectTypeIngredients.ValueIngredients valueIngredients = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeList.ValueList<ValueObjectTypeItemStack, ValueObjectTypeItemStack.ValueItemStack> list = variables.getValue(1, ValueTypes.LIST);
-                if (!valueIngredients.getRawValue().isPresent()) {
-                    return valueIngredients;
+                if (valueIngredients.getRawValue().isEmpty()) {
+                    valueIngredients = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = valueIngredients.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsList<>(baseIngredients,
@@ -3793,8 +3793,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
             .function(variables -> {
                 ValueObjectTypeIngredients.ValueIngredients valueIngredients = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeList.ValueList<ValueObjectTypeFluidStack, ValueObjectTypeFluidStack.ValueFluidStack> list = variables.getValue(1, ValueTypes.LIST);
-                if (!valueIngredients.getRawValue().isPresent()) {
-                    return valueIngredients;
+                if (valueIngredients.getRawValue().isEmpty()) {
+                    valueIngredients = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = valueIngredients.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsList<>(baseIngredients,
@@ -3810,8 +3810,8 @@ public IValue evaluate(OperatorBase.SafeVariablesGetter variables) throws Evalua
             .function(variables -> {
                 ValueObjectTypeIngredients.ValueIngredients valueIngredients = variables.getValue(0, ValueTypes.OBJECT_INGREDIENTS);
                 ValueTypeList.ValueList<ValueTypeInteger, ValueTypeInteger.ValueInteger> list = variables.getValue(1, ValueTypes.LIST);
-                if (!valueIngredients.getRawValue().isPresent()) {
-                    return valueIngredients;
+                if (valueIngredients.getRawValue().isEmpty()) {
+                    valueIngredients = ValueObjectTypeIngredients.ValueIngredients.of(new MixedIngredients(Maps.newIdentityHashMap()));
                 }
                 IMixedIngredients baseIngredients = valueIngredients.getRawValue().get();
                 return ValueObjectTypeIngredients.ValueIngredients.of(new ExtendedIngredientsList<>(baseIngredients,