From 8758c499f1895b6b976370306c617aa3c2001df1 Mon Sep 17 00:00:00 2001
From: Goby56 <60710855+Goby56@users.noreply.github.com>
Date: Fri, 12 Apr 2024 22:43:26 +0200
Subject: [PATCH] hmmm

---
 build.gradle                                  |  9 +++++++--
 gradle.properties                             | 20 ++++++++++---------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../wakes/compat/ValkyrienSkiesCompat.java    | 15 ++++++++++++++
 .../com/goby56/wakes/event/WakeTicker.java    |  2 ++
 5 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/goby56/wakes/compat/ValkyrienSkiesCompat.java

diff --git a/build.gradle b/build.gradle
index 225e31e..491be04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id 'me.fallenbreath.yamlang' version '1.3.1'
 }
@@ -62,9 +62,13 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 
-	modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}"
+	modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}") {
+		exclude(group: "com.twelvemonkeys.common")
+		exclude(group: "com.twelvemonkeys.imageio")
+	}
 
 	modCompileOnly "maven.modrinth:iris:${project.iris_version}"
+	modCompileOnly "maven.modrinth:valkyrien-skies:${project.valkyrien_skies_version}"
 //	modImplementation "maven.modrinth:sodium:${project.sodium_version}"
 //	modImplementation "org.anarres:jcpp:1.4.14"
 //	modImplementation "io.github.douira:glsl-transformer:2.0.0-pre13"
@@ -76,6 +80,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:5.10.0-M1"
 
 	implementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.23"
 
 	include(implementation("blue.endless:jankson:${project.jankson_version}"))
 
diff --git a/gradle.properties b/gradle.properties
index 9ae7298..a346cef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,22 +4,24 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.24
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.15.9
+
+#Fabric api
+fabric_version=0.92.0+1.20.1
 
 # Mod Properties
-mod_version=0.2.4-test-build-1
+mod_version=0.2.5-vc-compat
 maven_group=com.goby56.wakes
 archives_base_name=wakes
 
 # Dependencies
-fabric_version=0.90.7+1.20.2
-
 sodium_version=mc1.20.2-0.5.3
-yacl_version=3.3.0-beta.1+1.20.2
+yacl_version=3.2.2+1.20
 iris_version=1.6.9+1.20.2
-modmenu_version=8.0.0
+modmenu_version=7.2.2
 jankson_version=1.2.2
 # TODO CHANGE SATIN TO 1.16.0 AND MC TO 1.20.4
-satin_version=1.14.0
\ No newline at end of file
+satin_version=1.14.0
+valkyrien_skies_version=1.20.1-fabric-2.3.0-beta.5
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..20db9ad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/goby56/wakes/compat/ValkyrienSkiesCompat.java b/src/main/java/com/goby56/wakes/compat/ValkyrienSkiesCompat.java
new file mode 100644
index 0000000..b6744b6
--- /dev/null
+++ b/src/main/java/com/goby56/wakes/compat/ValkyrienSkiesCompat.java
@@ -0,0 +1,15 @@
+package com.goby56.wakes.compat;
+
+import net.minecraft.world.World;
+import org.valkyrienskies.core.api.ships.LoadedShip;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
+
+public class ValkyrienSkiesCompat {
+    public static void tick(World world) {
+        // for (LoadedShip ship : VSGameUtilsKt.getShipObjectWorld(world).getLoadedShips()) {
+        //     ship.getShipAABB();
+        // }
+
+
+    }
+}
diff --git a/src/main/java/com/goby56/wakes/event/WakeTicker.java b/src/main/java/com/goby56/wakes/event/WakeTicker.java
index 4066ccf..bbe5349 100644
--- a/src/main/java/com/goby56/wakes/event/WakeTicker.java
+++ b/src/main/java/com/goby56/wakes/event/WakeTicker.java
@@ -1,5 +1,6 @@
 package com.goby56.wakes.event;
 
+import com.goby56.wakes.compat.ValkyrienSkiesCompat;
 import com.goby56.wakes.render.SplashPlaneRenderer;
 import com.goby56.wakes.simulation.WakeHandler;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -9,6 +10,7 @@ public class WakeTicker implements ClientTickEvents.EndWorldTick {
     @Override
     public void onEndTick(ClientWorld world) {
         WakeHandler.getInstance().tick();
+        ValkyrienSkiesCompat.tick(world);
         SplashPlaneRenderer.tick();
     }
 }