From 4e226130df134a57bfdaf145614686ff2c18927c Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Sun, 25 Sep 2022 12:24:41 +0930
Subject: [PATCH] Fixed up some listener stuff in the config

---
 1.18.2.properties   | 4 +++-
 build.gradle        | 3 +++
 coreSubProjects     | 2 +-
 fabric/build.gradle | 6 +++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/1.18.2.properties b/1.18.2.properties
index 96c178c03..501c080a6 100644
--- a/1.18.2.properties
+++ b/1.18.2.properties
@@ -16,8 +16,9 @@ architectury_version=4.4.59
     lithium_version=mc1.18.2-0.7.9
     sodium_version=mc1.18.2-0.4.1
     iris_version=1.18.x-v1.2.5
-    immersive_portals_version = v1.0.4-1.18
     bclib_version=1.4.5
+    canvas_version=mc118:1.0.2397
+    immersive_portals_version = v1.4.9-1.18
 
     # Fabric mod run
     # 0 = Don't enable and don't run
@@ -29,6 +30,7 @@ architectury_version=4.4.59
     enable_lithium=0
     enable_iris=0
     enable_bclib=1
+    enable_canvas=0
 
 # Forge loader
 forge_version=40.0.18
diff --git a/build.gradle b/build.gradle
index b98b9da08..ebd3f2422 100644
--- a/build.gradle
+++ b/build.gradle
@@ -330,6 +330,9 @@ allprojects { p ->
         // Required for Mixins & VanillaGradle
         maven { url "https://repo.spongepowered.org/maven/" }
 
+        // Required for canvas
+        maven { url "https://maven.vram.io/" }
+
         // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
         flatDir {
             dirs "${rootDir}/mods/fabric"
diff --git a/coreSubProjects b/coreSubProjects
index 825c72d57..52b26c204 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 825c72d5726e5fce0f63c99f6a3f69e41cee5ac9
+Subproject commit 52b26c20467a77884e7fd71c102d3bb3d9ee7840
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 55fa911ce..4bed7d1e1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -73,6 +73,9 @@ dependencies {
     // BCLib
     addMod("com.github.paulevsGitch:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib)
 
+    // Canvas
+    addMod("io.vram:canvas-fabric-${project.canvas_version}", rootProject.enable_canvas)
+
     // Immersive Portals
     /*
     modImplementation("com.github.qouteall.ImmersivePortalsMod:build:${rootProject.immersive_portals_version}") {
@@ -87,7 +90,8 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
         transitive(false)
     }
-    */
+     */
+
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }