From 65161a4129d30af818e2a4022388725e8e3f5193 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 14 Feb 2022 22:29:55 -0500 Subject: [PATCH] deprecation annihilation --- .../resources/revisions/BuildingComp/1.json | 1 + core/src/mindustry/content/Blocks.java | 10 +- core/src/mindustry/content/TechTree.java | 13 - core/src/mindustry/ctype/ContentList.java | 8 - .../mindustry/ctype/UnlockableContent.java | 12 - .../mindustry/entities/comp/BuildingComp.java | 4 - .../src/mindustry/entities/comp/UnitComp.java | 8 +- core/src/mindustry/graphics/Shaders.java | 4 - core/src/mindustry/logic/LAssembler.java | 12 - core/src/mindustry/mod/ClassMap.java | 440 +----------------- core/src/mindustry/mod/Scripts.java | 13 - core/src/mindustry/type/Planet.java | 6 - core/src/mindustry/type/UnitType.java | 6 - core/src/mindustry/ui/Cicon.java | 12 - core/src/mindustry/ui/IconSize.java | 16 - core/src/mindustry/ui/ItemImage.java | 6 - .../mindustry/ui/fragments/ChatFragment.java | 6 - core/src/mindustry/world/Block.java | 9 - .../blocks/defense/turrets/LiquidTurret.java | 7 - .../blocks/defense/turrets/PowerTurret.java | 11 - .../world/blocks/defense/turrets/Turret.java | 20 - .../distribution/ExtendingItemBridge.java | 15 - .../blocks/distribution/PayloadConveyor.java | 14 - .../blocks/distribution/PayloadRouter.java | 14 - .../environment/DoubleOverlayFloor.java | 10 - .../world/blocks/experimental/BlockForge.java | 17 - .../blocks/experimental/BlockLoader.java | 16 - .../blocks/experimental/BlockUnloader.java | 16 - .../blocks/liquid/LiquidExtendingBridge.java | 14 - .../world/blocks/payloads/Payload.java | 7 - .../world/blocks/power/BurnerGenerator.java | 8 - .../blocks/power/ItemLiquidGenerator.java | 12 - .../world/blocks/power/PowerGraph.java | 6 - .../blocks/power/SingleTypeGenerator.java | 24 - .../blocks/production/AttributeSmelter.java | 25 - .../world/blocks/production/Cultivator.java | 48 -- .../blocks/production/GenericSmelter.java | 54 --- .../blocks/production/PayloadAcceptor.java | 18 - .../world/blocks/storage/Unloader.java | 43 +- .../mindustry/world/consumers/Consumers.java | 12 - core/src/mindustry/world/draw/DrawBlock.java | 9 - core/src/mindustry/world/meta/BlockFlag.java | 5 +- .../world/modules/ConsumeModule.java | 62 --- .../mindustry/world/modules/LiquidModule.java | 10 - gradle.properties | 2 +- 45 files changed, 28 insertions(+), 1057 deletions(-) create mode 100644 annotations/src/main/resources/revisions/BuildingComp/1.json delete mode 100644 core/src/mindustry/ctype/ContentList.java delete mode 100644 core/src/mindustry/ui/Cicon.java delete mode 100644 core/src/mindustry/ui/IconSize.java delete mode 100644 core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java delete mode 100644 core/src/mindustry/world/blocks/distribution/PayloadConveyor.java delete mode 100644 core/src/mindustry/world/blocks/distribution/PayloadRouter.java delete mode 100644 core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java delete mode 100644 core/src/mindustry/world/blocks/experimental/BlockForge.java delete mode 100644 core/src/mindustry/world/blocks/experimental/BlockLoader.java delete mode 100644 core/src/mindustry/world/blocks/experimental/BlockUnloader.java delete mode 100644 core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java delete mode 100644 core/src/mindustry/world/blocks/power/SingleTypeGenerator.java delete mode 100644 core/src/mindustry/world/blocks/production/AttributeSmelter.java delete mode 100644 core/src/mindustry/world/blocks/production/Cultivator.java delete mode 100644 core/src/mindustry/world/blocks/production/GenericSmelter.java delete mode 100644 core/src/mindustry/world/blocks/production/PayloadAcceptor.java delete mode 100644 core/src/mindustry/world/modules/ConsumeModule.java diff --git a/annotations/src/main/resources/revisions/BuildingComp/1.json b/annotations/src/main/resources/revisions/BuildingComp/1.json new file mode 100644 index 0000000000..2cf0bf73fc --- /dev/null +++ b/annotations/src/main/resources/revisions/BuildingComp/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:health,type:float},{name:items,type:mindustry.world.modules.ItemModule},{name:liquids,type:mindustry.world.modules.LiquidModule},{name:power,type:mindustry.world.modules.PowerModule},{name:team,type:mindustry.game.Team},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a99ce0931f..d22394c91d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -158,10 +158,6 @@ public class Blocks{ ; - /** @deprecated use the blocks with proper names */ - @Deprecated - public static Block blockForge, blockLoader, blockUnloader; - public static void load(){ //region environment @@ -3746,11 +3742,7 @@ public class Blocks{ consumes.power(2f); size = 3; }}; - - //deprecated, will be removed. - blockForge = constructor; - blockLoader = payloadLoader; - blockUnloader = payloadUnloader; + //annihilation //endregion //region sandbox diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index c3e61ff5c8..8bf2934a66 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -70,19 +70,6 @@ public class TechTree{ return context; } - /** @deprecated use {@link UnlockableContent#techNode} instead. */ - @Deprecated - public static @Nullable TechNode get(UnlockableContent content){ - return content.techNode; - } - - /** @deprecated use {@link UnlockableContent#techNode} instead. */ - @Deprecated - public static TechNode getNotNull(UnlockableContent content){ - if(content.techNode == null) throw new RuntimeException(content + " does not have a tech node"); - return content.techNode; - } - public static class TechNode{ /** Depth in tech tree. */ public int depth; diff --git a/core/src/mindustry/ctype/ContentList.java b/core/src/mindustry/ctype/ContentList.java deleted file mode 100644 index 27d7104216..0000000000 --- a/core/src/mindustry/ctype/ContentList.java +++ /dev/null @@ -1,8 +0,0 @@ -package mindustry.ctype; - -/** @deprecated single-method interfaces don't need to exist for content loading; just call YourList.load() as a static method directly in the order necessary. */ -@Deprecated -public interface ContentList{ - /** This method should create all the content. */ - void load(); -} diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index 868caf2a45..73843d4a2e 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -61,18 +61,6 @@ public abstract class UnlockableContent extends MappableContent{ uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon); } - /** @deprecated use the {@link #techNode} field instead. */ - @Deprecated - public @Nullable TechNode node(){ - return techNode; - } - - /** @deprecated Use fullIcon / uiIcon instead! This will be removed. */ - @Deprecated - public TextureRegion icon(Cicon icon){ - return icon == Cicon.full ? fullIcon : uiIcon; - } - public String displayDescription(){ return minfo.mod == null ? description : description + "\n" + Core.bundle.format("mod.display", minfo.mod.meta.displayName()); } diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 0c3b69aa0e..5c5ab919aa 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -75,10 +75,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, @Nullable ItemModule items; @Nullable LiquidModule liquids; - /** @deprecated use building methods instead, this is just a proxy! */ - @Deprecated - ConsumeModule cons = new ConsumeModule(self()); - public transient float healSuppressionTime = -1f; public transient float lastHealTime = -120f * 10f; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 73dcdf5355..97dd5ddf05 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -77,7 +77,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I } public void approach(Vec2 vector){ - vel.approachDelta(vector, type.accel * realSpeed()); + vel.approachDelta(vector, type.accel * speed()); } public void rotateMove(Vec2 vec){ @@ -124,12 +124,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I return (isCommanding() ? minFormationSpeed * 0.98f : type.speed) * strafePenalty * boost * floorSpeedMultiplier(); } - /** @deprecated use speed() instead */ - @Deprecated - public float realSpeed(){ - return speed(); - } - /** Iterates through this unit and everything it is controlling. */ public void eachGroup(Cons cons){ cons.get(self()); diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index e9b316977c..b4617f0f96 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -186,10 +186,6 @@ public class Shaders{ } } - /** @deprecated transition class for mods; use UnitBuildShader instead. */ - @Deprecated - public static class UnitBuild extends UnitBuildShader{} - public static class UnitBuildShader extends LoadShader{ public float progress, time; public Color color = new Color(); diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index ed6f4ec73d..212b98f9d9 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -29,18 +29,6 @@ public class LAssembler{ putConst("@this", null); } - /** @deprecated use the one with the privileged parameter */ - @Deprecated - public static LAssembler assemble(String data){ - return assemble(data, false); - } - - /** @deprecated use the one with the privileged parameter */ - @Deprecated - public static Seq read(String text){ - return read(text, false); - } - public static LAssembler assemble(String data, boolean privileged){ LAssembler asm = new LAssembler(); diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index 0780d9e45f..cd3044f777 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -7,444 +7,6 @@ public class ClassMap{ public static final ObjectMap> classes = new ObjectMap<>(); static{ - classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class); - classes.put("BuilderAI", mindustry.ai.types.BuilderAI.class); - classes.put("CargoAI", mindustry.ai.types.CargoAI.class); - classes.put("DefenderAI", mindustry.ai.types.DefenderAI.class); - classes.put("FlyingAI", mindustry.ai.types.FlyingAI.class); - classes.put("FlyingFollowAI", mindustry.ai.types.FlyingFollowAI.class); - classes.put("FormationAI", mindustry.ai.types.FormationAI.class); - classes.put("GroundAI", mindustry.ai.types.GroundAI.class); - classes.put("HugAI", mindustry.ai.types.HugAI.class); - classes.put("LogicAI", mindustry.ai.types.LogicAI.class); - classes.put("MinerAI", mindustry.ai.types.MinerAI.class); - classes.put("MissileAI", mindustry.ai.types.MissileAI.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("ArmorPlateAbility", mindustry.entities.abilities.ArmorPlateAbility.class); - classes.put("EnergyFieldAbility", mindustry.entities.abilities.EnergyFieldAbility.class); - classes.put("ForceFieldAbility", mindustry.entities.abilities.ForceFieldAbility.class); - classes.put("LiquidExplodeAbility", mindustry.entities.abilities.LiquidExplodeAbility.class); - classes.put("LiquidRegenAbility", mindustry.entities.abilities.LiquidRegenAbility.class); - classes.put("MoveLightningAbility", mindustry.entities.abilities.MoveLightningAbility.class); - classes.put("RegenAbility", mindustry.entities.abilities.RegenAbility.class); - classes.put("RepairFieldAbility", mindustry.entities.abilities.RepairFieldAbility.class); - classes.put("ShieldArcAbility", mindustry.entities.abilities.ShieldArcAbility.class); - classes.put("ShieldRegenFieldAbility", mindustry.entities.abilities.ShieldRegenFieldAbility.class); - classes.put("StatusFieldAbility", mindustry.entities.abilities.StatusFieldAbility.class); - classes.put("SuppressionFieldAbility", mindustry.entities.abilities.SuppressionFieldAbility.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); - classes.put("BulletType", mindustry.entities.bullet.BulletType.class); - classes.put("ContinuousBulletType", mindustry.entities.bullet.ContinuousBulletType.class); - classes.put("ContinuousFlameBulletType", mindustry.entities.bullet.ContinuousFlameBulletType.class); - classes.put("ContinuousLaserBulletType", mindustry.entities.bullet.ContinuousLaserBulletType.class); - classes.put("EmpBulletType", mindustry.entities.bullet.EmpBulletType.class); - classes.put("FireBulletType", mindustry.entities.bullet.FireBulletType.class); - classes.put("FlakBulletType", mindustry.entities.bullet.FlakBulletType.class); - classes.put("LaserBoltBulletType", mindustry.entities.bullet.LaserBoltBulletType.class); - classes.put("LaserBulletType", mindustry.entities.bullet.LaserBulletType.class); - classes.put("LightningBulletType", mindustry.entities.bullet.LightningBulletType.class); - classes.put("LiquidBulletType", mindustry.entities.bullet.LiquidBulletType.class); - classes.put("MassDriverBolt", mindustry.entities.bullet.MassDriverBolt.class); - classes.put("MissileBulletType", mindustry.entities.bullet.MissileBulletType.class); - classes.put("PointBulletType", mindustry.entities.bullet.PointBulletType.class); - classes.put("RailBulletType", mindustry.entities.bullet.RailBulletType.class); - classes.put("SapBulletType", mindustry.entities.bullet.SapBulletType.class); - classes.put("ShrapnelBulletType", mindustry.entities.bullet.ShrapnelBulletType.class); - classes.put("SpaceLiquidBulletType", mindustry.entities.bullet.SpaceLiquidBulletType.class); - classes.put("ExplosionEffect", mindustry.entities.effect.ExplosionEffect.class); - classes.put("MultiEffect", mindustry.entities.effect.MultiEffect.class); - classes.put("ParticleEffect", mindustry.entities.effect.ParticleEffect.class); - classes.put("RadialEffect", mindustry.entities.effect.RadialEffect.class); - classes.put("WaveEffect", mindustry.entities.effect.WaveEffect.class); - classes.put("WrapEffect", mindustry.entities.effect.WrapEffect.class); - classes.put("Objectives", mindustry.game.Objectives.class); - classes.put("Objective", mindustry.game.Objectives.Objective.class); - classes.put("OnPlanet", mindustry.game.Objectives.OnPlanet.class); - classes.put("OnSector", mindustry.game.Objectives.OnSector.class); - classes.put("Produce", mindustry.game.Objectives.Produce.class); - classes.put("Research", mindustry.game.Objectives.Research.class); - classes.put("SectorComplete", mindustry.game.Objectives.SectorComplete.class); - classes.put("AmmoType", mindustry.type.AmmoType.class); - classes.put("BlockSeq", mindustry.type.BlockSeq.class); - classes.put("BlockStack", mindustry.type.BlockStack.class); - classes.put("Category", mindustry.type.Category.class); - classes.put("CellLiquid", mindustry.type.CellLiquid.class); - classes.put("ErrorContent", mindustry.type.ErrorContent.class); - classes.put("Item", mindustry.type.Item.class); - classes.put("ItemSeq", mindustry.type.ItemSeq.class); - classes.put("ItemStack", mindustry.type.ItemStack.class); - classes.put("Liquid", mindustry.type.Liquid.class); - classes.put("LiquidStack", mindustry.type.LiquidStack.class); - classes.put("Planet", mindustry.type.Planet.class); - classes.put("Publishable", mindustry.type.Publishable.class); - classes.put("Satellite", mindustry.type.Satellite.class); - classes.put("Sector", mindustry.type.Sector.class); - classes.put("SectorRect", mindustry.type.Sector.SectorRect.class); - classes.put("SectorPreset", mindustry.type.SectorPreset.class); - classes.put("StatusEffect", mindustry.type.StatusEffect.class); - classes.put("TransitionHandler", mindustry.type.StatusEffect.TransitionHandler.class); - classes.put("TeamEntry", mindustry.type.TeamEntry.class); - classes.put("UnitType", mindustry.type.UnitType.class); - classes.put("UnitEngine", mindustry.type.UnitType.UnitEngine.class); - classes.put("Weapon", mindustry.type.Weapon.class); - classes.put("Weather", mindustry.type.Weather.class); - classes.put("WeatherEntry", mindustry.type.Weather.WeatherEntry.class); - classes.put("ItemAmmoType", mindustry.type.ammo.ItemAmmoType.class); - classes.put("PowerAmmoType", mindustry.type.ammo.PowerAmmoType.class); - classes.put("MissileUnitType", mindustry.type.unit.MissileUnitType.class); - classes.put("NeoplasmUnitType", mindustry.type.unit.NeoplasmUnitType.class); - classes.put("TankUnitType", mindustry.type.unit.TankUnitType.class); - classes.put("BuildWeapon", mindustry.type.weapons.BuildWeapon.class); - classes.put("PointDefenseWeapon", mindustry.type.weapons.PointDefenseWeapon.class); - classes.put("RepairBeamWeapon", mindustry.type.weapons.RepairBeamWeapon.class); - classes.put("HealBeamMount", mindustry.type.weapons.RepairBeamWeapon.HealBeamMount.class); - classes.put("MagneticStorm", mindustry.type.weather.MagneticStorm.class); - classes.put("ParticleWeather", mindustry.type.weather.ParticleWeather.class); - classes.put("RainWeather", mindustry.type.weather.RainWeather.class); - classes.put("SolarFlare", mindustry.type.weather.SolarFlare.class); - classes.put("Attributes", mindustry.world.blocks.Attributes.class); - classes.put("Autotiler", mindustry.world.blocks.Autotiler.class); - classes.put("AutotilerHolder", mindustry.world.blocks.Autotiler.AutotilerHolder.class); - classes.put("SliceMode", mindustry.world.blocks.Autotiler.SliceMode.class); - classes.put("ConstructBlock", mindustry.world.blocks.ConstructBlock.class); - 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("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); - classes.put("LaunchPadBuild", mindustry.world.blocks.campaign.LaunchPad.LaunchPadBuild.class); - classes.put("BuildTurret", mindustry.world.blocks.defense.BuildTurret.class); - classes.put("BuildTurretBuild", mindustry.world.blocks.defense.BuildTurret.BuildTurretBuild.class); - classes.put("DirectionalForceProjector", mindustry.world.blocks.defense.DirectionalForceProjector.class); - classes.put("DirectionalForceProjectorBuild", mindustry.world.blocks.defense.DirectionalForceProjector.DirectionalForceProjectorBuild.class); - classes.put("Door", mindustry.world.blocks.defense.Door.class); - classes.put("DoorBuild", mindustry.world.blocks.defense.Door.DoorBuild.class); - classes.put("ForceProjector", mindustry.world.blocks.defense.ForceProjector.class); - classes.put("ForceBuild", mindustry.world.blocks.defense.ForceProjector.ForceBuild.class); - classes.put("MendProjector", mindustry.world.blocks.defense.MendProjector.class); - classes.put("MendBuild", mindustry.world.blocks.defense.MendProjector.MendBuild.class); - classes.put("OverdriveProjector", mindustry.world.blocks.defense.OverdriveProjector.class); - classes.put("OverdriveBuild", mindustry.world.blocks.defense.OverdriveProjector.OverdriveBuild.class); - classes.put("RegenProjector", mindustry.world.blocks.defense.RegenProjector.class); - classes.put("RegenProjectorBuild", mindustry.world.blocks.defense.RegenProjector.RegenProjectorBuild.class); - classes.put("ShockMine", mindustry.world.blocks.defense.ShockMine.class); - classes.put("ShockMineBuild", mindustry.world.blocks.defense.ShockMine.ShockMineBuild.class); - classes.put("Thruster", mindustry.world.blocks.defense.Thruster.class); - classes.put("ThrusterBuild", mindustry.world.blocks.defense.Thruster.ThrusterBuild.class); - classes.put("Wall", mindustry.world.blocks.defense.Wall.class); - classes.put("WallBuild", mindustry.world.blocks.defense.Wall.WallBuild.class); - classes.put("BaseTurret", mindustry.world.blocks.defense.turrets.BaseTurret.class); - classes.put("BaseTurretBuild", mindustry.world.blocks.defense.turrets.BaseTurret.BaseTurretBuild.class); - classes.put("ContinuousLiquidTurret", mindustry.world.blocks.defense.turrets.ContinuousLiquidTurret.class); - classes.put("LiquidTurretBuild", mindustry.world.blocks.defense.turrets.ContinuousLiquidTurret.LiquidTurretBuild.class); - classes.put("ContinuousTurret", mindustry.world.blocks.defense.turrets.ContinuousTurret.class); - classes.put("ContinuousTurretBuild", mindustry.world.blocks.defense.turrets.ContinuousTurret.ContinuousTurretBuild.class); - classes.put("ItemTurret", mindustry.world.blocks.defense.turrets.ItemTurret.class); - classes.put("ItemEntry", mindustry.world.blocks.defense.turrets.ItemTurret.ItemEntry.class); - classes.put("ItemTurretBuild", mindustry.world.blocks.defense.turrets.ItemTurret.ItemTurretBuild.class); - classes.put("LaserTurret", mindustry.world.blocks.defense.turrets.LaserTurret.class); - classes.put("LaserTurretBuild", mindustry.world.blocks.defense.turrets.LaserTurret.LaserTurretBuild.class); - classes.put("LiquidTurret", mindustry.world.blocks.defense.turrets.LiquidTurret.class); - classes.put("LiquidTurretBuild", mindustry.world.blocks.defense.turrets.LiquidTurret.LiquidTurretBuild.class); - classes.put("PayloadTurret", mindustry.world.blocks.defense.turrets.PayloadTurret.class); - classes.put("PayloadTurretBuild", mindustry.world.blocks.defense.turrets.PayloadTurret.PayloadTurretBuild.class); - classes.put("PointDefenseTurret", mindustry.world.blocks.defense.turrets.PointDefenseTurret.class); - classes.put("PointDefenseBuild", mindustry.world.blocks.defense.turrets.PointDefenseTurret.PointDefenseBuild.class); - classes.put("PowerTurret", mindustry.world.blocks.defense.turrets.PowerTurret.class); - classes.put("PowerTurretBuild", mindustry.world.blocks.defense.turrets.PowerTurret.PowerTurretBuild.class); - classes.put("ReloadTurret", mindustry.world.blocks.defense.turrets.ReloadTurret.class); - classes.put("ReloadTurretBuild", mindustry.world.blocks.defense.turrets.ReloadTurret.ReloadTurretBuild.class); - classes.put("TractorBeamTurret", mindustry.world.blocks.defense.turrets.TractorBeamTurret.class); - classes.put("TractorBeamBuild", mindustry.world.blocks.defense.turrets.TractorBeamTurret.TractorBeamBuild.class); - classes.put("Turret", mindustry.world.blocks.defense.turrets.Turret.class); - classes.put("AmmoEntry", mindustry.world.blocks.defense.turrets.Turret.AmmoEntry.class); - classes.put("TurretBuild", mindustry.world.blocks.defense.turrets.Turret.TurretBuild.class); - classes.put("ArmoredConveyor", mindustry.world.blocks.distribution.ArmoredConveyor.class); - classes.put("ArmoredConveyorBuild", mindustry.world.blocks.distribution.ArmoredConveyor.ArmoredConveyorBuild.class); - classes.put("BufferedItemBridge", mindustry.world.blocks.distribution.BufferedItemBridge.class); - classes.put("BufferedItemBridgeBuild", mindustry.world.blocks.distribution.BufferedItemBridge.BufferedItemBridgeBuild.class); - classes.put("ChainedBuilding", mindustry.world.blocks.distribution.ChainedBuilding.class); - classes.put("Conveyor", mindustry.world.blocks.distribution.Conveyor.class); - classes.put("ConveyorBuild", mindustry.world.blocks.distribution.Conveyor.ConveyorBuild.class); - classes.put("DirectionBridge", mindustry.world.blocks.distribution.DirectionBridge.class); - classes.put("DirectionBridgeBuild", mindustry.world.blocks.distribution.DirectionBridge.DirectionBridgeBuild.class); - classes.put("DirectionLiquidBridge", mindustry.world.blocks.distribution.DirectionLiquidBridge.class); - classes.put("DuctBridgeBuild", mindustry.world.blocks.distribution.DirectionLiquidBridge.DuctBridgeBuild.class); - classes.put("DirectionalUnloader", mindustry.world.blocks.distribution.DirectionalUnloader.class); - classes.put("DirectionalUnloaderBuild", mindustry.world.blocks.distribution.DirectionalUnloader.DirectionalUnloaderBuild.class); - classes.put("Duct", mindustry.world.blocks.distribution.Duct.class); - classes.put("DuctBuild", mindustry.world.blocks.distribution.Duct.DuctBuild.class); - classes.put("DuctBridge", mindustry.world.blocks.distribution.DuctBridge.class); - classes.put("DuctBridgeBuild", mindustry.world.blocks.distribution.DuctBridge.DuctBridgeBuild.class); - classes.put("DuctRouter", mindustry.world.blocks.distribution.DuctRouter.class); - classes.put("DuctRouterBuild", mindustry.world.blocks.distribution.DuctRouter.DuctRouterBuild.class); - classes.put("ExtendingItemBridge", mindustry.world.blocks.distribution.ExtendingItemBridge.class); - classes.put("ExtendingItemBridgeBuild", mindustry.world.blocks.distribution.ExtendingItemBridge.ExtendingItemBridgeBuild.class); - classes.put("ItemBridge", mindustry.world.blocks.distribution.ItemBridge.class); - classes.put("ItemBridgeBuild", mindustry.world.blocks.distribution.ItemBridge.ItemBridgeBuild.class); - classes.put("Junction", mindustry.world.blocks.distribution.Junction.class); - classes.put("JunctionBuild", mindustry.world.blocks.distribution.Junction.JunctionBuild.class); - classes.put("MassDriver", mindustry.world.blocks.distribution.MassDriver.class); - classes.put("DriverBulletData", mindustry.world.blocks.distribution.MassDriver.DriverBulletData.class); - classes.put("DriverState", mindustry.world.blocks.distribution.MassDriver.DriverState.class); - classes.put("MassDriverBuild", mindustry.world.blocks.distribution.MassDriver.MassDriverBuild.class); - classes.put("OverflowDuct", mindustry.world.blocks.distribution.OverflowDuct.class); - classes.put("DuctRouterBuild", mindustry.world.blocks.distribution.OverflowDuct.DuctRouterBuild.class); - classes.put("OverflowGate", mindustry.world.blocks.distribution.OverflowGate.class); - classes.put("OverflowGateBuild", mindustry.world.blocks.distribution.OverflowGate.OverflowGateBuild.class); - classes.put("PayloadConveyor", mindustry.world.blocks.distribution.PayloadConveyor.class); - classes.put("PayloadConveyorBuild", mindustry.world.blocks.distribution.PayloadConveyor.PayloadConveyorBuild.class); - classes.put("PayloadRouter", mindustry.world.blocks.distribution.PayloadRouter.class); - classes.put("PayloadRouterBuild", mindustry.world.blocks.distribution.PayloadRouter.PayloadRouterBuild.class); - classes.put("Router", mindustry.world.blocks.distribution.Router.class); - classes.put("RouterBuild", mindustry.world.blocks.distribution.Router.RouterBuild.class); - classes.put("Sorter", mindustry.world.blocks.distribution.Sorter.class); - classes.put("SorterBuild", mindustry.world.blocks.distribution.Sorter.SorterBuild.class); - classes.put("StackConveyor", mindustry.world.blocks.distribution.StackConveyor.class); - classes.put("StackConveyorBuild", mindustry.world.blocks.distribution.StackConveyor.StackConveyorBuild.class); - classes.put("StackRouter", mindustry.world.blocks.distribution.StackRouter.class); - classes.put("StackRouterBuild", mindustry.world.blocks.distribution.StackRouter.StackRouterBuild.class); - classes.put("AirBlock", mindustry.world.blocks.environment.AirBlock.class); - classes.put("Cliff", mindustry.world.blocks.environment.Cliff.class); - classes.put("DoubleOverlayFloor", mindustry.world.blocks.environment.DoubleOverlayFloor.class); - classes.put("EmptyFloor", mindustry.world.blocks.environment.EmptyFloor.class); - classes.put("Floor", mindustry.world.blocks.environment.Floor.class); - classes.put("UpdateRenderState", mindustry.world.blocks.environment.Floor.UpdateRenderState.class); - classes.put("OreBlock", mindustry.world.blocks.environment.OreBlock.class); - classes.put("OverlayFloor", mindustry.world.blocks.environment.OverlayFloor.class); - classes.put("Prop", mindustry.world.blocks.environment.Prop.class); - classes.put("SeaBush", mindustry.world.blocks.environment.SeaBush.class); - classes.put("Seaweed", mindustry.world.blocks.environment.Seaweed.class); - classes.put("ShallowLiquid", mindustry.world.blocks.environment.ShallowLiquid.class); - classes.put("SpawnBlock", mindustry.world.blocks.environment.SpawnBlock.class); - classes.put("StaticTree", mindustry.world.blocks.environment.StaticTree.class); - classes.put("StaticWall", mindustry.world.blocks.environment.StaticWall.class); - classes.put("SteamVent", mindustry.world.blocks.environment.SteamVent.class); - classes.put("TallBlock", mindustry.world.blocks.environment.TallBlock.class); - classes.put("TreeBlock", mindustry.world.blocks.environment.TreeBlock.class); - classes.put("WobbleProp", mindustry.world.blocks.environment.WobbleProp.class); - classes.put("BlockForge", mindustry.world.blocks.experimental.BlockForge.class); - classes.put("BlockForgeBuild", mindustry.world.blocks.experimental.BlockForge.BlockForgeBuild.class); - classes.put("BlockLoader", mindustry.world.blocks.experimental.BlockLoader.class); - classes.put("BlockLoaderBuild", mindustry.world.blocks.experimental.BlockLoader.BlockLoaderBuild.class); - classes.put("BlockUnloader", mindustry.world.blocks.experimental.BlockUnloader.class); - classes.put("BlockUnloaderBuild", mindustry.world.blocks.experimental.BlockUnloader.BlockUnloaderBuild.class); - classes.put("HeatBlock", mindustry.world.blocks.heat.HeatBlock.class); - classes.put("HeatConductor", mindustry.world.blocks.heat.HeatConductor.class); - classes.put("HeatConductorBuild", mindustry.world.blocks.heat.HeatConductor.HeatConductorBuild.class); - classes.put("HeatConsumer", mindustry.world.blocks.heat.HeatConsumer.class); - classes.put("HeatProducer", mindustry.world.blocks.heat.HeatProducer.class); - classes.put("HeatProducerBuild", mindustry.world.blocks.heat.HeatProducer.HeatProducerBuild.class); - classes.put("LegacyBlock", mindustry.world.blocks.legacy.LegacyBlock.class); - classes.put("LegacyMechPad", mindustry.world.blocks.legacy.LegacyMechPad.class); - classes.put("LegacyMechPadBuild", mindustry.world.blocks.legacy.LegacyMechPad.LegacyMechPadBuild.class); - classes.put("LegacyUnitFactory", mindustry.world.blocks.legacy.LegacyUnitFactory.class); - classes.put("LegacyUnitFactoryBuild", mindustry.world.blocks.legacy.LegacyUnitFactory.LegacyUnitFactoryBuild.class); - classes.put("ArmoredConduit", mindustry.world.blocks.liquid.ArmoredConduit.class); - classes.put("ArmoredConduitBuild", mindustry.world.blocks.liquid.ArmoredConduit.ArmoredConduitBuild.class); - classes.put("Conduit", mindustry.world.blocks.liquid.Conduit.class); - classes.put("ConduitBuild", mindustry.world.blocks.liquid.Conduit.ConduitBuild.class); - classes.put("LiquidBlock", mindustry.world.blocks.liquid.LiquidBlock.class); - classes.put("LiquidBuild", mindustry.world.blocks.liquid.LiquidBlock.LiquidBuild.class); - classes.put("LiquidBridge", mindustry.world.blocks.liquid.LiquidBridge.class); - classes.put("LiquidBridgeBuild", mindustry.world.blocks.liquid.LiquidBridge.LiquidBridgeBuild.class); - classes.put("LiquidExtendingBridge", mindustry.world.blocks.liquid.LiquidExtendingBridge.class); - classes.put("LiquidExtendingBridgeBuild", mindustry.world.blocks.liquid.LiquidExtendingBridge.LiquidExtendingBridgeBuild.class); - classes.put("LiquidJunction", mindustry.world.blocks.liquid.LiquidJunction.class); - classes.put("LiquidJunctionBuild", mindustry.world.blocks.liquid.LiquidJunction.LiquidJunctionBuild.class); - classes.put("LiquidRouter", mindustry.world.blocks.liquid.LiquidRouter.class); - classes.put("LiquidRouterBuild", mindustry.world.blocks.liquid.LiquidRouter.LiquidRouterBuild.class); - classes.put("LogicBlock", mindustry.world.blocks.logic.LogicBlock.class); - classes.put("LogicBuild", mindustry.world.blocks.logic.LogicBlock.LogicBuild.class); - classes.put("LogicLink", mindustry.world.blocks.logic.LogicBlock.LogicLink.class); - classes.put("LogicDisplay", mindustry.world.blocks.logic.LogicDisplay.class); - classes.put("GraphicsType", mindustry.world.blocks.logic.LogicDisplay.GraphicsType.class); - classes.put("LogicDisplayBuild", mindustry.world.blocks.logic.LogicDisplay.LogicDisplayBuild.class); - classes.put("MemoryBlock", mindustry.world.blocks.logic.MemoryBlock.class); - classes.put("MemoryBuild", mindustry.world.blocks.logic.MemoryBlock.MemoryBuild.class); - classes.put("MessageBlock", mindustry.world.blocks.logic.MessageBlock.class); - classes.put("MessageBuild", mindustry.world.blocks.logic.MessageBlock.MessageBuild.class); - classes.put("SwitchBlock", mindustry.world.blocks.logic.SwitchBlock.class); - classes.put("SwitchBuild", mindustry.world.blocks.logic.SwitchBlock.SwitchBuild.class); - classes.put("BlockProducer", mindustry.world.blocks.payloads.BlockProducer.class); - classes.put("BlockProducerBuild", mindustry.world.blocks.payloads.BlockProducer.BlockProducerBuild.class); - classes.put("BuildPayload", mindustry.world.blocks.payloads.BuildPayload.class); - classes.put("Constructor", mindustry.world.blocks.payloads.Constructor.class); - classes.put("ConstructorBuild", mindustry.world.blocks.payloads.Constructor.ConstructorBuild.class); - classes.put("Payload", mindustry.world.blocks.payloads.Payload.class); - classes.put("PayloadBlock", mindustry.world.blocks.payloads.PayloadBlock.class); - classes.put("PayloadBlockBuild", mindustry.world.blocks.payloads.PayloadBlock.PayloadBlockBuild.class); - classes.put("PayloadConveyor", mindustry.world.blocks.payloads.PayloadConveyor.class); - classes.put("PayloadConveyorBuild", mindustry.world.blocks.payloads.PayloadConveyor.PayloadConveyorBuild.class); - classes.put("PayloadDeconstructor", mindustry.world.blocks.payloads.PayloadDeconstructor.class); - classes.put("PayloadDeconstructorBuild", mindustry.world.blocks.payloads.PayloadDeconstructor.PayloadDeconstructorBuild.class); - classes.put("PayloadLoader", mindustry.world.blocks.payloads.PayloadLoader.class); - classes.put("PayloadLoaderBuild", mindustry.world.blocks.payloads.PayloadLoader.PayloadLoaderBuild.class); - classes.put("PayloadMassDriver", mindustry.world.blocks.payloads.PayloadMassDriver.class); - classes.put("PayloadDriverBuild", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverBuild.class); - classes.put("PayloadDriverState", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverState.class); - classes.put("PayloadMassDriverData", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadMassDriverData.class); - classes.put("PayloadRouter", mindustry.world.blocks.payloads.PayloadRouter.class); - classes.put("PayloadRouterBuild", mindustry.world.blocks.payloads.PayloadRouter.PayloadRouterBuild.class); - classes.put("PayloadSource", mindustry.world.blocks.payloads.PayloadSource.class); - classes.put("PayloadSourceBuild", mindustry.world.blocks.payloads.PayloadSource.PayloadSourceBuild.class); - classes.put("PayloadUnloader", mindustry.world.blocks.payloads.PayloadUnloader.class); - classes.put("PayloadUnloaderBuild", mindustry.world.blocks.payloads.PayloadUnloader.PayloadUnloaderBuild.class); - classes.put("PayloadVoid", mindustry.world.blocks.payloads.PayloadVoid.class); - classes.put("PayloadVoidBuild", mindustry.world.blocks.payloads.PayloadVoid.PayloadVoidBuild.class); - classes.put("UnitPayload", mindustry.world.blocks.payloads.UnitPayload.class); - classes.put("Battery", mindustry.world.blocks.power.Battery.class); - classes.put("BatteryBuild", mindustry.world.blocks.power.Battery.BatteryBuild.class); - classes.put("BeamNode", mindustry.world.blocks.power.BeamNode.class); - classes.put("BeamNodeBuild", mindustry.world.blocks.power.BeamNode.BeamNodeBuild.class); - classes.put("BurnerGenerator", mindustry.world.blocks.power.BurnerGenerator.class); - classes.put("BurnerGeneratorBuild", mindustry.world.blocks.power.BurnerGenerator.BurnerGeneratorBuild.class); - classes.put("ConditionalConsumePower", mindustry.world.blocks.power.ConditionalConsumePower.class); - classes.put("ConsumeGenerator", mindustry.world.blocks.power.ConsumeGenerator.class); - classes.put("ConsumeGeneratorBuild", mindustry.world.blocks.power.ConsumeGenerator.ConsumeGeneratorBuild.class); - classes.put("DecayGenerator", mindustry.world.blocks.power.DecayGenerator.class); - classes.put("DynamicConsumePower", mindustry.world.blocks.power.DynamicConsumePower.class); - classes.put("ImpactReactor", mindustry.world.blocks.power.ImpactReactor.class); - classes.put("ImpactReactorBuild", mindustry.world.blocks.power.ImpactReactor.ImpactReactorBuild.class); - classes.put("ItemLiquidGenerator", mindustry.world.blocks.power.ItemLiquidGenerator.class); - classes.put("ItemLiquidGeneratorBuild", mindustry.world.blocks.power.ItemLiquidGenerator.ItemLiquidGeneratorBuild.class); - classes.put("LightBlock", mindustry.world.blocks.power.LightBlock.class); - classes.put("LightBuild", mindustry.world.blocks.power.LightBlock.LightBuild.class); - classes.put("NuclearReactor", mindustry.world.blocks.power.NuclearReactor.class); - classes.put("NuclearReactorBuild", mindustry.world.blocks.power.NuclearReactor.NuclearReactorBuild.class); - classes.put("PowerBlock", mindustry.world.blocks.power.PowerBlock.class); - classes.put("PowerDiode", mindustry.world.blocks.power.PowerDiode.class); - classes.put("PowerDiodeBuild", mindustry.world.blocks.power.PowerDiode.PowerDiodeBuild.class); - classes.put("PowerDistributor", mindustry.world.blocks.power.PowerDistributor.class); - classes.put("PowerGenerator", mindustry.world.blocks.power.PowerGenerator.class); - classes.put("GeneratorBuild", mindustry.world.blocks.power.PowerGenerator.GeneratorBuild.class); - classes.put("PowerGraph", mindustry.world.blocks.power.PowerGraph.class); - classes.put("PowerNode", mindustry.world.blocks.power.PowerNode.class); - classes.put("PowerNodeBuild", mindustry.world.blocks.power.PowerNode.PowerNodeBuild.class); - classes.put("SingleTypeGenerator", mindustry.world.blocks.power.SingleTypeGenerator.class); - classes.put("SolarGenerator", mindustry.world.blocks.power.SolarGenerator.class); - classes.put("SolarGeneratorBuild", mindustry.world.blocks.power.SolarGenerator.SolarGeneratorBuild.class); - classes.put("ThermalGenerator", mindustry.world.blocks.power.ThermalGenerator.class); - classes.put("ThermalGeneratorBuild", mindustry.world.blocks.power.ThermalGenerator.ThermalGeneratorBuild.class); - classes.put("AttributeCrafter", mindustry.world.blocks.production.AttributeCrafter.class); - classes.put("AttributeCrafterBuild", mindustry.world.blocks.production.AttributeCrafter.AttributeCrafterBuild.class); - classes.put("AttributeSmelter", mindustry.world.blocks.production.AttributeSmelter.class); - classes.put("AttributeSmelterBuild", mindustry.world.blocks.production.AttributeSmelter.AttributeSmelterBuild.class); - classes.put("BeamDrill", mindustry.world.blocks.production.BeamDrill.class); - classes.put("BeamDrillBuild", mindustry.world.blocks.production.BeamDrill.BeamDrillBuild.class); - classes.put("BurstDrill", mindustry.world.blocks.production.BurstDrill.class); - classes.put("BurstDrillBuild", mindustry.world.blocks.production.BurstDrill.BurstDrillBuild.class); - classes.put("Cultivator", mindustry.world.blocks.production.Cultivator.class); - classes.put("CultivatorBuild", mindustry.world.blocks.production.Cultivator.CultivatorBuild.class); - classes.put("Drill", mindustry.world.blocks.production.Drill.class); - classes.put("DrillBuild", mindustry.world.blocks.production.Drill.DrillBuild.class); - classes.put("Fracker", mindustry.world.blocks.production.Fracker.class); - classes.put("FrackerBuild", mindustry.world.blocks.production.Fracker.FrackerBuild.class); - classes.put("GenericCrafter", mindustry.world.blocks.production.GenericCrafter.class); - classes.put("GenericCrafterBuild", mindustry.world.blocks.production.GenericCrafter.GenericCrafterBuild.class); - classes.put("GenericSmelter", mindustry.world.blocks.production.GenericSmelter.class); - classes.put("SmelterBuild", mindustry.world.blocks.production.GenericSmelter.SmelterBuild.class); - classes.put("HeatCrafter", mindustry.world.blocks.production.HeatCrafter.class); - classes.put("HeatCrafterBuild", mindustry.world.blocks.production.HeatCrafter.HeatCrafterBuild.class); - classes.put("Incinerator", mindustry.world.blocks.production.Incinerator.class); - classes.put("IncineratorBuild", mindustry.world.blocks.production.Incinerator.IncineratorBuild.class); - classes.put("ItemIncinerator", mindustry.world.blocks.production.ItemIncinerator.class); - classes.put("ItemIncineratorBuild", mindustry.world.blocks.production.ItemIncinerator.ItemIncineratorBuild.class); - classes.put("LiquidConverter", mindustry.world.blocks.production.LiquidConverter.class); - classes.put("LiquidConverterBuild", mindustry.world.blocks.production.LiquidConverter.LiquidConverterBuild.class); - classes.put("PayloadAcceptor", mindustry.world.blocks.production.PayloadAcceptor.class); - classes.put("PayloadAcceptorBuild", mindustry.world.blocks.production.PayloadAcceptor.PayloadAcceptorBuild.class); - classes.put("Pump", mindustry.world.blocks.production.Pump.class); - classes.put("PumpBuild", mindustry.world.blocks.production.Pump.PumpBuild.class); - classes.put("Separator", mindustry.world.blocks.production.Separator.class); - classes.put("SeparatorBuild", mindustry.world.blocks.production.Separator.SeparatorBuild.class); - classes.put("SingleBlockProducer", mindustry.world.blocks.production.SingleBlockProducer.class); - classes.put("SingleBlockProducerBuild", mindustry.world.blocks.production.SingleBlockProducer.SingleBlockProducerBuild.class); - classes.put("SolidPump", mindustry.world.blocks.production.SolidPump.class); - classes.put("SolidPumpBuild", mindustry.world.blocks.production.SolidPump.SolidPumpBuild.class); - classes.put("WallCrafter", mindustry.world.blocks.production.WallCrafter.class); - classes.put("WallCrafterBuild", mindustry.world.blocks.production.WallCrafter.WallCrafterBuild.class); - classes.put("ItemSource", mindustry.world.blocks.sandbox.ItemSource.class); - classes.put("ItemSourceBuild", mindustry.world.blocks.sandbox.ItemSource.ItemSourceBuild.class); - classes.put("ItemVoid", mindustry.world.blocks.sandbox.ItemVoid.class); - classes.put("ItemVoidBuild", mindustry.world.blocks.sandbox.ItemVoid.ItemVoidBuild.class); - classes.put("LiquidSource", mindustry.world.blocks.sandbox.LiquidSource.class); - classes.put("LiquidSourceBuild", mindustry.world.blocks.sandbox.LiquidSource.LiquidSourceBuild.class); - classes.put("LiquidVoid", mindustry.world.blocks.sandbox.LiquidVoid.class); - classes.put("LiquidVoidBuild", mindustry.world.blocks.sandbox.LiquidVoid.LiquidVoidBuild.class); - classes.put("PowerSource", mindustry.world.blocks.sandbox.PowerSource.class); - classes.put("PowerSourceBuild", mindustry.world.blocks.sandbox.PowerSource.PowerSourceBuild.class); - classes.put("PowerVoid", mindustry.world.blocks.sandbox.PowerVoid.class); - classes.put("CoreBlock", mindustry.world.blocks.storage.CoreBlock.class); - classes.put("CoreBuild", mindustry.world.blocks.storage.CoreBlock.CoreBuild.class); - classes.put("StorageBlock", mindustry.world.blocks.storage.StorageBlock.class); - classes.put("StorageBuild", mindustry.world.blocks.storage.StorageBlock.StorageBuild.class); - classes.put("Unloader", mindustry.world.blocks.storage.Unloader.class); - classes.put("UnloaderBuild", mindustry.world.blocks.storage.Unloader.UnloaderBuild.class); - classes.put("ContainerStat", mindustry.world.blocks.storage.Unloader.UnloaderBuild.ContainerStat.class); - classes.put("CommandCenter", mindustry.world.blocks.units.CommandCenter.class); - classes.put("CommandBuild", mindustry.world.blocks.units.CommandCenter.CommandBuild.class); - classes.put("Reconstructor", mindustry.world.blocks.units.Reconstructor.class); - classes.put("ReconstructorBuild", mindustry.world.blocks.units.Reconstructor.ReconstructorBuild.class); - classes.put("RepairPoint", mindustry.world.blocks.units.RepairPoint.class); - classes.put("RepairPointBuild", mindustry.world.blocks.units.RepairPoint.RepairPointBuild.class); - classes.put("UnitAssembler", mindustry.world.blocks.units.UnitAssembler.class); - classes.put("AssemblerUnitPlan", mindustry.world.blocks.units.UnitAssembler.AssemblerUnitPlan.class); - classes.put("UnitAssemblerBuild", mindustry.world.blocks.units.UnitAssembler.UnitAssemblerBuild.class); - classes.put("YeetData", mindustry.world.blocks.units.UnitAssembler.YeetData.class); - classes.put("UnitAssemblerModule", mindustry.world.blocks.units.UnitAssemblerModule.class); - classes.put("UnitAssemblerModuleBuild", mindustry.world.blocks.units.UnitAssemblerModule.UnitAssemblerModuleBuild.class); - classes.put("UnitBlock", mindustry.world.blocks.units.UnitBlock.class); - classes.put("UnitBuild", mindustry.world.blocks.units.UnitBlock.UnitBuild.class); - classes.put("UnitCargoLoader", mindustry.world.blocks.units.UnitCargoLoader.class); - classes.put("UnitTransportSourceBuild", mindustry.world.blocks.units.UnitCargoLoader.UnitTransportSourceBuild.class); - classes.put("UnitCargoUnloadPoint", mindustry.world.blocks.units.UnitCargoUnloadPoint.class); - classes.put("UnitCargoUnloadPointBuild", mindustry.world.blocks.units.UnitCargoUnloadPoint.UnitCargoUnloadPointBuild.class); - 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("DrawAnimation", mindustry.world.draw.DrawAnimation.class); - classes.put("DrawArcSmelter", mindustry.world.draw.DrawArcSmelter.class); - classes.put("DrawBlock", mindustry.world.draw.DrawBlock.class); - classes.put("DrawBlurSpin", mindustry.world.draw.DrawBlurSpin.class); - classes.put("DrawBubbles", mindustry.world.draw.DrawBubbles.class); - classes.put("DrawCells", mindustry.world.draw.DrawCells.class); - classes.put("DrawCircles", mindustry.world.draw.DrawCircles.class); - classes.put("DrawCrucibleFlame", mindustry.world.draw.DrawCrucibleFlame.class); - classes.put("DrawCultivator", mindustry.world.draw.DrawCultivator.class); - classes.put("DrawGlow", mindustry.world.draw.DrawGlow.class); - classes.put("DrawGlowRegion", mindustry.world.draw.DrawGlowRegion.class); - classes.put("DrawHeatInput", mindustry.world.draw.DrawHeatInput.class); - classes.put("DrawHeatOutput", mindustry.world.draw.DrawHeatOutput.class); - classes.put("DrawHeatRegion", mindustry.world.draw.DrawHeatRegion.class); - classes.put("DrawLiquid", mindustry.world.draw.DrawLiquid.class); - classes.put("DrawLiquidOutputs", mindustry.world.draw.DrawLiquidOutputs.class); - classes.put("DrawLiquidRegion", mindustry.world.draw.DrawLiquidRegion.class); - classes.put("DrawLiquidTile", mindustry.world.draw.DrawLiquidTile.class); - classes.put("DrawMixer", mindustry.world.draw.DrawMixer.class); - classes.put("DrawMulti", mindustry.world.draw.DrawMulti.class); - classes.put("DrawMultiWeave", mindustry.world.draw.DrawMultiWeave.class); - classes.put("DrawPartial", mindustry.world.draw.DrawPartial.class); - classes.put("DrawParticles", mindustry.world.draw.DrawParticles.class); - classes.put("DrawPistons", mindustry.world.draw.DrawPistons.class); - classes.put("DrawPulseShape", mindustry.world.draw.DrawPulseShape.class); - classes.put("DrawPump", mindustry.world.draw.DrawPump.class); - classes.put("DrawRegion", mindustry.world.draw.DrawRegion.class); - classes.put("DrawRotator", mindustry.world.draw.DrawRotator.class); - classes.put("DrawShape", mindustry.world.draw.DrawShape.class); - classes.put("DrawSideRegion", mindustry.world.draw.DrawSideRegion.class); - classes.put("DrawSmelter", mindustry.world.draw.DrawSmelter.class); - classes.put("DrawSpikes", mindustry.world.draw.DrawSpikes.class); - classes.put("DrawTurbines", mindustry.world.draw.DrawTurbines.class); - 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("Block", mindustry.world.Block.class); + } } diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index a07b5011f4..5e9b8b6451 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -1,7 +1,6 @@ package mindustry.mod; import arc.*; -import arc.audio.*; import arc.files.*; import arc.func.*; import arc.util.*; @@ -82,18 +81,6 @@ public class Scripts implements Disposable{ return Vars.tree.get(path, true).readBytes(); } - /** @deprecated use Vars.tree.loadSound(soundName) instead */ - @Deprecated - public Sound loadSound(String soundName){ - return Vars.tree.loadSound(soundName); - } - - /** @deprecated use Vars.tree.loadMusic(musicName) instead */ - @Deprecated - public Music loadMusic(String musicName){ - return Vars.tree.loadMusic(musicName); - } - /** Ask the user to select a file to read for a certain purpose like "Please upload a sprite" */ public void readFile(String purpose, String ext, Cons cons){ selectFile(true, purpose, ext, fi -> cons.get(fi.readString())); diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 5798ac0934..84a2a1f9eb 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -155,12 +155,6 @@ public class Planet extends UnlockableContent{ } } - /** @deprecated confusing parameter order, use the other constructor instead */ - @Deprecated - public Planet(String name, Planet parent, int sectorSize, float radius){ - this(name, parent, radius, sectorSize); - } - public @Nullable Sector getLastSector(){ if(sectors.isEmpty()){ return null; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index fb51ff38f9..f322878169 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -211,12 +211,6 @@ public class UnitType extends UnlockableContent{ constructor = EntityMapping.map(this.name); } - /** @deprecated use the createController method instead */ - @Deprecated - public UnitController createController(){ - return defaultController.get(); - } - public UnitController createController(Unit unit){ return unitBasedDefaultController.get(unit); } diff --git a/core/src/mindustry/ui/Cicon.java b/core/src/mindustry/ui/Cicon.java deleted file mode 100644 index 846b7d136f..0000000000 --- a/core/src/mindustry/ui/Cicon.java +++ /dev/null @@ -1,12 +0,0 @@ -package mindustry.ui; - -/** Use content icon fields directly instead. This will be removed. */ -@Deprecated -public enum Cicon{ - tiny, small, medium, large, xlarge, full; - @Deprecated - public final int size = 32; - - public static final Cicon[] all = values(); - public static final Cicon[] scaled = values(); -} diff --git a/core/src/mindustry/ui/IconSize.java b/core/src/mindustry/ui/IconSize.java deleted file mode 100644 index a94943ca4a..0000000000 --- a/core/src/mindustry/ui/IconSize.java +++ /dev/null @@ -1,16 +0,0 @@ -package mindustry.ui; - -/** @deprecated completely pointless */ -@Deprecated -public enum IconSize{ - def(48), - small(32), - smaller(30), - tiny(16); - - public final int size; - - IconSize(int size){ - this.size = size; - } -} diff --git a/core/src/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java index 09add15c73..b58cb2f4fd 100644 --- a/core/src/mindustry/ui/ItemImage.java +++ b/core/src/mindustry/ui/ItemImage.java @@ -41,10 +41,4 @@ public class ItemImage extends Stack{ public ItemImage(BlockStack stack){ this(stack.block.uiIcon, stack.amount); } - - /** @deprecated what the heck is this */ - @Deprecated - public ItemImage(TextureRegion region){ - add(new Image(region)); - } } diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index a90e2bb9e7..889264fd64 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -262,12 +262,6 @@ public class ChatFragment extends Table{ return shown; } - /** @deprecated prefixes are ignored now, just add raw messages */ - @Deprecated - public void addMessage(String pointless, String message){ - addMessage(message); - } - public void addMessage(String message){ if(message == null) return; messages.insert(0, message); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index b0a07abca6..c63518e183 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -153,10 +153,6 @@ public class Block extends UnlockableContent implements Senseable{ public int size = 1; /** multiblock offset */ public float offset = 0f; - /** Deprecated for removal: Use clipSize instead. - * This does nothing, and is kept to preserve compatibility with v6 mods. */ - @Deprecated - public boolean expanded = false; /** Clipping size of this block. Should be as large as the block will draw. */ public float clipSize = -1f; /** When placeRangeCheck is enabled, this is the range checked for enemy blocks. */ @@ -966,11 +962,6 @@ public class Block extends UnlockableContent implements Senseable{ clipSize = Math.max(clipSize, size * tilesize); - //only kept to ensure compatibility with v6 mods. - if(expanded){ - clipSize += tilesize * 10f; - } - if(emitLight){ clipSize = Math.max(clipSize, lightRadius * 2f); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 04b055c3bf..5f798c4848 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,8 +1,6 @@ package mindustry.world.blocks.defense.turrets; -import arc.graphics.g2d.*; import arc.struct.*; -import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.*; import mindustry.entities.*; @@ -19,11 +17,6 @@ public class LiquidTurret extends Turret{ public ObjectMap ammoTypes = new ObjectMap<>(); public boolean extinguish = true; - /** @deprecated loaded in {@link #draw} instead, unused */ - public @Deprecated @Load("@-liquid") TextureRegion liquidRegion; - /** @deprecated loaded in {@link #draw} instead, unused */ - public @Deprecated @Load("@-top") TextureRegion topRegion; - public LiquidTurret(String name){ super(name); acceptCoolant = false; diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java index f173e7f937..b7c6f92e5a 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -7,9 +7,6 @@ import mindustry.world.meta.*; public class PowerTurret extends Turret{ public BulletType shootType; - /** @deprecated just consume power directly instead. */ - @Deprecated - public float powerUse = -1f; public PowerTurret(String name){ super(name); @@ -22,14 +19,6 @@ public class PowerTurret extends Turret{ stats.add(Stat.ammo, StatValues.ammo(ObjectMap.of(this, shootType))); } - @Override - public void init(){ - if(powerUse > 0){ - consumes.power(powerUse); - } - super.init(); - } - public class PowerTurretBuild extends TurretBuild{ @Override diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index a82ca97119..8f41554dd0 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -10,7 +10,6 @@ import arc.math.geom.*; import arc.struct.*; import arc.util.*; import arc.util.io.*; -import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.*; import mindustry.entities.*; @@ -110,25 +109,6 @@ public class Turret extends ReloadTurret{ public DrawBlock draw = new DrawTurret(); - /** @deprecated loaded in {@link #draw} instead, unused */ - @Deprecated - public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; - /** @deprecated loaded in {@link #draw} instead, unused */ - @Deprecated - public @Load("@-heat") TextureRegion heatRegion; - /** @deprecated use bulletOffset; this will always be zero. **/ - @Deprecated - protected Vec2 tr = new Vec2(); - /** @deprecated use recoilOffset; this will always be zero. **/ - @Deprecated - protected Vec2 tr2 = new Vec2(); - /** @deprecated set the draw field instead, this does nothing */ - @Deprecated - public Cons drawer = tile -> {}; - /** @deprecated set the draw field instead, this does nothing */ - @Deprecated - public Cons heatDrawer = tile -> {}; - public Turret(String name){ super(name); liquidCapacity = 20f; diff --git a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java deleted file mode 100644 index 7e2e5eac55..0000000000 --- a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java +++ /dev/null @@ -1,15 +0,0 @@ -package mindustry.world.blocks.distribution; - -/** @deprecated use ItemBridge instead. */ -@Deprecated -public class ExtendingItemBridge extends ItemBridge{ - - public ExtendingItemBridge(String name){ - super(name); - } - - @Deprecated - public class ExtendingItemBridgeBuild extends ItemBridgeBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java deleted file mode 100644 index 5dcfb64e26..0000000000 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ /dev/null @@ -1,14 +0,0 @@ -package mindustry.world.blocks.distribution; - -/** @deprecated use the class in the payload package instead */ -@Deprecated -public class PayloadConveyor extends mindustry.world.blocks.payloads.PayloadConveyor{ - - public PayloadConveyor(String name){ - super(name); - } - - public class PayloadConveyorBuild extends mindustry.world.blocks.payloads.PayloadConveyor.PayloadConveyorBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java deleted file mode 100644 index 50db237fd0..0000000000 --- a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java +++ /dev/null @@ -1,14 +0,0 @@ -package mindustry.world.blocks.distribution; - -/** @deprecated use the class in the payload package instead */ -@Deprecated -public class PayloadRouter extends mindustry.world.blocks.payloads.PayloadRouter{ - - public PayloadRouter(String name){ - super(name); - } - - public class PayloadRouterBuild extends mindustry.world.blocks.payloads.PayloadRouter.PayloadRouterBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java b/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java deleted file mode 100644 index 5d6af64871..0000000000 --- a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java +++ /dev/null @@ -1,10 +0,0 @@ -package mindustry.world.blocks.environment; - -/** @deprecated pointless, just use your own sprite instead */ -@Deprecated -public class DoubleOverlayFloor extends OverlayFloor{ - - public DoubleOverlayFloor(String name){ - super(name); - } -} diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java deleted file mode 100644 index 6f9987f8dc..0000000000 --- a/core/src/mindustry/world/blocks/experimental/BlockForge.java +++ /dev/null @@ -1,17 +0,0 @@ -package mindustry.world.blocks.experimental; - -import mindustry.world.blocks.payloads.*; - -/** @deprecated use Constructor instead. */ -@Deprecated -public class BlockForge extends Constructor{ - - public BlockForge(String name){ - super(name); - } - - @Deprecated - public class BlockForgeBuild extends Constructor.ConstructorBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java deleted file mode 100644 index 6c0202a883..0000000000 --- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java +++ /dev/null @@ -1,16 +0,0 @@ -package mindustry.world.blocks.experimental; - -import mindustry.world.blocks.payloads.*; - -@Deprecated -public class BlockLoader extends PayloadLoader{ - - public BlockLoader(String name){ - super(name); - } - - @Deprecated - public class BlockLoaderBuild extends PayloadLoaderBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java deleted file mode 100644 index 45403c0f1a..0000000000 --- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java +++ /dev/null @@ -1,16 +0,0 @@ -package mindustry.world.blocks.experimental; - -import mindustry.world.blocks.payloads.*; - -@Deprecated -public class BlockUnloader extends PayloadUnloader{ - - public BlockUnloader(String name){ - super(name); - } - - @Deprecated - public class BlockUnloaderBuild extends PayloadUnloaderBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java deleted file mode 100644 index 37dcc69b7d..0000000000 --- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java +++ /dev/null @@ -1,14 +0,0 @@ -package mindustry.world.blocks.liquid; - -/** @deprecated use LiquidBridge instead. */ -@Deprecated -public class LiquidExtendingBridge extends LiquidBridge{ - - public LiquidExtendingBridge(String name){ - super(name); - } - - @Deprecated - public class LiquidExtendingBridgeBuild extends LiquidBridgeBuild{ - } -} diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java index ffd5b41283..c2ff53721c 100644 --- a/core/src/mindustry/world/blocks/payloads/Payload.java +++ b/core/src/mindustry/world/blocks/payloads/Payload.java @@ -6,7 +6,6 @@ import arc.util.*; import arc.util.io.*; import mindustry.game.*; import mindustry.gen.*; -import mindustry.ui.*; import mindustry.type.*; import mindustry.world.*; @@ -61,12 +60,6 @@ public interface Payload extends Position{ /** @return icon describing the contents. */ TextureRegion icon(); - /** @deprecated use icon() instead. */ - @Deprecated - default TextureRegion icon(Cicon icon){ - return icon(); - } - @Override default float getX(){ return x(); diff --git a/core/src/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java index ca61959421..2ffa4efcde 100644 --- a/core/src/mindustry/world/blocks/power/BurnerGenerator.java +++ b/core/src/mindustry/world/blocks/power/BurnerGenerator.java @@ -1,18 +1,10 @@ package mindustry.world.blocks.power; -import arc.graphics.g2d.*; -import mindustry.annotations.Annotations.*; import mindustry.type.*; import mindustry.world.draw.*; //TODO deprecate this whole class? public class BurnerGenerator extends ItemLiquidGenerator{ - @Deprecated - public @Load(value = "@-turbine#", length = 2) TextureRegion[] turbineRegions; - @Deprecated - public @Load("@-cap") TextureRegion capRegion; - @Deprecated - public float turbineSpeed = 2f; public BurnerGenerator(String name){ super(true, false, name); diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index ffc15fa604..b38e8a63e7 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -3,10 +3,8 @@ package mindustry.world.blocks.power; import arc.*; import arc.func.*; import arc.graphics.*; -import arc.graphics.g2d.*; import arc.math.*; import arc.util.*; -import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.graphics.*; @@ -37,16 +35,6 @@ public class ItemLiquidGenerator extends PowerGenerator{ public boolean randomlyExplode = true; public boolean defaults = false; - /** @deprecated unused, use a custom drawer instead */ - @Deprecated - public Color heatColor = Color.valueOf("ff9b59"); - /** @deprecated unused, use a custom drawer instead */ - @Deprecated - public @Load("@-top") TextureRegion topRegion; - /** @deprecated unused, use a custom drawer instead */ - @Deprecated - public @Load("@-liquid") TextureRegion liquidRegion; - public ItemLiquidGenerator(boolean hasItems, boolean hasLiquids, String name){ this(name); this.hasItems = hasItems; diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index f4e4b408c2..4335808222 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -84,12 +84,6 @@ public class PowerGraph{ return Mathf.clamp(lastPowerProduced / lastPowerNeeded); } - /** @deprecated unused mechanic that always returns 1, I really don't know why you would use this outside of copy-pasted code */ - @Deprecated - public float getUsageFraction(){ - return 1f; - } - public float getPowerProduced(){ float powerProduced = 0f; for(Building producer : producers){ diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java deleted file mode 100644 index 549251c44a..0000000000 --- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java +++ /dev/null @@ -1,24 +0,0 @@ -package mindustry.world.blocks.power; - -import mindustry.type.*; - -/** @deprecated use ConsumeGenerator instead, this class does not have a sane implementation. */ -@Deprecated -public class SingleTypeGenerator extends ItemLiquidGenerator{ - public boolean useItems = true; - - public SingleTypeGenerator(String name){ - super(name); - defaults = true; - } - - @Override - protected float getItemEfficiency(Item item){ - return useItems ? 1f : 0f; - } - - @Override - protected float getLiquidEfficiency(Liquid liquid){ - return useItems ? 0f : 1f; - } -} diff --git a/core/src/mindustry/world/blocks/production/AttributeSmelter.java b/core/src/mindustry/world/blocks/production/AttributeSmelter.java deleted file mode 100644 index edece33611..0000000000 --- a/core/src/mindustry/world/blocks/production/AttributeSmelter.java +++ /dev/null @@ -1,25 +0,0 @@ -package mindustry.world.blocks.production; - -import arc.graphics.*; -import arc.graphics.g2d.*; -import mindustry.annotations.Annotations.*; - -/** @deprecated use AttributeCrafter instead, this is only a transition class. No flame effects are drawn, to encourage transition! */ -@Deprecated -public class AttributeSmelter extends AttributeCrafter{ - //parameters are kept for compatibility but deliberately unused - public Color flameColor = Color.valueOf("ffc999"); - public @Load("@-top") TextureRegion topRegion; - //compat - public float maxHeatBoost = 1f; - - public AttributeSmelter(String name){ - super(name); - } - - //unused, kept for compatibility - @Deprecated - public class AttributeSmelterBuild extends AttributeCrafterBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java deleted file mode 100644 index 4e51ae072b..0000000000 --- a/core/src/mindustry/world/blocks/production/Cultivator.java +++ /dev/null @@ -1,48 +0,0 @@ -package mindustry.world.blocks.production; - -import arc.graphics.*; -import arc.graphics.g2d.*; -import arc.math.*; -import arc.util.io.*; -import mindustry.annotations.Annotations.*; -import mindustry.world.meta.*; - -/** - * @deprecated use GenericCrafter or AttributeCrafter with a DrawCultivator instead. - * WARNING: If you switch from a class that used Cultivator to a GenericCrafter, make sure you set legacyReadWarmup to true! Failing to do so will break saves. - * This class has been gutted of its behavior. - * */ -@Deprecated -public class Cultivator extends GenericCrafter{ - //fields are kept for compatibility - public Color plantColor = Color.valueOf("5541b1"); - public Color plantColorLight = Color.valueOf("7457ce"); - public Color bottomColor = Color.valueOf("474747"); - - public @Load("@-middle") TextureRegion middleRegion; - public @Load("@-top") TextureRegion topRegion; - public Rand random = new Rand(0); - public float recurrence = 6f; - public Attribute attribute = Attribute.spores; - - public Cultivator(String name){ - super(name); - } - - public class CultivatorBuild extends GenericCrafterBuild{ - //compat - public float warmup, boost; - - @Override - public void write(Writes write){ - super.write(write); - write.f(warmup); - } - - @Override - public void read(Reads read, byte revision){ - super.read(read, revision); - warmup = read.f(); - } - } -} diff --git a/core/src/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java deleted file mode 100644 index 9d68130cb0..0000000000 --- a/core/src/mindustry/world/blocks/production/GenericSmelter.java +++ /dev/null @@ -1,54 +0,0 @@ -package mindustry.world.blocks.production; - -import arc.graphics.*; -import arc.graphics.g2d.*; -import arc.math.*; -import arc.util.*; -import mindustry.annotations.Annotations.*; -import mindustry.gen.*; -import mindustry.graphics.*; - -/** @deprecated this class has no new functionality over GenericCrafter, use GenericCrafter with a DrawSmelter drawer instead. See vanilla smelter blocks. */ -@Deprecated -public class GenericSmelter extends GenericCrafter{ - public Color flameColor = Color.valueOf("ffc999"); - public @Load("@-top") TextureRegion topRegion; - public float flameRadius = 3f, flameRadiusIn = 1.9f, flameRadiusScl = 5f, flameRadiusMag = 2f, flameRadiusInMag = 1f; - - public GenericSmelter(String name){ - super(name); - ambientSound = Sounds.smelter; - ambientSoundVolume = 0.07f; - } - - public class SmelterBuild extends GenericCrafterBuild{ - @Override - public void draw(){ - super.draw(); - - //draw glowing center - if(warmup > 0f && flameColor.a > 0.001f){ - float g = 0.3f; - float r = 0.06f; - float cr = Mathf.random(0.1f); - - Draw.z(Layer.block + 0.01f); - - Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * warmup); - - Draw.tint(flameColor); - Fill.circle(x, y, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr); - Draw.color(1f, 1f, 1f, warmup); - Draw.rect(topRegion, x, y); - Fill.circle(x, y, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr); - - Draw.color(); - } - } - - @Override - public void drawLight(){ - Drawf.light(team, x, y, (60f + Mathf.absin(10f, 5f)) * warmup * size, flameColor, 0.65f); - } - } -} diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java deleted file mode 100644 index be5d296008..0000000000 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package mindustry.world.blocks.production; - -import mindustry.world.blocks.payloads.*; - -/** @deprecated used PayloadBlock instead. */ -@Deprecated -public abstract class PayloadAcceptor extends PayloadBlock{ - - public PayloadAcceptor(String name){ - super(name); - } - - /** @deprecated used PayloadBlockBuild instead. */ - @Deprecated - public class PayloadAcceptorBuild extends PayloadBlockBuild{ - - } -} diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index 6e696a7ec8..6a326e68db 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -14,6 +14,8 @@ import mindustry.world.*; import mindustry.world.blocks.*; import mindustry.world.meta.*; +import java.util.*; + import static mindustry.Vars.*; public class Unloader extends Block{ @@ -55,23 +57,33 @@ public class Unloader extends Block{ bars.remove("items"); } + public static class ContainerStat{ + Building building; + float loadFactor; + boolean canLoad; + boolean canUnload; + int index; + } + public class UnloaderBuild extends Building{ public float unloadTimer = 0f; public Item sortItem = null; public int offset = 0; public int rotations = 0; public Seq possibleBlocks = new Seq<>(); - - public class ContainerStat{ - Building building; - float loadFactor; - boolean canLoad; - boolean canUnload; - int index; - } - public int[] lastUsed; + protected final Comparator comparator = Structs.comps( + Structs.comps( + Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad), + Structs.comparingBool(e -> e.canUnload && !e.canLoad) + ), + Structs.comps( + Structs.comparingFloat(e -> e.loadFactor), + Structs.comparingInt(e -> -lastUsed[e.index]) + ) + ); + @Override public void updateTile(){ if(((unloadTimer += delta()) < speed) || (proximity.size < 2)) return; @@ -146,18 +158,7 @@ public class Unloader extends Block{ } //sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load, and then by last use - possibleBlocks.sort( - Structs.comps( - Structs.comps( - Structs.comparingBool(e -> e.building.block.highUnloadPriority && !e.canLoad), - Structs.comparingBool(e -> e.canUnload && !e.canLoad) - ), - Structs.comps( - Structs.comparingFloat(e -> e.loadFactor), - Structs.comparingInt(e -> -lastUsed[e.index]) - ) - ) - ); + possibleBlocks.sort(comparator); ContainerStat dumpingFrom = null; ContainerStat dumpingTo = null; diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java index 335655463d..490e05b767 100644 --- a/core/src/mindustry/world/consumers/Consumers.java +++ b/core/src/mindustry/world/consumers/Consumers.java @@ -131,18 +131,6 @@ public class Consumers{ return (T)map[type.ordinal()]; } - /** @deprecated unnecessary getter */ - @Deprecated - public Consume[] all(){ - return all; - } - - /** @deprecated unnecessary getter */ - @Deprecated - public Consume[] optionals(){ - return optionals; - } - public void display(Stats stats){ for(Consume c : map){ if(c != null){ diff --git a/core/src/mindustry/world/draw/DrawBlock.java b/core/src/mindustry/world/draw/DrawBlock.java index 987e05c4a5..4bd8a4fe79 100644 --- a/core/src/mindustry/world/draw/DrawBlock.java +++ b/core/src/mindustry/world/draw/DrawBlock.java @@ -9,7 +9,6 @@ import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.world.*; import mindustry.world.blocks.production.*; -import mindustry.world.blocks.production.GenericCrafter.*; /** An implementation of custom rendering behavior for a crafter block. * This is used mostly for mods. */ @@ -19,14 +18,6 @@ public class DrawBlock{ /** If set, the icon is overridden to be these strings, in order. Each string is a suffix. */ public @Nullable String[] iconOverride = null; - /** @deprecated no longer called! not specific to generic crafters! */ - @Deprecated - public void draw(GenericCrafterBuild build){} - - /** @deprecated no longer called! not specific to generic crafters! */ - @Deprecated - public void drawLight(GenericCrafterBuild build){} - public void getRegionsToOutline(Block block, Seq out){ } diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java index 49f3c7be4a..a19e57c824 100644 --- a/core/src/mindustry/world/meta/BlockFlag.java +++ b/core/src/mindustry/world/meta/BlockFlag.java @@ -26,10 +26,7 @@ public enum BlockFlag{ //single-block identifiers launchPad, unitCargoUnloadPoint, - unitAssembler, - - /** @deprecated not used anywhere */ - @Deprecated resupply; + unitAssembler; public final static BlockFlag[] all = values(); diff --git a/core/src/mindustry/world/modules/ConsumeModule.java b/core/src/mindustry/world/modules/ConsumeModule.java deleted file mode 100644 index f40c99cd4c..0000000000 --- a/core/src/mindustry/world/modules/ConsumeModule.java +++ /dev/null @@ -1,62 +0,0 @@ -package mindustry.world.modules; - -import arc.util.io.*; -import mindustry.gen.*; -import mindustry.world.meta.*; - -/** - * why is it a module? literally two booleans, why did I think it was a good idea? yay, more pointers??? - * the braindead java "make everything a separate class" mentality - * */ -public class ConsumeModule extends BlockModule{ - private final Building build; - - public ConsumeModule(Building build){ - this.build = build; - } - - /** @deprecated use build.status() */ - @Deprecated - public BlockStatus status(){ - return build.status(); - } - - /** @deprecated use build.updateConsumption() */ - @Deprecated - public void update(){ - build.updateConsumption(); - } - - /** @deprecated use build.consume() */ - @Deprecated - public void trigger(){ - build.consume(); - } - - /** @deprecated use build.consValid() */ - @Deprecated - public boolean valid(){ - return build.consValid(); - } - - /** @deprecated use build.canConsume() */ - @Deprecated - public boolean canConsume(){ - return build.canConsume(); - } - - /** @deprecated use build.consOptionalValid() */ - @Deprecated - public boolean optionalValid(){ - return build.consOptionalValid(); - } - - //hahahahahahahahahaha - @Override - public void write(Writes write){ - } - - @Override - public void read(Reads read){ - } -} diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java index 0c4146dbce..d585761335 100644 --- a/core/src/mindustry/world/modules/LiquidModule.java +++ b/core/src/mindustry/world/modules/LiquidModule.java @@ -78,16 +78,6 @@ public class LiquidModule extends BlockModule{ return flow != null && cacheBits.get(liquid.id); } - /** - * @deprecated There is no good reason to check the total amount of liquids of a block. - * Use of this method is almost certainly a bug; currentAmount() is probably what you want instead. - * All liquid storage systems either store one liquid type, or have per-liquid inventories, and as such total liquid is irrelevant. - * */ - @Deprecated - public float total(){ - return total; - } - /** Last received or loaded liquid. Only valid for liquid modules with 1 type of liquid. */ public Liquid current(){ return current; diff --git a/gradle.properties b/gradle.properties index da169c95f9..35fa9b9452 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=985a940948 +archash=4775df2392