Skip to content

Commit

Permalink
hmmm
Browse files Browse the repository at this point in the history
  • Loading branch information
Goby56 committed Apr 12, 2024
1 parent 856becb commit 8758c49
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 12 deletions.
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down Expand Up @@ -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"
Expand All @@ -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}"))

Expand Down
20 changes: 11 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
satin_version=1.14.0
valkyrien_skies_version=1.20.1-fabric-2.3.0-beta.5
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions src/main/java/com/goby56/wakes/compat/ValkyrienSkiesCompat.java
Original file line number Diff line number Diff line change
@@ -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();
// }


}
}
2 changes: 2 additions & 0 deletions src/main/java/com/goby56/wakes/event/WakeTicker.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,6 +10,7 @@ public class WakeTicker implements ClientTickEvents.EndWorldTick {
@Override
public void onEndTick(ClientWorld world) {
WakeHandler.getInstance().tick();
ValkyrienSkiesCompat.tick(world);
SplashPlaneRenderer.tick();
}
}

0 comments on commit 8758c49

Please sign in to comment.