From 81c5124354a346624075d5878a9e8740f2baa34c Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Fri, 7 Jun 2024 11:29:00 +0200
Subject: [PATCH] Add Freecam support on Forge/NeoForge. Fix #443

---
 gradle-compose.yml                            |  4 +++-
 .../modsupport/FreecamSupport.java            |  4 +---
 .../modsupport/ModSupportLoader.java          | 20 ++++++++-----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gradle-compose.yml b/gradle-compose.yml
index 93e42566..8a9a1254 100644
--- a/gradle-compose.yml
+++ b/gradle-compose.yml
@@ -17,13 +17,15 @@ replacements:
   breaks: ', "FastAnim": "*"'
   fabric_dependencies: "
       modCompileOnly 'maven.modrinth:playeranimator:1.0.2-rc1+1.20-fabric'\n
-      modCompileOnly 'maven.modrinth:freecam:1.1.6-mc1.19'\n
+      modCompileOnly 'maven.modrinth:freecam:mYKA10cM'\n
       "
   forge_dependencies: "
       modCompileOnly 'maven.modrinth:playeranimator:1.0.2-rc1+1.20-forge'\n
+      modCompileOnly 'maven.modrinth:freecam:tXR5Jx3F'\n
       "
   neoforge_dependencies: "
       modCompileOnly 'maven.modrinth:playeranimator:1.0.2-rc1+1.20-forge'\n
+      modCompileOnly 'maven.modrinth:freecam:DrSgHrTu'\n
       "
 enabledFlags:
   - autopublish
diff --git a/src/main/java/dev/tr7zw/firstperson/modsupport/FreecamSupport.java b/src/main/java/dev/tr7zw/firstperson/modsupport/FreecamSupport.java
index 6b156019..bf0d64e3 100644
--- a/src/main/java/dev/tr7zw/firstperson/modsupport/FreecamSupport.java
+++ b/src/main/java/dev/tr7zw/firstperson/modsupport/FreecamSupport.java
@@ -1,4 +1,3 @@
-//#if FABRIC
 package dev.tr7zw.firstperson.modsupport;
 
 import dev.tr7zw.firstperson.api.ActivationHandler;
@@ -16,5 +15,4 @@ public boolean preventFirstperson() {
         return Freecam.isEnabled();
     }
 
-}
-//#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/dev/tr7zw/firstperson/modsupport/ModSupportLoader.java b/src/main/java/dev/tr7zw/firstperson/modsupport/ModSupportLoader.java
index a0a0904e..f840caec 100644
--- a/src/main/java/dev/tr7zw/firstperson/modsupport/ModSupportLoader.java
+++ b/src/main/java/dev/tr7zw/firstperson/modsupport/ModSupportLoader.java
@@ -9,18 +9,14 @@
 public class ModSupportLoader {
 
     public static void loadSupport() {
-        // spotless:off
-		//#if FABRIC
-		try {
-			if (ModLoaderUtil.isModLoaded("freecam")) {
-				FirstPersonAPI.registerPlayerHandler(new FreecamSupport());
-				FirstPersonBase.LOGGER.info("Freecam support loaded.");
-			}
-		} catch (Throwable ex) {
-			FirstPersonBase.LOGGER.warn("Error during initialization of mod support.", ex);
-		}
-		//#endif
-		//spotless:on
+        try {
+            if (ModLoaderUtil.isModLoaded("freecam")) {
+                FirstPersonAPI.registerPlayerHandler(new FreecamSupport());
+                FirstPersonBase.LOGGER.info("Freecam support loaded.");
+            }
+        } catch (Throwable ex) {
+            FirstPersonBase.LOGGER.warn("Error during initialization of mod support.", ex);
+        }
     }
 
 }