diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index 0d5ce7a..71a6c68 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -1,7 +1,5 @@ package com.sosnitzka.taiga.traits; -import com.sosnitzka.taiga.util.TickTask; -import com.sosnitzka.taiga.util.TickTaskHandler; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -27,11 +25,6 @@ public class TraitCascade extends AbstractTrait { sy = y = pos.getY(); sz = z = pos.getZ(); for (int i = random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * 1.5f)); i > 0; i--) { - TickTaskHandler.getInstance().addTask(new TickTask(20, new Runnable() { - @Override - public void run() { - } - })); int r = random.nextInt(3); int d = random.nextBoolean() ? 1 : -1; if (r == 0) x += d; @@ -49,11 +42,8 @@ public class TraitCascade extends AbstractTrait { y = sy; z = sz; } - } - } - } private float calcBonus(ItemStack tool) { diff --git a/src/main/java/com/sosnitzka/taiga/util/TickTask.java b/src/main/java/com/sosnitzka/taiga/util/TickTask.java deleted file mode 100644 index a928c68..0000000 --- a/src/main/java/com/sosnitzka/taiga/util/TickTask.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.sosnitzka.taiga.util; - - -public class TickTask { - private Runnable task; - private int targetTicks = 0; - private int ticks; - - public TickTask(int targetTicks, Runnable runnable) { - this.task = runnable; - this.targetTicks = targetTicks; - } - - public TickTask(Runnable runnable) { - this.task = runnable; - this.targetTicks = 1; - } - - public boolean tickRun() { - ticks++; - - if (ticks >= targetTicks) { - this.task.run(); - return true; - } - return false; - } -} diff --git a/src/main/java/com/sosnitzka/taiga/util/TickTaskHandler.java b/src/main/java/com/sosnitzka/taiga/util/TickTaskHandler.java deleted file mode 100644 index c11921e..0000000 --- a/src/main/java/com/sosnitzka/taiga/util/TickTaskHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.sosnitzka.taiga.util; - - -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class TickTaskHandler { - private List tickTasks = new ArrayList(); - - - private TickTaskHandler() { - } - - public static TickTaskHandler getInstance() { - return InstanceHolder.INSTANCE; - } - - @SubscribeEvent - public void onTick(TickEvent.ServerTickEvent e) { - for (Iterator iterator = tickTasks.iterator(); iterator.hasNext(); ) { - TickTask task = iterator.next(); - if (task.tickRun()) { - iterator.remove(); - } - } - } - - public void addTask(TickTask tickTask) { - tickTasks.add(tickTask); - } - - private static final class InstanceHolder { - static final TickTaskHandler INSTANCE = new TickTaskHandler(); - } -}