Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/src/mindustry/core/ContentLoader.java core/src/mindustry/world/Block.java
2022-01-27 14:58:44 -05:00
parent 7cdd9edb5f 0b9483cffc
commit e4595b6831
16 changed files with 152 additions and 54 deletions
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1395,6 +1395,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
        return self() != other;
    }

+    /**
+     * Called when this block's config menu is closed
+     */
+    public void onConfigureClosed(){}
+
    /** Returns whether this config menu should show when the specified player taps it. */
    public boolean shouldShowConfigure(Player player){
        return true;