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

Fixed incorrect consumption rate in booster stats

Browse Source
This commit is contained in:
Anuken
2023-07-29 09:51:58 -04:00
parent f3656d24d4
commit 09d00b30e9
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/dialogs/MapListDialog.java
View File

@@ -153,7 +153,7 @@ public abstract class MapListDialog extends BaseDialog{
if(displayType){
button.row();
button.add(map.custom ? "@custom" : map.workshop ? "@workshop" : map.mod != null ? "[lightgray]" + map.mod.meta.displayName() : "@builtin").color(Color.gray).padTop(3);
button.add(map.custom ? "@custom" : map.workshop ? "@workshop" : map.mod != null ? "[lightgray]" + map.mod.meta.displayName : "@builtin").color(Color.gray).padTop(3);
}
i++;

10
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -215,7 +215,7 @@ public class ModsDialog extends BaseDialog{
pane[0].clear();
boolean any = false;
for(LoadedMod item : mods.list()){
if(Strings.matches(query, item.meta.displayName())){
if(Strings.matches(query, item.meta.displayName)){
any = true;
if(!item.enabled() && !anyDisabled[0] && mods.list().size > 0){
anyDisabled[0] = true;
@@ -249,7 +249,7 @@ public class ModsDialog extends BaseDialog{
boolean hideDisabled = !item.isSupported() || item.hasUnmetDependencies() || item.hasContentErrors();
String shortDesc = item.meta.shortDescription();
text.add("[accent]" + Strings.stripColors(item.meta.displayName()) + "\n" +
text.add("[accent]" + Strings.stripColors(item.meta.displayName) + "\n" +
(shortDesc.length() > 0 ? "[lightgray]" + shortDesc + "\n" : "")
//so does anybody care about version?
//+ "[gray]v" + Strings.stripColors(trimText(item.meta.version)) + "\n"
@@ -369,7 +369,7 @@ public class ModsDialog extends BaseDialog{
}
private void showMod(LoadedMod mod){
BaseDialog dialog = new BaseDialog(mod.meta.displayName());
BaseDialog dialog = new BaseDialog(mod.meta.displayName);
dialog.addCloseButton();
@@ -390,7 +390,7 @@ public class ModsDialog extends BaseDialog{
desc.add("@editor.name").padRight(10).color(Color.gray).padTop(0);
desc.row();
desc.add(mod.meta.displayName()).growX().wrap().padTop(2);
desc.add(mod.meta.displayName).growX().wrap().padTop(2);
desc.row();
if(mod.meta.author != null){
desc.add("@editor.author").padRight(10).color(Color.gray);
@@ -418,7 +418,7 @@ public class ModsDialog extends BaseDialog{
if(all.any()){
dialog.cont.row();
dialog.cont.button("@mods.viewcontent", Icon.book, () -> {
BaseDialog d = new BaseDialog(mod.meta.displayName());
BaseDialog d = new BaseDialog(mod.meta.displayName);
d.cont.pane(cs -> {
int i = 0;
for(UnlockableContent c : all){

2
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -154,7 +154,7 @@ public class SchematicsDialog extends BaseDialog{
}else{
buttons.button(Icon.trash, style, () -> {
if(s.mod != null){
ui.showInfo(Core.bundle.format("mod.item.remove", s.mod.meta.displayName()));
ui.showInfo(Core.bundle.format("mod.item.remove", s.mod.meta.displayName));
}else{
ui.showConfirm("@confirm", "@schematic.delete.confirm", () -> {
schematics.remove(s);