From 11910d0f283e886c170a75fe883d945d87f7aa69 Mon Sep 17 00:00:00 2001 From: TomTheFurry <46843632+TomTheFurry@users.noreply.github.com> Date: Thu, 10 Mar 2022 17:29:27 +0800 Subject: [PATCH] Fix IDE not reconising preprocessor --- build.gradle | 15 +++++++++++---- build.properties | 1 + .../main/java/com/seibel/lod/common/Config.java | 12 +----------- gradle.properties | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 build.properties diff --git a/build.gradle b/build.gradle index 68d6ef3bc..bbf15f9e7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,11 @@ plugins { id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false } +def writeBuildGradlePredefine() { + def excapedMCVersion = rootProject.minecraft_version.replace(".", "_") + new File(projectDir, "build.properties").text = "MC_VERSION_${excapedMCVersion}=\n" +} + def loadProperties() { def defaultMcVersion = '1.18.2' if (!project.hasProperty("mcVer")) { @@ -28,6 +33,7 @@ def loadProperties() { rootProject.ext.set(prop.key, prop.value) // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]" } + writeBuildGradlePredefine() } loadProperties() @@ -170,11 +176,12 @@ allprojects { p -> tasks.withType(JavaCompile) { - // Add Manifold Preprocessor - def excapedMCVersion = rootProject.minecraft_version.replace(".", "_") - options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"] - +// def excapedMCVersion = rootProject.minecraft_version.replace(".", "_") +// options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"] +// + options.compilerArgs += ['-Xplugin:Manifold'] + // println options.compilerArgs if (p != project(":core")) { options.release = rootProject.java_version as Integer diff --git a/build.properties b/build.properties new file mode 100644 index 000000000..ae4f3e14a --- /dev/null +++ b/build.properties @@ -0,0 +1 @@ +MC_VERSION_1_18_2= diff --git a/common/src/main/java/com/seibel/lod/common/Config.java b/common/src/main/java/com/seibel/lod/common/Config.java index 87ceec063..4b3593810 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/Config.java @@ -29,21 +29,12 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.I import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator; - -#define CONFIG - -#if MC_VERSION_1.18.2 - -stafdqvsrevasbhyuicwegyhio - -#endif /** * This handles any configuration the user has access to. * @author coolGi2007 * @version 12-12-2021 */ -#if CONFIG public class Config //public class Config extends TinyConfig { @@ -296,5 +287,4 @@ public class Config } } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3498d0558..62d6d3038 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ toml_version=3.6.4 manifold_version=2022.1.5 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: -mcVer=1.18.1 \ No newline at end of file +mcVer=1.18.2 \ No newline at end of file