From 77044db39f4b5c80ffc020c783c1fe660bc92caf Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:26:57 +0300 Subject: [PATCH 1/7] Remove v6 servers from v7 serverlist (#6286) --- servers_v7.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 9da1fdac62..e7feb0ad29 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,8 +1,4 @@ [ - { - "name": "Mindustry Central", - "address": ["n2.mindustry.me:4019", "mindustry.me:2034", "mindustry.me:2035"] - }, { "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"] @@ -55,10 +51,6 @@ "name": "Shiza Minigames", "address": ["shizashizashiza.ml"] }, - { - "name": "devass.su", - "address": ["185.22.152.66"] - }, { "name": "Phoenix Network", "address": ["172.104.253.198"] From a7cd8c8ef3e79e43dd7d433a3a275fb8d679a316 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Wed, 3 Nov 2021 01:27:09 +1000 Subject: [PATCH 2/7] Removing to v7 (#6284) --- servers_v6.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 39130c65cd..98cbeb7ac5 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -7,10 +7,6 @@ "name": "RCM", "address": ["185.104.248.61", "easyplay.su"] }, - { - "name": "SkaarjDustry", - "address": ["skaarjproject.duckdns.org"] - }, { "name": "{AA}", "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] From 921c1133753dba04c1654fcf29368246005c9bbd Mon Sep 17 00:00:00 2001 From: Valeriy Date: Wed, 3 Nov 2021 01:27:14 +1000 Subject: [PATCH 3/7] Moving to v7 (#6285) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index e7feb0ad29..fcefdd7745 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -23,6 +23,10 @@ "name": "DarkDustry", "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] }, + { + "name": "SkaarjDustry", + "address": ["skaarjproject.duckdns.org"] + }, { "name": "Chaotic Neutral", "address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"] From a438be7fcd22c8aa96c570762366302960cbc6a2 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:22:07 -0700 Subject: [PATCH 4/7] when and why was this hardcoded (#6289) --- core/src/mindustry/ai/types/MinerAI.java | 4 ++-- core/src/mindustry/game/Teams.java | 4 +--- core/src/mindustry/type/UnitType.java | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/ai/types/MinerAI.java b/core/src/mindustry/ai/types/MinerAI.java index f4a408800f..bc9b1a9da9 100644 --- a/core/src/mindustry/ai/types/MinerAI.java +++ b/core/src/mindustry/ai/types/MinerAI.java @@ -25,7 +25,7 @@ public class MinerAI extends AIController{ if(mining){ if(timer.get(timerTarget2, 60 * 4) || targetItem == null){ - targetItem = unit.team.data().mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i)); + targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i)); } //core full of the target item, do nothing @@ -75,4 +75,4 @@ public class MinerAI extends AIController{ circle(core, unit.type.range / 1.8f); } } -} +} \ No newline at end of file diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index f6f284ab35..0f3bf22c69 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -234,8 +234,6 @@ public class Teams{ public Queue blocks = new Queue<>(); /** The current command for units to follow. */ public UnitCommand command = UnitCommand.attack; - /** Target items to mine. */ - public Seq mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium); /** Quadtree for all buildings of this team. Null if not active. */ @Nullable @@ -370,4 +368,4 @@ public class Teams{ '}'; } } -} +} \ No newline at end of file diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index fcff622497..ac576f396d 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -88,6 +88,8 @@ public class UnitType extends UnlockableContent{ public BlockFlag[] targetFlags = {null}; /** targetFlags, as an override for "non-AI" teams. By default, units of this type will rush the core. */ public BlockFlag[] playerTargetFlags = {BlockFlag.core, null}; + /** Target items to mine. Used in MinerAI */ + public Seq mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium); public Color outlineColor = Pal.darkerMetal; public int outlineRadius = 3; @@ -965,4 +967,4 @@ public class UnitType extends UnlockableContent{ //endregion -} +} \ No newline at end of file From 3574b982abb316b24ef5ca8cb82488aedb317386 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 2 Nov 2021 19:03:47 -0700 Subject: [PATCH 5/7] misspelling (#6291) --- core/src/mindustry/world/Block.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 167f7e8b4b..f75d256bef 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -86,7 +86,7 @@ public class Block extends UnlockableContent{ public boolean solid; /** whether this block CAN be solid. */ public boolean solidifes; - /** whether this is rotateable */ + /** whether this is rotatable */ public boolean rotate; /** number of different variant regions to use */ public int variants = 0; From 996193ea69ea4f34cfc00b0cf0cad32caaa9a83c Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 3 Nov 2021 10:34:42 -0700 Subject: [PATCH 6/7] `payloadRotation` field (#6294) --- core/src/mindustry/entities/comp/BuildingComp.java | 1 + core/src/mindustry/world/blocks/payloads/BuildPayload.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 8182b24d3d..eb5490446c 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -61,6 +61,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, transient boolean updateFlow; transient byte cdump; transient int rotation; + transient float payloadRotation; transient boolean enabled = true; transient float enabledControlTime; transient String lastAccessed; diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java index 4b8454fd5c..cf6370ccf7 100644 --- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java +++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java @@ -80,6 +80,7 @@ public class BuildPayload implements Payload{ @Override public void set(float x, float y, float rotation){ build.set(x, y); + build.payloadRotation = rotation; } @Override From 7884bbd29971088844547a650a14f4a161fde390 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 3 Nov 2021 10:37:02 -0700 Subject: [PATCH 7/7] stack conveyor looks weird on payload conveyors (#6295) --- .../mindustry/world/blocks/distribution/StackConveyor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index d19004d243..fa7d2427e3 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -153,6 +153,11 @@ public class StackConveyor extends Block implements Autotiler{ Draw.z(Layer.block - 0.15f); super.drawCracks(); } + + @Override + public void payloadDraw(){ + Draw.rect(block.fullIcon, x, y); + } @Override public void onProximityUpdate(){