Skip to content

Commit 7a9cb3e

Browse files
way-zerway-zer
committed
Update HEAD BE25256(153980c)
1 parent 1a4853f commit 7a9cb3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+231
-256
lines changed

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ index 0000000000000000000000000000000000000000..181b87c1d5f3755f16a01c0528d0a89f
231231
+mindustry.annotations.misc.LogicStatementProcessor
232232
+mindustry.annotations.remote.RemoteProcess
233233
diff --git a/build.gradle b/build.gradle
234-
index 9bca8edb256e33ff341e5cae71c6b2922811a720..0cb5c6337c2d6a41243907d2c34c679b63112d61 100644
234+
index 0a2a28b66ca6914943b0d0501a3c47933f017fb3..3ac0012a751b893f2bed04484034e4fb004cd8ac 100644
235235
--- a/build.gradle
236236
+++ b/build.gradle
237237
@@ -7,22 +7,9 @@ buildscript{
@@ -242,7 +242,7 @@ index 9bca8edb256e33ff341e5cae71c6b2922811a720..0cb5c6337c2d6a41243907d2c34c679b
242242
+ return "com.github.anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
243243
}
244244
}
245-
-
245+
-
246246
- repositories{
247247
- mavenLocal()
248248
- mavenCentral()
@@ -657,7 +657,7 @@ index 0000000000000000000000000000000000000000..f1a2bfd729db5c05cb4bc9b0e5af6dd0
657657
+}
658658
\ No newline at end of file
659659
diff --git a/desktop/build.gradle b/desktop/build.gradle
660-
index 7f4ecdcf0a6407ffce7181234527dc6cbc4d484b..b63f4a3ca7964f41f02a3fa12a068f859b51f96c 100644
660+
index b4d9955e70e7cfbf4792d5196bbe17e06c3762bd..b63f4a3ca7964f41f02a3fa12a068f859b51f96c 100644
661661
--- a/desktop/build.gradle
662662
+++ b/desktop/build.gradle
663663
@@ -3,12 +3,7 @@ sourceSets.main.java.srcDirs = ["src/"]
@@ -748,20 +748,20 @@ index 7f4ecdcf0a6407ffce7181234527dc6cbc4d484b..b63f4a3ca7964f41f02a3fa12a068f85
748748
- }
749749
- }else{
750750
- def jarPath = JDK_DIR + "packr.jar"
751-
- def args = ["java", "-jar", jarPath] as String[]
752-
-
753-
- args += [
754-
- "--platform", platform == "MacOS" ? "Mac" : platform.toString(),
755-
- "--jdk", JDK_DIR + "jre-${platform.toString().toLowerCase()}",
756-
- "--executable", appName,
757-
- "--classpath", "$rootDir/desktop/build/packr/desktop.jar".toString(),
758-
- "--mainclass", project.ext.mainClassName,
759-
- "--verbose",
760-
- "--bundle", getPackage() + ".mac",
761-
- "--icon", ICON_DIR,
762-
- "--output", "$rootDir/desktop/build/packr/output".toString(),
763-
- "--removelibs", "$rootDir/desktop/build/packr/desktop.jar".toString()
764-
- ]
751+
- def args = new String[]{"java", "-jar", jarPath}
752+
-
753+
- args += new String[]{
754+
- "--platform", platform == "MacOS" ? "Mac" : platform.toString(),
755+
- "--jdk", JDK_DIR + "jre-${platform.toString().toLowerCase()}",
756+
- "--executable", appName,
757+
- "--classpath", "$rootDir/desktop/build/packr/desktop.jar".toString(),
758+
- "--mainclass", project.ext.mainClassName,
759+
- "--verbose",
760+
- "--bundle", getPackage() + ".mac",
761+
- "--icon", ICON_DIR,
762+
- "--output", "$rootDir/desktop/build/packr/output".toString(),
763+
- "--removelibs", "$rootDir/desktop/build/packr/desktop.jar".toString()
764+
- }
765765
-
766766
- args += "--vmargs"
767767
-
@@ -3073,7 +3073,7 @@ index d0ec38f0a9c9f7d07c240a3d0c8c24bd0f6c1ebf..44d6d24b5b4d43514c8c5bf535bf7077
30733073
launchIPhoneSimulator.dependsOn build
30743074
launchIPadSimulator.dependsOn build
30753075
diff --git a/server/build.gradle b/server/build.gradle
3076-
index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..badc019ded25d495a139efe134085184640eb500 100644
3076+
index f348e41dbf38a2ad4c676ce243e1fe4389bfefaf..079379178548b8c3fc9257668f85c3bf9935c9cc 100644
30773077
--- a/server/build.gradle
30783078
+++ b/server/build.gradle
30793079
@@ -3,10 +3,6 @@ sourceSets.main.java.srcDirs = ["src/"]
@@ -3100,7 +3100,7 @@ index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..badc019ded25d495a139efe134085184
31003100
exclude("sprites/**")
31013101
exclude("music/**")
31023102
exclude("sounds/**")
3103-
@@ -51,40 +48,3 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
3103+
@@ -53,40 +50,3 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
31043104
attributes 'Main-Class': project.mainClassName
31053105
}
31063106
}
@@ -3142,7 +3142,7 @@ index 7359fdac3cb101aec25a7be9e8b9813ed1afd547..badc019ded25d495a139efe134085184
31423142
-
31433143
-dist.dependsOn classes
31443144
diff --git a/settings.gradle b/settings.gradle
3145-
index b74305dad2bd47c96c697e92b902717e9b36b73e..17add3c489d87175c3ceb175b03cba0b3a22ee79 100644
3145+
index dafd6bdf99f48074cd7f2a1a819236433e3c6a55..304e893b1657dd6d23f87a0c6c2939ac7c1d5c84 100644
31463146
--- a/settings.gradle
31473147
+++ b/settings.gradle
31483148
@@ -1,8 +1,16 @@
@@ -3153,8 +3153,8 @@ index b74305dad2bd47c96c697e92b902717e9b36b73e..17add3c489d87175c3ceb175b03cba0b
31533153
+ }
31543154
+}
31553155
+
3156-
if(JavaVersion.current().ordinal() < JavaVersion.VERSION_16.ordinal()){
3157-
throw new Exception("!!! YOU MUST USE JAVA 16 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}")
3156+
if(JavaVersion.current().ordinal() < JavaVersion.VERSION_17.ordinal()){
3157+
throw new Exception("!!! YOU MUST USE JAVA 17 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}")
31583158
}
31593159

31603160
-include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ index d42ffe6d4a318ce558f1010eae46140f88ed5c99..bf44ead5c58abfb79c500e6daae30c3e
6666
+ <string name="app_name">MindustryX</string>
6767
</resources>
6868
diff --git a/build.gradle b/build.gradle
69-
index 0cb5c6337c2d6a41243907d2c34c679b63112d61..3c56a228b18f50b16b3abb327fcebf379c0c1348 100644
69+
index 3ac0012a751b893f2bed04484034e4fb004cd8ac..d64047c2ff2f1f6b4ead7354f4edee748c2347b1 100644
7070
--- a/build.gradle
7171
+++ b/build.gradle
7272
@@ -21,7 +21,7 @@ allprojects{
7373
apply plugin: 'maven-publish'
74-
74+
7575
version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
7676
- group = 'com.github.Anuken'
7777
+ group = 'cf.wayzer.MindustryX'
@@ -92,7 +92,7 @@ index f1a2bfd729db5c05cb4bc9b0e5af6dd003bb7d96..f5129a036a3655bd41da6e51ed657cad
9292
processResources.configure {
9393
dependsOn(generateLocales, generateBasePartNames, writeVersion)
9494
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
95-
index bc4c6a494aec88af73f001906598ba91a50ac6a3..d08d04a6f0e8107cec995876b2072c46aa85b3c2 100644
95+
index e7bca60cd616dbf699329909fc67c37d92e335df..d7756c3df025ba0e76882f656501d7d560c87114 100644
9696
--- a/core/src/mindustry/Vars.java
9797
+++ b/core/src/mindustry/Vars.java
9898
@@ -77,7 +77,7 @@ public class Vars implements Loadable{
@@ -177,13 +177,13 @@ index 48599c6b96474117057e7ca2b87b545873a0ea31..4366eeef830845fb13132a0ae3534129
177177
buffer.put((byte)state.rules.mode().ordinal());
178178
buffer.putInt(netServer.admins.getPlayerLimit());
179179
diff --git a/gradle.properties b/gradle.properties
180-
index 048ee4d9efe3907eacdd135f80bc38bc7d97c605..82e277deb64d1f368ec2dfc6b02ef2011c8c7370 100644
180+
index 0c6c42e01d70bb59166e3e21e91a41801e7c113f..5fcc2f6a7455a09fc17437e4f73e6e6f4d818f86 100644
181181
--- a/gradle.properties
182182
+++ b/gradle.properties
183183
@@ -27,3 +27,5 @@ org.gradle.internal.http.socketTimeout=100000
184184
org.gradle.internal.http.connectionTimeout=100000
185185
android.enableR8.fullMode=false
186-
archash=6676d38433
186+
archash=29c4199b83
187187
+
188188
+upstreamBuild=25162
189189
\ No newline at end of file

‎patches/client/0004-API-Hooks.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Subject: [PATCH] API: Hooks
1212
create mode 100644 core/src/mindustryX/Hooks.java
1313

1414
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
15-
index 2e8d7396c1ac3eea65a6d0fa8bf03f86088768df..e3bf01fb63b179f4669e99c43891b842bcae66a6 100644
15+
index c68681b7a9d6caf8e0ed8dace53b839efbf34eb5..1b5a25a7cbbd00c5a8e463ec722fb3b3ac5da9d6 100644
1616
--- a/core/src/mindustry/ClientLauncher.java
1717
+++ b/core/src/mindustry/ClientLauncher.java
18-
@@ -171,6 +171,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
18+
@@ -173,6 +173,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
1919
add(ui = new UI());
2020
add(netServer = new NetServer());
2121
add(netClient = new NetClient());
@@ -24,7 +24,7 @@ index 2e8d7396c1ac3eea65a6d0fa8bf03f86088768df..e3bf01fb63b179f4669e99c43891b842
2424
assets.load(schematics);
2525

2626
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
27-
index d08d04a6f0e8107cec995876b2072c46aa85b3c2..793c1759060a5e28e1df276bae2fdcf23f78284e 100644
27+
index d7756c3df025ba0e76882f656501d7d560c87114..d6b74b8a99a5ae12248f4dead618a374ea77ec12 100644
2828
--- a/core/src/mindustry/Vars.java
2929
+++ b/core/src/mindustry/Vars.java
3030
@@ -269,6 +269,7 @@ public class Vars implements Loadable{

‎patches/client/0007-API-Add-LogicBlock.running.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] API: Add `LogicBlock.running`
88
1 file changed, 5 insertions(+)
99

1010
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
11-
index 655cf48e4f974d2e05cdca66deb361f1ee9f65bf..6f4d08ac40d461d0c41dbb292866add7565ed784 100644
11+
index b7baa0c587b1433bbfed051a02f1b65260b91035..b0af04af3eb5311bee7ef27fa0208f99d23d7894 100644
1212
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
1313
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
1414
@@ -24,6 +24,7 @@ import mindustry.ui.*;

‎patches/client/0009-S-Add-icons.properties-bundles-block_colors.png-to-s.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Subject: [PATCH] S: Add icons.properties,bundles,block_colors.png to server
1010
2 files changed, 13 insertions(+), 13 deletions(-)
1111

1212
diff --git a/server/build.gradle b/server/build.gradle
13-
index badc019ded25d495a139efe134085184640eb500..f212b7bf9d8a3e46179ba62d8987fcb15efa5568 100644
13+
index 079379178548b8c3fc9257668f85c3bf9935c9cc..d57060fff7ec12b93198dca4b447ca68f4c9c076 100644
1414
--- a/server/build.gradle
1515
+++ b/server/build.gradle
1616
@@ -31,18 +31,18 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
@@ -42,8 +42,8 @@ index badc019ded25d495a139efe134085184640eb500..f212b7bf9d8a3e46179ba62d8987fcb1
4242
+ include "*.*"
4343
+ }
4444

45-
manifest{
46-
attributes 'Main-Class': project.mainClassName
45+
duplicatesStrategy = 'exclude'
46+
4747
diff --git a/server/src/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java
4848
index 1799c999b2affdc0de392841212edc1f544e4751..81683e05cc3f38d943ae94f00621da01e09a1f31 100644
4949
--- a/server/src/mindustry/server/ServerLauncher.java

‎patches/client/0011-API-add-LogicAssembledEvent.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 6f65e9981f2291d1c892c23f3ec8603aec8e3a4c..32133826223d3e4fe1be991c8abd3bc2
3434
}
3535
line ++;
3636
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
37-
index a27e35304befd452e741012aa23d6a59a9f30b54..a176f45e5d76ed8396f2d91cc1b25d528f78aefe 100644
37+
index 9d8faa880a9e518d6b303c7d0e67f4419026e208..580202ec1745ae6982dc5b485c16914e24439b93 100644
3838
--- a/core/src/mindustry/logic/LStatements.java
3939
+++ b/core/src/mindustry/logic/LStatements.java
4040
@@ -20,6 +20,7 @@ import mindustry.logic.LogicFx.*;
@@ -63,7 +63,7 @@ index a27e35304befd452e741012aa23d6a59a9f30b54..a176f45e5d76ed8396f2d91cc1b25d52
6363
@Override
6464
public void build(Table table){
6565
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
66-
index 6f4d08ac40d461d0c41dbb292866add7565ed784..261b6374360c2cbae88f44aa441f55706c181936 100644
66+
index b0af04af3eb5311bee7ef27fa0208f99d23d7894..12cda95f81156b8b5ce60d3ab97aa6db90bd3f0d 100644
6767
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
6868
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
6969
@@ -1,5 +1,6 @@

‎patches/client/0012-SC-Fix-6.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] SC: Fix #6
88
1 file changed, 4 insertions(+), 1 deletion(-)
99

1010
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
11-
index e6c368d97eec75f27d68d681fec480defe7e8218..f9064cdc0773a76860f6d1873901083c4ccd07ce 100644
11+
index ec5523dd1c0a03183dd4749ae6ebba148f7af02e..f5cb88ef766e3aa3435bce0a54e1aa5baa3a5d68 100644
1212
--- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
1313
+++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
14-
@@ -154,7 +154,10 @@ public class PayloadConveyor extends Block{
14+
@@ -155,7 +155,10 @@ public class PayloadConveyor extends Block{
1515
if(valid && stepAccepted != curStep && item != null){
1616
if(next != null){
1717
//trigger update forward

‎patches/client/0013-C-dynamic-Window-title.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Content-Transfer-Encoding: 8bit
1212
1 file changed, 15 insertions(+)
1313

1414
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
15-
index e3bf01fb63b179f4669e99c43891b842bcae66a6..dffbb9df1312c2c7842c533bb2801b4810328747 100644
15+
index 1b5a25a7cbbd00c5a8e463ec722fb3b3ac5da9d6..46d9d838b42182024ebc8c0547361137900b1452 100644
1616
--- a/core/src/mindustry/ClientLauncher.java
1717
+++ b/core/src/mindustry/ClientLauncher.java
18-
@@ -238,6 +238,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
18+
@@ -240,6 +240,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
1919
}))));
2020
}
2121
}else{
@@ -24,7 +24,7 @@ index e3bf01fb63b179f4669e99c43891b842bcae66a6..dffbb9df1312c2c7842c533bb2801b48
2424
asyncCore.begin();
2525

2626
super.update();
27-
@@ -254,6 +256,19 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
27+
@@ -256,6 +258,19 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
2828
}
2929
}
3030

