Skip to content

Commit

Permalink
- Fix mod settings possibly being displayed weirdly
Browse files Browse the repository at this point in the history
- Fix schemloadtime being in nanoseconds instead of milliseconds
- Update feature list to reflect removed command
  • Loading branch information
buthed010203 committed Jan 3, 2024
1 parent db479e8 commit 62fe514
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion core/assets/features
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
* {p}buildmine - A mix of {p}builder and {p}miner. Switches to buildpath when buildplans exist (and build is enabled) then switches back to mining after done.
* {p} [message...] (note the space) - sends the given message in chat with an exclamation point at the start
* {p}shrug [message...] - send ¯\_(ツ)_/¯ in chat followed by the message
* {p}login [name] [pw] - auto login to CN servers, not secure
* {p}marker <name> [x] [y] - place a named marker on the map
* {p}js <code...> - run javascript code locally
* {p}/js <code...> - run javascript both locally and on the server (if permitted)
Expand Down
2 changes: 1 addition & 1 deletion core/src/mindustry/ui/dialogs/SchematicsDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ public void draw(){

private void setPreview(){
var maxTime = Core.settings.getInt("schemloadtime");
if(maxTime > 0 && previewTime > maxTime && !schematics.hasPreview(schematic)){ // Only allow 10ms of expensive preview creation each frame. Yes this is janky. No I don't care
if(maxTime > 0 && previewTime > Time.millisToNanos(maxTime) && !schematics.hasPreview(schematic)){ // Only allow 10ms of expensive preview creation each frame. Yes this is janky. No I don't care
set = false;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -814,13 +814,13 @@ public void pref(Setting setting){

private void makeSearchBar(){
searchBarTable = table(s -> {
s.left();
s.image(Icon.zoom);
searchBar = s.field(search, res -> {
search = res;
rebuild();
}).growX().get();
}).get();
row();
}

public SliderSetting sliderPref(String name, int def, int min, int max, StringProcessor s){
Expand Down

0 comments on commit 62fe514

Please sign in to comment.