Skip to content

Commit 57ac8b0

Browse files
way-zerway-zer
committed
sync 2024/7/23
1 parent 3bcab79 commit 57ac8b0

24 files changed

+440
-347
lines changed

‎patches/client/0001-BUILD-build.gradle.kts-and-clear.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ index f7f291ef1ab71577313759a7e9fdfd3c1e0833dc..00000000000000000000000000000000
588588
\ No newline at end of file
589589
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
590590
new file mode 100644
591-
index 0000000000000000000000000000000000000000..e2a6d4ede97677940bc6b73de42f6f5ff71fc0be
591+
index 0000000000000000000000000000000000000000..f1a2bfd729db5c05cb4bc9b0e5af6dd003bb7d96
592592
--- /dev/null
593593
+++ b/core/build.gradle.kts
594594
@@ -0,0 +1,64 @@
@@ -615,7 +615,7 @@ index 0000000000000000000000000000000000000000..e2a6d4ede97677940bc6b73de42f6f5f
615615
+ outputs.cacheIf { true }
616616
+ val outFile = projectDir.resolve("assets/locales")
617617
+ outputs.file(outFile).withPropertyName("outFile")
618-
+ val bundles = projectDir.resolve("assets/bundles/").list()!!
618+
+ val bundles = listOf("en") + projectDir.resolve("assets/bundles/").list()!!
619619
+ .filter { it.startsWith("bundle_") }
620620
+ .map { it.substring("bundle_".length, it.lastIndexOf('.')) }
621621
+ .sorted()

‎patches/client/0003-CS-Version.patch

+5-11
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Subject: [PATCH] CS: Version
77
.gitignore | 1 +
88
android/build.gradle | 4 ++--
99
android/res/values/strings.xml | 2 +-
10-
build.gradle | 4 ++--
10+
build.gradle | 2 +-
1111
core/build.gradle.kts | 2 +-
1212
core/src/mindustry/Vars.java | 2 +-
1313
core/src/mindustry/core/NetClient.java | 2 ++
1414
core/src/mindustry/core/Version.java | 16 +++++++++++++++-
1515
core/src/mindustry/net/NetworkIO.java | 2 +-
1616
gradle.properties | 2 ++
17-
10 files changed, 28 insertions(+), 9 deletions(-)
17+
10 files changed, 27 insertions(+), 8 deletions(-)
1818

