diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index b7d9809cbb..7f4a40d602 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -21,7 +21,7 @@ public class UnitBlocks extends BlockList implements ContentList{ produceTime = 5700; size = 2; consumes.power(0.08f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)}); + consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)); }}; phantomFactory = new UnitFactory("phantom-factory"){{ @@ -29,7 +29,7 @@ public class UnitBlocks extends BlockList implements ContentList{ produceTime = 7300; size = 2; consumes.power(0.2f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)}); + consumes.items(new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)); }}; wraithFactory = new UnitFactory("wraith-factory"){{ @@ -37,7 +37,7 @@ public class UnitBlocks extends BlockList implements ContentList{ produceTime = 1800; size = 2; consumes.power(0.1f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)}); + consumes.items(new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)); }}; ghoulFactory = new UnitFactory("ghoul-factory"){{ @@ -46,7 +46,7 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 3; consumes.power(0.2f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); + consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)); }}; revenantFactory = new UnitFactory("revenant-factory"){{ @@ -55,7 +55,7 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 4; consumes.power(0.3f); shadow = "shadow-round-4"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)}); + consumes.items(new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)); }}; daggerFactory = new UnitFactory("dagger-factory"){{ @@ -63,7 +63,7 @@ public class UnitBlocks extends BlockList implements ContentList{ produceTime = 1700; size = 2; consumes.power(0.05f); - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10)}); + consumes.items(new ItemStack(Items.silicon, 10)); }}; titanFactory = new UnitFactory("titan-factory"){{ @@ -72,7 +72,7 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 3; consumes.power(0.15f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)}); + consumes.items(new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)); }}; fortressFactory = new UnitFactory("fortress-factory"){{ @@ -81,7 +81,7 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 3; consumes.power(0.2f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)}); + consumes.items(new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)); }}; repairPoint = new RepairPoint("repair-point"){{ diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java index cfabf5e7ca..9433de8c54 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java @@ -52,7 +52,7 @@ public class Consumers{ return i; } - public ConsumeItems items(ItemStack[] items){ + public ConsumeItems items(ItemStack... items){ ConsumeItems i = new ConsumeItems(items); add(i); return i; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java index 22e37ea7bd..af9ab67af2 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java @@ -38,11 +38,11 @@ public class ItemListValue implements ContentStatValue{ public void display(Table table){ if(items != null){ for(Item item : items){ - table.add(new ItemDisplay(item)); + table.add(new ItemDisplay(item)).padRight(5); } }else{ for(ItemStack stack : stacks){ - new ItemDisplay(stack.item, stack.amount); + table.add(new ItemDisplay(stack.item, stack.amount)).padRight(5); } } }