From fd71e159d3a63f7d8164f909bdd61147c579c475 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 10 Oct 2020 11:16:04 +0100 Subject: [PATCH 1/2] make storageblock instantiable --- core/src/mindustry/content/Blocks.java | 2 -- core/src/mindustry/world/blocks/storage/StorageBlock.java | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5843484090..f04da239bb 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1358,14 +1358,12 @@ public class Blocks implements ContentList{ requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125)); size = 3; itemCapacity = 1000; - group = BlockGroup.storage; }}; container = new StorageBlock("container"){{ requirements(Category.effect, with(Items.titanium, 100)); size = 2; itemCapacity = 300; - group = BlockGroup.storage; }}; unloader = new Unloader("unloader"){{ diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java index 6b022bf2f6..320d70868a 100644 --- a/core/src/mindustry/world/blocks/storage/StorageBlock.java +++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java @@ -5,15 +5,16 @@ import arc.util.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; +import mindustry.world.meta.*; -public abstract class StorageBlock extends Block{ - +public class StorageBlock extends Block{ public StorageBlock(String name){ super(name); hasItems = true; solid = true; update = false; destructible = true; + group = BlockGroup.storage; } @Override From 4b9659d4fa05778034a6919d95bf1e32f68dfb6b Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Sat, 10 Oct 2020 12:23:08 +0100 Subject: [PATCH 2/2] thank you quezler --- core/src/mindustry/world/blocks/storage/CoreBlock.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 372042b5bc..295a127f2b 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -50,6 +50,7 @@ public class CoreBlock extends StorageBlock{ unitCapModifier = 10; activeSound = Sounds.respawning; activeSoundVolume = 1f; + group = BlockGroup.none; } @Remote(called = Loc.server)