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

More reorganization, implemented multiblock drills, API changes

Browse Source
This commit is contained in:
Anuken
2018-03-04 22:00:32 -05:00
parent 099d88ba7b
commit 292dbf101b
70 changed files with 606 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
View File

@@ -269,7 +269,7 @@ public class BlocksFragment implements Fragment{
desctable.left();
for(ItemStack stack : recipe.requirements){
requirements.addImage(Draw.region("icon-"+stack.item.name)).size(8*3);
requirements.addImage(stack.item.region).size(8*3);
Label reqlabel = new Label("");
reqlabel.update(()->{
@@ -309,7 +309,7 @@ public class BlocksFragment implements Fragment{
pane.setFadeScrollBars(false);
Table top = new Table();
top.left();
top.add(new Image(Draw.region(block.name))).size(8*5 * block.width);
top.add(new Image(Draw.region(block.name))).size(8*5 * block.size);
top.add("[accent]"+block.formalName).padLeft(6f);
table.add(top).fill().left();
table.row();
@@ -357,8 +357,7 @@ public class BlocksFragment implements Fragment{
int amount = state.inventory.getItems()[i];
if(amount == 0) continue;
String formatted = amount > 99999999 ? "inf" : format(amount);
Image image = new Image(Draw.hasRegion("icon-" + Item.getByID(i).name) ?
Draw.region("icon-" + Item.getByID(i).name) : Draw.region("blank"));
Image image = new Image(Item.getByID(i).region);
Label label = new Label(formatted);
label.setFontScale(fontscale*1.5f);
itemtable.add(image).size(8*3);