fix recipe logic not updating on world reload

fix pump "tank exported to is full" logic
GregTechCE · Nov 30, 2020 · 8850a5f · 8850a5f
1 parent 60a2b47
commit 8850a5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java
@@ -106,28 +106,18 @@ public void update() {
         if (!getMetaTileEntity().getWorld().isRemote) {
             if (workingEnabled) {
                 if (progressTime > 0) {
-                    int currentProgress = progressTime;
                     updateRecipeProgress();
-                    if (progressTime > currentProgress) {
-                        metaTileEntity.setSituation(WORKING);
-                    } else if (progressTime != 0) {
-                        metaTileEntity.setSituation(INSUFFICIENT_POWER);
-                    }
                 }
                 if (progressTime == 0) {
-                    trySearchNewRecipe();
-                }
-                if (currentRecipe == null) {
                     if (metaTileEntity.isInputEmpty()) {
                         metaTileEntity.setSituation(IDLE);
-                    } else {
+                    }
+                    trySearchNewRecipe();
+                    if (currentRecipe == null) {
                         metaTileEntity.setSituation(NO_MATCHING_RECIPE);
                     }
-                } else if (!canOutputsFit()) {
-                    metaTileEntity.setSituation(OUTPUT_INVENTORY_FULL);
                 }
-            }
-            else {
+            } else {
                 metaTileEntity.setSituation(DISABLED_BY_CONTROLLER);
             }
         }
@@ -145,13 +135,15 @@ boolean canOutputsFit(){
     protected void updateRecipeProgress() {
         boolean drawEnergy = drawEnergy(recipeEUt);
         if (drawEnergy || (recipeEUt < 0)) {
+            metaTileEntity.setSituation(WORKING);
             if (++progressTime >= maxProgressTime) {
                 completeRecipe();
             }
         } else if (recipeEUt > 0) {
             //only set hasNotEnoughEnergy if this recipe is consuming recipe
             //generators always have enough energy
             this.hasNotEnoughEnergy = true;
+            metaTileEntity.setSituation(INSUFFICIENT_POWER);
             //if current progress value is greater than 2, decrement it by 2
             if (progressTime >= 2) {
                 if (ConfigHolder.insufficientEnergySupplyWipesRecipeProgress) {
@@ -183,6 +175,8 @@ protected void trySearchNewRecipe() {
         }
         if (this.currentRecipe != null && setupAndConsumeRecipeInputs(this.currentRecipe)) {
             setupRecipe(this.currentRecipe);
+        } else {
+            metaTileEntity.setSituation(OUTPUT_INVENTORY_FULL);
         }
     }
 

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -858,7 +858,7 @@ public void pushFluidsIntoNearbyHandlers(EnumFacing... allowedFaces) {
             if (fluidHandler == null || myFluidHandler == null) {
                 continue;
             }
-            if (GTFluidUtils.transferFluids(myFluidHandler, fluidHandler, Integer.MAX_VALUE) == 0) {
+            if (GTFluidUtils.transferFluids(myFluidHandler, fluidHandler, Integer.MAX_VALUE) == Integer.MAX_VALUE ) {
                 this.failedToMoveFluids = true;
             }
         }