Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #10394

Browse Source
This commit is contained in:
Anuken
2025-01-12 10:16:04 -05:00
parent 75cd83286a
commit d414a65cbb
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/editor/MapProcessorsDialog.java
View File

@@ -19,7 +19,7 @@ import mindustry.world.blocks.logic.LogicBlock.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class MapProcessorsDialog extends BaseDialog{ public class MapProcessorsDialog extends BaseDialog{
private IconSelectDialog iconSelect = new IconSelectDialog(); private IconSelectDialog iconSelect = new IconSelectDialog(true);
private TextField search; private TextField search;
private Seq<Building> processors = new Seq<>(); private Seq<Building> processors = new Seq<>();
private Table list; private Table list;

6
core/src/mindustry/logic/LogicDialog.java
View File

@@ -155,13 +155,13 @@ public class LogicDialog extends BaseDialog{
buttons.button("@variables", Icon.menu, () -> { buttons.button("@variables", Icon.menu, () -> {
BaseDialog dialog = new BaseDialog("@variables"); BaseDialog dialog = new BaseDialog("@variables");
dialog.hidden(() -> { dialog.hidden(() -> {
if(!wasPaused && !net.active()){ if(!wasPaused && !net.active() && !state.isMenu()){
state.set(State.paused); state.set(State.paused);
} }
}); });
dialog.shown(() -> { dialog.shown(() -> {
if(!wasPaused && !net.active()){ if(!wasPaused && !net.active() && !state.isMenu()){
state.set(State.playing); state.set(State.playing);
} }
}); });
@@ -220,7 +220,7 @@ public class LogicDialog extends BaseDialog{
dialog.buttons.button("@logic.globals", Icon.list, () -> globalsDialog.show()).size(210f, 64f); dialog.buttons.button("@logic.globals", Icon.list, () -> globalsDialog.show()).size(210f, 64f);
dialog.show(); dialog.show();
}).name("variables").disabled(b -> executor == null || executor.vars.length == 0); }).name("variables").disabled(b -> executor == null || executor.vars.length == 0 || state.isMenu());
buttons.button("@add", Icon.add, () -> { buttons.button("@add", Icon.add, () -> {
showAddDialog(); showAddDialog();

7
core/src/mindustry/ui/dialogs/IconSelectDialog.java
View File

@@ -15,8 +15,13 @@ import static mindustry.Vars.*;
public class IconSelectDialog extends Dialog{ public class IconSelectDialog extends Dialog{
private Intc consumer = i -> Log.info("you have mere seconds"); private Intc consumer = i -> Log.info("you have mere seconds");
private boolean allowLocked;
public IconSelectDialog(){ public IconSelectDialog(){
this(true);
}
public IconSelectDialog(boolean allowLocked){
closeOnBack(); closeOnBack();
setFillParent(true); setFillParent(true);
@@ -52,7 +57,7 @@ public class IconSelectDialog extends Dialog{
i = 0; i = 0;
for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){ for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
if(!u.isHidden() && u.unlocked()){ if(!u.isHidden() && (allowLocked || u.unlocked())){
t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> { t.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
hide(); hide();
consumer.get(u.emojiChar()); consumer.get(u.emojiChar());