Combine flux back into one module

CRModders · Mar 26, 2024 · 54950ac · 54950ac
1 parent 5c0b526
commit 54950ac
Show file tree

Hide file tree

Showing 77 changed files with 137 additions and 500 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/fabric/build.gradle.kts → build.gradle.kts b/fabric/build.gradle.kts → build.gradle.kts
@@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
 import java.net.URI
 
 object Properties {
-    const val MOD_VERSION = "0.3.4"
+    const val MOD_VERSION = "0.4.0"
     const val MOD_NAME = "FluxAPI"
     const val MODID = "fluxapi"
     const val MAVEN_GROUP = "dev.crmodders.flux"
@@ -71,10 +71,11 @@ dependencies {
 
 // Embedded | Project Dependencies
 dependencies {
+    shadow("net.fabricmc:sponge-mixin:0.12.5+mixin.0.8.5")
+
+    implementation("org.hjson:hjson:3.1.0")
     implementation("org.tinylog:tinylog:1.3.1")
     implementation("com.github.tobiasrm:tinylog-coloredconsole:1.3.1")
-
-    implementation(project(":common"))
 }
 
 base {
@@ -138,7 +139,6 @@ tasks.processResources {
 tasks.register("SetupWorkEnviornment") {
     group = "crmodders"
 
-    dependsOn("downloadCosmicReach")
     dependsOn("downloadLoader")
 }
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
diff --git a/common/src/main/java/dev/crmodders/flux/FluxConstants.java b/common/src/main/java/dev/crmodders/flux/FluxConstants.java
diff --git a/common/src/main/java/dev/crmodders/flux/menus/BasicMainMenu.java b/common/src/main/java/dev/crmodders/flux/menus/BasicMainMenu.java
diff --git a/common/src/main/java/dev/crmodders/flux/menus/ConfigViewMenu.java b/common/src/main/java/dev/crmodders/flux/menus/ConfigViewMenu.java
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17