From 1413b479efa5e04c9bf18cb56d9983f734dd837b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 2 Apr 2023 22:44:44 -0400 Subject: [PATCH] Classmap auto-update --- core/src/mindustry/mod/ClassMap.java | 25 +++++++++++++++++-- .../mindustry/tools/ScriptMainGenerator.java | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index 934b72a019..b626a81725 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -8,6 +8,7 @@ public class ClassMap{ static{ classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class); + classes.put("BoostAI", mindustry.ai.types.BoostAI.class); classes.put("BuilderAI", mindustry.ai.types.BuilderAI.class); classes.put("CargoAI", mindustry.ai.types.CargoAI.class); classes.put("CommandAI", mindustry.ai.types.CommandAI.class); @@ -139,6 +140,7 @@ public class ClassMap{ classes.put("ConstructBuild", mindustry.world.blocks.ConstructBlock.ConstructBuild.class); classes.put("ControlBlock", mindustry.world.blocks.ControlBlock.class); classes.put("ItemSelection", mindustry.world.blocks.ItemSelection.class); + classes.put("UnitTetherBlock", mindustry.world.blocks.UnitTetherBlock.class); classes.put("Accelerator", mindustry.world.blocks.campaign.Accelerator.class); classes.put("AcceleratorBuild", mindustry.world.blocks.campaign.Accelerator.AcceleratorBuild.class); classes.put("LaunchPad", mindustry.world.blocks.campaign.LaunchPad.class); @@ -424,6 +426,27 @@ public class ClassMap{ classes.put("UnitFactory", mindustry.world.blocks.units.UnitFactory.class); classes.put("UnitFactoryBuild", mindustry.world.blocks.units.UnitFactory.UnitFactoryBuild.class); classes.put("UnitPlan", mindustry.world.blocks.units.UnitFactory.UnitPlan.class); + classes.put("Consume", mindustry.world.consumers.Consume.class); + classes.put("ConsumeCoolant", mindustry.world.consumers.ConsumeCoolant.class); + classes.put("ConsumeItemCharged", mindustry.world.consumers.ConsumeItemCharged.class); + classes.put("ConsumeItemDynamic", mindustry.world.consumers.ConsumeItemDynamic.class); + classes.put("ConsumeItemExplode", mindustry.world.consumers.ConsumeItemExplode.class); + classes.put("ConsumeItemExplosive", mindustry.world.consumers.ConsumeItemExplosive.class); + classes.put("ConsumeItemFilter", mindustry.world.consumers.ConsumeItemFilter.class); + classes.put("ConsumeItemFlammable", mindustry.world.consumers.ConsumeItemFlammable.class); + classes.put("ConsumeItemRadioactive", mindustry.world.consumers.ConsumeItemRadioactive.class); + classes.put("ConsumeItems", mindustry.world.consumers.ConsumeItems.class); + classes.put("ConsumeLiquid", mindustry.world.consumers.ConsumeLiquid.class); + classes.put("ConsumeLiquidBase", mindustry.world.consumers.ConsumeLiquidBase.class); + classes.put("ConsumeLiquidFilter", mindustry.world.consumers.ConsumeLiquidFilter.class); + classes.put("ConsumeLiquidFlammable", mindustry.world.consumers.ConsumeLiquidFlammable.class); + classes.put("ConsumeLiquids", mindustry.world.consumers.ConsumeLiquids.class); + classes.put("ConsumePayloadDynamic", mindustry.world.consumers.ConsumePayloadDynamic.class); + classes.put("ConsumePayloadFilter", mindustry.world.consumers.ConsumePayloadFilter.class); + classes.put("ConsumePayloads", mindustry.world.consumers.ConsumePayloads.class); + classes.put("ConsumePower", mindustry.world.consumers.ConsumePower.class); + classes.put("ConsumePowerCondition", mindustry.world.consumers.ConsumePowerCondition.class); + classes.put("ConsumePowerDynamic", mindustry.world.consumers.ConsumePowerDynamic.class); classes.put("DrawArcSmelt", mindustry.world.draw.DrawArcSmelt.class); classes.put("DrawBlock", mindustry.world.draw.DrawBlock.class); classes.put("DrawBlurSpin", mindustry.world.draw.DrawBlurSpin.class); @@ -459,8 +482,6 @@ public class ClassMap{ classes.put("DrawTurret", mindustry.world.draw.DrawTurret.class); classes.put("DrawWarmupRegion", mindustry.world.draw.DrawWarmupRegion.class); classes.put("DrawWeave", mindustry.world.draw.DrawWeave.class); - classes.put("ConsumeCoolant", mindustry.world.consumers.ConsumeCoolant.class); - classes.put("ConsumeLiquidFlammable", mindustry.world.consumers.ConsumeLiquidFlammable.class); classes.put("Block", mindustry.world.Block.class); } } diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java index 6d8bc9ae87..1c84083efe 100644 --- a/tools/src/mindustry/tools/ScriptMainGenerator.java +++ b/tools/src/mindustry/tools/ScriptMainGenerator.java @@ -83,6 +83,7 @@ public class ScriptMainGenerator{ "mindustry.type.ammo", "mindustry.game.Objectives", "mindustry.world.blocks", + "mindustry.world.consumers", "mindustry.world.draw", "mindustry.type", "mindustry.entities.pattern",