diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index b167e791c2..8a07ded655 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -915,7 +915,7 @@ public class Blocks implements ContentList{ junction = new Junction("junction"){{ requirements(Category.distribution, ItemStack.with(Items.copper, 1), true); speed = 26; - capacity = 15; + capacity = 12; health = 30; }}; @@ -923,7 +923,7 @@ public class Blocks implements ContentList{ requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4)); range = 4; speed = 70f; - bufferCapacity = 15; + bufferCapacity = 14; }}; phaseConveyor = new ItemBridge("phase-conveyor"){{ diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 7ab8a5c9dd..3663069518 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -359,9 +359,11 @@ public class UI implements ApplicationListener, Loadable{ public void showText(String titleText, String text){ new Dialog(titleText){{ - cont.margin(15).add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center); + cont.row(); cont.addImage().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent); cont.row(); + cont.add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center); + cont.row(); buttons.addButton("$ok", this::hide).size(90, 50).pad(4); }}.show(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index 782d94fdda..d41b392a3a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -252,6 +252,16 @@ public class ItemBridge extends Block{ int rel2 = tile.relativeTo(source.x, source.y); if(rel == rel2) return false; + + + IntSetIterator it = entity.incoming.iterator(); + + while(it.hasNext){ + int v = it.next(); + if(tile.absoluteRelativeTo(Pos.x(v), Pos.y(v)) == rel2){ + return false; + } + } }else{ return source.block() instanceof ItemBridge && source.entity().link == tile.pos() && tile.entity.items.total() < itemCapacity; }