diff --git a/build.gradle b/build.gradle index 9d5b13d3..8db696d5 100644 --- a/build.gradle +++ b/build.gradle @@ -165,9 +165,9 @@ project.tasks.copyBuildRelease { Task task -> } project.tasks.jar { Jar jar -> - jar.archiveFileName = "classes.jar" + jar.archiveFileName.set "classes.jar" - jar.duplicatesStrategy = DuplicatesStrategy.EXCLUDE + jar.duplicatesStrategy DuplicatesStrategy.EXCLUDE jar.from { project.configurations.runtimeClasspath.collect { File file -> file.isDirectory() ? file : zipTree(file) @@ -186,6 +186,8 @@ project.tasks.buildRelease { Jar jar -> project.ext.useandroid ? [project.zipTree(project.tasks.jar.archiveFile.get()), project.zipTree(dexFile)] : [project.zipTree(project.tasks.jar.archiveFile.get())] } + + jar.destinationDirectory.set project.file("artifacts") } // create dex jar diff --git a/core/annotations/src/main/resources/classids.properties b/core/annotations/src/main/resources/classids.properties deleted file mode 100644 index d92d1ad8..00000000 --- a/core/annotations/src/main/resources/classids.properties +++ /dev/null @@ -1,17 +0,0 @@ -#Maps entity names to IDs. Autogenerated. - -assault=0 -bugFlyingSmall=1 -bugSmall=2 -general=11 -legion=3 -legionnaire=13 -lord=4 -myriad=14 -radix=10 -sergeant=5 -smoke=12 -subSmall=6 -testOverdrive=7 -vulture=8 -warden=9 \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/assault/0.json b/core/annotations/src/main/resources/revisions/assault/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/assault/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/bugFlyingSmall/0.json b/core/annotations/src/main/resources/revisions/bugFlyingSmall/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/bugFlyingSmall/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/bugSmall/0.json b/core/annotations/src/main/resources/revisions/bugSmall/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/bugSmall/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/general/0.json b/core/annotations/src/main/resources/revisions/general/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/general/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/legion/0.json b/core/annotations/src/main/resources/revisions/legion/0.json deleted file mode 100644 index 653894aa..00000000 --- a/core/annotations/src/main/resources/revisions/legion/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/legionnaire/0.json b/core/annotations/src/main/resources/revisions/legionnaire/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/legionnaire/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/lord/0.json b/core/annotations/src/main/resources/revisions/lord/0.json deleted file mode 100644 index 95f8e969..00000000 --- a/core/annotations/src/main/resources/revisions/lord/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:syncMounts,type:"mindustry.entities.units.WeaponMount[]"},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/lord/1.json b/core/annotations/src/main/resources/revisions/lord/1.json deleted file mode 100644 index f9d94442..00000000 --- a/core/annotations/src/main/resources/revisions/lord/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/myriad/0.json b/core/annotations/src/main/resources/revisions/myriad/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/myriad/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/radix/0.json b/core/annotations/src/main/resources/revisions/radix/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/radix/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/sergeant/0.json b/core/annotations/src/main/resources/revisions/sergeant/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/sergeant/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/sergeant/1.json b/core/annotations/src/main/resources/revisions/sergeant/1.json deleted file mode 100644 index b6384b94..00000000 --- a/core/annotations/src/main/resources/revisions/sergeant/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:elevation,type:float},{name:health,type:float},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/sergeant/2.json b/core/annotations/src/main/resources/revisions/sergeant/2.json deleted file mode 100644 index fd03c8ff..00000000 --- a/core/annotations/src/main/resources/revisions/sergeant/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/smoke/0.json b/core/annotations/src/main/resources/revisions/smoke/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/smoke/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/subSmall/0.json b/core/annotations/src/main/resources/revisions/subSmall/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/subSmall/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/testOverdrive/0.json b/core/annotations/src/main/resources/revisions/testOverdrive/0.json deleted file mode 100644 index ae24252b..00000000 --- a/core/annotations/src/main/resources/revisions/testOverdrive/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:building,type:mindustry.gen.Building},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/vulture/0.json b/core/annotations/src/main/resources/revisions/vulture/0.json deleted file mode 100644 index f3b76e30..00000000 --- a/core/annotations/src/main/resources/revisions/vulture/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/annotations/src/main/resources/revisions/warden/0.json b/core/annotations/src/main/resources/revisions/warden/0.json deleted file mode 100644 index 545bb6c8..00000000 --- a/core/annotations/src/main/resources/revisions/warden/0.json +++ /dev/null @@ -1 +0,0 @@ -{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle deleted file mode 100644 index e69de29b..00000000 diff --git a/extensions/zelaux-entity-anno-comp/core.gradle b/extensions/zelaux-entity-anno-comp/core.gradle index 4e52c9c4..d7435e13 100644 --- a/extensions/zelaux-entity-anno-comp/core.gradle +++ b/extensions/zelaux-entity-anno-comp/core.gradle @@ -1,4 +1,4 @@ -project.tasks.jar { Jar task -> +project.tasks.compileJava { JavaCompile task -> task.doFirst { project.copy { CopySpec spec -> spec.from project.file("mod.json") diff --git a/src/fos/core/FOSMod.java b/src/fos/core/FOSMod.java index f3c0cac7..62a134ad 100644 --- a/src/fos/core/FOSMod.java +++ b/src/fos/core/FOSMod.java @@ -11,8 +11,8 @@ import arc.util.*; import fos.content.*; import fos.controllers.CapsulesController; -import fos.gen.FosCall; -import fos.gen.FosEntityMapping; +import fos.gen.FOSCall; +import fos.gen.FOSEntityMapping; import fos.graphics.*; import fos.net.FOSPackets; import fos.ui.*; @@ -30,10 +30,12 @@ import static arc.Core.settings; import static mindustry.Vars.headless; -@ModAnnotations.RootDirectoryPath(rootDirectoryPath = "core") +@ModAnnotations.RootDirectoryPath(rootDirectoryPath = "") @ModAnnotations.AnnotationSettings( rootPackage = "fos", - modInfoPath = "res/mod.json" + modInfoPath = "res/mod.json", + classPrefix = "FOS", + revisionsPath = "revisions" ) public class FOSMod extends Mod { public FOSMod() { @@ -42,8 +44,11 @@ public FOSMod() { Log.level = Log.LogLevel.debug; FOSPackets.register(); - FosCall.registerPackets(); - FosEntityMapping.init(); + FOSCall.registerPackets(); + FOSEntityMapping.init(); + EntityMapping.nameMap.keys().toSeq().each(s -> { + EntityMapping.nameMap.put("fos-" + s, EntityMapping.nameMap.get(s)); + }); Events.on(EventType.ClientLoadEvent.class, e -> { clientLoaded(); diff --git a/src/fos/type/blocks/units/UpgradeCenter.java b/src/fos/type/blocks/units/UpgradeCenter.java index e3b1b3a0..ae3f87b8 100644 --- a/src/fos/type/blocks/units/UpgradeCenter.java +++ b/src/fos/type/blocks/units/UpgradeCenter.java @@ -8,7 +8,7 @@ import arc.struct.Seq; import arc.util.*; import arc.util.io.*; -import fos.gen.FosCall; +import fos.gen.FOSCall; import fos.gen.LumoniPlayerUnitc; import fos.net.FOSPackets; import fos.type.content.WeaponSet; @@ -198,7 +198,7 @@ public void buildConfiguration(Table table) { table.row(); table.button(Icon.units, Styles.clearTogglei, () -> { if (weaponSet == null || Vars.player == null) return; - FosCall.upgrade(Vars.player, tile()); + FOSCall.upgrade(Vars.player, tile()); deselect(); }).visible(() -> fraction() >= 1f); } else {