Skip to content

Commit 8634921

Browse files
way-zerway-zer
committed
sync 2024/7/2
1 parent daa28ff commit 8634921

5 files changed

+107
-147
lines changed

‎patches/client/0073-ARC-arcScanMode.patch

+68-67
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,73 @@ Date: Sun, 19 May 2024 19:40:31 +0800
44
Subject: [PATCH] ARC arcScanMode
55

66
---
7-
.../arcModule/toolpack/ArcScanMode.java | 397 ++++++++++++++++++
87
.../blocks/distribution/DirectionBridge.java | 7 +
98
.../world/blocks/distribution/ItemBridge.java | 12 +
109
.../world/blocks/distribution/MassDriver.java | 3 +
11-
4 files changed, 419 insertions(+)
12-
create mode 100644 core/src/mindustry/arcModule/toolpack/ArcScanMode.java
10+
core/src/mindustryX/features/ArcScanMode.java | 398 ++++++++++++++++++
11+
4 files changed, 420 insertions(+)
12+
create mode 100644 core/src/mindustryX/features/ArcScanMode.java
1313

14-
diff --git a/core/src/mindustry/arcModule/toolpack/ArcScanMode.java b/core/src/mindustry/arcModule/toolpack/ArcScanMode.java
14+
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
15+
index 2c0077cc99557c80f49d0cf496c92309b31e482e..341b81c8ec8cae795b3e5c3872e253f9317975bc 100644
16+
--- a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
17+
+++ b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
18+
@@ -215,5 +215,12 @@ public class DirectionBridge extends Block{
19+
}
20+
return null;
21+
}
22+
+ public boolean arcCheckAccept(Building source) {
23+
+ //only accept if there's an output point.
24+
+ if(findLink() == null) return false;
25+
+
26+
+ int rel = this.relativeToEdge(source.tile);
27+
+ return rel != rotation && occupied[(rel + 2) % 4] == null;
28+
+ }
29+
}
30+
}
31+
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
32+
index 050e7151487c8d248c0e6e0b48913fbe944164d9..ecad9d1a4270e0611bca5c6b3d23f4d6f07dd027 100644
33+
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
34+
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
35+
@@ -530,5 +530,17 @@ public class ItemBridge extends Block{
36+
wasMoved = moved = read.bool();
37+
}
38+
}
39+
+
40+
+ public boolean arcLinkValid() {
41+
+ return linkValid(this.tile, world.tile(link));
42+
+ }
43+
+
44+
+ public boolean arcCheckDump(Building to){
45+
+ return checkDump(to);
46+
+ }
47+
+
48+
+ public boolean arcCheckAccept(Building source) {
49+
+ return checkAccept(source, world.tile(link));
50+
+ }
51+
}
52+
}
53+
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
54+
index 7fc0d5f0ec12e7d2aaa70d32beebed9027914449..f749a280f0307a1c44294b6ebcba25808f429ef0 100644
55+
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
56+
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
57+
@@ -335,6 +335,9 @@ public class MassDriver extends Block{
58+
return other instanceof MassDriverBuild entity && other.isValid() && other.efficiency > 0 && entity.block == block && entity.link == pos() && within(other, range);
59+
}
60+
61+
+ public boolean arcLinkValid(){
62+
+ return linkValid();
63+
+ }
64+
protected boolean linkValid(){
65+
if(link == -1) return false;
66+
return world.build(this.link) instanceof MassDriverBuild other && other.block == block && other.team == team && within(other, range);
67+
diff --git a/core/src/mindustryX/features/ArcScanMode.java b/core/src/mindustryX/features/ArcScanMode.java
1568
new file mode 100644
16-
index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba52b8b6aaa
69+
index 0000000000000000000000000000000000000000..f2b394217a66d92c418db8ae1311a07f4bbf9263
1770
--- /dev/null
18-
+++ b/core/src/mindustry/arcModule/toolpack/ArcScanMode.java
19-
@@ -0,0 +1,397 @@
20-
+package mindustry.arcModule.toolpack;
71+
+++ b/core/src/mindustryX/features/ArcScanMode.java
72+
@@ -0,0 +1,398 @@
73+
+package mindustryX.features;
2174
+
2275
+import arc.*;
2376
+import arc.func.*;
@@ -30,7 +83,6 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
3083
+import arc.struct.*;
3184
+import arc.util.*;
3285
+import mindustry.ai.types.*;
33-
+import mindustry.arcModule.*;
3486
+import mindustry.gen.*;
3587
+import mindustry.graphics.*;
3688
+import mindustry.input.*;
@@ -42,9 +94,11 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
4294
+import mindustry.world.blocks.production.*;
4395
+import mindustry.world.blocks.storage.*;
4496
+import mindustry.world.meta.*;
97+
+import mindustryX.features.ui.*;
4598
+
4699
+import static mindustry.Vars.*;
47100
+
101+
+//move from mindustry.arcModule.toolpack.ArcScanMode
48102
+public class ArcScanMode{
49103
+ public static boolean enabled = false;
50104
+ private static final Table ctTable = new Table();
@@ -90,8 +144,8 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
90144
+ private static void updateSpawnerDisplay(){
91145
+ spawnerTable.clear();
92146
+ flyerTable.clear();
93-
+ if(arcWaveSpawner.arcWave.isEmpty()) return;
94-
+ arcWaveSpawner.waveInfo thisWave = arcWaveSpawner.arcWave.get(Math.min(state.wave - 1, arcWaveSpawner.arcWave.size - 1));
147+
+ if(ArcWaveSpawner.arcWave.isEmpty()) return;
148+
+ ArcWaveSpawner.waveInfo thisWave = ArcWaveSpawner.arcWave.get(Math.min(state.wave - 1, ArcWaveSpawner.arcWave.size - 1));
95149
+ for(Tile tile : spawner.getSpawns()){
96150
+ if(Mathf.dst(tile.worldx(), tile.worldy(), Core.input.mouseWorldX(), Core.input.mouseWorldY()) < state.rules.dropZoneRadius){
97151
+ float curve = Mathf.curve(Time.time % 240f, 120f, 240f);
@@ -104,7 +158,7 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
104158
+ float spawnX = Mathf.clamp(world.width() * tilesize / 2f + Angles.trnsx(flyerAngle, trns), 0, world.width() * tilesize);
105159
+ float spawnY = Mathf.clamp(world.height() * tilesize / 2f + Angles.trnsy(flyerAngle, trns), 0, world.height() * tilesize);
106160
+
107-
+ if(arcWaveSpawner.hasFlyer){
161+
+ if(ArcWaveSpawner.hasFlyer){
108162
+ Lines.line(tile.worldx(), tile.worldy(), spawnX, spawnY);
109163
+ Tmp.v1.set(spawnX - tile.worldx(), spawnY - tile.worldy());
110164
+ Tmp.v1.setLength(Tmp.v1.len() * curve);
@@ -113,7 +167,7 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
113167
+ Vec2 v = Core.camera.project(spawnX, spawnY);
114168
+ flyerTable.setPosition(v.x, v.y);
115169
+ flyerTable.table(Styles.black3, tt -> {
116-
+ tt.add(RFuncs.calWaveTimer()).row();
170+
+ tt.add(FormatDefault.duration(state.wavetime / 60, false)).row();
117171
+ thisWave.specLoc(tile.pos(), group -> group.type.flying);
118172
+ tt.add(thisWave.proTable(false));
119173
+ tt.row();
@@ -133,7 +187,7 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
133187
+ Vec2 v = Core.camera.project(tile.worldx(), tile.worldy());
134188
+ spawnerTable.setPosition(v.x, v.y);
135189
+ spawnerTable.table(Styles.black3, tt -> {
136-
+ tt.add(RFuncs.calWaveTimer()).row();
190+
+ tt.add(FormatDefault.duration(state.wavetime / 60, false)).row();
137191
+ thisWave.specLoc(tile.pos(), group -> !group.type.flying);
138192
+ tt.add(thisWave.proTable(false));
139193
+ tt.row();
@@ -414,56 +468,3 @@ index 0000000000000000000000000000000000000000..b5336d79400f724b39d50c304e417ba5
414468
+ }
415469
+ }
416470
+}
417-
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
418-
index 2c0077cc99557c80f49d0cf496c92309b31e482e..341b81c8ec8cae795b3e5c3872e253f9317975bc 100644
419-
--- a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
420-
+++ b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
421-
@@ -215,5 +215,12 @@ public class DirectionBridge extends Block{
422-
}
423-
return null;
424-
}
425-
+ public boolean arcCheckAccept(Building source) {
426-
+ //only accept if there's an output point.
427-
+ if(findLink() == null) return false;
428-
+
429-
+ int rel = this.relativeToEdge(source.tile);
430-
+ return rel != rotation && occupied[(rel + 2) % 4] == null;
431-
+ }
432-
}
433-
}
434-
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
435-
index 050e7151487c8d248c0e6e0b48913fbe944164d9..ecad9d1a4270e0611bca5c6b3d23f4d6f07dd027 100644
436-
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
437-
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
438-
@@ -530,5 +530,17 @@ public class ItemBridge extends Block{
439-
wasMoved = moved = read.bool();
440-
}
441-
}
442-
+
443-
+ public boolean arcLinkValid() {
444-
+ return linkValid(this.tile, world.tile(link));
445-
+ }
446-
+
447-
+ public boolean arcCheckDump(Building to){
448-
+ return checkDump(to);
449-
+ }
450-
+
451-
+ public boolean arcCheckAccept(Building source) {
452-
+ return checkAccept(source, world.tile(link));
453-
+ }
454-
}
455-
}
456-
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
457-
index 7fc0d5f0ec12e7d2aaa70d32beebed9027914449..f749a280f0307a1c44294b6ebcba25808f429ef0 100644
458-
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
459-
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
460-
@@ -335,6 +335,9 @@ public class MassDriver extends Block{
461-
return other instanceof MassDriverBuild entity && other.isValid() && other.efficiency > 0 && entity.block == block && entity.link == pos() && within(other, range);
462-
}
463-
464-
+ public boolean arcLinkValid(){
465-
+ return linkValid();
466-
+ }
467-
protected boolean linkValid(){
468-
if(link == -1) return false;
469-
return world.build(this.link) instanceof MassDriverBuild other && other.block == block && other.team == team && within(other, range);

‎patches/client/0078-C-RenderExt-drawBars.patch

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Date: Wed, 5 Jun 2024 23:26:51 +0800
44
Subject: [PATCH] C(RenderExt) drawBars
55

66
---
7-
core/src/mindustryX/features/RenderExt.java | 54 +++++++++++++++++++++
8-
1 file changed, 54 insertions(+)
7+
core/src/mindustryX/features/RenderExt.java | 56 +++++++++++++++++++++
8+
1 file changed, 56 insertions(+)
99

1010
diff --git a/core/src/mindustryX/features/RenderExt.java b/core/src/mindustryX/features/RenderExt.java
11-
index 5f9673b79a87985190aee8083a51607e60af04b7..5e5190b95b68b37423a9d6beaf7d2215cba32e97 100644
11+
index 5f9673b79a87985190aee8083a51607e60af04b7..ac0ebc4e161570f3a5f8a3c0717fb7459f5d5f04 100644
1212
--- a/core/src/mindustryX/features/RenderExt.java
1313
+++ b/core/src/mindustryX/features/RenderExt.java
1414
@@ -6,6 +6,8 @@ import arc.graphics.g2d.*;
@@ -56,7 +56,7 @@ index 5f9673b79a87985190aee8083a51607e60af04b7..5e5190b95b68b37423a9d6beaf7d2215
5656
}
5757

5858
private static void placementEffect(float x, float y, float lifetime, float range, Color color){
59-
@@ -152,4 +162,48 @@ public class RenderExt{
59+
@@ -152,4 +162,50 @@ public class RenderExt{
6060
}
6161
}
6262
}
@@ -103,5 +103,7 @@ index 5f9673b79a87985190aee8083a51607e60af04b7..5e5190b95b68b37423a9d6beaf7d2215
103103
+ Draw.color(fg, 0.6f);
104104
+ Lines.stroke(2f);
105105
+ Lines.line(x1, y, Mathf.lerp(x1, x2, Mathf.clamp(ratio, 0f, 1f)), y);
106+
+
107+
+ Draw.reset();
106108
+ }
107109
}