‎patches/client/0016-C-RenderExt-bulletShow-showMineBeam-displayAllMessag.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Subject: [PATCH] C(RenderExt) bulletShow showMineBeam displayAllMessage
1111
3 files changed, 19 insertions(+), 1 deletion(-)
1212

1313
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
14-
index 3408948807b1bc145fa5effb4cd77b9f5ff4a29d..d8999d2001071b91a9976921f66a71562c215e09 100644
14+
index af3cd1b562c8eaa7750ba7d1c665bf5b052ebdfa..8db65f2bdfe17ec8e9250b7cd599616092812a6c 100644
1515
--- a/core/src/mindustry/type/UnitType.java
1616
+++ b/core/src/mindustry/type/UnitType.java
1717
@@ -37,6 +37,7 @@ import mindustry.world.blocks.payloads.*;
@@ -22,7 +22,7 @@ index 3408948807b1bc145fa5effb4cd77b9f5ff4a29d..d8999d2001071b91a9976921f66a7156
2222

2323
import static arc.graphics.g2d.Draw.*;
2424
import static mindustry.Vars.*;
25-
@@ -1207,7 +1208,7 @@ public class UnitType extends UnlockableContent implements Senseable{
25+
@@ -1209,7 +1210,7 @@ public class UnitType extends UnlockableContent implements Senseable{
2626

2727
unit.drawBuilding();
2828

‎patches/client/0018-C-RenderExt-researchViewer.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ index f50c8c0ca180f07cc2ce13068540910c915189d5..fbb783f85810db49bd6a321d729f5214
4343
}
4444

4545
diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
46-
index a251419f31092b68aca9fd756f19e8c3602263d4..59e3d7507a1161e9120b71d9f11ba02a501a796b 100644
46+
index e601e02b5df2ea34d97a338b992ca30554a7e3fa..416587393a5e27822e95196cc964a902a632aca7 100644
4747
--- a/core/src/mindustry/ui/dialogs/ResearchDialog.java
4848
+++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java
4949
@@ -27,6 +27,7 @@ import mindustry.type.*;

‎patches/client/0021-C-StatusEffects.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..87ca026cadc01f80b5e927ed210bc78f
4141
+status.fast.name = 迅捷
4242
+
4343
diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java
44-
index ff3dcf43df95bb50b1e8f28e965af02ed912c086..1dc361fe2a3f5a32da09b63220bc79e6025ac9e7 100644
44+
index 1ccaabc80faeabf0acaf38ae371fcc1f98bd9750..c58b4ec28d39f53104fc4555646e4284917364cb 100644
4545
--- a/core/src/mindustry/content/StatusEffects.java
4646
+++ b/core/src/mindustry/content/StatusEffects.java
4747
@@ -202,6 +202,7 @@ public class StatusEffects{

0 commit comments

Comments
 (0)