From cdedddca2dc62d785674240ec73b95e0323e6b22 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 13 Nov 2021 15:35:04 -0800 Subject: [PATCH] Guard against the same input calling fill multiple times per tick. *cough* GT output hatch *cough* --- build.gradle | 4 +--- gradle.properties | 2 +- .../liquid/AbstractEnderLiquidConduit.java | 15 ++++++++++++++- .../conduit/liquid/AbstractTankConduit.java | 4 ++++ .../conduit/liquid/AdvancedLiquidConduit.java | 9 +++++++++ .../enderio/conduit/liquid/LiquidConduit.java | 6 +----- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index e8f24f79..134462dc 100644 --- a/build.gradle +++ b/build.gradle @@ -73,9 +73,7 @@ repositories { dependencies { exportedCompile 'cglib:cglib-nodep:3.1' - if (!project.hasProperty('useLocalEnderCore')) { - compile "com.enderio.core:EnderCore:${endercore_version}:dev" - } + compileOnly "com.enderio.core:EnderCore:${endercore_version}:dev" compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" diff --git a/gradle.properties b/gradle.properties index 95c588b7..2be0389d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.7.10 forge_version=10.13.4.1614-1.7.10 forgeDep_version=10.13.4.1614 -mod_version=2.3.1.18 +mod_version=2.3.1.19 #Comment out this line to get rid of the appendix #mod_appendix=beta diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java index a4e88aad..254cbb86 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java @@ -26,9 +26,11 @@ import net.minecraftforge.fluids.FluidTankInfo; import java.util.EnumMap; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { @@ -39,7 +41,8 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN; static final Map ICONS = new HashMap(); - + private final Set filledFromThisTick = new HashSet<>(); + @SideOnly(Side.CLIENT) public static void initIcons() { IconUtil.addIconProvider(new IconUtil.IIconProvider() { @@ -242,6 +245,7 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { @Override public void updateEntity(World world) { super.updateEntity(world); + filledFromThisTick.clear(); if(world.isRemote) { return; } @@ -281,6 +285,15 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { if(network == null || !getConnectionMode(from).acceptsInput()) { return 0; } + + // Guard against things that continuously call fill! + if(filledFromThisTick.contains(getLocation().getLocation(from))) { + return 0; + } + if(doFill) { + filledFromThisTick.add(getLocation().getLocation(from)); + } + return network.fillFrom(this, from, resource, doFill); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java index 22a56793..1d753e27 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java @@ -1,6 +1,8 @@ package crazypants.enderio.conduit.liquid; +import java.util.HashSet; import java.util.List; +import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -31,6 +33,7 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit { protected int numEmptyEvents = 0; protected boolean fluidTypeLocked = false; private int lastLightValue; + protected final Set filledFromThisTick = new HashSet<>(); @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { @@ -191,6 +194,7 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit { @Override public void updateEntity(World world) { + filledFromThisTick.clear(); int lightValue = getLightValue(); if(lastLightValue != lightValue) { BlockCoord bc = getLocation(); diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java index ff38157a..95238acb 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java @@ -239,6 +239,15 @@ public class AdvancedLiquidConduit extends AbstractTankConduit { if(network == null || !getConnectionMode(from).acceptsInput()) { return 0; } + + // Guard against things that continuously call fill! + if(filledFromThisTick.contains(getLocation().getLocation(from))) { + return 0; + } + if(doFill) { + filledFromThisTick.add(getLocation().getLocation(from)); + } + return network.fill(from, resource, doFill); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 59aaef15..91d03421 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -83,8 +83,6 @@ public class LiquidConduit extends AbstractTankConduit { private ForgeDirection startPushDir = ForgeDirection.DOWN; - private final Set filledFromThisTick = new HashSet(); - private long ticksSinceFailedExtract = 0; @Override @@ -170,9 +168,7 @@ public class LiquidConduit extends AbstractTankConduit { return 0; } - // Note: This is just a guard against mekansims pipes that will continuously - // call - // fill on us if we push liquid to them. + // Guard against things that continuously call fill! if(filledFromThisTick.contains(getLocation().getLocation(from))) { return 0; }