From 5d8f6d7c9760f6fb60ed074ac139907639087e61 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 09:31:28 -0400 Subject: [PATCH] More environmental support --- core/src/mindustry/content/Blocks.java | 2 ++ core/src/mindustry/world/blocks/liquid/LiquidBridge.java | 1 + .../mindustry/world/blocks/liquid/LiquidExtendingBridge.java | 1 + core/src/mindustry/world/blocks/logic/MessageBlock.java | 1 + core/src/mindustry/world/blocks/power/PowerDiode.java | 1 + core/src/mindustry/world/blocks/sandbox/LiquidSource.java | 1 + core/src/mindustry/world/blocks/sandbox/LiquidVoid.java | 1 + gradle.properties | 2 +- 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c7beacbe6b..10fa055e4d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -742,6 +742,7 @@ public class Blocks implements ContentList{ hasItems = true; hasPower = true; outputItem = new ItemStack(Items.pyratite, 1); + envEnabled |= Env.space; size = 2; @@ -755,6 +756,7 @@ public class Blocks implements ContentList{ hasPower = true; outputItem = new ItemStack(Items.blastCompound, 1); size = 2; + envEnabled |= Env.space; consumes.items(with(Items.pyratite, 1, Items.sporePod, 1)); consumes.power(0.40f); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java index 83b2fe3e1e..0944f7fef8 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -17,6 +17,7 @@ public class LiquidBridge extends ItemBridge{ outputsLiquid = true; canOverdrive = false; group = BlockGroup.liquids; + envEnabled = Env.any; } public class LiquidBridgeBuild extends ItemBridgeBuild{ diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java index 552c348891..d08f14d277 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java @@ -16,6 +16,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{ hasLiquids = true; outputsLiquid = true; group = BlockGroup.liquids; + envEnabled = Env.any; } public class LiquidExtendingBridgeBuild extends ExtendingItemBridgeBuild{ diff --git a/core/src/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java index d279e079d9..6964f2c4f6 100644 --- a/core/src/mindustry/world/blocks/logic/MessageBlock.java +++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java @@ -30,6 +30,7 @@ public class MessageBlock extends Block{ destructible = true; group = BlockGroup.logic; drawDisabled = false; + envEnabled = Env.any; config(String.class, (MessageBuild tile, String text) -> { if(text.length() > maxTextLength){ diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java index 422c978aef..f31cf71cf6 100644 --- a/core/src/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -23,6 +23,7 @@ public class PowerDiode extends Block{ group = BlockGroup.power; noUpdateDisabled = true; schematicPriority = 10; + envEnabled |= Env.space; } @Override diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index 7f029299c3..621c2252df 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -27,6 +27,7 @@ public class LiquidSource extends Block{ noUpdateDisabled = true; displayFlow = false; group = BlockGroup.liquids; + envEnabled = Env.any; config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l); configClear((LiquidSourceBuild tile) -> tile.source = null); diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java index bde9742467..713dace08f 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java @@ -13,6 +13,7 @@ public class LiquidVoid extends Block{ solid = true; update = true; group = BlockGroup.liquids; + envEnabled = Env.any; } @Override diff --git a/gradle.properties b/gradle.properties index 133a6a5351..fb172e55f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ kapt.include.compile.classpath=false kotlin.stdlib.default.dependency=false #needed for android compilation android.useAndroidX=true -archash=df2786dd8de1ebc1b70c453d6dcac62c2ecf9e18 +archash=283f2b76f419fc157312b26b1f1eff0de83898e1