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

18
core/src/mindustry/mod/Mods.java
View File

@@ -798,8 +798,7 @@ public class Mods implements Loadable{
}
/** Tries to find the config file of a mod/plugin. */
@Nullable
public ModMeta findMeta(Fi file){
public @Nullable ModMeta findMeta(Fi file){
Fi metaFile = null;
for(String name : metaFiles){
if((metaFile = file.child(name)).exists()){
@@ -1167,7 +1166,12 @@ public class Mods implements Loadable{
/** Mod metadata information.*/
public static class ModMeta{
public String name, minGameVersion = "0", internalName;
/** Name as defined in mod.json. Stripped of colors, but may contain spaces. */
public String name;
/** Name without spaces in all lower case. */
public String internalName;
/** Minimum game version that this mod requires, e.g. "140.1" */
public String minGameVersion = "0";
public @Nullable String displayName, author, description, subtitle, version, main, repo;
public Seq<String> dependencies = Seq.with();
public Seq<String> softDependencies = Seq.with();
@@ -1183,7 +1187,8 @@ public class Mods implements Loadable{
public boolean pregenerated;
public String displayName(){
return displayName == null ? name : displayName;
//useless, kept for legacy reasons
return displayName;
}
public String shortDescription(){
@@ -1194,12 +1199,11 @@ public class Mods implements Loadable{
public void cleanup(){
if(name != null) name = Strings.stripColors(name);
if(displayName != null) displayName = Strings.stripColors(displayName);
if(displayName == null) displayName = name;
if(author != null) author = Strings.stripColors(author);
if(description != null) description = Strings.stripColors(description);
if(subtitle != null) subtitle = Strings.stripColors(subtitle).replace("\n", "");
if(name != null){
internalName = name.toLowerCase(Locale.ROOT).replace(" ", "-");
}
if(name != null) internalName = name.toLowerCase(Locale.ROOT).replace(" ", "-");
}
public int getMinMajor(){