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

Merge pull request #38 from Anuken/4.0

Browse Source
This commit is contained in:
Anuken
2017-12-30 10:59:34 -05:00
committed by GitHub
parent 1cb2609be8 54662ee83f
commit f0c60b9f15
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/resource/Item.java
View File

@@ -13,7 +13,10 @@ public class Item{
steel = new Item("steel"), steel = new Item("steel"),
titanium = new Item("titanium"), titanium = new Item("titanium"),
dirium = new Item("dirium"), dirium = new Item("dirium"),
uranium = new Item("uranium"); uranium = new Item("uranium"),
sand = new Item("sand"),
glass = new Item("glass"),
silicon = new Item("silicon");
public final int id; public final int id;
public final String name; public final String name;

3
core/src/io/anuke/mindustry/resource/Liquid.java
View File

@@ -12,7 +12,8 @@ public class Liquid {
water = new Liquid("water", Color.ROYAL), water = new Liquid("water", Color.ROYAL),
plasma = new Liquid("plasma", Color.CORAL), plasma = new Liquid("plasma", Color.CORAL),
lava = new Liquid("lava", Color.valueOf("ed5334")), lava = new Liquid("lava", Color.valueOf("ed5334")),
oil = new Liquid("oil", Color.valueOf("292929")); oil = new Liquid("oil", Color.valueOf("292929")),
cryofluid = new Liquid("cryofluid", Color.SKY);
public final Color color; public final Color color;
public final String name; public final String name;

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

@@ -299,7 +299,8 @@ public class BlocksFragment implements Fragment{
int amount = control.getItems()[i]; int amount = control.getItems()[i];
if(amount == 0) continue; if(amount == 0) continue;
String formatted = amount > 99999999 ? "inf" : format(amount); String formatted = amount > 99999999 ? "inf" : format(amount);
Image image = new Image(Draw.region("icon-" + Item.getByID(i).name)); Image image = new Image(Draw.hasRegion("icon-" + Item.getByID(i).name) ?
Draw.region("icon-" + Item.getByID(i).name) : Draw.region("blank"));
Label label = new Label(formatted); Label label = new Label(formatted);
label.setFontScale(fontscale*1.5f); label.setFontScale(fontscale*1.5f);
itemtable.add(image).size(8*3); itemtable.add(image).size(8*3);