Merge

core/src/mindustry/world/blocks/Autotiler.java

@@ -84,7 +84,7 @@ public interface Autotiler{
     default boolean blends(Tile tile, int rotation, int direction){
         Tile other = tile.getNearby(Mathf.mod(rotation - direction, 4));
         if(other != null) other = other.link();
-        return other != null && blends(tile, rotation, other.x, other.y, other.rotation(), other.block());
+        return other != null && other.team() == tile.team() && blends(tile, rotation, other.x, other.y, other.rotation(), other.block());
     }
 
     default boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){

core/src/mindustry/world/blocks/ItemSelection.java

@@ -1,31 +1,29 @@
 package mindustry.world.blocks;
 
-import arc.struct.*;
 import arc.func.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.ctype.*;
 import mindustry.gen.*;
-import mindustry.type.*;
 import mindustry.ui.*;
-import mindustry.ui.Cicon;
 
 import static mindustry.Vars.*;
 
 public class ItemSelection{
+    private static float scrollPos = 0f;
 
-    public static void buildItemTable(Table table, Prov<Item> holder, Cons<Item> consumer){
-
-        Array<Item> items = content.items();
+    public static <T extends UnlockableContent> void buildTable(Table table, Array<T> items, Prov<T> holder, Cons<T> consumer){
 
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
         group.setMinCheckCount(0);
         Table cont = new Table();
-        cont.defaults().size(38);
+        cont.defaults().size(40);
 
         int i = 0;
 
-        for(Item item : items){
+        for(T item : items){
             if(!data.isUnlocked(item) && world.isZone()) continue;
 
             ImageButton button = cont.addImageButton(Tex.whiteui, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).group(group).get();
@@ -38,6 +36,21 @@ public class ItemSelection{
             }
         }
 
-        table.add(cont);
+        //add extra blank spaces so it looks nice
+        if(i % 4 != 0){
+            int remaining = 4 - (i % 4);
+            for(int j = 0; j < remaining; j++){
+                cont.addImage(Styles.black6);
+            }
+        }
+
+        ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
+        pane.setScrollingDisabled(true, false);
+        pane.setScrollYForce(scrollPos);
+        pane.update(() -> {
+            scrollPos = pane.getScrollY();
+        });
+
+        table.add(pane).maxHeight(40 * 5);
     }
 }

core/src/mindustry/world/blocks/distribution/Sorter.java

@@ -133,7 +133,7 @@ public class Sorter extends Block{
     @Override
     public void buildConfiguration(Tile tile, Table table){
         SorterEntity entity = tile.ent();
-        ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> {
+        ItemSelection.buildTable(table, content.items(), () -> entity.sortItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.id);
         });

core/src/mindustry/world/blocks/power/Battery.java

@@ -1,10 +1,29 @@
 package mindustry.world.blocks.power;
 
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.tilesize;
+
 public class Battery extends PowerDistributor{
+    public int topRegion = reg("-top");
+
+    public Color emptyLightColor = Color.valueOf("f8c266");
+    public Color fullLightColor = Color.valueOf("fb9567");
 
     public Battery(String name){
         super(name);
         outputsPower = true;
         consumesPower = true;
     }
+
+    @Override
+    public void draw(Tile tile){
+        Draw.color(emptyLightColor, fullLightColor, tile.entity.power().status);
+        Fill.square(tile.drawx(), tile.drawy(), tilesize * size / 2f - 1);
+        Draw.color();
+
+        Draw.rect(reg(topRegion), tile.drawx(), tile.drawy());
+    }
 }

core/src/mindustry/world/blocks/sandbox/ItemSource.java

@@ -81,7 +81,7 @@ public class ItemSource extends Block{
     @Override
     public void buildConfiguration(Tile tile, Table table){
         ItemSourceEntity entity = tile.ent();
-        ItemSelection.buildItemTable(table, () -> entity.outputItem, item -> {
+        ItemSelection.buildTable(table, content.items(), () -> entity.outputItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.id);
         });

core/src/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -1,24 +1,19 @@
 package mindustry.world.blocks.sandbox;
 
 import arc.*;
-import arc.struct.*;
 import arc.graphics.g2d.*;
-import arc.scene.style.*;
-import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
-import mindustry.gen.*;
-import mindustry.gen.*;
+import arc.util.*;
 import mindustry.entities.units.*;
+import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.ui.Cicon;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 
 import java.io.*;
 
-import static mindustry.Vars.*;
+import static mindustry.Vars.content;
 
 public class LiquidSource extends Block{
     public static Liquid lastLiquid;
@@ -82,29 +77,10 @@ public class LiquidSource extends Block{
     public void buildConfiguration(Tile tile, Table table){
         LiquidSourceEntity entity = tile.ent();
 
-        Array<Liquid> items = content.liquids();
-
-        ButtonGroup<ImageButton> group = new ButtonGroup<>();
-        group.setMinCheckCount(0);
-        Table cont = new Table();
-
-        for(int i = 0; i < items.size; i++){
-            final int f = i;
-            ImageButton button = cont.addImageButton(Tex.clear, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).size(38).group(group).get();
-            button.changed(() -> {
-                tile.configure(button.isChecked() ? items.get(f).id : -1);
-                control.input.frag.config.hideConfig();
-                lastLiquid = items.get(f);
-            });
-            button.getStyle().imageUp = new TextureRegionDrawable(items.get(i).icon(Cicon.medium));
-            button.setChecked(entity.source == items.get(i));
-
-            if(i % 4 == 3){
-                cont.row();
-            }
-        }
-
-        table.add(cont);
+        ItemSelection.buildTable(table, content.liquids(), () -> entity.source, liquid -> {
+            lastLiquid = liquid;
+            tile.configure(liquid == null ? -1 : liquid.id);
+        });
     }
 
     @Override

core/src/mindustry/world/blocks/storage/Unloader.java

@@ -123,7 +123,7 @@ public class Unloader extends Block{
     @Override
     public void buildConfiguration(Tile tile, Table table){
         UnloaderEntity entity = tile.ent();
-        ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> {
+        ItemSelection.buildTable(table, content.items(), () -> entity.sortItem, item -> {
             lastItem = item;
             tile.configure(item == null ? -1 : item.id);
         });