1919
diff --git a/.gitignore b/.gitignore
2020
index 7d91d3191096c431b739d2d5ecd951a764feead3..ba271e6bd0dd06971fff6fa2314254149cc90087 100644
@@ -61,10 +61,10 @@ index d42ffe6d4a318ce558f1010eae46140f88ed5c99..bf44ead5c58abfb79c500e6daae30c3e
6161
+ <string name="app_name">MindustryX</string>
6262
</resources>
6363
diff --git a/build.gradle b/build.gradle
64-
index 0cb5c6337c2d6a41243907d2c34c679b63112d61..fb6808e41d2fbff78c81f3904d01eb4e8e413492 100644
64+
index 0cb5c6337c2d6a41243907d2c34c679b63112d61..3c56a228b18f50b16b3abb327fcebf379c0c1348 100644
6565
--- a/build.gradle
6666
+++ b/build.gradle
67-
@@ -21,12 +21,12 @@ allprojects{
67+
@@ -21,7 +21,7 @@ allprojects{
6868
apply plugin: 'maven-publish'
6969

7070
version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
@@ -73,14 +73,8 @@ index 0cb5c6337c2d6a41243907d2c34c679b63112d61..fb6808e41d2fbff78c81f3904d01eb4e
7373

7474
ext{
7575
versionNumber = '7'
76-
if(!project.hasProperty("versionModifier")) versionModifier = 'release'
77-
- if(!project.hasProperty("versionType")) versionType = 'official'
78-
+ if(!project.hasProperty("versionType")) versionType = 'MindustryX'
79-
appName = 'Mindustry'
80-
steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
81-
rhinoVersion = '73a812444ac388ac2d94013b5cadc8f70b7ea027'
8276
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
83-
index e2a6d4ede97677940bc6b73de42f6f5ff71fc0be..9d9d170c1fb00fbd4bf35c1a2f04bcff6dca09cf 100644
77+
index f1a2bfd729db5c05cb4bc9b0e5af6dd003bb7d96..f5129a036a3655bd41da6e51ed657caddf29dab5 100644
8478
--- a/core/build.gradle.kts
8579
+++ b/core/build.gradle.kts
8680
@@ -46,7 +46,7 @@ tasks{

‎patches/client/0017-C-RenderExt-arcChoiceUiIcon.patch

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Content-Transfer-Encoding: 8bit
1919
7 files changed, 18 insertions(+)
2020

2121
diff --git a/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java b/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java
22-
index 92ccae0e1122e1501ab2d96facb3c0cef5ce8842..e8416d87136fced0e6bc045d93a58be52cb48f31 100644
22+
index 92ccae0e1122e1501ab2d96facb3c0cef5ce8842..010404a6f75731b1f9ac504c1d4c55259f082827 100644
2323
--- a/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java
2424
+++ b/core/src/mindustry/world/blocks/distribution/DirectionalUnloader.java
2525
@@ -14,6 +14,7 @@ import mindustry.world.blocks.*;
@@ -34,12 +34,12 @@ index 92ccae0e1122e1501ab2d96facb3c0cef5ce8842..e8416d87136fced0e6bc045d93a58be5
3434
Draw.color(unloadItem.color);
3535
Draw.rect(centerRegion, x, y);
3636
Draw.color();
37-
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(unloadItem.uiIcon, x, y,4f,4f);
37+
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(unloadItem.fullIcon, x, y,4f,4f);
3838
}else{
3939
Draw.rect(arrowRegion, x, y, rotdeg());
4040
}
4141
diff --git a/core/src/mindustry/world/blocks/distribution/DuctRouter.java b/core/src/mindustry/world/blocks/distribution/DuctRouter.java
42-
index 502915d2887c3a9a9f78fecc2841bbfdaf10cd26..485301ae729ba660a4cad4dba2c2ddc038a23d32 100644
42+
index 502915d2887c3a9a9f78fecc2841bbfdaf10cd26..401f813a015c2b8e313a914c71771ecee49c5ebd 100644
4343
--- a/core/src/mindustry/world/blocks/distribution/DuctRouter.java
4444
+++ b/core/src/mindustry/world/blocks/distribution/DuctRouter.java
4545
@@ -12,6 +12,7 @@ import mindustry.type.*;
@@ -54,12 +54,12 @@ index 502915d2887c3a9a9f78fecc2841bbfdaf10cd26..485301ae729ba660a4cad4dba2c2ddc0
5454
Draw.color(sortItem.color);
5555
Draw.rect("center", x, y);
5656
Draw.color();
57-
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(sortItem.uiIcon, x, y,4f,4f);
57+
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(sortItem.fullIcon, x, y,4f,4f);
5858
}else{
5959
Draw.rect(topRegion, x, y, rotdeg());
6060
}
6161
diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java
62-
index 805fad17aa2548240be635f75085c158d100fb1f..371a22776d3f569c2a65590ba720432b365cb75b 100644
62+
index 805fad17aa2548240be635f75085c158d100fb1f..c63355564e9c1f9419b8911af3f4a454681bac82 100644
6363
--- a/core/src/mindustry/world/blocks/distribution/Sorter.java
6464
+++ b/core/src/mindustry/world/blocks/distribution/Sorter.java
6565
@@ -13,6 +13,7 @@ import mindustry.type.*;
@@ -74,12 +74,12 @@ index 805fad17aa2548240be635f75085c158d100fb1f..371a22776d3f569c2a65590ba720432b
7474
Draw.color(sortItem.color);
7575
Fill.square(x, y, tilesize/2f - 0.00001f);
7676
Draw.color();
77-
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(sortItem.uiIcon, x, y,4f,4f);
77+
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(sortItem.fullIcon, x, y,4f,4f);
7878
}
7979

8080
super.draw();
8181
diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
82-
index 0a7461a7ec54131d4a81f0a80c3039341f3100d1..fe9bd668c42f121d89ac4defea3c9d8981ca32b6 100644
82+
index 0a7461a7ec54131d4a81f0a80c3039341f3100d1..18a282b760a6adb78e21b8625b19ed6072d390df 100644
8383
--- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java
8484
+++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
8585
@@ -11,6 +11,7 @@ import mindustry.type.*;
@@ -94,12 +94,12 @@ index 0a7461a7ec54131d4a81f0a80c3039341f3100d1..fe9bd668c42f121d89ac4defea3c9d89
9494
Draw.color(outputItem.color);
9595
Fill.square(x, y, tilesize/2f - 0.00001f);
9696
Draw.color();
97-
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(outputItem.uiIcon, x, y,4f,4f);
97+
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(outputItem.fullIcon, x, y,4f,4f);
9898
}
9999

