Allow listening to EvaluationException resolutions

Required for CyclopsMC/IntegratedScripting#5
CyclopsMC · Apr 13, 2024 · 6fef4df · 6fef4df
1 parent 9531d16
commit 6fef4df
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/src/main/java/org/cyclops/integrateddynamics/api/evaluate/EvaluationException.java b/src/main/java/org/cyclops/integrateddynamics/api/evaluate/EvaluationException.java
@@ -1,7 +1,10 @@
 package org.cyclops.integrateddynamics.api.evaluate;
 
+import com.google.common.collect.Lists;
 import net.minecraft.network.chat.MutableComponent;
 
+import java.util.List;
+
 /**
  * Exception to indicate a failed evaluation.
  * @author rubensworks
@@ -10,22 +13,48 @@ public class EvaluationException extends Exception {
 
     private final MutableComponent errorMessage;
     private boolean retryEvaluation;
+    private final List<Runnable> resolutionListeners;
 
     public EvaluationException(MutableComponent errorMessage) {
         super(errorMessage.toString());
         this.errorMessage = errorMessage;
         this.retryEvaluation = false;
+        this.resolutionListeners = Lists.newArrayList();
     }
 
     public MutableComponent getErrorMessage() {
         return errorMessage;
     }
 
+    /**
+     * This should only be set at construction time of this exception.
+     * @param retryEvaluation If the evaluation may be retried again in the next tick.
+     */
     public void setRetryEvaluation(boolean retryEvaluation) {
         this.retryEvaluation = retryEvaluation;
     }
 
+    /**
+     * @return If the evaluation may be retried again in the next tick.
+     */
     public boolean isRetryEvaluation() {
         return retryEvaluation;
     }
+
+    public void addResolutionListeners(Runnable listener) {
+        this.resolutionListeners.add(listener);
+    }
+
+    /**
+     * If evaluators halt operation due to this thrown evaluation,
+     * invoking this method will cause them to remove the exception and resume operation.
+     *
+     * In contrast to {@link #retryEvaluation}, this may be invoked anywhere within the lifetime of evaluation
+     * exceptions.
+     */
+    public void resolve() {
+        for (Runnable resolutionListener : Lists.newArrayList(this.resolutionListeners.listIterator())) {
+            resolutionListener.run();
+        }
+    }
 }
diff --git a/src/main/java/org/cyclops/integrateddynamics/core/evaluate/expression/LazyExpression.java b/src/main/java/org/cyclops/integrateddynamics/core/evaluate/expression/LazyExpression.java
@@ -71,10 +71,12 @@ public V getValue() throws EvaluationException {
             return (V) value;
         } catch (ClassCastException e) {
             errored = true;
-            throw new EvaluationException(Component.translatable(L10NValues.OPERATOR_ERROR_WRONGTYPEOUTPUT,
+            EvaluationException e2 = new EvaluationException(Component.translatable(L10NValues.OPERATOR_ERROR_WRONGTYPEOUTPUT,
                     op,
                     Component.translatable(value.getType().getTranslationKey()),
                     Component.translatable(op.getOutputType().getTranslationKey())));
+            e2.addResolutionListeners(this::invalidate);
+            throw e2;
         }
     }
 

diff --git a/...main/java/org/cyclops/integrateddynamics/core/part/panel/PartTypePanelVariableDriven.java b/...main/java/org/cyclops/integrateddynamics/core/part/panel/PartTypePanelVariableDriven.java
@@ -136,6 +136,8 @@ public void update(INetwork network, IPartNetwork partNetwork, PartTarget target
                     state.addGlobalError(e.getErrorMessage());
                     if (e.isRetryEvaluation()) {
                         state.setRetryEvaluation(true);
+                    } else {
+                        e.addResolutionListeners(() -> state.onVariableContentsUpdated((P) this, target));
                     }
                 }
             }
@@ -190,6 +192,7 @@ protected void onValueChanged(INetwork network, IPartNetwork partNetwork, PartTa
                 materializedValue = newValue.getType().materialize(newValue);
             } catch (EvaluationException e) {
                 state.addGlobalError(e.getErrorMessage());
+                e.addResolutionListeners(() -> state.addGlobalError(null)); // TODO: also change here?
             }
             state.setDisplayValue(materializedValue);
         }

diff --git a/src/main/java/org/cyclops/integrateddynamics/part/aspect/write/AspectWriteBase.java b/src/main/java/org/cyclops/integrateddynamics/part/aspect/write/AspectWriteBase.java
@@ -59,6 +59,7 @@ public <P extends IPartType<P, S>, S extends IPartState<P>> void update(INetwork
             } catch (EvaluationException e) {
                 writerState.addError(this, e.getErrorMessage());
                 writerState.setDeactivated(true);
+                e.addResolutionListeners(() -> writerState.onVariableContentsUpdated(partTypeWriter, target));
             }
         } else if(!writerState.isDeactivated()) {
             onDeactivate(partTypeWriter, target, writerState);