From 467402ef7311da257e6a7dbe5f9b720b1cdc559a Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 19 Feb 2021 19:20:04 -0500 Subject: [PATCH] Various fixes --- core/assets/bundles/bundle_ro.properties | 2 +- core/src/mindustry/mod/ClassMap.java | 7 +++++++ core/src/mindustry/mod/ContentParser.java | 2 +- tools/src/mindustry/tools/ScriptMainGenerator.java | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 0ce1983a4f..d8372d10eb 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -800,7 +800,7 @@ setting.logichints.name = Indicii Procesoare Logice setting.flow.name = Afișează Rata de Curgere a lichidelor setting.buildautopause.name = Autopauză de la Construit 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.animatedshields.name = Scuturi Animate setting.antialias.name = Antialiasing[lightgray] (necesită repornire)[] diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index 5d650511fb..af000c2f96 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -14,6 +14,13 @@ public class ClassMap{ classes.put("MinerAI", mindustry.ai.types.MinerAI.class); classes.put("RepairAI", mindustry.ai.types.RepairAI.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("BasicBulletType", mindustry.entities.bullet.BasicBulletType.class); classes.put("BombBulletType", mindustry.entities.bullet.BombBulletType.class); diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 818d518963..0531fe4eb6 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -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); } }else{ - block = make(resolve(getType(value), Block.class), mod + "-" + name); + block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name); } currentContent = block; diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 845d056f9a..0406783661 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -76,6 +76,7 @@ public class ScriptMainGenerator{ Seq packages = Seq.with( "mindustry.entities.effect", "mindustry.entities.bullet", + "mindustry.entities.abilities", "mindustry.ai.types", "mindustry.type.weather", "mindustry.game.Objectives",