Fixed puddles not appearing / Overdrive tweaks

- Bridges, routers and junctions can (probably) be overdrived now, untested

core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java

@@ -16,10 +16,11 @@ public class BufferedItemBridge extends ExtendingItemBridge{
         super(name);
         hasPower = false;
         hasItems = true;
+        canOverdrive = true;
     }
 
     public class BufferedItemBridgeEntity extends ExtendingItemBridgeEntity{
-        ItemBuffer buffer = new ItemBuffer(bufferCapacity, speed);
+        ItemBuffer buffer = new ItemBuffer(bufferCapacity);
 
         @Override
         public void updateTransport(Tilec other){
@@ -27,7 +28,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
                 buffer.accept(items.take());
             }
 
-            Item item = buffer.poll();
+            Item item = buffer.poll(speed / timeScale);
             if(timer(timerAccept, 4) && item != null && other.acceptItem(this, item)){
                 cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
                 other.handleItem(this, item);

core/src/mindustry/world/blocks/distribution/ItemBridge.java

@@ -41,6 +41,8 @@ public class ItemBridge extends Block{
         hasItems = true;
         unloadable = false;
         group = BlockGroup.transportation;
+        canOverdrive = false;
+
         //point2 config is relative
         config(Point2.class, (tile, i) -> ((ItemBridgeEntity)tile).link = Point2.pack(i.x + tile.tileX(), i.y + tile.tileY()));
         //integer is not

core/src/mindustry/world/blocks/distribution/Junction.java

@@ -27,7 +27,7 @@ public class Junction extends Block{
     }
 
     public class JunctionEntity extends TileEntity{
-        DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity, speed);
+        DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity);
 
         @Override
         public int acceptStack(Item item, int amount, Teamc source){
@@ -43,7 +43,7 @@ public class Junction extends Block{
                     long l = buffer.buffers[i][0];
                     float time = BufferItem.time(l);
 
-                    if(Time.time() >= time + speed || Time.time() < time){
+                    if(Time.time() >= time + speed / timeScale || Time.time() < time){
 
                         Item item = content.item(BufferItem.item(l));
                         Tilec dest = nearby(i);

core/src/mindustry/world/blocks/distribution/OverflowGate.java

@@ -22,6 +22,7 @@ public class OverflowGate extends Block{
         update = true;
         group = BlockGroup.transportation;
         unloadable = false;
+        canOverdrive = false;
     }
 
     @Override
@@ -136,7 +137,7 @@ public class OverflowGate extends Block{
         public void read(Reads read, byte revision){
             super.read(read, revision);
             if(revision == 1){
-                new DirectionalItemBuffer(25, 50f).read(read);
+                new DirectionalItemBuffer(25).read(read);
             }else if(revision == 3){
                 lastInput = world.tile(read.i());
                 lastItem = items.first();

core/src/mindustry/world/blocks/distribution/Router.java

@@ -1,6 +1,5 @@
 package mindustry.world.blocks.distribution;
 
-import arc.util.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -27,12 +26,12 @@ public class Router extends Block{
 
         @Override
         public void updateTile(){
-            if(lastItem == null && items.total() > 0){
+            if(lastItem == null && items.any()){
                 items.clear();
             }
 
             if(lastItem != null){
-                time += 1f / speed * Time.delta();
+                time += 1f / speed * delta();
                 Tilec target = getTileTarget(lastItem, lastInput, false);
 
                 if(target != null && (time >= 1f || !(target.block() instanceof Router))){

core/src/mindustry/world/blocks/distribution/Sorter.java

@@ -170,7 +170,7 @@ public class Sorter extends Block{
             sortItem = content.item(read.s());
 
             if(revision == 1){
-                new DirectionalItemBuffer(20, 45f).read(read);
+                new DirectionalItemBuffer(20).read(read);
             }
         }
     }

core/src/mindustry/world/blocks/liquid/Conduit.java

@@ -114,7 +114,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
             smoothLiquid = Mathf.lerpDelta(smoothLiquid, liquids.currentAmount() / liquidCapacity, 0.05f);
 
             if(liquids.total() > 0.001f && timer(timerFlow, 1)){
-                moveLiquid(tile.getNearbyEntity(rotation()), leakResistance, liquids.current());
+                moveLiquidForward(leakResistance, liquids.current());
                 noSleep();
             }else{
                 sleep();

core/src/mindustry/world/blocks/liquid/LiquidBridge.java

@@ -44,7 +44,7 @@ public class LiquidBridge extends ItemBridge{
 
                 if(uptime >= 0.5f){
 
-                    if(moveLiquid(other, false, liquids.current()) > 0.1f){
+                    if(moveLiquid(other, liquids.current()) > 0.1f){
                         cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
                     }else{
                         cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f);

core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java

@@ -39,7 +39,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
                 }
 
                 if(uptime >= 0.5f){
-                    if(moveLiquid(other, false, liquids.current()) > 0.1f){
+                    if(moveLiquid(other, liquids.current()) > 0.1f){
                         cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
                     }else{
                         cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f);

core/src/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -24,6 +24,8 @@ public class LiquidSource extends Block{
         liquidCapacity = 100f;
         configurable = true;
         outputsLiquid = true;
+        saveConfig = true;
+
         config(Liquid.class, (tile, l) -> ((LiquidSourceEntity)tile).source = l);
         configClear(tile -> ((LiquidSourceEntity)tile).source = null);
     }

core/src/mindustry/world/blocks/storage/StorageBlock.java

@@ -23,36 +23,6 @@ public abstract class StorageBlock extends Block{
     public class StorageBlockEntity extends TileEntity{
         protected @Nullable Tilec linkedCore;
 
-        /**
-         * Removes an item and returns it. If item is not null, it should return the item.
-         * Returns null if no items are there.
-         */
-        @Nullable
-        public Item removeItem(@Nullable Item item){
-            if(item == null){
-                return items.take();
-            }else{
-                if(items.has(item)){
-                    items.remove(item, 1);
-                    return item;
-                }
-
-                return null;
-            }
-        }
-
-        /**
-         * Returns whether this storage block has the specified item.
-         * If the item is null, it should return whether it has ANY items.
-         */
-        public boolean hasItem(@Nullable Item item){
-            if(item == null){
-                return items.total() > 0;
-            }else{
-                return items.has(item);
-            }
-        }
-
         @Override
         public boolean acceptItem(Tilec source, Item item){
             return linkedCore != null ? linkedCore.acceptItem(source, item) : items.get(item) < getMaximumAccepted(item);