From afe3b0d11173117103418ce078d73840cebb2d8f Mon Sep 17 00:00:00 2001 From: summetdev Date: Sat, 31 Oct 2020 22:30:37 +0300 Subject: [PATCH 1/2] Group for unit factory --- core/src/mindustry/world/blocks/units/UnitFactory.java | 1 + core/src/mindustry/world/meta/BlockGroup.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index f76fd42dfe..32839e4814 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -29,6 +29,7 @@ public class UnitFactory extends UnitBlock{ public UnitFactory(String name){ super(name); + group = BlockGroup.units; update = true; hasPower = true; hasItems = true; diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java index 2b3434ccfb..de7591e751 100644 --- a/core/src/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,5 +1,5 @@ package mindustry.world.meta; public enum BlockGroup{ - none, walls, turrets, transportation, power, liquids, drills, storage + none, walls, turrets, transportation, power, liquids, drills, storage, units } From e6f60505e6a5746a650dd992c7f1663707a0dd27 Mon Sep 17 00:00:00 2001 From: summetdev Date: Sat, 31 Oct 2020 23:03:25 +0300 Subject: [PATCH 2/2] Add group to UnitBlock --- core/src/mindustry/world/blocks/units/UnitBlock.java | 3 ++- core/src/mindustry/world/blocks/units/UnitFactory.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/units/UnitBlock.java b/core/src/mindustry/world/blocks/units/UnitBlock.java index d1bce06795..246ac03ada 100644 --- a/core/src/mindustry/world/blocks/units/UnitBlock.java +++ b/core/src/mindustry/world/blocks/units/UnitBlock.java @@ -10,6 +10,7 @@ import mindustry.gen.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.production.*; +import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -17,7 +18,7 @@ public class UnitBlock extends PayloadAcceptor{ public UnitBlock(String name){ super(name); - + group = BlockGroup.units; outputsPayload = true; rotate = true; update = true; diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index 32839e4814..f76fd42dfe 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -29,7 +29,6 @@ public class UnitFactory extends UnitBlock{ public UnitFactory(String name){ super(name); - group = BlockGroup.units; update = true; hasPower = true; hasItems = true;