From 9f3dcdf727f459476449aa2105403d284dfdd257 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Dec 2019 16:29:11 -0500 Subject: [PATCH] Fixed #1215 - made all valid floors show up in drill mine list --- .../world/blocks/production/Drill.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 865fb8aea7..1ef45a3c2f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -14,7 +14,6 @@ import io.anuke.mindustry.gen.*; import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; @@ -179,23 +178,23 @@ public class Drill extends Block{ super.setStats(); stats.add(BlockStat.drillTier, table -> { - Array list = new Array<>(); + Array list = content.blocks().select(b -> b.isFloor() && b.asFloor().itemDrop != null && b.asFloor().itemDrop.hardness <= tier); - for(Item item : content.items()){ - if(tier >= item.hardness && Core.atlas.has(item.name + "1")){ - list.add(item); + table.table(l -> { + l.left(); + + for(int i = 0; i < list.size; i++){ + Block item = list.get(i); + + l.addImage(item.icon(Cicon.small)).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3); + l.add(item.localizedName).left().padLeft(1).padRight(4); + if(i % 5 == 4){ + l.row(); + } } - } + }); - for(int i = 0; i < list.size; i++){ - Item item = list.get(i); - table.addImage(Core.atlas.find(item.name + "1")).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3); - table.add(item.localizedName); - if(i != list.size - 1){ - table.add("/").padLeft(5).padRight(5); - } - } }); stats.add(BlockStat.drillSpeed, 60f / drillTime * size * size, StatUnit.itemsSecond);