From 54662ee83fcb9d252f4841cc622bd7309e9c5d6d Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 29 Dec 2017 19:59:58 -0500 Subject: [PATCH] Added some new resources --- core/src/io/anuke/mindustry/resource/Item.java | 5 ++++- core/src/io/anuke/mindustry/resource/Liquid.java | 3 ++- core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/resource/Item.java b/core/src/io/anuke/mindustry/resource/Item.java index 484440eccb..d5ea87d2b1 100644 --- a/core/src/io/anuke/mindustry/resource/Item.java +++ b/core/src/io/anuke/mindustry/resource/Item.java @@ -13,7 +13,10 @@ public class Item{ steel = new Item("steel"), titanium = new Item("titanium"), 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 String name; diff --git a/core/src/io/anuke/mindustry/resource/Liquid.java b/core/src/io/anuke/mindustry/resource/Liquid.java index 4c2b9c100a..5bf97660b3 100644 --- a/core/src/io/anuke/mindustry/resource/Liquid.java +++ b/core/src/io/anuke/mindustry/resource/Liquid.java @@ -12,7 +12,8 @@ public class Liquid { water = new Liquid("water", Color.ROYAL), plasma = new Liquid("plasma", Color.CORAL), 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 String name; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index 35fc83121d..be847111b6 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -299,7 +299,8 @@ public class BlocksFragment implements Fragment{ int amount = control.getItems()[i]; if(amount == 0) continue; 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.setFontScale(fontscale*1.5f); itemtable.add(image).size(8*3);