From f4f46eb924f1e16c65ff75e8901d87c5537d9359 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Fri, 23 Jul 2021 13:45:48 -0400 Subject: [PATCH 1/4] Better plan skipping (#5634) This prevents the plans being skipped when there is a large number of items entering the core yet the core is still starved of that item. --- core/src/mindustry/entities/comp/BuilderComp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index 9b456e5602..f9a5af6ca2 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -179,7 +179,7 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{ //requests that you have at least *started* are considered if(state.rules.infiniteResources || team.rules().infiniteResources || request.breaking || core == null || request.isRotation(team)) return false; - return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized); + return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item, Math.min(i.amount, 15)) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized); } void removeBuild(int x, int y, boolean breaking){ From 0c00000910e2c876c61cab63c021b2418086741e Mon Sep 17 00:00:00 2001 From: Semetrix <73433905+Semetrix@users.noreply.github.com> Date: Fri, 23 Jul 2021 20:49:42 +0100 Subject: [PATCH 2/4] Add a second Hungarian server (#5636) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 843fde67d9..98a1079bd4 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -93,7 +93,7 @@ }, { "name": "Hungarian", - "address": ["magyarmindustry.tk"] + "address": ["magyarmindustry.tk", "148.251.175.124:25601"] }, { "name": "Xpdustry", From d89a1fac70ece3ba3182ca29137c11faf290933e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Jul 2021 15:50:09 -0400 Subject: [PATCH 3/4] Update pull_request_template.md --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4f03450b6e..81d2a8c472 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,4 @@ -If your pull request is **not** translation-related, read the list of requirements below and check each box: +If your pull request is **not** translation or serverlist-related, read the list of requirements below and check each box: - [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md). - [ ] I have ensured that my code compiles, if applicable. From 53214f0ddc4a02ea263fa082fccce60147b66caf Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Fri, 23 Jul 2021 15:51:26 -0400 Subject: [PATCH 4/4] Enable mining of sand when double click to mine is enabled (#4788) * Sand mineable with double click to mine enabled Since the only reason sand is un-mineable in the first place is because accidentally mining it is annoying, it should be enabled for double click to mine. * only show sand as mineable when double click mine is enabled Co-authored-by: Anuken --- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/type/UnitType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 0882c39dea..bc385af592 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -1027,7 +1027,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ return !Core.scene.hasMouse() && tile.drop() != null && player.unit().validMine(tile) - && !(tile.floor().playerUnmineable && tile.overlay().itemDrop == null) + && !((!Core.settings.getBool("doubletapmine") && tile.floor().playerUnmineable) && tile.overlay().itemDrop == null) && player.unit().acceptsItem(tile.drop()) && tile.block() == Blocks.air; } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 7e0b55ce65..da238f0584 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -279,7 +279,7 @@ public class UnitType extends UnlockableContent{ if(mineTier >= 1){ stats.addPercent(Stat.mineSpeed, mineSpeed); - stats.add(Stat.mineTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= mineTier && !f.playerUnmineable)); + stats.add(Stat.mineTier, StatValues.blocks(b -> b instanceof Floor f && f.itemDrop != null && f.itemDrop.hardness <= mineTier && (!f.playerUnmineable || Core.settings.getBool("doubletapmine")))); } if(buildSpeed > 0){ stats.addPercent(Stat.buildSpeed, buildSpeed);