From 816ab161dfb2c3fb6a75155fcd9cd3ca62e6d570 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Oct 2021 12:07:07 -0400 Subject: [PATCH] Make Unit type default to Alpha --- .../main/java/mindustry/annotations/entity/EntityProcess.java | 2 +- core/src/mindustry/entities/comp/UnitComp.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java index 3b859e3436..e01d0f15cb 100644 --- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java +++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java @@ -878,7 +878,7 @@ public class EntityProcess extends BaseProcessor{ nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build()); - write(nullBuilder); + write(nullBuilder, imports.asArray()); } write(nullsBuilder); diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 7236f5618b..507a451dce 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -11,6 +11,7 @@ import arc.util.*; import mindustry.ai.*; import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; +import mindustry.content.*; import mindustry.core.*; import mindustry.ctype.*; import mindustry.entities.*; @@ -41,7 +42,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Import WeaponMount[] mounts; private UnitController controller; - UnitType type; + UnitType type = UnitTypes.alpha; boolean spawnedByCore; double flag;