From 15a8244c755e6f44582a445a8fe29091982be1ad Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 15 Nov 2021 22:46:35 -0500 Subject: [PATCH 1/3] oops --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 668a144faf..cf97a672b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,7 @@ if (new File(settingsDir, 'local.properties').exists()) { if (System.getenv("JITPACK") == "true") hasSdk = false -if (hasSdk && false) { +if (hasSdk) { include 'android' } else { println("No Android SDK found. Skipping Android module.") From 610658ece28f175804ab720629609025315b624a Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 15 Nov 2021 22:46:58 -0500 Subject: [PATCH 2/3] oops2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643eed..442d9132ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7d752140a130f2479257807eb9c0b2ce8fde7302 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Tue, 16 Nov 2021 10:14:43 -0500 Subject: [PATCH 3/3] Fix mod weirdness? --- core/src/mindustry/mod/Scripts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 77ff3f17d7..dec48e8865 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -25,7 +25,7 @@ public class Scripts implements Disposable{ private static final Seq blacklist = Seq.with(".net.", "java.net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system", ".awt", "socket", "classloader", "oracle", "invoke", "java.util.function", "java.util.stream", "org.", "mod.classmap"); - private static final Seq whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "jdk.proxy1", "mindustry.gen.", + private static final Seq whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "jdk.proxy1", "jdk.proxy2", "mindustry.gen.", "mindustry.logic.", "mindustry.async.", "saveio", "systemcursor", "filetreeinitevent", "com.github.blahblahbloopster."); private final Context context;