diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5691b8f546..bad25b7933 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1315,6 +1315,7 @@ public class Blocks{ researchCostMultiplier = 10f; + group = BlockGroup.heat; size = 3; drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(), new DrawHeatInput("-heat")); regionRotated1 = 1; @@ -1325,6 +1326,7 @@ public class Blocks{ researchCostMultiplier = 10f; + group = BlockGroup.heat; size = 3; drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(-1, false), new DrawHeatOutput(), new DrawHeatOutput(1, false), new DrawHeatInput("-heat")); regionRotated1 = 1; diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index e89174319b..8ce8ea7dd1 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -489,7 +489,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ throw new ValidateException(player, "Player cannot configure a tile."); } build.configured(player == null || player.dead() ? null : player.unit(), value); - Core.app.post(() -> Events.fire(new ConfigEvent(build, player, value))); + Events.fire(new ConfigEvent(build, player, value)); } //only useful for servers or local mods, and is not replicated across clients diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 965304ab7d..273855a0d7 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -259,14 +259,9 @@ public class CustomRulesDialog extends BaseDialog{ } t.button("@rules.anyenv", style, () -> { - if(!rules.infiniteResources){ - //unlocalized for now - ui.showInfo("The 'any' environment can only be used in sandbox mode."); - }else{ - rules.env = Vars.defaultEnv; - rules.hiddenBuildItems.clear(); - rules.planet = Planets.sun; - } + rules.env = Vars.defaultEnv; + rules.hiddenBuildItems.clear(); + rules.planet = Planets.sun; }).group(group).checked(b -> rules.planet == Planets.sun); }).left().fill(false).expand(false, false).row(); diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index 019e8c6078..a4377efc7a 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -37,7 +37,7 @@ public class DrawTurret extends DrawBlock{ part.getOutlines(out); } - if(block.region.found() && !(block.outlinedIcon > 0 && block.getGeneratedIcons()[block.outlinedIcon].equals(block.region))){ + if(block.region.found() && !(block.outlinedIcon > 0 && block.outlinedIcon < block.getGeneratedIcons().length && block.getGeneratedIcons()[block.outlinedIcon].equals(block.region))){ out.add(block.region); } diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java index 72a850d6c4..e3b6d8ed11 100644 --- a/core/src/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,7 +1,7 @@ package mindustry.world.meta; public enum BlockGroup{ - none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true); + none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true), payloads(true), heat(true); /** if true, any block in this category replaces any other block in this category. */ public final boolean anyReplace;