update camera overhaul reforged compat

fixes #101
Up-Mods · Jun 11, 2024 · aae9b3e · aae9b3e
1 parent ebd1300
commit aae9b3e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/NeoForge/libs.versions.toml b/NeoForge/libs.versions.toml
@@ -9,7 +9,7 @@ curios = "5.8.1+1.20.1"
 
 caelus = "3.2.0+1.20.1"
 
-cameraoverhaul = "5310618"
+cameraoverhaul = "5416786"
 
 [libraries]
 neoforge = { module = "net.neoforged:forge", version.ref = "neoforge" }

diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/compat/CameraOverhaulCompat.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/compat/CameraOverhaulCompat.java
@@ -24,12 +24,13 @@
 
 package dev.cammiescorner.icarus.neoforge.compat;
 
+import com.confusingfool.cameraoverhaulneoforge.core.callbacks.CameraUpdateCallback;
+import com.confusingfool.cameraoverhaulneoforge.core.callbacks.ModifyCameraTransformCallback;
+import com.confusingfool.cameraoverhaulneoforge.core.structures.Transform;
 import dev.cammiescorner.icarus.IcarusConfig;
-import mirsario.cameraoverhaul.core.callbacks.CameraUpdateCallback;
-import mirsario.cameraoverhaul.core.callbacks.ModifyCameraTransformCallback;
-import mirsario.cameraoverhaul.core.structures.Transform;
 import net.minecraft.client.Camera;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 
@@ -43,7 +44,7 @@ public static void load() {
     }
 
     @Override
-    public void OnCameraUpdate(Camera camera, Transform cameraTransform, float deltaTime) {
+    public void OnCameraUpdate(Entity focusedEntrity, Camera camera, Transform cameraTransform, float deltaTime) {
         float pitch = camera.getXRot();
         float rollAmount = (pitch < -90 || pitch > 90) ? IcarusConfig.rollAmount : -IcarusConfig.rollAmount;
         Vec3 velocity = camera.getEntity().getDeltaMovement();

diff --git a/NeoForge/src/main/resources/META-INF/mods.toml b/NeoForge/src/main/resources/META-INF/mods.toml
@@ -27,7 +27,8 @@ config = "${mod_id}.neoforge.mixins.json"
         { modId = "curios", mandatory = true, versionRange = "[5.8.0,)", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "309927", modrinth = "vvuO3ImH" } },
         { modId = "caelus", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "308989", modrinth = "40FYwb4z" } },
         { modId = "resourcefulconfig", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "714059", modrinth = "M1953qlQ" } },
-        { modId = "commonnetworking", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "806044", modrinth = "HIuqnQpi" } }
+        { modId = "commonnetworking", mandatory = true, versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "806044", modrinth = "HIuqnQpi" } },
+        { modId = "camera_overhaul_neoforge", mandatory = false, versionRange = "[1.1,)", ordering = "NONE", side = "CLIENT", mc-publish = { curseforge = "1011593", modrinth = "LwcpSm6L" } }
     ]
 
 # Features are specific properties of the game environment, that you may want to declare you require. This example declares
@@ -44,6 +45,6 @@ config = "${mod_id}.neoforge.mixins.json"
         "forge"
     ]
     dependencies = [
-        "camera-overhaul-reforged(optional){modrinth:LwcpSm6L}{curseforge:1011593}",
+        "camera_overhaul_neoforge(optional){modrinth:LwcpSm6L}{curseforge:1011593}",
         "figura(optional){modrinth:s9gIPDom}{curseforge:901503}"
     ]