Merge branch '1.6-1.20.1' of https://github.com/SammySemicolon/Malum-Mod

into 1.6-1.20.1
SammySemicolon · Oct 19, 2024 · ecc93a8 · ecc93a8
2 parents cfc99ab + bcb6d1c
commit ecc93a8
Show file tree

Hide file tree

Showing 608 changed files with 3,308 additions and 1,535 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,9 @@ build
 # other
 eclipse
 run
+run-data
+logs
 
 # Files from Forge MDK
 forge*changelog.txt
-/run-data/logs/
 /src/generated/resources/.cache/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,6 +30,10 @@ val mixinVersion: String by extra
 val modJavaVersion: String by extra
 val lodestoneVersion: String by extra
 val fusionVersion: String by extra
+var caelusVersion: String by extra
+val geckoLibVersion: String by extra
+val playerAnimatorVersion: String by extra
+val ironsSpellsVersion: String by extra
 
 jarJar.enable()
 
@@ -145,6 +149,18 @@ repositories {
         }
     }
 
+    //Iron's Spellbooks requirements
+    maven {
+        name = "Iron's Maven - Release"
+        url = uri("https://code.redspace.io/releases")
+    }
+    maven {
+        url = uri("https://maven.kosmx.dev/")
+    }
+    maven {
+        url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/")
+    }
+
     exclusiveContent {
         forRepository {
             maven {
@@ -184,19 +200,30 @@ dependencies {
 
     implementation(fg.deobf("team.lodestar.lodestone:lodestone:${minecraftVersion}-${lodestoneVersion}"))
 
-    runtimeOnly(fg.deobf("maven.modrinth:fusion-connected-textures:${fusionVersion}-forge-mc${minecraftVersion}"))
-
+    //FD Optional Dependency
     compileOnly(fg.deobf("curse.maven:farmers_delight-398521:4638874"))
 
-    runtimeOnly(fg.deobf("curse.maven:create-328085:4626108"))
-    //implementation(fg.deobf("curse.maven:jeed-532286:4599236"))
-    implementation(fg.deobf("curse.maven:mutil-351914:4824501"))
-    implementation(fg.deobf("curse.maven:tetra-289712:5544287"))
+    //Tetra Optional Dependency
+    compileOnly(fg.deobf("curse.maven:mutil-351914:4824501"))
+    compileOnly(fg.deobf("curse.maven:tetra-289712:5544287"))
 
-    runtimeOnly(fg.deobf("curse.maven:world-stripper-250603:4578579"))
+    //Iron's Spellbooks Optional Dependency
+    compileOnly(fg.deobf("top.theillusivec4.caelus:caelus-forge:${caelusVersion}:api"))
+    runtimeOnly(fg.deobf("top.theillusivec4.caelus:caelus-forge:${caelusVersion}"))
+    implementation(fg.deobf("software.bernie.geckolib:geckolib-forge-${geckoLibVersion}"))
+    implementation(fg.deobf("dev.kosmx.player-anim:player-animation-lib-forge:${playerAnimatorVersion}"))
+    compileOnly(fg.deobf("io.redspace.ironsspellbooks:irons_spellbooks:${ironsSpellsVersion}:api"))
+    runtimeOnly(fg.deobf("io.redspace.ironsspellbooks:irons_spellbooks:${ironsSpellsVersion}"))
+
+    //Apothic Attributes
+    implementation(fg.deobf("curse.maven:placebo-283644:5414631"))
+    implementation(fg.deobf("curse.maven:apothic-attributes-898963:5634071"))
+
+    //Misc
     runtimeOnly(fg.deobf("curse.maven:spark-361579:4587309"))
     runtimeOnly(fg.deobf("curse.maven:attributefix-280510:4911084"))
     runtimeOnly(fg.deobf("curse.maven:overloaded-armor-bar-314002:4631133"))
+    runtimeOnly(fg.deobf("maven.modrinth:fusion-connected-textures:${fusionVersion}-forge-mc${minecraftVersion}"))
 }
 
 tasks.withType<ProcessResources> {
@@ -242,6 +269,7 @@ tasks.withType<Jar> {
         )
     }
     finalizedBy("reobfJar")
+    finalizedBy("reobfJarJar")
 }
 
 tasks.jar.configure {

diff --git a/gradle.properties b/gradle.properties
@@ -11,12 +11,22 @@ parchmentVersion=2023.09.03-1.20.1
 mixinVersion=0.8.5
 modName=Malum
 modId=malum
-modVersion=1.6.2
+modVersion=1.6.4
 modLicense=All Rights Reserved
 modGroupId=com.sammy.malum
 modAuthors=Sammy Semicolon
 modDescription=A dark magic mod focused on soul and spirit magic.
-lodestoneVersion=1.6.2.216
-jeiVersion=15.2.0.22
+
+# Mandatory
+lodestoneVersion=1.6.3.246
 curiosVersion=5.7.1+1.20.1
+
+# Iron's Spellbooks
+caelusVersion=3.1.0+1.20
+geckoLibVersion=1.20.1:4.4.5
+playerAnimatorVersion=1.0.2-rc1+1.20
+ironsSpellsVersion=1.20.1-3.4.0.2
+
+# Misc
+jeiVersion=15.2.0.22
 fusionVersion=1.1.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists