Testing liquids/items in tech tree

core/src/mindustry/content/TechTree.java

@@ -140,63 +140,30 @@ public class TechTree implements ContentList{
             });
 
             node(mechanicalDrill, () -> {
-                node(graphitePress, () -> {
-                    node(pneumaticDrill, () -> {
-                        node(cultivator, () -> {
 
-                        });
+                node(Liquids.water, () -> {
+                    node(mechanicalPump, () -> {
+                        node(conduit, () -> {
+                            node(liquidJunction, () -> {
+                                node(liquidRouter, () -> {
+                                    node(liquidTank);
 
-                        node(laserDrill, () -> {
-                            node(blastDrill, () -> {
+                                    node(bridgeConduit);
 
-                            });
+                                    node(pulseConduit, () -> {
+                                        node(phaseConduit, () -> {
 
-                            node(waterExtractor, () -> {
-                                node(oilExtractor, () -> {
+                                        });
 
-                                });
-                            });
-                        });
-                    });
-
-                    node(pyratiteMixer, () -> {
-                        node(blastMixer, () -> {
-
-                        });
-                    });
-
-                    node(siliconSmelter, () -> {
-
-                        node(sporePress, () -> {
-                            node(coalCentrifuge, () -> {
-
-                            });
-                            node(multiPress, () -> {
-
-                            });
-
-                            node(plastaniumCompressor, () -> {
-                                node(phaseWeaver, () -> {
-
-                                });
-                            });
-                        });
-
-                        node(kiln, () -> {
-                            node(incinerator, () -> {
-                                node(melter, () -> {
-                                    node(surgeSmelter, () -> {
-
-                                    });
-
-                                    node(separator, () -> {
-                                        node(pulverizer, () -> {
+                                        node(platedConduit, () -> {
 
                                         });
                                     });
 
-                                    node(cryofluidMixer, () -> {
+                                    node(rotaryPump, () -> {
+                                        node(thermalPump, () -> {
 
+                                        });
                                     });
                                 });
                             });
@@ -204,84 +171,121 @@ public class TechTree implements ContentList{
                     });
                 });
 
+                node(Items.coal, () -> {
+                    node(graphitePress, () -> {
+                        node(pneumaticDrill, () -> {
+                            node(cultivator, () -> {
 
-                node(mechanicalPump, () -> {
-                    node(conduit, () -> {
-                        node(liquidJunction, () -> {
-                            node(liquidRouter, () -> {
-                                node(liquidTank);
+                            });
 
-                                node(bridgeConduit);
+                            node(laserDrill, () -> {
+                                node(blastDrill, () -> {
 
-                                node(pulseConduit, () -> {
-                                    node(phaseConduit, () -> {
+                                });
 
-                                    });
-
-                                    node(platedConduit, () -> {
+                                node(waterExtractor, () -> {
+                                    node(oilExtractor, () -> {
 
                                     });
                                 });
+                            });
+                        });
 
-                                node(rotaryPump, () -> {
-                                    node(thermalPump, () -> {
+                        node(pyratiteMixer, () -> {
+                            node(blastMixer, () -> {
 
+                            });
+                        });
+
+                        node(siliconSmelter, () -> {
+
+                            node(sporePress, () -> {
+                                node(coalCentrifuge, () -> {
+
+                                });
+                                node(multiPress, () -> {
+
+                                });
+
+                                node(plastaniumCompressor, () -> {
+                                    node(phaseWeaver, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(kiln, () -> {
+                                node(incinerator, () -> {
+                                    node(melter, () -> {
+                                        node(surgeSmelter, () -> {
+
+                                        });
+
+                                        node(separator, () -> {
+                                            node(pulverizer, () -> {
+
+                                            });
+                                        });
+
+                                        node(cryofluidMixer, () -> {
+
+                                        });
                                     });
                                 });
                             });
                         });
                     });
-                });
 
-                node(combustionGenerator, () -> {
-                    node(powerNode, () -> {
-                        node(powerNodeLarge, () -> {
-                            node(diode, () -> {
-                                node(surgeTower, () -> {
-
-                                });
-                            });
-                        });
-
-                        node(battery, () -> {
-                            node(batteryLarge, () -> {
-
-                            });
-                        });
-
-                        node(mender, () -> {
-                            node(mendProjector, () -> {
-                                node(forceProjector, () -> {
-                                    node(overdriveProjector, () -> {
+                    node(combustionGenerator, () -> {
+                        node(powerNode, () -> {
+                            node(powerNodeLarge, () -> {
+                                node(diode, () -> {
+                                    node(surgeTower, () -> {
 
                                     });
                                 });
+                            });
 
-                                node(repairPoint, () -> {
+                            node(battery, () -> {
+                                node(batteryLarge, () -> {
 
                                 });
                             });
-                        });
 
-                        node(turbineGenerator, () -> {
-                            node(thermalGenerator, () -> {
-                                node(differentialGenerator, () -> {
-                                    node(thoriumReactor, () -> {
-                                        node(impactReactor, () -> {
+                            node(mender, () -> {
+                                node(mendProjector, () -> {
+                                    node(forceProjector, () -> {
+                                        node(overdriveProjector, () -> {
 
                                         });
+                                    });
 
-                                        node(rtgGenerator, () -> {
+                                    node(repairPoint, () -> {
 
+                                    });
+                                });
+                            });
+
+                            node(turbineGenerator, () -> {
+                                node(thermalGenerator, () -> {
+                                    node(differentialGenerator, () -> {
+                                        node(thoriumReactor, () -> {
+                                            node(impactReactor, () -> {
+
+                                            });
+
+                                            node(rtgGenerator, () -> {
+
+                                            });
                                         });
                                     });
                                 });
                             });
-                        });
 
-                        node(solarPanel, () -> {
-                            node(largeSolarPanel, () -> {
+                            node(solarPanel, () -> {
+                                node(largeSolarPanel, () -> {
 
+                                });
                             });
                         });
                     });

core/src/mindustry/content/Weathers.java

@@ -112,6 +112,7 @@ public class Weathers implements ContentList{
                 Tmp.r1.grow(padding);
                 Core.camera.bounds(Tmp.r2);
                 int total = (int)(Tmp.r1.area() / density * state.intensity()) / 2;
+                Lines.stroke(0.75f);
 
                 float t = Time.time() / 22f;
 
@@ -141,7 +142,6 @@ public class Weathers implements ContentList{
                             Draw.color(Color.royal, Color.white, 0.3f);
                             Draw.alpha(Mathf.slope(life) * state.opacity());
 
-                            Lines.stroke(1f);
                             float space = 45f;
                             for(int j : new int[]{-1, 1}){
                                 Tmp.v1.trns(90f + j*space, 1f + 5f * life);

core/src/mindustry/mod/Mods.java

@@ -480,13 +480,11 @@ public class Mods implements Loadable{
                         }catch(Throwable e){
                             Core.app.post(() -> {
                                 Log.err("Error loading main script @ for mod @.", main.name(), mod.meta.name);
-                                e.printStackTrace();
+                                Log.err(e);
                             });
                         }
                     }else{
-                        Core.app.post(() -> {
-                            Log.err("No main.js found for mod @.", mod.meta.name);
-                        });
+                        Core.app.post(() -> Log.err("No main.js found for mod @.", mod.meta.name));
                     }
                 }
             });

core/src/mindustry/world/blocks/production/Drill.java

@@ -206,15 +206,14 @@ public class Drill extends Block{
     }
 
     public class DrillEntity extends TileEntity{
-        float progress;
-        int index;
-        float warmup;
-        float timeDrilled;
-        float lastDrillSpeed;
-
-        int dominantItems;
-        Item dominantItem;
+        public float progress;
+        public int index;
+        public float warmup;
+        public float timeDrilled;
+        public float lastDrillSpeed;
 
+        public int dominantItems;
+        public Item dominantItem;
 
         @Override
         public boolean shouldConsume(){