100100
super.draw();
101101
diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
102-
index db0fdbfe1e4746cf55043276f84cd5e9677ec5bf..5e20ab7962934efa7bccd9450137993a46a8bc5d 100644
102+
index db0fdbfe1e4746cf55043276f84cd5e9677ec5bf..8653e861192ee7ddab781bd03d4843ad83b78c45 100644
103103
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
104104
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
105105
@@ -17,6 +17,8 @@ import mindustry.world.meta.*;
@@ -116,14 +116,14 @@ index db0fdbfe1e4746cf55043276f84cd5e9677ec5bf..5e20ab7962934efa7bccd9450137993a
116116
super.draw();
117117

118118
+ if(RenderExt.arcChoiceUiIcon && sortItem != null){
119-
+ Draw.rect(sortItem.uiIcon, x, y,4f,4f);
119+
+ Draw.rect(sortItem.fullIcon, x, y,4f,4f);
120120
+ return;
121121
+ }
122122
Draw.color(sortItem == null ? Color.clear : sortItem.color);
123123
Draw.rect(centerRegion, x, y);
124124
Draw.color();
125125
diff --git a/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
126-
index d7a2e02c0d81c1935482c3bbb4edb7b555788a43..b536c4f3fdb6b4d850deae290c9de52417deeb26 100644
126+
index d7a2e02c0d81c1935482c3bbb4edb7b555788a43..3b3e49cca2b424aeddd693d261b5e242cd344913 100644
127127
--- a/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
128128
+++ b/core/src/mindustry/world/blocks/units/UnitCargoUnloadPoint.java
129129
@@ -12,6 +12,7 @@ import mindustry.type.*;
@@ -138,7 +138,7 @@ index d7a2e02c0d81c1935482c3bbb4edb7b555788a43..b536c4f3fdb6b4d850deae290c9de524
138138
Draw.color(item.color);
139139
Draw.rect(topRegion, x, y);
140140
Draw.color();
141-
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(item.uiIcon, x, y,4f,4f);
141+
+ if(RenderExt.arcChoiceUiIcon) Draw.rect(item.fullIcon, x, y,4f,4f);
142142
}
143143
}
144144

