From 40d8a8ad7869332f1087d24326ed5b7c32ebf8fd Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 29 Mar 2021 21:35:20 +0800
Subject: Publish REI 6 to Forge

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 forge/build.gradle                                 | 28 +++++++++++++++++++++-
 .../forge/RoughlyEnoughItemsInitializerImpl.java   |  3 +++
 forge/src/main/resources/META-INF/mods.toml        |  6 ++---
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'forge')

diff --git a/forge/build.gradle b/forge/build.gradle
index 338ecaa99..2674432f9 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,4 +1,10 @@
-archivesBaseName = "forge"
+plugins {
+    id "com.github.johnrengelman.shadow" version "5.0.0"
+}
+
+configurations {
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+}
 
 architectury {
     platformSetupLoomIde()
@@ -38,9 +44,29 @@ dependencies {
     developmentForge(project(path: ":runtime")) { transitive = false }
     developmentForge(project(path: ":jei-compatibility-layer")) { transitive = false }
 
+    shadowCommon(project(path: ":api", configuration: "transformProductionForge")) { transitive = false }
+    shadowCommon(project(path: ":default-plugin", configuration: "transformProductionForge")) { transitive = false }
+    shadowCommon(project(path: ":runtime", configuration: "transformProductionForge")) { transitive = false }
+    shadowCommon(project(path: ":jei-compatibility-layer")) { transitive = false }
+
     modRuntime("curse.maven:chiselsbits-231095:3176033")
     modRuntime("curse.maven:jumbofurnace-390880:3120970")
     modRuntime("curse.maven:cyclic-239286:3221427")
     modRuntime("curse.maven:mekanism-268560:3206392")
     modRuntime("appeng:appliedenergistics2:8.2.0")
 }
+
+shadowJar {
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier "forge"
+}
+
+jar {
+    classifier "dev"
+}
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
index b6ce353b2..a433c87a5 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsInitializerImpl.java
@@ -34,6 +34,9 @@ public class RoughlyEnoughItemsInitializerImpl {
     }
     
     public static void checkMods() {
+        if (ModList.get().isLoaded("jei")) {
+            RoughlyEnoughItemsState.error("JEI is installed! REI is an replacement of JEI, we can't co-exist!");
+        }
         if (isClient()) {
             if (!ModList.get().isLoaded("cloth-config")) {
                 RoughlyEnoughItemsState.error("Cloth Config is not installed!", "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all");
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index aa62f0797..02685e595 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -13,8 +13,8 @@ To allow players to view items and recipes.
 '''
 
 [[dependencies.roughlyenoughitems]]
-modId = "cloth-config"
+modId = "architectury"
 mandatory = true
-versionRange = "[4.0.1,)"
+versionRange = "[1.9.136,)"
 ordering = "NONE"
-side = "CLIENT"
\ No newline at end of file
+side = "BOTH"
-- 
cgit