From 1b5e49bd3c11b188eaa3d9aebd71bacc3cd45007 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 9 Jun 2022 13:16:34 -0400 Subject: [PATCH] Items/liquids consume shorthand --- core/src/mindustry/mod/ContentParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 6883b9cedd..131e8b25ff 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -402,10 +402,14 @@ public class ContentParser{ case "itemRadioactive" -> block.consume((Consume)parser.readValue(ConsumeItemRadioactive.class, child)); case "itemExplosive" -> block.consume((Consume)parser.readValue(ConsumeItemExplosive.class, child)); case "itemExplode" -> block.consume((Consume)parser.readValue(ConsumeItemExplode.class, child)); - case "items" -> block.consume((Consume)parser.readValue(ConsumeItems.class, child)); + case "items" -> block.consume(child.isArray() ? + new ConsumeItems(parser.readValue(ItemStack[].class, child)) : + parser.readValue(ConsumeItems.class, child)); case "liquidFlammable" -> block.consume((Consume)parser.readValue(ConsumeLiquidFlammable.class, child)); case "liquid" -> block.consume((Consume)parser.readValue(ConsumeLiquid.class, child)); - case "liquids" -> block.consume((Consume)parser.readValue(ConsumeLiquids.class, child)); + case "liquids" -> block.consume(child.isArray() ? + new ConsumeLiquids(parser.readValue(LiquidStack[].class, child)) : + parser.readValue(ConsumeLiquids.class, child)); case "coolant" -> block.consume((Consume)parser.readValue(ConsumeCoolant.class, child)); case "power" -> { if(child.isNumber()){