‎patches/client/0019-C-RenderExt-hiddenItemTransparency.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ index d91da022ce4ca749164958cf8fc4438ddf777b23..1b8ac44e8773af0b69e40f284a1dfff5
5959
return index < buffer.length;
6060
}
6161
diff --git a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
62-
index 6fe8e90722ef740148d337a09754febd47a7ab10..cf4602f09a5e5e6dfd86eef88ace838ea0309fbf 100644
62+
index 6fe8e90722ef740148d337a09754febd47a7ab10..8a6de353e073b653abfd14a2610905705cc4e034 100644
6363
--- a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
6464
+++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
6565
@@ -1,9 +1,17 @@
@@ -117,7 +117,7 @@ index 6fe8e90722ef740148d337a09754febd47a7ab10..cf4602f09a5e5e6dfd86eef88ace838e
117117
+ float p = Math.min(((Time.time - time) * timeScale / speed), (float)(bufferCapacity - i) / bufferCapacity);
118118
+
119119
+ Draw.alpha(RenderExt.hiddenItemTransparency / 100f);
120-
+ Draw.rect(item.uiIcon, Mathf.lerp(begx, endx, p), Mathf.lerp(begy, endy, p), 4f, 4f);
120+
+ Draw.rect(item.fullIcon, Mathf.lerp(begx, endx, p), Mathf.lerp(begy, endy, p), 4f, 4f);
121121
+ }
122122
+ }
123123
+ }
@@ -127,7 +127,7 @@ index 6fe8e90722ef740148d337a09754febd47a7ab10..cf4602f09a5e5e6dfd86eef88ace838e
127127
public void write(Writes write){
128128
super.write(write);
129129
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
130-
index 2663365fc253a5eee6113ff6070b3624bfdceaf6..050e7151487c8d248c0e6e0b48913fbe944164d9 100644
130+
index 2663365fc253a5eee6113ff6070b3624bfdceaf6..0de0b62d119ca4befb1612374f96690b3434b6b3 100644
131131
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
132132
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
133133
@@ -17,6 +17,7 @@ import mindustry.input.*;
@@ -149,7 +149,7 @@ index 2663365fc253a5eee6113ff6070b3624bfdceaf6..050e7151487c8d248c0e6e0b48913fbe
149149
+ int loti = 0;
150150
+ for(int iid = 0; iid < items.length(); iid++){
151151
+ for(int itemid = 1; itemid <= items.get(iid); itemid++){
152-
+ Draw.rect(content.item(iid).uiIcon,
152+
+ Draw.rect(content.item(iid).fullIcon,
153153
+ x, y - tilesize / 2f + 1f + 0.6f * (float)(loti++), 4f, 4f
154154
+ );
155155
+ }
@@ -160,7 +160,7 @@ index 2663365fc253a5eee6113ff6070b3624bfdceaf6..050e7151487c8d248c0e6e0b48913fbe
160160

161161
Tile other = world.tile(link);
162162
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
163-
index d02fb844045f4cf7b11050e86661ae6f5529e0dc..698e95ac696a3267bba1eb4bb3da2852154b71a4 100644
163+
index d02fb844045f4cf7b11050e86661ae6f5529e0dc..a34377db8cec36032d8a27014ea9d1e79f99b0aa 100644
164164
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
165165
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
166166
@@ -1,11 +1,17 @@
@@ -202,7 +202,7 @@ index d02fb844045f4cf7b11050e86661ae6f5529e0dc..698e95ac696a3267bba1eb4bb3da2852
202202
+ for(int i = 0; (item = buffer.getItem(dir, i)) != null; i++){
203203
+ float time = buffer.getTime(dir, i);
204204
+ float p = Math.min(((Time.time - time) * timeScale / speed), (float)(capacity - i) / capacity);
205-
+ Draw.rect(item.uiIcon, Mathf.lerp(begx, endx, p), Mathf.lerp(begy, endy, p), 4f, 4f);
205+
+ Draw.rect(item.fullIcon, Mathf.lerp(begx, endx, p), Mathf.lerp(begy, endy, p), 4f, 4f);
206206
+ }
207207
+ }
208208
+ }

‎patches/client/0023-C-StatExt.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ index e9f5331bbef3b2110eeeed5934ec10b5f5fc9e12..cf350df9ea21f3654672c99a70c5c9f2
502502
stats.add(Stat.targetsGround, targetGround);
503503
if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);
504504
diff --git a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
505-
index cf4602f09a5e5e6dfd86eef88ace838ea0309fbf..ccb6d48fe731ea72fd720caa06c0173a00dc123a 100644
505+
index 8a6de353e073b653abfd14a2610905705cc4e034..3a206039844a00ea43e9ac3c12e238868392b426 100644
506506
--- a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
507507
+++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
508508
@@ -9,6 +9,7 @@ import mindustry.gen.*;
@@ -529,7 +529,7 @@ index cf4602f09a5e5e6dfd86eef88ace838ea0309fbf..ccb6d48fe731ea72fd720caa06c0173a
529529
ItemBuffer buffer = new ItemBuffer(bufferCapacity);
530530

