Move config to Forge project

62832 · Dec 3, 2023 · c4fec60 · c4fec60
1 parent d08a019
commit c4fec60
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 val modId: String by project
 val modVersion = (System.getenv("MEGA_VERSION") ?: "v0.0.0").substring(1)
-val minecraftVersion: String = libs.versions.minecraft.get()
+val minecraftVersion = libs.versions.minecraft.get()
 
 val platforms by extra {
     property("enabledPlatforms").toString().split(',')

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -7,7 +7,6 @@ dependencies {
     modImplementation(libs.fabric.loader)
     modCompileOnly(libs.fabric.api)
     modCompileOnly(libs.ae2.fabric)
-    modCompileOnly(libs.cloth.fabric)
     modCompileOnly(libs.ae2wtlib.fabric)
     modCompileOnly(libs.appbot.fabric)
     modCompileOnly(libs.botania.fabric) { isTransitive = false }

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -62,8 +62,6 @@ dependencies {
     modImplementation(libs.fabric.api)
 
     modImplementation(libs.ae2.fabric)
-    modImplementation(libs.cloth.fabric)
-    modImplementation(libs.modmenu)
 
     modImplementation(libs.appbot.fabric) { exclude(group = "dev.emi", module = "emi-fabric") }
     modRuntimeOnly(libs.botania.fabric) { exclude(group = "dev.emi", module = "emi-fabric") }
@@ -72,6 +70,7 @@ dependencies {
 
     modRuntimeOnly(libs.jei.fabric)
     modRuntimeOnly(libs.jade.fabric)
+    modRuntimeOnly(libs.modmenu)
 }
 
 tasks {

diff --git a/forge/src/main/java/gripe/_90/megacells/forge/ForgePlatform.java b/forge/src/main/java/gripe/_90/megacells/forge/ForgePlatform.java
@@ -71,7 +71,6 @@
 import gripe._90.megacells.core.Platform;
 import gripe._90.megacells.definition.MEGABlockEntities;
 import gripe._90.megacells.definition.MEGABlocks;
-import gripe._90.megacells.definition.MEGAConfig;
 import gripe._90.megacells.definition.MEGACreativeTab;
 import gripe._90.megacells.definition.MEGAItems;
 import gripe._90.megacells.definition.MEGAMenus;

diff --git a/forge/src/main/java/gripe/_90/megacells/forge/MEGACellsForge.java b/forge/src/main/java/gripe/_90/megacells/forge/MEGACellsForge.java
@@ -5,7 +5,6 @@
 
 import gripe._90.megacells.MEGACells;
 import gripe._90.megacells.core.Addons;
-import gripe._90.megacells.definition.MEGAConfig;
 import gripe._90.megacells.integration.appmek.AppMekIntegration;
 
 @Mod(MEGACells.MODID)

diff --git a/.../_90/megacells/definition/MEGAConfig.java → ...gripe/_90/megacells/forge/MEGAConfig.java b/.../_90/megacells/definition/MEGAConfig.java → ...gripe/_90/megacells/forge/MEGAConfig.java
@@ -1,4 +1,4 @@
-package gripe._90.megacells.definition;
+package gripe._90.megacells.forge;
 
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigData;

diff --git a/...e/src/main/java/gripe/_90/megacells/integration/appmek/item/RadioactiveCellInventory.java b/...e/src/main/java/gripe/_90/megacells/integration/appmek/item/RadioactiveCellInventory.java
@@ -19,7 +19,7 @@
 import mekanism.api.chemical.attribute.ChemicalAttributeValidator;
 import mekanism.common.registries.MekanismGases;
 
-import gripe._90.megacells.definition.MEGAConfig;
+import gripe._90.megacells.forge.MEGAConfig;
 
 public class RadioactiveCellInventory implements StorageCell {
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,11 +28,8 @@ dependencyResolutionManagement {
             library("ae2-forge", "appeng", "appliedenergistics2-forge").versionRef("ae2")
 
             version("cloth-config", "11.1.106")
-            library("cloth-fabric", "me.shedaniel.cloth", "cloth-config-fabric").versionRef("cloth-config")
             library("cloth-forge", "me.shedaniel.cloth", "cloth-config-forge").versionRef("cloth-config")
 
-            library("modmenu", "com.terraformersmc", "modmenu").version("7.2.1")
-
             // AE2WTLib
             val ae2wtVersion = "15.0.1-beta"
             version("ae2wtlib", ae2wtVersion)
@@ -67,6 +64,8 @@ dependencyResolutionManagement {
 
             library("jade-fabric", "maven.modrinth", "jade").version("ckXpheui")
             library("jade-forge", "maven.modrinth", "jade").version("5gvujWrb")
+
+            library("modmenu", "com.terraformersmc", "modmenu").version("7.2.1")
         }
     }
 }