Unfinished graphite press block

core/assets/bundles/bundle.properties

@@ -505,6 +505,7 @@ mech.ability = [LIGHT_GRAY]Ability: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
+block.graphite-press.name = Graphite Press
 block.constructing = {0} [LIGHT_GRAY](Constructing)
 block.spawn.name = Enemy Spawn
 block.core.name = Core

core/src/io/anuke/mindustry/content/TechTree.java

@@ -117,14 +117,15 @@ public class TechTree implements ContentList{
                     });
                 });
 
-                node(siliconSmelter, () -> {
+                node(graphitePress, () -> {
-
                     node(pyratiteMixer, () -> {
                         node(blastMixer, () -> {
 
                         });
                     });
 
+                    node(siliconSmelter, () -> {
+
                         node(biomatterCompressor, () -> {
                             node(plastaniumCompressor, () -> {
                                 node(phaseWeaver, () -> {
@@ -151,6 +152,9 @@ public class TechTree implements ContentList{
                             });
                         });
                     });
+                });
+
+
 
                 node(mechanicalPump, () -> {
                     node(conduit, () -> {

core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java

@@ -29,13 +29,12 @@ import static io.anuke.mindustry.Vars.*;
 
 public class DeployDialog extends FloatingDialog{
     private static final float nodeSize = 250f;
-    private ZoneNode root;
     private ObjectSet<ZoneNode> nodes = new ObjectSet<>();
 
     public DeployDialog(){
         super("");
 
-        root = new ZoneNode(Zones.groundZero, null);
+        ZoneNode root = new ZoneNode(Zones.groundZero, null);
 
         TreeLayout layout = new TreeLayout();
         layout.gapBetweenLevels = 40f;
@@ -43,21 +42,16 @@ public class DeployDialog extends FloatingDialog{
         layout.layout(root);
 
         cont.setFillParent(true);
-        cont.add(new View()).grow();
 
         addCloseButton();
         buttons.addImageTextButton("$techtree", "icon-tree", 16 * 2, () -> ui.tech.show()).size(230f, 64f);
 
-        //shown(this::setup);
+        shown(this::setup);
     }
 
     public void setup(){
-        buttons.clear();
         cont.clear();
 
-        addCloseButton();
-        buttons.addImageTextButton("$techtree", "icon-tree", 16 * 2, () -> ui.tech.show()).size(230f, 64f);
-
         cont.stack(new Table(){{
             top().left().margin(10);
 
@@ -71,7 +65,7 @@ public class DeployDialog extends FloatingDialog{
                 }
             }
 
-        }}, new Table(){{
+        }}, control.saves.getZoneSlot() == null ? new View() : new Table(){{
             SaveSlot slot = control.saves.getZoneSlot();
 
             TextButton[] b = {null};
@@ -243,8 +237,10 @@ public class DeployDialog extends FloatingDialog{
         }
     }
 
+    //should be static variables of View, but that's impossible
+    static float panX = 0, panY = -200;
+
     class View extends Group{
-        float panX = 0, panY = -200;
 
         {
             for(ZoneNode node : nodes){

core/src/io/anuke/mindustry/world/Block.java

@@ -13,6 +13,8 @@ import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.Damage;
 import io.anuke.mindustry.entities.Player;
@@ -280,6 +282,10 @@ public class Block extends BlockStorage{
         setStats();
 
         consumes.checkRequired(this);
+
+        if(buildRequirements.length > 0 && !Core.bundle.has("block." + name + ".name")){
+            Log.warn("No name for block '{0}' found. Add the following to bundle.properties:\nblock.{0}.name = {1}", name, Strings.capitalize(name));
+        }
     }
 
     @Override