Skip to content

Commit bf42b5f

Browse files
committed
oh wait wrong branch
1 parent f9e45d8 commit bf42b5f

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111

12-
- name: Set up JDK 16
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v1
1414
with:
15-
java-version: 16
15+
java-version: 17
1616

1717
- name: Set up PATH
1818
run: echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH

annotations/src/unity/annotations/Annotations.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,11 @@ enum FloatPacker{
243243
@Retention(RetentionPolicy.SOURCE)
244244
public @interface SyncLocal{}
245245

246+
/** Indicates that a field should not be synced to clients (but may still be non-transient) */
247+
@Target({ElementType.FIELD})
248+
@Retention(RetentionPolicy.SOURCE)
249+
public @interface NoSync{}
250+
246251
/** Indicates that the field annotated with this came from another component class */
247252
@Target(ElementType.FIELD)
248253
@Retention(RetentionPolicy.SOURCE)

annotations/src/unity/annotations/processors/BaseProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ public String descString(VariableElement v){
216216
}
217217

218218
public String descString(ExecutableElement m){
219-
String params = Arrays.toString(m.getParameters().toArray());
220-
params = params.substring(1, params.length() - 1);
219+
String params = Seq.with(m.getParameters()).toString(", ", e -> e.getEnclosingElement().asType() + " " + e.getSimpleName());
221220

222221
return m.getEnclosingElement().toString() + "#" + simpleName(m) + "(" + params + ")";
223222
}

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ buildscript{
77

88
repositories{
99
mavenCentral()
10+
maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
1011
maven{ url 'https://jitpack.io' }
1112
}
1213
}
@@ -42,6 +43,7 @@ allprojects{
4243

4344
repositories{
4445
mavenCentral()
46+
maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
4547
maven{ url "https://jitpack.io" }
4648
}
4749

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# For faster compile time in next builds.
22
org.gradle.daemon = true
33
# Android SDK version.
4-
sdkVersion = 30
4+
sdkVersion = 33
55
# Minimum Android API version.
66
sdkAPI = 14
77
# Mindustry classpath version (Uses MindustryJITPack)
8-
mindustryVersion = v140.4
8+
mindustryVersion = v146
99
# Actual Mindustry hash that is used for fetching component classes
10-
mindustryFetchVersion = 4f912f25ee795c44475ecdf42f17fda8132f47fa
10+
mindustryFetchVersion = v146
1111
# Fallback Arc version, deviate from `mindustryVersion` if you're using a Bleeding Edge classpath version.
1212
arcVersion = b32576ca09
1313
# Javapoet classpath version, for class file generation.

main/src/unity/world/blocks/production/CrucibleSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void buildConfiguration(Table table){
7070

7171
@Override
7272
public Integer config(){
73-
return config.id;
73+
return config == null ? 0 : config.id;
7474
}
7575

7676
@Override

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "Avant Team",
55
"description": "A big-collaboration Mindustry mod created by many authors from the Mindustry modding community.",
66
"version": "0.2-youngcha.3.3",
7-
"minGameVersion": 140.4,
7+
"minGameVersion": 146,
88
"main": "unity.Unity",
99
"java": true
1010
}

0 commit comments

Comments
 (0)