531531
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
532-
index 698e95ac696a3267bba1eb4bb3da2852154b71a4..5ed25c723e407a4a95c878c6637a3cf34ec4a820 100644
532+
index a34377db8cec36032d8a27014ea9d1e79f99b0aa..e3593dbef6fc1c812a9b392de892ad0aed4c4fa6 100644
533533
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
534534
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
535535
@@ -30,6 +30,16 @@ public class Junction extends Block{

‎patches/client/0025-F-InternalMods.patch

+14-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Subject: [PATCH] F: InternalMods
55

66
---
77
core/src/mindustry/mod/Mods.java | 2 +-
8-
.../src/mindustryX/features/InternalMods.java | 35 +++++++++++++++++++
9-
2 files changed, 36 insertions(+), 1 deletion(-)
8+
.../src/mindustryX/features/InternalMods.java | 43 +++++++++++++++++++
9+
2 files changed, 44 insertions(+), 1 deletion(-)
1010
create mode 100644 core/src/mindustryX/features/InternalMods.java
1111

1212
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
@@ -24,25 +24,28 @@ index 3ece15b1d9dd00a522a9ea62e13427004155cd96..8b258a35f1a5a6f01d0a2904ed6fbbd5
2424
.retainAll(f -> f.extEquals("jar") || f.extEquals("zip") || (f.isDirectory() && Structs.contains(metaFiles, meta -> f.child(meta).exists())))
2525
diff --git a/core/src/mindustryX/features/InternalMods.java b/core/src/mindustryX/features/InternalMods.java
2626
new file mode 100644
27-
index 0000000000000000000000000000000000000000..1ce00d17c712d417383a3d61f13e6f62e5d91adc
27+
index 0000000000000000000000000000000000000000..58af44c6fe4224643a87b23fd79e1e3e220a5ecc
2828
--- /dev/null
2929
+++ b/core/src/mindustryX/features/InternalMods.java
30-
@@ -0,0 +1,35 @@
30+
@@ -0,0 +1,43 @@
3131
+package mindustryX.features;
3232
+
3333
+import arc.files.*;
3434
+import arc.struct.*;
3535
+import mindustry.core.*;
3636
+import mindustry.mod.*;
3737
+import mindustry.mod.Mods.*;
38+
+import mindustryX.*;
3839
+
3940
+import static arc.Core.files;
4041
+import static mindustry.Vars.*;
4142
+
4243
+public class InternalMods{
4344
+ public static Seq<LoadedMod> load(){
44-
+ return Seq.with(
45-
+ );
45+
+ Seq<LoadedMod> mods = new Seq<>();
46+
+ if(!VarsX.isLoader)
47+
+ mods.add(internalMod(meta("MindustryX", "MindustryX", Version.mdtXBuild, "")));
48+
+ return mods;
4649
+ }
4750
+
4851
+ private static ModMeta meta(String id, String displayName, String version, String author){
@@ -62,4 +65,9 @@ index 0000000000000000000000000000000000000000..1ce00d17c712d417383a3d61f13e6f62
6265
+ Fi root = files.internal("/mindustryX/mods/" + meta.name);
6366
+ return new LoadedMod(file, root, main, InternalMods.class.getClassLoader(), meta);
6467
+ }
68+
+
69+
+ private static LoadedMod internalMod(ModMeta meta){
70+
+ return internalMod(meta, new Mod(){
71+
+ });
72+
+ }
6573
+}

‎patches/client/0026-C-InternalMods-claj.patch

+13-12
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,38 @@ way-zer <[email protected]> on 2024/4/13 at 19:18
1818
不可用时隐藏claj按钮
1919
way-zer <[email protected]> on 2024/4/22 at 20:1
2020
---
21-
.../src/mindustryX/features/InternalMods.java | 2 +
21+
.../src/mindustryX/features/InternalMods.java | 4 +-
2222
core/src/mindustryX/mods/claj/Claj.java | 31 ++++
2323
.../mindustryX/mods/claj/ClajIntegration.java | 139 ++++++++++++++++++
2424
.../mods/claj/dialogs/JoinViaClajDialog.java | 108 ++++++++++++++
2525
.../mods/claj/dialogs/ManageRoomsDialog.java | 99 +++++++++++++
26-
5 files changed, 379 insertions(+)
26+
5 files changed, 380 insertions(+), 1 deletion(-)
2727
create mode 100644 core/src/mindustryX/mods/claj/Claj.java
2828
create mode 100644 core/src/mindustryX/mods/claj/ClajIntegration.java
2929
create mode 100644 core/src/mindustryX/mods/claj/dialogs/JoinViaClajDialog.java
3030
create mode 100644 core/src/mindustryX/mods/claj/dialogs/ManageRoomsDialog.java
3131

3232
diff --git a/core/src/mindustryX/features/InternalMods.java b/core/src/mindustryX/features/InternalMods.java
33-
index 1ce00d17c712d417383a3d61f13e6f62e5d91adc..67e4cde70b0dbdc197cf8e9d5f12b5ae26172f08 100644
33+
index 58af44c6fe4224643a87b23fd79e1e3e220a5ecc..63f413ea5fe200cd88c48bb5efeca4ffe342f438 100644
3434
--- a/core/src/mindustryX/features/InternalMods.java
3535
+++ b/core/src/mindustryX/features/InternalMods.java
36-
@@ -5,6 +5,7 @@ import arc.struct.*;
37-
import mindustry.core.*;
36+
@@ -6,13 +6,15 @@ import mindustry.core.*;
3837
import mindustry.mod.*;
3938
import mindustry.mod.Mods.*;
39+
import mindustryX.*;
4040
+import mindustryX.mods.claj.*;
4141

4242
import static arc.Core.files;
43-
import static mindustry.Vars.*;
44-
@@ -12,6 +13,7 @@ import static mindustry.Vars.*;
43+
-import static mindustry.Vars.*;
44+
+import static mindustry.Vars.modDirectory;
45+
4546
public class InternalMods{
4647
public static Seq<LoadedMod> load(){
47-
return Seq.with(
48-
+ internalMod(meta("claj", "Claj联机", "1.1", "[#0096FF]xzxADIxzx cong重写 WayZer合并进MDTX"), new Claj())
49-
);
50-
}
51-
48+
Seq<LoadedMod> mods = new Seq<>();
49+
+ mods.add(internalMod(meta("claj", "Claj联机", "1.1", "[#0096FF]xzxADIxzx cong重写 WayZer合并进MDTX"), new Claj()));
50+
if(!VarsX.isLoader)
51+
mods.add(internalMod(meta("MindustryX", "MindustryX", Version.mdtXBuild, "")));
52+
return mods;
5253
diff --git a/core/src/mindustryX/mods/claj/Claj.java b/core/src/mindustryX/mods/claj/Claj.java
5354
new file mode 100644
5455
index 0000000000000000000000000000000000000000..fd2d5ad910433779dc0324a5f86e3d28e9f6832c

0 commit comments

Comments
 (0)