diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java index e933eafdbf..a5b2ab959b 100644 --- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java @@ -130,7 +130,7 @@ public abstract class BaseProcessor extends AbstractProcessor{ Seq result = new Seq<>(); for(String s : rawSource.split("\n", -1)){ result.add(s); - if (s.startsWith("package ")){ + if(s.startsWith("package ")){ result.add(""); for (String i : imports){ result.add(i); diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 9ab58cba5c..aea0d11281 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -53,7 +53,7 @@ public class ErekirTechTree{ }); }); - //TODO further in? no use for these without units. + //TODO should only be unlocked in unit sector node(constructor, Seq.with(new Research(siliconArcFurnace), erekirSector.first()), () -> { node(payloadLoader, () -> { node(payloadUnloader, () -> { @@ -110,9 +110,9 @@ public class ErekirTechTree{ }); node(reinforcedConduit, () -> { - //TODO so should this be *on* or *complete*? - node(reinforcedPump, Seq.with(new OnSector(aware)), () -> { - //TODO T2 pump + //TODO maybe should be even later + node(reinforcedPump, Seq.with(new SectorComplete(aware)), () -> { + //TODO T2 pump, consume cyanogen or similar }); node(reinforcedLiquidJunction, () -> { @@ -122,7 +122,7 @@ public class ErekirTechTree{ node(reinforcedLiquidRouter, () -> { node(reinforcedLiquidContainer, () -> { - node(reinforcedLiquidTank, () -> { + node(reinforcedLiquidTank, Seq.with(new SectorComplete(aware)), () -> { }); }); @@ -132,7 +132,8 @@ public class ErekirTechTree{ node(siliconArcFurnace, () -> { node(cliffCrusher, () -> { - node(electrolyzer, () -> { + //TODO should be gated on landing of 3rd sector, not complete? + node(electrolyzer, Seq.with(new SectorComplete(aware)), () -> { node(oxidationChamber, () -> { node(electricHeater, () -> { node(heatRedirector, () -> { diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index c3c624bb45..c9b5d9b370 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -1301,7 +1301,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } if(points.size > 1 && end instanceof ChainedBuilding){ Point2 secondToLast = points.get(points.size - 2); - if (!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){ + if(!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){ endRotation = end.rotation; } } diff --git a/gradle.properties b/gradle.properties index 90932044b2..0039eeffea 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=e62237bfb1 +archash=a066e32504 diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index e54abd1e92..129333e891 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -584,7 +584,7 @@ public class ServerControl implements ApplicationListener{ if(arg.length == 1){ info("'@' is currently @.", c.name(), c.get()); }else{ - if (arg[1].equals("default")){ + if(arg[1].equals("default")){ c.set(c.defaultValue); }else if(c.isBool()){ c.set(arg[1].equals("on") || arg[1].equals("true"));