Massive TechTree system cleanup

core/src/mindustry/content/Blocks.java

@@ -34,7 +34,7 @@ import mindustry.world.meta.*;
 
 import static mindustry.type.ItemStack.*;
 
-public class Blocks implements ContentList{
+public class Blocks{
     public static Block
 
     //environment
@@ -131,8 +131,7 @@ public class Blocks implements ContentList{
     @Deprecated
     public static Block blockForge, blockLoader, blockUnloader;
 
-    @Override
-    public void load(){
+    public static void load(){
         //region environment
 
         air = new AirBlock("air");

core/src/mindustry/content/Bullets.java

@@ -1,12 +1,11 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.effect.*;
 import mindustry.graphics.*;
 
-public class Bullets implements ContentList{
+public class Bullets{
     public static BulletType
 
     //artillery
@@ -31,8 +30,7 @@ public class Bullets implements ContentList{
     //environment, misc.
     damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame;
 
-    @Override
-    public void load(){
+    public static void load(){
 
         //lightning bullets need to be initialized first.
         damageLightning = new BulletType(0.0001f, 0f){{

core/src/mindustry/content/ErekirTechTree.java

@@ -0,0 +1,31 @@
+package mindustry.content;
+
+import static mindustry.content.Blocks.*;
+import static mindustry.content.TechTree.*;
+
+public class ErekirTechTree{
+
+    public static void load(){
+        rootErekir = node(coreBastion, () -> {
+            node(duct, () -> {
+                node(ductRouter, () -> {
+                    node(ductBridge, () -> {
+                        node(surgeConveyor, () -> {
+                            node(surgeRouter);
+                        });
+                    });
+
+                    node(overflowDuct, () -> {
+
+                    });
+
+                    node(reinforcedContainer, () -> {
+                        node(reinforcedVault, () -> {
+
+                        });
+                    });
+                });
+            });
+        });
+    }
+}

core/src/mindustry/content/Items.java

@@ -1,17 +1,15 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import mindustry.ctype.*;
 import mindustry.type.*;
 
-public class Items implements ContentList{
+public class Items{
     public static Item
     scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
     phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass,
     beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst;
 
-    @Override
-    public void load(){
+    public static void load(){
         copper = new Item("copper", Color.valueOf("d99d73")){{
             hardness = 1;
             cost = 0.5f;

core/src/mindustry/content/Liquids.java

@@ -1,16 +1,14 @@
 package mindustry.content;
 
 import arc.graphics.*;
-import mindustry.ctype.*;
 import mindustry.type.*;
 
-public class Liquids implements ContentList{
+public class Liquids{
     public static Liquid water, slag, oil, cryofluid, neoplasm,
     gallium,
     ozone, hydrogen, nitrogen, cyanogen;
 
-    @Override
-    public void load(){
+    public static void load(){
 
         water = new Liquid("water", Color.valueOf("596ab8")){{
             heatCapacity = 0.4f;

core/src/mindustry/content/Loadouts.java

@@ -3,15 +3,14 @@ package mindustry.content;
 import mindustry.ctype.*;
 import mindustry.game.*;
 
-public class Loadouts implements ContentList{
+public class Loadouts{
     public static Schematic
     basicShard,
     basicFoundation,
     basicNucleus,
     basicBastion;
 
-    @Override
-    public void load(){
+    public static void load(){
         basicShard = Schematics.readBase64("bXNjaAB4nD2K2wqAIBiD5ymibnoRn6YnEP1BwUMoBL19FuJ2sbFvUFgYZDaJsLeQrkinN9UJHImsNzlYE7WrIUastuSbnlKx2VJJt+8IQGGKdfO/8J5yrGJSMegLg+YUIA==");
         basicFoundation = Schematics.readBase64("bXNjaAB4nD1OSQ6DMBBzFhVu8BG+0X8MQyoiJTNSukj8nlCi2Adbtg/GA4OBF8oB00rvyE/9ykafqOIw58A7SWRKy1ZiShhZ5RcOLZhYS1hefQ1gRIeptH9jq/qW2lvc1d2tgWsOfVX/tOwE86AYBA==");
         basicNucleus = Schematics.readBase64("bXNjaAB4nD2MUQqAIBBEJy0s6qOLdJXuYNtCgikYBd2+LNmdj308hkGHtkId7M4YFns4mk/yfB4a48602eDI+mlNznu0FMPFd0wYKCaewl8F0EOueqM+yKSLVfJrNKWnSw/FZGzEGXFG9sy/px4gEBW1");

core/src/mindustry/content/Planets.java

@@ -6,7 +6,6 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.ctype.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
@@ -14,15 +13,14 @@ import mindustry.maps.planet.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
-public class Planets implements ContentList{
+public class Planets{
     public static Planet
     sun,
     erekir,
     tantros,
     serpulo;
 
-    @Override
-    public void load(){
+    public static void load(){
         sun = new Planet("sun", null, 4f){{
             bloom = true;
             accessible = false;
@@ -104,7 +102,7 @@ public class Planets implements ContentList{
         });
     }
 
-    private void makeAsteroid(String name, Planet parent, Block base, Block tint, float tintThresh, int pieces, float scale, Cons<AsteroidGenerator> cgen){
+    private static void makeAsteroid(String name, Planet parent, Block base, Block tint, float tintThresh, int pieces, float scale, Cons<AsteroidGenerator> cgen){
         new Planet(name, parent, 0.12f){{
             hasAtmosphere = false;
             alwaysUnlocked = true; //for testing only!

core/src/mindustry/content/SectorPresets.java

@@ -5,7 +5,7 @@ import mindustry.type.*;
 
 import static mindustry.content.Planets.*;
 
-public class SectorPresets implements ContentList{
+public class SectorPresets{
     public static SectorPreset
     groundZero,
     craters, biomassFacility, frozenForest, ruinousShores, windsweptIslands, stainedMountains, tarFields,
@@ -13,8 +13,7 @@ public class SectorPresets implements ContentList{
     impact0078, desolateRift, nuclearComplex, planetaryTerminal,
     coastline, navalFortress;
 
-    @Override
-    public void load(){
+    public static void load(){
         //region serpulo
 
         groundZero = new SectorPreset("groundZero", serpulo, 15){{

core/src/mindustry/content/SerpuloTechTree.java

@@ -0,0 +1,651 @@
+package mindustry.content;
+
+import arc.struct.*;
+import mindustry.game.Objectives.*;
+
+import static mindustry.content.Blocks.*;
+import static mindustry.content.SectorPresets.*;
+import static mindustry.content.SectorPresets.craters;
+import static mindustry.content.TechTree.*;
+import static mindustry.content.UnitTypes.*;
+
+public class SerpuloTechTree{
+
+    public static void load(){
+        root = node(coreShard, () -> {
+
+            node(conveyor, () -> {
+
+                node(junction, () -> {
+                    node(router, () -> {
+                        node(launchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
+                            node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
+
+                            });
+                        });
+
+                        node(distributor);
+                        node(sorter, () -> {
+                            node(invertedSorter);
+                            node(overflowGate, () -> {
+                                node(underflowGate);
+                            });
+                        });
+                        node(container, Seq.with(new SectorComplete(biomassFacility)), () -> {
+                            node(unloader);
+                            node(vault, Seq.with(new SectorComplete(stainedMountains)), () -> {
+
+                            });
+                        });
+
+                        node(itemBridge, () -> {
+                            node(titaniumConveyor, Seq.with(new SectorComplete(craters)), () -> {
+                                node(phaseConveyor, () -> {
+                                    node(massDriver, () -> {
+                                        node(payloadPropulsionTower, () -> {
+
+                                        });
+                                    });
+                                });
+
+                                node(payloadConveyor, () -> {
+                                    node(payloadRouter, () -> {
+
+                                    });
+                                });
+
+                                node(armoredConveyor, () -> {
+                                    node(plastaniumConveyor, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(coreFoundation, () -> {
+                node(coreNucleus, () -> {
+
+                });
+            });
+
+            node(mechanicalDrill, () -> {
+
+                node(mechanicalPump, () -> {
+                    node(conduit, () -> {
+                        node(liquidJunction, () -> {
+                            node(liquidRouter, () -> {
+                                node(liquidContainer, () -> {
+                                    node(liquidTank);
+                                });
+
+                                node(bridgeConduit);
+
+                                node(pulseConduit, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                                    node(phaseConduit, () -> {
+
+                                    });
+
+                                    node(platedConduit, () -> {
+
+                                    });
+
+                                    node(rotaryPump, () -> {
+                                        node(impulsePump, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(graphitePress, () -> {
+                    node(pneumaticDrill, Seq.with(new SectorComplete(frozenForest)), () -> {
+                        node(cultivator, Seq.with(new SectorComplete(biomassFacility)), () -> {
+
+                        });
+
+                        node(laserDrill, () -> {
+                            node(blastDrill, Seq.with(new SectorComplete(nuclearComplex)), () -> {
+
+                            });
+
+                            node(waterExtractor, Seq.with(new SectorComplete(saltFlats)), () -> {
+                                node(oilExtractor, () -> {
+
+                                });
+                            });
+                        });
+                    });
+
+                    node(pyratiteMixer, () -> {
+                        node(blastMixer, () -> {
+
+                        });
+                    });
+
+                    node(siliconSmelter, () -> {
+
+                        node(sporePress, () -> {
+                            node(coalCentrifuge, () -> {
+                                node(multiPress, () -> {
+                                    node(siliconCrucible, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                                node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
+
+                                });
+                            });
+                        });
+
+                        node(kiln, Seq.with(new SectorComplete(craters)), () -> {
+                            node(pulverizer, () -> {
+                                node(incinerator, () -> {
+                                    node(melter, () -> {
+                                        node(surgeSmelter, () -> {
+
+                                        });
+
+                                        node(separator, () -> {
+                                            node(disassembler, () -> {
+
+                                            });
+                                        });
+
+                                        node(cryofluidMixer, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        node(microProcessor, () -> {
+                            node(switchBlock, () -> {
+                                node(message, () -> {
+                                    node(logicDisplay, () -> {
+                                        node(largeLogicDisplay, () -> {
+
+                                        });
+                                    });
+
+                                    node(memoryCell, () -> {
+                                        node(memoryBank, () -> {
+
+                                        });
+                                    });
+                                });
+
+                                node(logicProcessor, () -> {
+                                    node(hyperProcessor, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(illuminator, () -> {
+
+                        });
+                    });
+                });
+
+
+                node(combustionGenerator, Seq.with(new Research(Items.coal)), () -> {
+                    node(powerNode, () -> {
+                        node(powerNodeLarge, () -> {
+                            node(diode, () -> {
+                                node(surgeTower, () -> {
+
+                                });
+                            });
+                        });
+
+                        node(battery, () -> {
+                            node(batteryLarge, () -> {
+
+                            });
+                        });
+
+                        node(mender, () -> {
+                            node(mendProjector, () -> {
+                                node(forceProjector, Seq.with(new SectorComplete(impact0078)), () -> {
+                                    node(overdriveProjector, Seq.with(new SectorComplete(impact0078)), () -> {
+                                        node(overdriveDome, Seq.with(new SectorComplete(impact0078)), () -> {
+
+                                        });
+                                    });
+                                });
+
+                                node(repairPoint, () -> {
+                                    node(repairTurret, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(steamGenerator, Seq.with(new SectorComplete(craters)), () -> {
+                            node(thermalGenerator, () -> {
+                                node(differentialGenerator, () -> {
+                                    node(thoriumReactor, Seq.with(new Research(Liquids.cryofluid)), () -> {
+                                        node(impactReactor, () -> {
+
+                                        });
+
+                                        node(rtgGenerator, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        node(solarPanel, () -> {
+                            node(largeSolarPanel, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(duo, () -> {
+                node(copperWall, () -> {
+                    node(copperWallLarge, () -> {
+                        node(titaniumWall, () -> {
+                            node(titaniumWallLarge);
+
+                            node(door, () -> {
+                                node(doorLarge);
+                            });
+                            node(plastaniumWall, () -> {
+                                node(plastaniumWallLarge, () -> {
+
+                                });
+                            });
+                            node(thoriumWall, () -> {
+                                node(thoriumWallLarge);
+                                node(surgeWall, () -> {
+                                    node(surgeWallLarge);
+                                    node(phaseWall, () -> {
+                                        node(phaseWallLarge);
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(scatter, () -> {
+                    node(hail, Seq.with(new SectorComplete(craters)), () -> {
+                        node(salvo, () -> {
+                            node(swarmer, () -> {
+                                node(cyclone, () -> {
+                                    node(spectre, Seq.with(new SectorComplete(nuclearComplex)), () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(ripple, () -> {
+                                node(fuse, () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(scorch, () -> {
+                    node(arc, () -> {
+                        node(wave, () -> {
+                            node(parallax, () -> {
+                                node(segment, () -> {
+
+                                });
+                            });
+
+                            node(tsunami, () -> {
+
+                            });
+                        });
+
+                        node(lancer, () -> {
+                            node(meltdown, () -> {
+                                node(foreshadow, () -> {
+
+                                });
+                            });
+
+                            node(shockMine, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(groundFactory, () -> {
+                node(commandCenter, () -> {
+
+                });
+
+                node(dagger, () -> {
+                    node(mace, () -> {
+                        node(fortress, () -> {
+                            node(scepter, () -> {
+                                node(reign, () -> {
+
+                                });
+                            });
+                        });
+                    });
+
+                    node(nova, () -> {
+                        node(pulsar, () -> {
+                            node(quasar, () -> {
+                                node(vela, () -> {
+                                    node(corvus, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(crawler, () -> {
+                        node(atrax, () -> {
+                            node(spiroct, () -> {
+                                node(arkyid, () -> {
+                                    node(toxopid, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(airFactory, () -> {
+                    node(flare, () -> {
+                        node(horizon, () -> {
+                            node(zenith, () -> {
+                                node(antumbra, () -> {
+                                    node(eclipse, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(mono, () -> {
+                            node(poly, () -> {
+                                node(mega, () -> {
+                                    node(quad, () -> {
+                                        node(oct, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(navalFactory, Seq.with(new SectorComplete(ruinousShores)), () -> {
+                        node(risso, () -> {
+                            node(minke, () -> {
+                                node(bryde, () -> {
+                                    node(sei, () -> {
+                                        node(omura, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(retusa, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                                node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> {
+                                    node(cyerce, () -> {
+                                        node(aegires, () -> {
+                                            node(navanax, Seq.with(new SectorComplete(navalFortress)), () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(additiveReconstructor, Seq.with(new SectorComplete(biomassFacility)), () -> {
+                    node(multiplicativeReconstructor, () -> {
+                        node(exponentialReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
+                            node(tetrativeReconstructor, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+
+            node(groundZero, () -> {
+                node(frozenForest, Seq.with(
+                new SectorComplete(groundZero),
+                new Research(junction),
+                new Research(router)
+                ), () -> {
+                    node(craters, Seq.with(
+                    new SectorComplete(frozenForest),
+                    new Research(mender),
+                    new Research(combustionGenerator)
+                    ), () -> {
+                        node(ruinousShores, Seq.with(
+                        new SectorComplete(craters),
+                        new Research(graphitePress),
+                        new Research(kiln),
+                        new Research(mechanicalPump)
+                        ), () -> {
+                            node(windsweptIslands, Seq.with(
+                            new SectorComplete(ruinousShores),
+                            new Research(pneumaticDrill),
+                            new Research(hail),
+                            new Research(siliconSmelter),
+                            new Research(steamGenerator)
+                            ), () -> {
+                                node(tarFields, Seq.with(
+                                new SectorComplete(windsweptIslands),
+                                new Research(coalCentrifuge),
+                                new Research(conduit),
+                                new Research(wave)
+                                ), () -> {
+                                    node(impact0078, Seq.with(
+                                    new SectorComplete(tarFields),
+                                    new Research(Items.thorium),
+                                    new Research(lancer),
+                                    new Research(salvo),
+                                    new Research(coreFoundation)
+                                    ), () -> {
+                                        node(desolateRift, Seq.with(
+                                        new SectorComplete(impact0078),
+                                        new Research(thermalGenerator),
+                                        new Research(thoriumReactor),
+                                        new Research(coreNucleus)
+                                        ), () -> {
+                                            node(planetaryTerminal, Seq.with(
+                                            new SectorComplete(desolateRift),
+                                            new SectorComplete(nuclearComplex),
+                                            new SectorComplete(overgrowth),
+                                            new SectorComplete(extractionOutpost),
+                                            new SectorComplete(saltFlats),
+                                            new Research(risso),
+                                            new Research(minke),
+                                            new Research(bryde),
+                                            new Research(spectre),
+                                            new Research(launchPad),
+                                            new Research(massDriver),
+                                            new Research(impactReactor),
+                                            new Research(additiveReconstructor),
+                                            new Research(exponentialReconstructor)
+                                            ), () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+
+                                node(extractionOutpost, Seq.with(
+                                new SectorComplete(stainedMountains),
+                                new SectorComplete(windsweptIslands),
+                                new Research(groundFactory),
+                                new Research(nova),
+                                new Research(airFactory),
+                                new Research(mono)
+                                ), () -> {
+
+                                });
+
+                                node(saltFlats, Seq.with(
+                                new SectorComplete(windsweptIslands),
+                                new Research(commandCenter),
+                                new Research(groundFactory),
+                                new Research(additiveReconstructor),
+                                new Research(airFactory),
+                                new Research(door)
+                                ), () -> {
+                                    node(coastline, Seq.with(
+                                    new SectorComplete(windsweptIslands),
+                                    new Research(navalFactory),
+                                    new Research(payloadConveyor)
+                                    ), () -> {
+                                        node(navalFortress, Seq.with(
+                                        new SectorComplete(coastline),
+                                        new SectorComplete(extractionOutpost),
+                                        new Research(oxynoe),
+                                        new Research(minke),
+                                        new Research(cyclone),
+                                        new Research(ripple)
+                                        ), () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+                        });
+
+                        node(overgrowth, Seq.with(
+                        new SectorComplete(craters),
+                        new SectorComplete(fungalPass),
+                        new Research(cultivator),
+                        new Research(sporePress),
+                        new Research(additiveReconstructor),
+                        new Research(UnitTypes.mace),
+                        new Research(UnitTypes.flare)
+                        ), () -> {
+
+                        });
+                    });
+
+                    node(biomassFacility, Seq.with(
+                    new SectorComplete(frozenForest),
+                    new Research(powerNode),
+                    new Research(steamGenerator),
+                    new Research(scatter),
+                    new Research(graphitePress)
+                    ), () -> {
+                        node(stainedMountains, Seq.with(
+                        new SectorComplete(biomassFacility),
+                        new Research(pneumaticDrill),
+                        new Research(siliconSmelter)
+                        ), () -> {
+                            node(fungalPass, Seq.with(
+                            new SectorComplete(stainedMountains),
+                            new Research(groundFactory),
+                            new Research(door)
+                            ), () -> {
+                                node(nuclearComplex, Seq.with(
+                                new SectorComplete(fungalPass),
+                                new Research(thermalGenerator),
+                                new Research(laserDrill),
+                                new Research(Items.plastanium),
+                                new Research(swarmer)
+                                ), () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+
+            nodeProduce(Items.copper, () -> {
+                nodeProduce(Liquids.water, () -> {
+
+                });
+
+                nodeProduce(Items.lead, () -> {
+                    nodeProduce(Items.titanium, () -> {
+                        nodeProduce(Liquids.cryofluid, () -> {
+
+                        });
+
+                        nodeProduce(Items.thorium, () -> {
+                            nodeProduce(Items.surgeAlloy, () -> {
+
+                            });
+
+                            nodeProduce(Items.phaseFabric, () -> {
+
+                            });
+                        });
+                    });
+
+                    nodeProduce(Items.metaglass, () -> {
+
+                    });
+                });
+
+                nodeProduce(Items.sand, () -> {
+                    nodeProduce(Items.scrap, () -> {
+                        nodeProduce(Liquids.slag, () -> {
+
+                        });
+                    });
+
+                    nodeProduce(Items.coal, () -> {
+                        nodeProduce(Items.graphite, () -> {
+                            nodeProduce(Items.silicon, () -> {
+
+                            });
+                        });
+
+                        nodeProduce(Items.pyratite, () -> {
+                            nodeProduce(Items.blastCompound, () -> {
+
+                            });
+                        });
+
+                        nodeProduce(Items.sporePod, () -> {
+
+                        });
+
+                        nodeProduce(Liquids.oil, () -> {
+                            nodeProduce(Items.plastanium, () -> {
+
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}

core/src/mindustry/content/StatusEffects.java

@@ -3,20 +3,17 @@ package mindustry.content;
 import arc.*;
 import arc.graphics.*;
 import arc.math.*;
-import mindustry.ctype.*;
-import mindustry.game.*;
 import mindustry.game.EventType.*;
-import mindustry.type.*;
+import mindustry.game.*;
 import mindustry.graphics.*;
-
+import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
-public class StatusEffects implements ContentList{
+public class StatusEffects{
     public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed, disarmed, electrified, invincible;
 
-    @Override
-    public void load(){
+    public static void load(){
 
         none = new StatusEffect("none");
 

core/src/mindustry/content/TechTree.java

@@ -7,705 +7,23 @@ import mindustry.ctype.*;
 import mindustry.game.Objectives.*;
 import mindustry.type.*;
 
-import static mindustry.content.Blocks.*;
-import static mindustry.content.SectorPresets.craters;
-import static mindustry.content.SectorPresets.*;
-import static mindustry.content.UnitTypes.*;
+/** Class for storing a list of TechNodes with some utility tree builder methods; context dependent. See {@link SerpuloTechTree#load} source for example usage. */
+public class TechTree{
+    private static TechNode context = null;
 
-public class TechTree implements ContentList{
-    static ObjectMap<UnlockableContent, TechNode> map = new ObjectMap<>();
-    static TechNode context = null;
-
-    public static Seq<TechNode> all;
+    public static Seq<TechNode> all = new Seq<>();
+    //TODO deprecate and refactor the root system
     public static TechNode root, rootErekir;
 
-    @Override
-    public void load(){
-        setup();
-
-        //region serpulo
-        root = node(coreShard, () -> {
-
-            node(conveyor, () -> {
-
-                node(junction, () -> {
-                    node(router, () -> {
-                        node(launchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> {
-                            node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> {
-                                
-                            });
-                        });
-
-                        node(distributor);
-                        node(sorter, () -> {
-                            node(invertedSorter);
-                            node(overflowGate, () -> {
-                                node(underflowGate);
-                            });
-                        });
-                        node(container, Seq.with(new SectorComplete(biomassFacility)), () -> {
-                            node(unloader);
-                            node(vault, Seq.with(new SectorComplete(stainedMountains)), () -> {
-
-                            });
-                        });
-
-                        node(itemBridge, () -> {
-                            node(titaniumConveyor, Seq.with(new SectorComplete(craters)), () -> {
-                                node(phaseConveyor, () -> {
-                                    node(massDriver, () -> {
-                                        node(payloadPropulsionTower, () -> {
-
-                                        });
-                                    });
-                                });
-
-                                node(payloadConveyor, () -> {
-                                    node(payloadRouter, () -> {
-
-                                    });
-                                });
-
-                                node(armoredConveyor, () -> {
-                                    node(plastaniumConveyor, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(coreFoundation, () -> {
-                node(coreNucleus, () -> {
-
-                });
-            });
-
-            node(mechanicalDrill, () -> {
-
-                node(mechanicalPump, () -> {
-                    node(conduit, () -> {
-                        node(liquidJunction, () -> {
-                            node(liquidRouter, () -> {
-                                node(liquidContainer, () -> {
-                                    node(liquidTank);
-                                });
-
-                                node(bridgeConduit);
-
-                                node(pulseConduit, Seq.with(new SectorComplete(windsweptIslands)), () -> {
-                                    node(phaseConduit, () -> {
-
-                                    });
-
-                                    node(platedConduit, () -> {
-
-                                    });
-
-                                    node(rotaryPump, () -> {
-                                        node(impulsePump, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(graphitePress, () -> {
-                    node(pneumaticDrill, Seq.with(new SectorComplete(frozenForest)), () -> {
-                        node(cultivator, Seq.with(new SectorComplete(biomassFacility)), () -> {
-
-                        });
-
-                        node(laserDrill, () -> {
-                            node(blastDrill, Seq.with(new SectorComplete(nuclearComplex)), () -> {
-
-                            });
-
-                            node(waterExtractor, Seq.with(new SectorComplete(saltFlats)), () -> {
-                                node(oilExtractor, () -> {
-
-                                });
-                            });
-                        });
-                    });
-
-                    node(pyratiteMixer, () -> {
-                        node(blastMixer, () -> {
-
-                        });
-                    });
-
-                    node(siliconSmelter, () -> {
-
-                        node(sporePress, () -> {
-                            node(coalCentrifuge, () -> {
-                                node(multiPress, () -> {
-                                    node(siliconCrucible, () -> {
-
-                                    });
-                                });
-                            });
-
-                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands)), () -> {
-                                node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
-
-                                });
-                            });
-                        });
-
-                        node(kiln, Seq.with(new SectorComplete(craters)), () -> {
-                            node(pulverizer, () -> {
-                                node(incinerator, () -> {
-                                    node(melter, () -> {
-                                        node(surgeSmelter, () -> {
-
-                                        });
-
-                                        node(separator, () -> {
-                                            node(disassembler, () -> {
-
-                                            });
-                                        });
-
-                                        node(cryofluidMixer, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-
-                        node(microProcessor, () -> {
-                            node(switchBlock, () -> {
-                                node(message, () -> {
-                                    node(logicDisplay, () -> {
-                                        node(largeLogicDisplay, () -> {
-
-                                        });
-                                    });
-
-                                    node(memoryCell, () -> {
-                                        node(memoryBank, () -> {
-
-                                        });
-                                    });
-                                });
-
-                                node(logicProcessor, () -> {
-                                    node(hyperProcessor, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-
-                        node(illuminator, () -> {
-
-                        });
-                    });
-                });
-
-
-                node(combustionGenerator, Seq.with(new Research(Items.coal)), () -> {
-                    node(powerNode, () -> {
-                        node(powerNodeLarge, () -> {
-                            node(diode, () -> {
-                                node(surgeTower, () -> {
-
-                                });
-                            });
-                        });
-
-                        node(battery, () -> {
-                            node(batteryLarge, () -> {
-
-                            });
-                        });
-
-                        node(mender, () -> {
-                            node(mendProjector, () -> {
-                                node(forceProjector, Seq.with(new SectorComplete(impact0078)), () -> {
-                                    node(overdriveProjector, Seq.with(new SectorComplete(impact0078)), () -> {
-                                        node(overdriveDome, Seq.with(new SectorComplete(impact0078)), () -> {
-
-                                        });
-                                    });
-                                });
-
-                                node(repairPoint, () -> {
-                                    node(repairTurret, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-
-                        node(steamGenerator, Seq.with(new SectorComplete(craters)), () -> {
-                            node(thermalGenerator, () -> {
-                                node(differentialGenerator, () -> {
-                                    node(thoriumReactor, Seq.with(new Research(Liquids.cryofluid)), () -> {
-                                        node(impactReactor, () -> {
-
-                                        });
-
-                                        node(rtgGenerator, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-
-                        node(solarPanel, () -> {
-                            node(largeSolarPanel, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(duo, () -> {
-                node(copperWall, () -> {
-                    node(copperWallLarge, () -> {
-                        node(titaniumWall, () -> {
-                            node(titaniumWallLarge);
-
-                            node(door, () -> {
-                                node(doorLarge);
-                            });
-                            node(plastaniumWall, () -> {
-                                node(plastaniumWallLarge, () -> {
-
-                                });
-                            });
-                            node(thoriumWall, () -> {
-                                node(thoriumWallLarge);
-                                node(surgeWall, () -> {
-                                    node(surgeWallLarge);
-                                    node(phaseWall, () -> {
-                                        node(phaseWallLarge);
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(scatter, () -> {
-                    node(hail, Seq.with(new SectorComplete(craters)), () -> {
-                        node(salvo, () -> {
-                            node(swarmer, () -> {
-                                node(cyclone, () -> {
-                                    node(spectre, Seq.with(new SectorComplete(nuclearComplex)), () -> {
-
-                                    });
-                                });
-                            });
-
-                            node(ripple, () -> {
-                                node(fuse, () -> {
-
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(scorch, () -> {
-                    node(arc, () -> {
-                        node(wave, () -> {
-                            node(parallax, () -> {
-                                node(segment, () -> {
-
-                                });
-                            });
-
-                            node(tsunami, () -> {
-
-                            });
-                        });
-
-                        node(lancer, () -> {
-                            node(meltdown, () -> {
-                                node(foreshadow, () -> {
-
-                                });
-                            });
-
-                            node(shockMine, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(groundFactory, () -> {
-                node(commandCenter, () -> {
-
-                });
-
-                node(dagger, () -> {
-                    node(mace, () -> {
-                        node(fortress, () -> {
-                            node(scepter, () -> {
-                                node(reign, () -> {
-
-                                });
-                            });
-                        });
-                    });
-
-                    node(nova, () -> {
-                        node(pulsar, () -> {
-                            node(quasar, () -> {
-                                node(vela, () -> {
-                                    node(corvus, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-                    });
-
-                    node(crawler, () -> {
-                        node(atrax, () -> {
-                            node(spiroct, () -> {
-                                node(arkyid, () -> {
-                                    node(toxopid, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(airFactory, () -> {
-                    node(flare, () -> {
-                        node(horizon, () -> {
-                            node(zenith, () -> {
-                                node(antumbra, () -> {
-                                    node(eclipse, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-
-                        node(mono, () -> {
-                            node(poly, () -> {
-                                node(mega, () -> {
-                                    node(quad, () -> {
-                                        node(oct, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-
-                    node(navalFactory, Seq.with(new SectorComplete(ruinousShores)), () -> {
-                        node(risso, () -> {
-                            node(minke, () -> {
-                                node(bryde, () -> {
-                                    node(sei, () -> {
-                                        node(omura, () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-
-                            node(retusa, Seq.with(new SectorComplete(windsweptIslands)), () -> {
-                                node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> {
-                                    node(cyerce, () -> {
-                                        node(aegires, () -> {
-                                            node(navanax, Seq.with(new SectorComplete(navalFortress)), () -> {
-
-                                            });
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-
-                node(additiveReconstructor, Seq.with(new SectorComplete(biomassFacility)), () -> {
-                    node(multiplicativeReconstructor, () -> {
-                        node(exponentialReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> {
-                            node(tetrativeReconstructor, () -> {
-                                
-                            });
-                        });
-                    });
-                });
-            });
-
-            node(groundZero, () -> {
-                node(frozenForest, Seq.with(
-                    new SectorComplete(groundZero),
-                    new Research(junction),
-                    new Research(router)
-                ), () -> {
-                    node(craters, Seq.with(
-                        new SectorComplete(frozenForest),
-                        new Research(mender),
-                        new Research(combustionGenerator)
-                    ), () -> {
-                        node(ruinousShores, Seq.with(
-                            new SectorComplete(craters),
-                            new Research(graphitePress),
-                            new Research(kiln),
-                            new Research(mechanicalPump)
-                        ), () -> {
-                            node(windsweptIslands, Seq.with(
-                                new SectorComplete(ruinousShores),
-                                new Research(pneumaticDrill),
-                                new Research(hail),
-                                new Research(siliconSmelter),
-                                new Research(steamGenerator)
-                            ), () -> {
-                                node(tarFields, Seq.with(
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(coalCentrifuge),
-                                    new Research(conduit),
-                                    new Research(wave)
-                                ), () -> {
-                                    node(impact0078, Seq.with(
-                                        new SectorComplete(tarFields),
-                                        new Research(Items.thorium),
-                                        new Research(lancer),
-                                        new Research(salvo),
-                                        new Research(coreFoundation)
-                                    ), () -> {
-                                        node(desolateRift, Seq.with(
-                                            new SectorComplete(impact0078),
-                                            new Research(thermalGenerator),
-                                            new Research(thoriumReactor),
-                                            new Research(coreNucleus)
-                                        ), () -> {
-                                            node(planetaryTerminal, Seq.with(
-                                                new SectorComplete(desolateRift),
-                                                new SectorComplete(nuclearComplex),
-                                                new SectorComplete(overgrowth),
-                                                new SectorComplete(extractionOutpost),
-                                                new SectorComplete(saltFlats),
-                                                new Research(risso),
-                                                new Research(minke),
-                                                new Research(bryde),
-                                                new Research(spectre),
-                                                new Research(launchPad),
-                                                new Research(massDriver),
-                                                new Research(impactReactor),
-                                                new Research(additiveReconstructor),
-                                                new Research(exponentialReconstructor)
-                                            ), () -> {
-
-                                            });
-                                        });
-                                    });
-                                });
-
-                                node(extractionOutpost, Seq.with(
-                                    new SectorComplete(stainedMountains),
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(groundFactory),
-                                    new Research(nova),
-                                    new Research(airFactory),
-                                    new Research(mono)
-                                ), () -> {
-
-                                });
-
-                                node(saltFlats, Seq.with(
-                                    new SectorComplete(windsweptIslands),
-                                    new Research(commandCenter),
-                                    new Research(groundFactory),
-                                    new Research(additiveReconstructor),
-                                    new Research(airFactory),
-                                    new Research(door)
-                                ), () -> {
-                                    node(coastline, Seq.with(
-                                        new SectorComplete(windsweptIslands),
-                                        new Research(navalFactory),
-                                        new Research(payloadConveyor)
-                                    ), () -> {
-                                        node(navalFortress, Seq.with(
-                                            new SectorComplete(coastline),
-                                            new SectorComplete(extractionOutpost),
-                                            new Research(oxynoe),
-                                            new Research(minke),
-                                            new Research(cyclone),
-                                            new Research(ripple)
-                                        ), () -> {
-
-                                        });
-                                    });
-                                });
-                            });
-                        });
-
-                        node(overgrowth, Seq.with(
-                            new SectorComplete(craters),
-                            new SectorComplete(fungalPass),
-                            new Research(cultivator),
-                            new Research(sporePress),
-                            new Research(additiveReconstructor),
-                            new Research(UnitTypes.mace),
-                            new Research(UnitTypes.flare)
-                        ), () -> {
-
-                        });
-                    });
-
-                    node(biomassFacility, Seq.with(
-                        new SectorComplete(frozenForest),
-                        new Research(powerNode),
-                        new Research(steamGenerator),
-                        new Research(scatter),
-                        new Research(graphitePress)
-                    ), () -> {
-                        node(stainedMountains, Seq.with(
-                            new SectorComplete(biomassFacility),
-                            new Research(pneumaticDrill),
-                            new Research(siliconSmelter)
-                        ), () -> {
-                            node(fungalPass, Seq.with(
-                                new SectorComplete(stainedMountains),
-                                new Research(groundFactory),
-                                new Research(door)
-                            ), () -> {
-                                node(nuclearComplex, Seq.with(
-                                    new SectorComplete(fungalPass),
-                                    new Research(thermalGenerator),
-                                    new Research(laserDrill),
-                                    new Research(Items.plastanium),
-                                    new Research(swarmer)
-                                ), () -> {
-
-                                });
-                            });
-                        });
-                    });
-                });
-            });
-
-            nodeProduce(Items.copper, () -> {
-                nodeProduce(Liquids.water, () -> {
-
-                });
-
-                nodeProduce(Items.lead, () -> {
-                    nodeProduce(Items.titanium, () -> {
-                        nodeProduce(Liquids.cryofluid, () -> {
-
-                        });
-
-                        nodeProduce(Items.thorium, () -> {
-                            nodeProduce(Items.surgeAlloy, () -> {
-
-                            });
-
-                            nodeProduce(Items.phaseFabric, () -> {
-
-                            });
-                        });
-                    });
-
-                    nodeProduce(Items.metaglass, () -> {
-
-                    });
-                });
-
-                nodeProduce(Items.sand, () -> {
-                    nodeProduce(Items.scrap, () -> {
-                        nodeProduce(Liquids.slag, () -> {
-
-                        });
-                    });
-
-                    nodeProduce(Items.coal, () -> {
-                        nodeProduce(Items.graphite, () -> {
-                            nodeProduce(Items.silicon, () -> {
-
-                            });
-                        });
-
-                        nodeProduce(Items.pyratite, () -> {
-                            nodeProduce(Items.blastCompound, () -> {
-
-                            });
-                        });
-
-                        nodeProduce(Items.sporePod, () -> {
-
-                        });
-
-                        nodeProduce(Liquids.oil, () -> {
-                            nodeProduce(Items.plastanium, () -> {
-
-                            });
-                        });
-                    });
-                });
-            });
-        });
-
-        //endregion
-        //region erekir
-
-        rootErekir = node(coreBastion, () -> {
-            node(duct, () -> {
-                node(ductRouter, () -> {
-                    node(ductBridge, () -> {
-                        node(surgeConveyor, () -> {
-                            node(surgeRouter);
-                        });
-                    });
-
-                    node(overflowDuct, () -> {
-
-                    });
-
-                    node(reinforcedContainer, () -> {
-                        node(reinforcedVault, () -> {
-
-                        });
-                    });
-                });
-            });
-        });
-
-        //endregion
-    }
-
-    public static void setup(){
-        context = null;
-        map = new ObjectMap<>();
-        all = new Seq<>();
-    }
-
-    //all the "node" methods are hidden, because they are for internal context-dependent use only
-    //for custom research, just use the TechNode constructor
-
-    static TechNode node(UnlockableContent content, Runnable children){
+    public static TechNode node(UnlockableContent content, Runnable children){
         return node(content, content.researchRequirements(), children);
     }
 
-    static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
+    public static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
         return node(content, requirements, null, children);
     }
 
-    static TechNode node(UnlockableContent content, ItemStack[] requirements, Seq<Objective> objectives, Runnable children){
+    public static TechNode node(UnlockableContent content, ItemStack[] requirements, Seq<Objective> objectives, Runnable children){
         TechNode node = new TechNode(context, content, requirements);
         if(objectives != null){
             node.objectives.addAll(objectives);
@@ -719,29 +37,33 @@ public class TechTree implements ContentList{
         return node;
     }
 
-    static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
+    public static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
         return node(content, content.researchRequirements(), objectives, children);
     }
 
-    static TechNode node(UnlockableContent block){
+    public static TechNode node(UnlockableContent block){
         return node(block, () -> {});
     }
 
-    static TechNode nodeProduce(UnlockableContent content, Seq<Objective> objectives, Runnable children){
+    public static TechNode nodeProduce(UnlockableContent content, Seq<Objective> objectives, Runnable children){
         return node(content, content.researchRequirements(), objectives.and(new Produce(content)), children);
     }
 
-    static TechNode nodeProduce(UnlockableContent content, Runnable children){
+    public static TechNode nodeProduce(UnlockableContent content, Runnable children){
         return nodeProduce(content, new Seq<>(), children);
     }
 
-    @Nullable
-    public static TechNode get(UnlockableContent content){
-        return map.get(content);
+    /** @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){
-        return map.getThrow(content, () -> new RuntimeException(content + " does not have a tech node"));
+        if(content.techNode == null) throw new RuntimeException(content + " does not have a tech node");
+        return content.techNode;
     }
 
     public static class TechNode{
@@ -777,7 +99,7 @@ public class TechTree implements ContentList{
                 }
             });
 
-            map.put(content, this);
+            content.techNode = this;
             all.add(this);
         }
 

core/src/mindustry/content/UnitTypes.java

@@ -7,7 +7,6 @@ import arc.math.geom.*;
 import arc.struct.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
@@ -24,7 +23,7 @@ import static arc.graphics.g2d.Lines.*;
 import static arc.math.Angles.*;
 import static mindustry.Vars.*;
 
-public class UnitTypes implements ContentList{
+public class UnitTypes{
     //region standard
 
     //mech
@@ -76,8 +75,7 @@ public class UnitTypes implements ContentList{
 
     //endregion
 
-    @Override
-    public void load(){
+    public static void load(){
         //region ground attack
 
         dagger = new UnitType("dagger"){{

core/src/mindustry/content/Weathers.java

@@ -2,13 +2,12 @@ package mindustry.content;
 
 import arc.graphics.*;
 import arc.util.*;
-import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.type.weather.*;
 import mindustry.world.meta.*;
 
-public class Weathers implements ContentList{
+public class Weathers{
     public static Weather
     rain,
     snow,
@@ -17,8 +16,7 @@ public class Weathers implements ContentList{
     fog,
     suspendParticles;
 
-    @Override
-    public void load(){
+    public static void load(){
         snow = new ParticleWeather("snow"){{
             particleRegion = "particle";
             sizeMax = 13f;