From f0bf4a7b91947ddc6c6ba13b975ca4db71df6abc Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 28 Jan 2015 22:34:19 +0100 Subject: [PATCH] update task progress at least once per second --- .../machine/AbstractPoweredTaskEntity.java | 4 +++- .../machine/slicensplice/TileSliceAndSplice.java | 16 ++-------------- .../enderio/machine/soul/TileSoulBinder.java | 14 +------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 65137325..15e77872 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -22,6 +22,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected boolean startFailed = false; protected int lastProgressScaled = -1; + protected int ticksSinceLastProgressUpdate; public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { super(slotDefinition); @@ -124,6 +125,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected void sendTaskProgressPacket() { PacketHandler.sendToAllAround(new PacketCurrentTaskProgress(this), this); + ticksSinceLastProgressUpdate = 0; } protected boolean checkProgress(boolean redstoneChecksPassed) { @@ -140,7 +142,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt } int curScaled = getProgressScaled(16); - if(curScaled != lastProgressScaled) { + if(++ticksSinceLastProgressUpdate >= 20 || curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index d31d7fdc..571a4626 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -4,12 +4,10 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.FakePlayerFactory; -import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -17,7 +15,6 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; @@ -40,8 +37,8 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); - private int axeIndex = 6; - private int shearsIndex = 7; + private final int axeIndex = 6; + private final int shearsIndex = 7; private EntityLivingBase fakePlayer; private ICapacitor capacitor; @@ -94,15 +91,6 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected IMachineRecipe canStartNextTask(float chance) { if(getAxe() == null || getShears() == null) { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index d235e41b..4f5bde26 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.soul; import java.util.List; -import scala.xml.persistent.SetStorage; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -10,7 +9,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -22,7 +20,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; @@ -45,7 +42,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx private ICapacitor capacitor; - private ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); + private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); public TileSoulBinder() { super(new SlotDefinition(2, 2, 1)); @@ -174,15 +171,6 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected boolean doPull(ForgeDirection dir) { boolean res = super.doPull(dir);