Removed unused/broken block classes

core/src/mindustry/content/Blocks.java

@@ -110,7 +110,7 @@ public class Blocks{
     //defense - erekir
     radar,
     buildTower,
-    regenProjector, barrierProjector, shockwaveTower,
+    regenProjector, shockwaveTower,
     //campaign only
     shieldProjector,
     largeShieldProjector,
@@ -2034,19 +2034,6 @@ public class Blocks{
             }});
         }};
 
-        //TODO implement
-        if(false)
-        barrierProjector = new DirectionalForceProjector("barrier-projector"){{
-            requirements(Category.effect, with(Items.surgeAlloy, 100, Items.silicon, 125));
-            size = 3;
-            width = 50f;
-            length = 36;
-            shieldHealth = 2000f;
-            cooldownNormal = 3f;
-            cooldownBrokenBase = 0.35f;
-
-            consumePower(4f);
-        }};
 
         shockwaveTower = new ShockwaveTower("shockwave-tower"){{
             requirements(Category.effect, with(Items.surgeAlloy, 50, Items.silicon, 150, Items.oxide, 30, Items.tungsten, 100));

core/src/mindustry/mod/ClassMap.java

@@ -5,7 +5,7 @@ import arc.struct.*;
 @SuppressWarnings("deprecation")
 public class ClassMap{
     public static final ObjectMap<String, Class<?>> classes = new ObjectMap<>();
-    
+
     static{
         classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class);
         classes.put("BoostAI", mindustry.ai.types.BoostAI.class);
@@ -165,8 +165,6 @@ public class ClassMap{
         classes.put("BaseShieldBuild", mindustry.world.blocks.defense.BaseShield.BaseShieldBuild.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);
@@ -422,9 +420,6 @@ public class ClassMap{
         classes.put("Unloader", mindustry.world.blocks.storage.Unloader.class);
         classes.put("ContainerStat", mindustry.world.blocks.storage.Unloader.ContainerStat.class);
         classes.put("UnloaderBuild", mindustry.world.blocks.storage.Unloader.UnloaderBuild.class);
-        classes.put("DroneCenter", mindustry.world.blocks.units.DroneCenter.class);
-        classes.put("DroneCenterBuild", mindustry.world.blocks.units.DroneCenter.DroneCenterBuild.class);
-        classes.put("EffectDroneAI", mindustry.world.blocks.units.DroneCenter.EffectDroneAI.class);
         classes.put("Reconstructor", mindustry.world.blocks.units.Reconstructor.class);
         classes.put("ReconstructorBuild", mindustry.world.blocks.units.Reconstructor.ReconstructorBuild.class);
         classes.put("RepairTower", mindustry.world.blocks.units.RepairTower.class);

core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java

@@ -1,275 +0,0 @@
-package mindustry.world.blocks.defense;
-
-import arc.func.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.math.geom.*;
-import arc.util.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.entities.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.ui.*;
-import mindustry.world.*;
-import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
-
-import static mindustry.Vars.*;
-
-//TODO use completely different layer
-//TODO consume heat
-//TODO broken class!!!!!
-public class DirectionalForceProjector extends Block{
-    protected static final Vec2 intersectOut = new Vec2(), p1 = new Vec2(), p2 = new Vec2();
-    protected static DirectionalForceProjectorBuild paramEntity;
-    protected static Effect paramEffect;
-    protected static final Cons<Bullet> dirShieldConsumer = b -> {
-        if(b.team != paramEntity.team && b.type.absorbable){
-            //just in case
-            float deltaAdd = 1.1f;
-
-            if(Intersector.intersectSegments(b.x, b.y,
-                    b.x + b.vel.x * (Time.delta + deltaAdd),
-                    b.y + b.vel.y * (Time.delta + deltaAdd), p1.x, p1.y, p2.x, p2.y, intersectOut)){
-                b.set(intersectOut);
-                b.absorb();
-                paramEffect.at(b);
-                paramEntity.hit = 1f;
-                paramEntity.buildup += b.damage();
-            }
-        }
-    };
-
-    public float width = 30f;
-    public float shieldHealth = 3000f;
-    public float cooldownNormal = 1.75f;
-    public float cooldownLiquid = 1.5f;
-    public float cooldownBrokenBase = 0.35f;
-
-    public Effect absorbEffect = Fx.absorb;
-    public Effect shieldBreakEffect = Fx.shieldBreak;
-    public @Load("@-top") TextureRegion topRegion;
-
-    public float length = 40f;
-    public float padSize = 40f;
-
-    public DirectionalForceProjector(String name){
-        super(name);
-
-        rotate = true;
-        rotateDraw = false;
-
-        update = true;
-        solid = true;
-        group = BlockGroup.projectors;
-        envEnabled |= Env.space;
-        ambientSound = Sounds.loopShield;
-        ambientSoundVolume = 0.08f;
-    }
-
-    @Override
-    public void init(){
-        updateClipRadius((width + 3f));
-
-        super.init();
-
-        if(length < 0){
-            length = size * tilesize/2f;
-        }
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-        addBar("shield", (DirectionalForceProjectorBuild entity) -> new Bar("stat.shieldhealth", Pal.accent, () -> entity.broken ? 0f : 1f - entity.buildup / (shieldHealth)).blink(Color.white));
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public void setStats(){
-        super.setStats();
-        stats.add(Stat.shieldHealth, shieldHealth, StatUnit.none);
-        stats.add(Stat.cooldownTime, (int) (shieldHealth / cooldownBrokenBase / 60f), StatUnit.seconds);
-    }
-
-    @Override
-    public void drawPlace(int x, int y, int rotation, boolean valid){
-        drawPotentialLinks(x, y);
-
-        x *= tilesize;
-        y *= tilesize;
-
-        Tmp.v1.set(length - size/2f, (width + size/2f)).rotate(rotation * 90).add(x, y);
-        Tmp.v2.set(length - size/2f, -(width + size/2f)).rotate(rotation * 90).add(x, y);
-
-        Drawf.dashLine(Color.lightGray, x, y, Tmp.v1.x, Tmp.v1.y);
-        Drawf.dashLine(Color.lightGray, x, y, Tmp.v2.x, Tmp.v2.y);
-        Drawf.dashLine(Pal.accent, Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
-    }
-
-    public class DirectionalForceProjectorBuild extends Building{
-        public boolean broken = true;
-        public float buildup, hit, warmup, shieldRadius;
-
-        @Override
-        public boolean shouldAmbientSound(){
-            return !broken && shieldRadius > 1f;
-        }
-
-        @Override
-        public void pickedUp(){
-            super.pickedUp();
-            shieldRadius = warmup = 0f;
-        }
-
-        @Override
-        public void updateTile(){
-            shieldRadius = Mathf.lerpDelta(shieldRadius, broken ? 0f : warmup * width, 0.05f);
-
-            //TODO ?????????????????
-            if(Mathf.chanceDelta(buildup / shieldHealth * 0.1f)){
-                Fx.reactorsmoke.at(x + Mathf.range(tilesize / 2f), y + Mathf.range(tilesize / 2f));
-            }
-
-            warmup = Mathf.lerpDelta(warmup, efficiency, 0.1f);
-
-            //TODO aaaaaaaaaaaaAAAAAAAAAAAAAAaa
-            if(buildup > 0 && false){
-                float scale = !broken ? cooldownNormal : cooldownBrokenBase;
-                Consume cons = null;
-                //if(cons.valid(this)){
-                //    cons.update(this);
-                //    scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
-                //}
-
-                buildup -= delta() * scale;
-            }
-
-            if(broken && buildup <= 0){
-                broken = false;
-            }
-
-            if(buildup >= shieldHealth && !broken){
-                broken = true;
-                buildup = shieldHealth;
-                shieldBreakEffect.at(x, y, shieldRadius, team.color);
-            }
-
-            if(hit > 0f){
-                hit -= 1f / 5f * Time.delta;
-            }
-
-            deflectBullets();
-        }
-
-        public void deflectBullets(){
-
-            if(shieldRadius > 0 && !broken){
-                paramEntity = this;
-                paramEffect = absorbEffect;
-
-                //top
-                p1.set(length, shieldRadius).rotate(rotdeg());
-                //bot
-                p2.set(length, -shieldRadius).rotate(rotdeg());
-
-                //"check" radius is grown to catch bullets moving at high velocity
-                Tmp.r1.set(p2.x, p2.y, p1.x - p2.x, p1.y - p2.y).normalize().grow(padSize);
-
-                p1.add(x, y);
-                p2.add(x, y);
-
-                Groups.bullet.intersect(x + Tmp.r1.x, y + Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, dirShieldConsumer);
-            }
-        }
-
-        @Override
-        public void draw(){
-            super.draw();
-
-            //TODO wrong
-            if(buildup > 0f){
-                Draw.alpha(buildup / shieldHealth * 0.75f);
-                Draw.z(Layer.blockAdditive);
-                Draw.blend(Blending.additive);
-                Draw.rect(topRegion, x, y);
-                Draw.blend();
-                Draw.z(Layer.block);
-                Draw.reset();
-            }
-
-            drawShield();
-        }
-
-        public void drawShield(){
-            if(!broken && shieldRadius > 0){
-                float rot = rotdeg();
-
-                p1.set(length, shieldRadius).rotate(rot).add(this);
-                p2.set(length, -shieldRadius).rotate(rot).add(this);
-                float size = 4f;
-                Tmp.r1.set(p2.x, p2.y, p1.x - p2.x, p1.y - p2.y).normalize().grow(size);
-
-                Draw.z(Layer.shields);
-
-                Draw.color(team.color, Color.white, Mathf.clamp(hit));
-
-                if(renderer.animateShields){
-                    Fill.rect(Tmp.r1);
-
-                    Tmp.v1.set(length - size/2f, (shieldRadius + size/2f)).rotate(rot).add(this);
-                    Tmp.v2.set(length - size/2f, -(shieldRadius + size/2f)).rotate(rot).add(this);
-
-                    //Fill.tri(x, y, Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
-                    Lines.stroke(3f);
-                    Lines.line(x, y, Tmp.v1.x, Tmp.v1.y);
-                    Lines.line(x, y, Tmp.v2.x, Tmp.v2.y);
-
-                    Draw.z(Layer.shields);
-
-                    for(int i : Mathf.signs){
-                        Tmp.v1.set(length - size/2f, (shieldRadius + size/2f) * i).rotate(rot).add(this);
-                        Tmp.v3.set(length + size/2f, (shieldRadius + size/2f) * i).rotate(rot).add(this);
-                        Tmp.v2.set(length, (shieldRadius + size) * i).rotate(rot).add(this);
-                        Fill.tri(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, Tmp.v3.x, Tmp.v3.y);
-                    }
-                }else{
-                    Lines.stroke(1.5f);
-                    Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
-                    Fill.rect(Tmp.r1);
-                    Draw.alpha(1f);
-                    Lines.rect(Tmp.r1);
-                    Draw.reset();
-                }
-
-                Draw.reset();
-            }
-        }
-
-        //TODO
-        /*
-        @Override
-        public void write(Writes write){
-            super.write(write);
-            write.bool(broken);
-            write.f(buildup);
-            write.f(radscl);
-            write.f(warmup);
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-            broken = read.bool();
-            buildup = read.f();
-            radscl = read.f();
-            warmup = read.f();
-        }*/
-    }
-}

core/src/mindustry/world/blocks/units/DroneCenter.java

@@ -1,166 +0,0 @@
-package mindustry.world.blocks.units;
-
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.struct.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.content.*;
-import mindustry.entities.*;
-import mindustry.entities.units.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-import mindustry.world.*;
-
-import static mindustry.Vars.*;
-
-//TODO remove
-public class DroneCenter extends Block{
-    public int unitsSpawned = 4;
-    public UnitType droneType;
-    public StatusEffect status = StatusEffects.overdrive;
-    public float droneConstructTime = 60f * 3f;
-    public float statusDuration = 60f * 2f;
-    public float droneRange = 50f;
-
-    public DroneCenter(String name){
-        super(name);
-
-        update = solid = true;
-        configurable = true;
-    }
-
-    @Override
-    public void init(){
-        super.init();
-
-        droneType.aiController = EffectDroneAI::new;
-    }
-
-    public class DroneCenterBuild extends Building{
-        protected IntSeq readUnits = new IntSeq();
-        protected int readTarget = -1;
-
-        public Seq<Unit> units = new Seq<>();
-        public @Nullable Unit target;
-        public float droneProgress, droneWarmup, totalDroneProgress;
-
-        @Override
-        public void updateTile(){
-            if(!readUnits.isEmpty()){
-                units.clear();
-                readUnits.each(i -> {
-                    var unit = Groups.unit.getByID(i);
-                    if(unit != null){
-                        units.add(unit);
-                    }
-                });
-                readUnits.clear();
-            }
-
-            units.removeAll(u -> !u.isAdded() || u.dead);
-
-            droneWarmup = Mathf.lerpDelta(droneWarmup, units.size < unitsSpawned ? efficiency : 0f, 0.1f);
-            totalDroneProgress += droneWarmup * Time.delta;
-
-            if(readTarget != 0){
-                target = Groups.unit.getByID(readTarget);
-                readTarget = 0;
-            }
-
-            //TODO better effects?
-            if(units.size < unitsSpawned && (droneProgress += edelta() / droneConstructTime) >= 1f){
-                var unit = droneType.create(team);
-                if(unit instanceof BuildingTetherc bt){
-                    bt.building(this);
-                }
-                unit.set(x, y);
-                unit.rotation = 90f;
-                unit.add();
-
-                Fx.spawn.at(unit);
-                units.add(unit);
-                droneProgress = 0f;
-            }
-
-            if(target != null && !target.isValid()){
-                target = null;
-            }
-
-            //TODO no autotarget, bad
-            if(target == null){
-                target = Units.closest(team, x, y, u -> !u.spawnedByCore && u.type != droneType);
-            }
-        }
-
-        @Override
-        public void drawConfigure(){
-            Drawf.square(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time, 4f, 1f));
-
-            if(target != null){
-                Drawf.square(target.x, target.y, target.hitSize * 0.8f);
-            }
-        }
-
-        @Override
-        public void draw(){
-            super.draw();
-
-            //TODO draw more stuff
-
-            if(droneWarmup > 0){
-                Draw.draw(Layer.blockOver + 0.2f, () -> {
-                    Drawf.construct(this, droneType.fullIcon, Pal.accent, 0f, droneProgress, droneWarmup, totalDroneProgress, 14f);
-                });
-            }
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-
-            write.i(target == null ? -1 : target.id);
-
-            write.s(units.size);
-            for(var unit : units){
-                write.i(unit.id);
-            }
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-
-            readTarget = read.i();
-
-            int count = read.s();
-            readUnits.clear();
-            for(int i = 0; i < count; i++){
-                readUnits.add(read.i());
-            }
-        }
-    }
-
-    public class EffectDroneAI extends AIController{
-
-        @Override
-        public void updateUnit(){
-            if(!(unit instanceof BuildingTetherc tether)) return;
-            if(!(tether.building() instanceof DroneCenterBuild build)) return;
-            if(build.target == null) return;
-
-            target = build.target;
-
-            //TODO what angle?
-            moveTo(target, build.target.hitSize / 1.8f + droneRange - 10f);
-
-            unit.lookAt(target);
-
-            //TODO low power? status effects may not be the best way to do this...
-            if(unit.within(target, droneRange + build.target.hitSize)){
-                build.target.apply(status, statusDuration);
-            }
-        }
-    }
-}