From e03c1a4c26a82527f575ced1e363682a61067257 Mon Sep 17 00:00:00 2001
From: Technici4n <13494793+Technici4n@users.noreply.github.com>
Date: Sun, 28 Nov 2021 23:38:36 +0100
Subject: [PATCH] Update build and deps

---
 build.gradle                       | 10 +++++-----
 gradle.properties                  |  6 +++---
 src/main/resources/fabric.mod.json | 15 +++------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 55e09c3c8..d4da72630 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,8 +131,8 @@ repositories {
 }
 
 dependencies {
-    // TODO remove
-    include modImplementation("net.fabricmc.fabric-api:fabric-data-generation-api-v1:0.0.1+f8f4a6586d") {
+    // TODO remove when fabric PR is merged
+    modImplementation("net.fabricmc.fabric-api:fabric-data-generation-api-v1:0.0.1+f8f4a6586d") {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
@@ -351,9 +351,9 @@ if (System.getenv("CURSEFORGE_API_KEY") && !version.endsWith("-SNAPSHOT")) {
             changelogType = "markdown"
             delegate.changelog = changelog
 
-            addGameVersion "1.17.1"
+            addGameVersion "1.18-Snapshot"
             addGameVersion "Fabric"
-            addGameVersion "Java 16"
+            addGameVersion "Java 17"
 
             relations {
                 requiredDependency "fabric-api"
@@ -388,6 +388,6 @@ task publishModrinth (type: TaskModrinthUpload){
     delegate.changelog = changelog
     versionType = releaseChannel.toUpperCase()
     uploadFile = remapJar.archiveFile
-    addGameVersion "1.17.1"
+    addGameVersion "1.18-rc3"
     addLoader "fabric"
 }
diff --git a/gradle.properties b/gradle.properties
index e7ae5af74..7b44d0869 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,8 +9,8 @@ org.gradle.jvmargs=-Xmx1G \
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.18-pre7
-	yarn_mappings=1.18-pre7+build.3
+	minecraft_version=1.18-rc3
+	yarn_mappings=1.18-rc3+build.2
 	loader_version=0.12.5
 
 # Mod Properties
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1G \
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.43.0+1.18
+	fabric_version=0.43.1+1.18
 	rei_version=7.0.337
 	patchouli_version=1.17.1-56-FABRIC
 	cloth_api_version=1.5.47
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 314dfc9c7..84ed78d2a 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,5 +1,4 @@
 {
-  "__comment": "TODO 1.18 add back REI and patchouli deps",
   "schemaVersion": 1,
   "id": "modern_industrialization",
   "version": "${version}",
@@ -47,7 +46,8 @@
   "depends": {
     "fabricloader": ">=0.7.4",
     "fabric": ">=0.43",
-    "minecraft": "1.18.x"
+    "minecraft": "1.18.x",
+    "roughlyenoughitems": "*"
   },
   "breaks": {
     "universalcomponents": "*"
@@ -56,15 +56,6 @@
     "waila:plugins": {
       "id": "modern_industrialization:plugin",
       "initializer": "aztech.modern_industrialization.compat.waila.MIWailaPlugin"
-    },
-    "dashloader:customobject": [
-      "aztech.modern_industrialization.compat.dashloader.DashMachineBakedModel",
-      "aztech.modern_industrialization.compat.dashloader.DashMachineCastingModel",
-      "aztech.modern_industrialization.compat.dashloader.DashPipeModel",
-      "aztech.modern_industrialization.compat.dashloader.DashTankModel"
-    ],
-    "dashloader:customdata": [
-      "aztech.modern_industrialization.compat.dashloader.MachineCastingModelsData"
-    ]
+    }
   }
 }