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

Various fixes

Browse Source
This commit is contained in:
Anuken
2021-02-19 19:20:04 -05:00
parent f78719afc0
commit 467402ef73
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle_ro.properties
View File

@@ -800,7 +800,7 @@ setting.logichints.name = Indicii Procesoare Logice
setting.flow.name = Afișează Rata de Curgere a lichidelor setting.flow.name = Afișează Rata de Curgere a lichidelor
setting.buildautopause.name = Autopauză de la Construit setting.buildautopause.name = Autopauză de la Construit
setting.backgroundpause.name = Pune Pauză în Fundal setting.backgroundpause.name = Pune Pauză în Fundal
setting.modcrashdisable = Dezactivează Modurile în Cazul unui Crash la Pornire setting.modcrashdisable.name = Dezactivează Modurile în Cazul unui Crash la Pornire
setting.animatedwater.name = Suprafețe Animate setting.animatedwater.name = Suprafețe Animate
setting.animatedshields.name = Scuturi Animate setting.animatedshields.name = Scuturi Animate
setting.antialias.name = Antialiasing[lightgray] (necesită repornire)[] setting.antialias.name = Antialiasing[lightgray] (necesită repornire)[]

7
core/src/mindustry/mod/ClassMap.java
View File

@@ -14,6 +14,13 @@ public class ClassMap{
classes.put("MinerAI", mindustry.ai.types.MinerAI.class); classes.put("MinerAI", mindustry.ai.types.MinerAI.class);
classes.put("RepairAI", mindustry.ai.types.RepairAI.class); classes.put("RepairAI", mindustry.ai.types.RepairAI.class);
classes.put("SuicideAI", mindustry.ai.types.SuicideAI.class); classes.put("SuicideAI", mindustry.ai.types.SuicideAI.class);
classes.put("Ability", mindustry.entities.abilities.Ability.class);
classes.put("ForceFieldAbility", mindustry.entities.abilities.ForceFieldAbility.class);
classes.put("MoveLightningAbility", mindustry.entities.abilities.MoveLightningAbility.class);
classes.put("RepairFieldAbility", mindustry.entities.abilities.RepairFieldAbility.class);
classes.put("ShieldRegenFieldAbility", mindustry.entities.abilities.ShieldRegenFieldAbility.class);
classes.put("StatusFieldAbility", mindustry.entities.abilities.StatusFieldAbility.class);
classes.put("UnitSpawnAbility", mindustry.entities.abilities.UnitSpawnAbility.class);
classes.put("ArtilleryBulletType", mindustry.entities.bullet.ArtilleryBulletType.class); classes.put("ArtilleryBulletType", mindustry.entities.bullet.ArtilleryBulletType.class);
classes.put("BasicBulletType", mindustry.entities.bullet.BasicBulletType.class); classes.put("BasicBulletType", mindustry.entities.bullet.BasicBulletType.class);
classes.put("BombBulletType", mindustry.entities.bullet.BombBulletType.class); classes.put("BombBulletType", mindustry.entities.bullet.BombBulletType.class);

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -211,7 +211,7 @@ public class ContentParser{
throw new IllegalArgumentException("When defining properties for an existing block, you must not re-declare its type. The original type will be used. Block: " + name); throw new IllegalArgumentException("When defining properties for an existing block, you must not re-declare its type. The original type will be used. Block: " + name);
} }
}else{ }else{
block = make(resolve(getType(value), Block.class), mod + "-" + name); block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name);
} }
currentContent = block; currentContent = block;

1
tools/src/mindustry/tools/ScriptMainGenerator.java
View File

@@ -76,6 +76,7 @@ public class ScriptMainGenerator{
Seq<String> packages = Seq.with( Seq<String> packages = Seq.with(
"mindustry.entities.effect", "mindustry.entities.effect",
"mindustry.entities.bullet", "mindustry.entities.bullet",
"mindustry.entities.abilities",
"mindustry.ai.types", "mindustry.ai.types",
"mindustry.type.weather", "mindustry.type.weather",
"mindustry.game.Objectives", "mindustry.game.Objectives",