diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index 9f784b22bf..f3d7b464f8 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -143,6 +143,17 @@ public class Sorter extends Block{ ItemSelection.buildTable(table, content.items(), () -> sortItem, item -> tile.configure(lastItem = item)); } + @Override + public boolean onConfigureTileTapped(Tilec other){ + if(this == other){ + control.input.frag.config.hideConfig(); + tile.configure(lastItem = null); + return false; + } + + return true; + } + @Override public Item config(){ return sortItem; diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java index c828624da8..aad37d4145 100644 --- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java @@ -12,7 +12,7 @@ import mindustry.world.*; import mindustry.world.blocks.*; import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemSource extends Block{ private static Item lastItem; @@ -79,6 +79,17 @@ public class ItemSource extends Block{ ItemSelection.buildTable(table, content.items(), () -> outputItem, item -> tile.configure(lastItem = item)); } + @Override + public boolean onConfigureTileTapped(Tilec other){ + if(this == other){ + control.input.frag.config.hideConfig(); + tile.configure(lastItem = null); + return false; + } + + return true; + } + @Override public boolean acceptItem(Tilec source, Item item){ return false; diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index 033f01ef6b..596b064089 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -13,7 +13,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidSource extends Block{ public static Liquid lastLiquid; @@ -71,6 +71,17 @@ public class LiquidSource extends Block{ ItemSelection.buildTable(table, content.liquids(), () -> source, liquid -> tile.configure(lastLiquid = liquid)); } + @Override + public boolean onConfigureTileTapped(Tilec other){ + if(this == other){ + control.input.frag.config.hideConfig(); + tile.configure(lastLiquid = null); + return false; + } + + return true; + } + @Override public void playerPlaced(){ if(lastLiquid != null){ diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index ce9ca1167d..6548d1613a 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -11,7 +11,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Unloader extends Block{ public float speed = 1f; @@ -104,6 +104,17 @@ public class Unloader extends Block{ ItemSelection.buildTable(table, content.items(), () -> tile.ent().sortItem, item -> tile.configure(lastItem = item)); } + @Override + public boolean onConfigureTileTapped(Tilec other){ + if(this == other){ + control.input.frag.config.hideConfig(); + tile.configure(lastItem = null); + return false; + } + + return true; + } + @Override public boolean canDump(Tilec to, Item item){ return !(to.block() instanceof StorageBlock);