‎patches/client/0085-C-RenderExt-playerEffectColor.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ index 3cafd2e7f08c2ad7c9528a914df7eab1bdec9e87..855c5dad204db7796043e9c9c159a3c3
3232
case 0 -> "关闭";
3333
case 1 -> "虚圆";
3434
diff --git a/core/src/mindustryX/features/RenderExt.java b/core/src/mindustryX/features/RenderExt.java
35-
index 5e5190b95b68b37423a9d6beaf7d2215cba32e97..d3af9a67991d89027dc2c556d9b757803fa15553 100644
35+
index ac0ebc4e161570f3a5f8a3c0717fb7459f5d5f04..7dd8cea136898d7800142e6f5b9e54c87f1c5877 100644
3636
--- a/core/src/mindustryX/features/RenderExt.java
3737
+++ b/core/src/mindustryX/features/RenderExt.java
3838
@@ -43,6 +43,7 @@ public class RenderExt{

‎patches/client/0086-ARC-merged.patch

+2-75
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ way-zer <[email protected]> on 2024/7/2
133133
core/src/mindustryX/features/ArcBuilds.java | 160 +++
134134
core/src/mindustryX/features/ArcOld.java | 42 +
135135
core/src/mindustryX/features/ArcRadar.java | 239 ++++
136-
.../features}/ArcScanMode.java | 15 +-
137136
core/src/mindustryX/features/ArcUnits.java | 346 +++++
138137
.../mindustryX/features/ArcWaveSpawner.java | 258 ++++
139138
core/src/mindustryX/features/MarkerType.java | 12 +-
@@ -144,10 +143,9 @@ way-zer <[email protected]> on 2024/7/2
144143
.../mindustryX/features/ui/ArcPowerInfo.java | 71 ++
145144
.../features/ui/ArcWaveInfoDialog.java | 1117 +++++++++++++++++
146145
.../features/ui/BlockSelectDialog.java | 65 +
147-
69 files changed, 6196 insertions(+), 285 deletions(-)
146+
68 files changed, 6188 insertions(+), 278 deletions(-)
148147
create mode 100644 core/src/mindustryX/features/ArcBuilds.java
149148
create mode 100644 core/src/mindustryX/features/ArcRadar.java
150-
rename core/src/{mindustry/arcModule/toolpack => mindustryX/features}/ArcScanMode.java (97%)
151149
create mode 100644 core/src/mindustryX/features/ArcUnits.java
152150
create mode 100644 core/src/mindustryX/features/ArcWaveSpawner.java
153151
create mode 100644 core/src/mindustryX/features/PicToMindustry.java
@@ -6649,77 +6647,6 @@ index 0000000000000000000000000000000000000000..21abee2343532b732130d2209137a6c0
66496647
+ }
66506648
+
66516649
+}
6652-
diff --git a/core/src/mindustry/arcModule/toolpack/ArcScanMode.java b/core/src/mindustryX/features/ArcScanMode.java
6653-
similarity index 97%
6654-
rename from core/src/mindustry/arcModule/toolpack/ArcScanMode.java
6655-
rename to core/src/mindustryX/features/ArcScanMode.java
6656-
index b5336d79400f724b39d50c304e417ba52b8b6aaa..f2b394217a66d92c418db8ae1311a07f4bbf9263 100644
6657-
--- a/core/src/mindustry/arcModule/toolpack/ArcScanMode.java
6658-
+++ b/core/src/mindustryX/features/ArcScanMode.java
6659-
@@ -1,4 +1,4 @@
6660-
-package mindustry.arcModule.toolpack;
6661-
+package mindustryX.features;
6662-
6663-
import arc.*;
6664-
import arc.func.*;
6665-
@@ -11,7 +11,6 @@ import arc.scene.ui.layout.*;
6666-
import arc.struct.*;
6667-
import arc.util.*;
6668-
import mindustry.ai.types.*;
6669-
-import mindustry.arcModule.*;
6670-
import mindustry.gen.*;
6671-
import mindustry.graphics.*;
6672-
import mindustry.input.*;
6673-
@@ -23,9 +22,11 @@ import mindustry.world.blocks.liquid.*;
6674-
import mindustry.world.blocks.production.*;
6675-
import mindustry.world.blocks.storage.*;
6676-
import mindustry.world.meta.*;
6677-
+import mindustryX.features.ui.*;
6678-
6679-
import static mindustry.Vars.*;
6680-
6681-
+//move from mindustry.arcModule.toolpack.ArcScanMode
6682-
public class ArcScanMode{
6683-
public static boolean enabled = false;
6684-
private static final Table ctTable = new Table();
6685-
@@ -71,8 +72,8 @@ public class ArcScanMode{
6686-
private static void updateSpawnerDisplay(){
6687-
spawnerTable.clear();
6688-
flyerTable.clear();
6689-
- if(arcWaveSpawner.arcWave.isEmpty()) return;
6690-
- arcWaveSpawner.waveInfo thisWave = arcWaveSpawner.arcWave.get(Math.min(state.wave - 1, arcWaveSpawner.arcWave.size - 1));
6691-
+ if(ArcWaveSpawner.arcWave.isEmpty()) return;
6692-
+ ArcWaveSpawner.waveInfo thisWave = ArcWaveSpawner.arcWave.get(Math.min(state.wave - 1, ArcWaveSpawner.arcWave.size - 1));
6693-
for(Tile tile : spawner.getSpawns()){
6694-
if(Mathf.dst(tile.worldx(), tile.worldy(), Core.input.mouseWorldX(), Core.input.mouseWorldY()) < state.rules.dropZoneRadius){
6695-
float curve = Mathf.curve(Time.time % 240f, 120f, 240f);
6696-
@@ -85,7 +86,7 @@ public class ArcScanMode{
6697-
float spawnX = Mathf.clamp(world.width() * tilesize / 2f + Angles.trnsx(flyerAngle, trns), 0, world.width() * tilesize);
6698-
float spawnY = Mathf.clamp(world.height() * tilesize / 2f + Angles.trnsy(flyerAngle, trns), 0, world.height() * tilesize);
6699-
6700-
- if(arcWaveSpawner.hasFlyer){
6701-
+ if(ArcWaveSpawner.hasFlyer){
6702-
Lines.line(tile.worldx(), tile.worldy(), spawnX, spawnY);
6703-
Tmp.v1.set(spawnX - tile.worldx(), spawnY - tile.worldy());
6704-
Tmp.v1.setLength(Tmp.v1.len() * curve);
6705-
@@ -94,7 +95,7 @@ public class ArcScanMode{
6706-
Vec2 v = Core.camera.project(spawnX, spawnY);
6707-
flyerTable.setPosition(v.x, v.y);
6708-
flyerTable.table(Styles.black3, tt -> {
6709-
- tt.add(RFuncs.calWaveTimer()).row();
6710-
+ tt.add(FormatDefault.duration(state.wavetime / 60, false)).row();
6711-
thisWave.specLoc(tile.pos(), group -> group.type.flying);
6712-
tt.add(thisWave.proTable(false));
6713-
tt.row();
6714-
@@ -114,7 +115,7 @@ public class ArcScanMode{
6715-
Vec2 v = Core.camera.project(tile.worldx(), tile.worldy());
6716-
spawnerTable.setPosition(v.x, v.y);
6717-
spawnerTable.table(Styles.black3, tt -> {
6718-
- tt.add(RFuncs.calWaveTimer()).row();
6719-
+ tt.add(FormatDefault.duration(state.wavetime / 60, false)).row();
6720-
thisWave.specLoc(tile.pos(), group -> !group.type.flying);
6721-
tt.add(thisWave.proTable(false));
6722-
tt.row();
67236650
diff --git a/core/src/mindustryX/features/ArcUnits.java b/core/src/mindustryX/features/ArcUnits.java
67246651
new file mode 100644
67256652
index 0000000000000000000000000000000000000000..3b05b8fbce42092593a7dd4b177e73a69eedfc43
@@ -7741,7 +7668,7 @@ index 0000000000000000000000000000000000000000..b3bf32d2d3da28f6adc38c56ea3d2440
77417668
+ }
77427669
+}
77437670
diff --git a/core/src/mindustryX/features/RenderExt.java b/core/src/mindustryX/features/RenderExt.java
7744-
index d3af9a67991d89027dc2c556d9b757803fa15553..9312ef2a44bc8fb8d0bd50c106a6ce74967fcfdd 100644
7671+
index 7dd8cea136898d7800142e6f5b9e54c87f1c5877..cf09ac1033e9af7f50aedfa7402048ac05bc3a3b 100644
77457672
--- a/core/src/mindustryX/features/RenderExt.java
77467673
+++ b/core/src/mindustryX/features/RenderExt.java
77477674
@@ -7,8 +7,8 @@ import arc.math.*;

‎patches/client/0089-BUILD-BE-release.patch

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: way-zer <[email protected]>
3+
Date: Wed, 3 Jul 2024 00:16:15 +0800
4+
Subject: [PATCH] BUILD BE release
5+
6+
---
7+
.github/workflows/build.yml | 5 +++--
8+
1 file changed, 3 insertions(+), 2 deletions(-)
9+
10+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
11+
index 7274747394a37e24191ce31bfa5ed03a8e31b834..2909edd2d2efc4f59e51349efebef9863e97974c 100644
12+
--- a/.github/workflows/build.yml
13+
+++ b/.github/workflows/build.yml
14+
@@ -39,13 +39,14 @@ jobs:
15+
keystore_alias_password: ${{ secrets.KEYSTORE_PASSWORD_SECRET }}
16+
keystore_alias: MindustryX
17+
run: |
18+
- gradle desktop:dist core:genLoaderModAll android:assembleRelease -Pbuildversion=${RELEASE_VERSION}
19+
+ gradle desktop:dist android:assembleRelease server:dist -Pbuildversion=${RELEASE_VERSION}
20+
- name: Move artifacts
21+
run: |
22+
mkdir artifacts
23+
mv desktop/build/libs/Mindustry.jar artifacts/MindustryX-${{env.RELEASE_VERSION}}-Desktop.jar
24+
- mv core/build/distributions/MindustryX.loader.dex.jar artifacts/MindustryX-${{env.RELEASE_VERSION}}.loader.dex.jar
25+
+# mv core/build/distributions/MindustryX.loader.dex.jar artifacts/MindustryX-${{env.RELEASE_VERSION}}.loader.dex.jar
26+
mv android/build/outputs/apk/release/android-release.apk artifacts/MindustryX-${{env.RELEASE_VERSION}}-Android.apk
27+
+ mv work/server/build/libs/server-release.jar artifacts/server-${{env.RELEASE_VERSION}}.jar
28+
- name: Update Tag
29+
uses: rickstaa/action-create-tag@v1
30+
with:

0 commit comments

Comments
 (0)