From 3d8fb1b6ca3eb7142bcf2d611d9c1c47781077b4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Sep 2020 13:36:10 -0400 Subject: [PATCH] Bridge fixes --- core/assets/baseparts/4125616123544.msch | Bin 0 -> 247 bytes core/src/mindustry/content/Blocks.java | 2 +- .../src/mindustry/entities/comp/BuildingComp.java | 2 +- core/src/mindustry/ui/CoreItemsDisplay.java | 2 +- .../mindustry/world/blocks/ConstructBlock.java | 2 +- .../world/blocks/distribution/ItemBridge.java | 8 +++++--- .../blocks/liquid/LiquidExtendingBridge.java | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 core/assets/baseparts/4125616123544.msch diff --git a/core/assets/baseparts/4125616123544.msch b/core/assets/baseparts/4125616123544.msch new file mode 100644 index 0000000000000000000000000000000000000000..7e1ee818117f48086111b6f7ed8f70891676de0a GIT binary patch literal 247 zcmc~TPR?Mgn4@|=JFnS5faQVWGhYUM-&xzr9|+iTE&A7ZWU-Q3P=37rXXe^9Z)Gz- zv_`j7$cnK)-s?ZXrv2wu$3IWnORc8W-MKdX_wBMJzsoANFa8^QcOy@o)bIJVv(iH* zmwW%e(^p% core == null ? "0" : UI.formatAmount(core.items.get(item))).padRight(3); + label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item))).padRight(3).left(); if(++i % 4 == 0){ row(); diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 893a7234ae..95674dc86b 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -75,7 +75,7 @@ public class ConstructBlock extends Block{ //last builder was this local client player, call placed() if(tile.build != null && !headless && builder == player.unit()){ - tile.build.playerPlaced(); + tile.build.playerPlaced(config); } Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 7b8fa6923b..ba70c0fc2f 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -133,8 +133,10 @@ public class ItemBridge extends Block{ public float cycleSpeed = 1f; @Override - public void playerPlaced(){ - super.playerPlaced(); + public void playerPlaced(Object config){ + super.playerPlaced(config); + + if(config != null) return; Tile link = findLink(tile.x, tile.y); if(linkValid(tile, link)){ @@ -265,7 +267,7 @@ public class ItemBridge extends Block{ Item item = items.take(); if(item != null && other.acceptItem(this, item)){ other.handleItem(this, item); - cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); + cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); //TODO this is kinda broken, because lerping only happens on a timer }else{ cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f); if(item != null) items.add(item, 1); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java index 6d925d7087..76e4929b45 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java @@ -6,7 +6,7 @@ import mindustry.type.*; import mindustry.world.blocks.distribution.*; import mindustry.world.meta.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class LiquidExtendingBridge extends ExtendingItemBridge{ @@ -42,7 +42,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{ if(moveLiquid(other, liquids.current()) > 0.1f){ cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); }else{ - cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f); + cycleSpeed = Mathf.lerpDelta(cycleSpeed, 0f, 0.01f); } } }