From bf42b5fa675d9d82bea8ddf77e3a6be9eb03c7d0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 13 Sep 2023 19:38:42 -0400
Subject: [PATCH] oh wait wrong branch

---
 .github/workflows/push.yml                                  | 4 ++--
 annotations/src/unity/annotations/Annotations.java          | 5 +++++
 .../src/unity/annotations/processors/BaseProcessor.java     | 3 +--
 build.gradle                                                | 2 ++
 gradle.properties                                           | 6 +++---
 main/src/unity/world/blocks/production/CrucibleSource.java  | 2 +-
 mod.json                                                    | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index f1221927..6f4b296b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -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
diff --git a/annotations/src/unity/annotations/Annotations.java b/annotations/src/unity/annotations/Annotations.java
index 016e7241..236f2d4a 100644
--- a/annotations/src/unity/annotations/Annotations.java
+++ b/annotations/src/unity/annotations/Annotations.java
@@ -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)
diff --git a/annotations/src/unity/annotations/processors/BaseProcessor.java b/annotations/src/unity/annotations/processors/BaseProcessor.java
index 171315a0..92240583 100644
--- a/annotations/src/unity/annotations/processors/BaseProcessor.java
+++ b/annotations/src/unity/annotations/processors/BaseProcessor.java
@@ -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 + ")";
     }
diff --git a/build.gradle b/build.gradle
index 196aa163..cec62377 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript{
 
     repositories{
         mavenCentral()
+        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
         maven{ url 'https://jitpack.io' }
     }
 }
@@ -42,6 +43,7 @@ allprojects{
 
     repositories{
         mavenCentral()
+        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
         maven{ url "https://jitpack.io" }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 25da237c..c990e673 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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.
diff --git a/main/src/unity/world/blocks/production/CrucibleSource.java b/main/src/unity/world/blocks/production/CrucibleSource.java
index bb9615aa..932d37e6 100644
--- a/main/src/unity/world/blocks/production/CrucibleSource.java
+++ b/main/src/unity/world/blocks/production/CrucibleSource.java
@@ -70,7 +70,7 @@ public void buildConfiguration(Table table){
 
         @Override
         public Integer config(){
-            return config.id;
+            return config == null ? 0 : config.id;
         }
 
         @Override
diff --git a/mod.json b/mod.json
index a299c620..b3d4a07e 100644
--- a/mod.json
+++ b/mod.json
@@ -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
 }