properly using the preprocessor system

Author: WizardlyBump17

.github/workflows/publish.yml

@@ -24,9 +24,6 @@ jobs:
         run: echo "WLIB_BUILD_DATE=$(date +'%Y-%m-%d_%H-%M-%S')" >> "$GITHUB_ENV"
       - name: Get snapshot number
         run: echo "WLIB_SNAPSHOT_NUMBER=$((${{ github.run_number }}+${{ github.run_attempt }}))" >> $GITHUB_ENV
-      - name: "Skip NMS if needed"
-        if: ${{ github.event_name != 'release' }}
-        run: echo "WLIB_SKIP_NMS=true" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -36,7 +33,12 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Build
-        run: ./gradlew build
+        run: |
+          if [ "${{ github.event_name }}" != "release" ]; then
+            ./gradlew build -Pskip_nms=true
+          else
+            ./gradlew build
+          fi
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -1,3 +1,4 @@
 **/build/
 .idea/
 .gradle/
+/build.properties

core/build.gradle

@@ -25,7 +25,7 @@ dependencies {
             project(':bukkit-utils'),
     )
 
-    if (System.getenv("WLIB_SKIP_NMS") == null) {
+    if (!"true".equals(properties.get("skip_nms"))) {
         implementation(project(":versions:v1_20_R4"))
         implementation(project(":versions:v1_21_R1"))
         implementation(project(":versions:v1_21_R3"))
@@ -52,10 +52,18 @@ tasks {
         archiveFileName = 'WLib-' + project.version + '.jar'
         relocate("com.github.sisyphsu", "com.wizardlybump17.wlib.libs.com.github.sisyphsu")
     }
+}
+
+def preprocessors() {
+    StringBuilder preprocessors = new StringBuilder()
 
-    tasks.withType(JavaCompile) {
-        if (System.getenv("WLIB_SKIP_NMS") == null)
-            options.compilerArgs += ["-Awlib_include_nms"]
+    if ("true".equals(properties.get("skip_nms"))) {
+        preprocessors.append("WLIB_INCLUDE_NMS=0")
+    } else {
+        preprocessors.append("WLIB_INCLUDE_NMS=1")
     }
+
+    new File(rootProject.projectDir, "build.properties").text = preprocessors.toString()
 }
 
+preprocessors()

core/src/main/java/com/wizardlybump17/wlib/WLib.java

@@ -2,6 +2,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.wizardlybump17.wlib.adapter.AttributeAdapter;
+import com.wizardlybump17.wlib.adapter.ItemAdapter;
+import com.wizardlybump17.wlib.adapter.command.CommandMapAdapter;
+import com.wizardlybump17.wlib.adapter.player.PlayerAdapter;
 import com.wizardlybump17.wlib.command.WLibCommandExecutor;
 import com.wizardlybump17.wlib.command.extractor.method.MethodCommandExtractor;
 import com.wizardlybump17.wlib.command.extractor.method.factory.OfflinePlayerMethodCommandNodeFactory;
@@ -154,7 +158,13 @@ private void initAdapters() {
     }
 
     private void setupAdapters() {
-        #if WLIB_INCLUDE_NMS
+        //keep IntelliJ from removing the import
+        ItemAdapter.class.toString();
+        PlayerAdapter.class.toString();
+        AttributeAdapter.class.toString();
+        CommandMapAdapter.class.toString();
+
+        #if WLIB_INCLUDE_NMS == 1
         String version = Bukkit.getMinecraftVersion();
         switch (version) {
             case "1.20.5", "1.20.6" -> {
@@ -183,6 +193,8 @@ private void setupAdapters() {
             }
             default -> getLogger().severe("The server version (" + version + ") is not supported by WLib yet.");
         }
+        #else
+        getLogger().severe("The NMS integration was disabled during compile, probably because of the presence of the \"skip_nms\" property and it was set to \"true\". The following systems are expected to not work: ItemAdapter, PlayerAdapter, AttributeAdapter, CommandMapAdapter.");
         #endif
     }