Skip to content

Commit

Permalink
oh wait wrong branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Anuken committed Sep 13, 2023
1 parent f9e45d8 commit bf42b5f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 16
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 16
java-version: 17

- name: Set up PATH
run: echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH
Expand Down
5 changes: 5 additions & 0 deletions annotations/src/unity/annotations/Annotations.java
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,11 @@ enum FloatPacker{
@Retention(RetentionPolicy.SOURCE)
public @interface SyncLocal{}

/** Indicates that a field should not be synced to clients (but may still be non-transient) */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.SOURCE)
public @interface NoSync{}

/** Indicates that the field annotated with this came from another component class */
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.SOURCE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,7 @@ public String descString(VariableElement v){
}

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

return m.getEnclosingElement().toString() + "#" + simpleName(m) + "(" + params + ")";
}
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ buildscript{

repositories{
mavenCentral()
maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
maven{ url 'https://jitpack.io' }
}
}
Expand Down Expand Up @@ -42,6 +43,7 @@ allprojects{

repositories{
mavenCentral()
maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
maven{ url "https://jitpack.io" }
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# For faster compile time in next builds.
org.gradle.daemon = true
# Android SDK version.
sdkVersion = 30
sdkVersion = 33
# Minimum Android API version.
sdkAPI = 14
# Mindustry classpath version (Uses MindustryJITPack)
mindustryVersion = v140.4
mindustryVersion = v146
# Actual Mindustry hash that is used for fetching component classes
mindustryFetchVersion = 4f912f25ee795c44475ecdf42f17fda8132f47fa
mindustryFetchVersion = v146
# Fallback Arc version, deviate from `mindustryVersion` if you're using a Bleeding Edge classpath version.
arcVersion = b32576ca09
# Javapoet classpath version, for class file generation.
Expand Down
2 changes: 1 addition & 1 deletion main/src/unity/world/blocks/production/CrucibleSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void buildConfiguration(Table table){

@Override
public Integer config(){
return config.id;
return config == null ? 0 : config.id;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Avant Team",
"description": "A big-collaboration Mindustry mod created by many authors from the Mindustry modding community.",
"version": "0.2-youngcha.3.3",
"minGameVersion": 140.4,
"minGameVersion": 146,
"main": "unity.Unity",
"java": true
}

0 comments on commit bf42b5f

Please sign in to comment.