Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #4141 / Fixed #4136

Browse Source
This commit is contained in:
Anuken
2020-12-27 10:16:34 -05:00
parent c02d603a7a
commit 16778ea16c
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -2146,21 +2146,21 @@ public class Blocks implements ContentList{
//region experimental //region experimental
blockForge = new BlockForge("block-forge"){{ blockForge = new BlockForge("block-forge"){{
requirements(Category.production, BuildVisibility.debugOnly, with(Items.thorium, 100)); requirements(Category.crafting, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true; hasPower = true;
consumes.power(2f); consumes.power(2f);
size = 3; size = 3;
}}; }};
blockLoader = new BlockLoader("block-loader"){{ blockLoader = new BlockLoader("block-loader"){{
requirements(Category.production, BuildVisibility.debugOnly, with(Items.thorium, 100)); requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true; hasPower = true;
consumes.power(2f); consumes.power(2f);
size = 3; size = 3;
}}; }};
blockUnloader = new BlockUnloader("block-unloader"){{ blockUnloader = new BlockUnloader("block-unloader"){{
requirements(Category.production, BuildVisibility.debugOnly, with(Items.thorium, 100)); requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true; hasPower = true;
consumes.power(2f); consumes.power(2f);
size = 3; size = 3;

2
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -40,7 +40,7 @@ public class DatabaseDialog extends BaseDialog{
for(int j = 0; j < allContent.length; j++){ for(int j = 0; j < allContent.length; j++){
ContentType type = ContentType.all[j]; ContentType type = ContentType.all[j];
Seq<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden()); Seq<Content> array = allContent[j].select(c -> c instanceof UnlockableContent u && (!u.isHidden() || u.node() != null));
if(array.size == 0) continue; if(array.size == 0) continue;
table.add("@content." + type.name() + ".name").growX().left().color(Pal.accent); table.add("@content." + type.name() + ".name").growX().left().color(Pal.accent);

4
core/src/mindustry/world/consumers/ConsumeItemDynamic.java
View File

@@ -43,10 +43,12 @@ public class ConsumeItemDynamic extends Consume{
private void rebuild(Building tile, Table table){ private void rebuild(Building tile, Table table){
table.clear(); table.clear();
int i = 0;
for(ItemStack stack : items.get(tile)){ for(ItemStack stack : items.get(tile)){
table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount), table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
() -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8); () -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8).left();
if(++i % 4 == 0) table.row();
} }
} }

10
core/src/mindustry/world/consumers/ConsumeItems.java
View File

@@ -34,10 +34,14 @@ public class ConsumeItems extends Consume{
@Override @Override
public void build(Building tile, Table table){ public void build(Building tile, Table table){
for(ItemStack stack : items){ table.table(c -> {
table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount), int i = 0;
for(ItemStack stack : items){
c.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
() -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8); () -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8);
} if(++i % 4 == 0) table.row();
}
}).left();
} }
@Override @Override