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

Research system progress

Browse Source
This commit is contained in:
Anuken
2020-06-19 19:31:14 -04:00
parent 08ac91359b
commit 6bcc103cf7
59 changed files with 393 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/consumers/ConsumeItemDynamic.java
+4 -3
View File
@@ -1,6 +1,7 @@
package mindustry.world.consumers;
import arc.func.*;
import arc.math.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
@@ -12,8 +13,8 @@ import mindustry.world.meta.*;
public class ConsumeItemDynamic extends Consume{
public final @NonNull Func<Tilec, ItemStack[]> items;
public ConsumeItemDynamic(Func<Tilec, ItemStack[]> items){
this.items = items;
public <T extends Tilec> ConsumeItemDynamic(Func<T, ItemStack[]> items){
this.items = (Func<Tilec, ItemStack[]>)items;
}
@Override
@@ -43,7 +44,7 @@ public class ConsumeItemDynamic extends Consume{
private void rebuild(Tilec tile, Table table){
for(ItemStack stack : items.get(tile)){
table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
() -> tile.items() != null && tile.items().has(stack.item, stack.amount))).size(8 * 4).padRight(5);
() -> tile.items() != null && tile.items().has(stack.item, stack.amount))).size(8 * 4).padRight(6 * Mathf.digits(stack.amount));
}
}
core/src/mindustry/world/consumers/ConsumeItemFilter.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class ConsumeItemFilter extends Consume{
@Override
public void build(Tilec tile, Table table){
MultiReqImage image = new MultiReqImage();
content.items().each(i -> filter.get(i) && (!state.isCampaign() || data.isUnlocked(i)), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium), 1),
content.items().each(i -> filter.get(i) && i.unlockedNow(), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium), 1),
() -> tile.items() != null && tile.items().has(item))));
table.add(image).size(8 * 4);