diff --git a/build.gradle b/build.gradle index d10b8534..118dbbc7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } } plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'com.modrinth.minotaur' version '2.+' id 'org.ajoberstar.reckon' version '0.13.1' } @@ -43,13 +43,12 @@ reckon { repositories { mavenLocal() flatDir { dirs 'lib' } - maven { name 'entity-reach-attributes'; url 'https://maven.jamieswhiteshirt.com/libs-release'; content { includeGroup "com.jamieswhiteshirt" } } maven { name 'trinkets'; url 'https://maven.ladysnake.org/releases' } maven { name 'mod-menu'; url 'https://maven.terraformersmc.com/' } maven { name 'minelp-snapshot'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' } maven { name 'minelp-releases'; url 'https://repo.minelittlepony-mod.com/maven/release' } maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' } - maven { name 'Nodium'; url 'https://maven.cafeteria.dev/releases/' } + maven { name 'Iris Deps'; url "https://maven.covers1624.net/" } maven { name 'Greenhouse Maven For Farmers delight'; url 'https://maven.greenhouseteam.dev/releases/' } maven { name 'Porting Lib For Farmers delight'; url = 'https://mvn.devos.one/releases/' } maven { name 'Modrinth'; url 'https://api.modrinth.com/maven' } @@ -67,9 +66,6 @@ dependencies { modApi "com.minelittlepony:kirin:${project.kirin_version}" include "com.minelittlepony:kirin:${project.kirin_version}" - modApi "com.jamieswhiteshirt:reach-entity-attributes:${project.reach_attributes_version}" - include "com.jamieswhiteshirt:reach-entity-attributes:${project.reach_attributes_version}" - modApi "com.sollace:fabwork:${project.fabwork_version}" include "com.sollace:fabwork:${project.fabwork_version}" @@ -77,6 +73,13 @@ dependencies { include "com.sollace:Romanizer:Romanizer:1.0.2" modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" + + modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" + include "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" + + modImplementation "com.github.MattiDragon:TlaApi:${project.tla_version}" + include "com.github.MattiDragon:TlaApi:${project.tla_version}" + if (project.use_trinkets == '1') { modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" modCompileOnly "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.3.0" @@ -85,15 +88,11 @@ dependencies { modCompileOnly "dev.emi:trinkets-dummy:${project.trinkets_version}" } - modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" - include "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraformer_api_version}" - - modImplementation "me.luligabi:NoIndium:${project.nodium_version}" - include "me.luligabi:NoIndium:${project.nodium_version}" - - //modImplementation "vectorwing:FarmersDelight-Refabricated:${project.farmers_delight_version}", { - // exclude group: "net.fabricmc" - //} + if (project.use_farmers_delight == '1') { + modImplementation "vectorwing:FarmersDelight-Refabricated:${project.farmers_delight_version}", { + exclude group: "net.fabricmc" + } + } if (project.use_pehkui == '1') { modCompileOnly "maven.modrinth:pehkui:${project.pehkui_version}", { exclude group: "net.fabricmc.fabric-api" } modCompileOnly "com.github.Virtuoel:KanosConfig:0.4.1", { exclude group: "net.fabricmc.fabric-api" } @@ -112,8 +111,13 @@ dependencies { if (project.tmi_type == 'emi') { modCompileOnly "dev.emi:emi-fabric:${project.emi_version}" - } else { - modCompileOnly "dev.emi:emi-fabric-dummy:${project.emi_version}" + } + if (project.tmi_type == 'rei') { + modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:${project.rei_version}" + modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" + modCompileOnly "dev.architectury:architectury-fabric:${project.rei_architectury_version}" + modCompileOnly "me.shedaniel.cloth:basic-math:${project.rei_cloth_basic_math_version}" + modCompileOnly "me.shedaniel.cloth:cloth-config-fabric:${project.rei_cloth_config_version}" } } diff --git a/gradle.properties b/gradle.properties index c5973b7b..9cdeb9d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.4 - yarn_mappings=1.20.4+build.1 - loader_version=0.15.1 - fabric_version=0.91.2+1.20.4 + minecraft_version=1.21 + yarn_mappings=1.21+build.9 + loader_version=0.16.5 + fabric_version=0.102.0+1.21 # Mod Properties group=com.minelittlepony @@ -15,32 +15,36 @@ org.gradle.daemon=false description=Magical Abilities for Mine Little Pony! # Publishing - minecraft_version_range=1.20.4 + minecraft_version_range=>=1.21 modrinth_loader_type=fabric modrinth_project_id=9K7RJlvM # Dependencies - fabwork_version=1.3.0+1.20.2 - modmenu_version=9.0.0-pre.1 - minelp_version=4.11.6+1.20.2 - kirin_version=1.17.1+1.20.4 - reach_attributes_version=2.4.2 - trinkets_version=3.8.0 - terraformer_api_version=8.0.0-beta.1 - nodium_version=1.1.0+1.20 + fabwork_version=1.3.1+1.21 + modmenu_version=11.0.0-beta.1 + minelp_version=4.12.0+1.21 + kirin_version=1.19.0+1.21 + trinkets_version=3.10.0 + terraformer_api_version=11.0.0-alpha.1 # Testing + use_farmers_delight=0 use_trinkets=1 use_pehkui=0 use_sodium=1 use_iris=1 - farmers_delight_version=1.20.1-2.0.9 - pehkui_version=3.7.8+1.14.4-1.20.4 - iris_version=1.7.2+1.20.4 - sodium_version=mc1.20.4-0.5.8 - indium_version=1.0.30+mc1.20.4 + farmers_delight_version=1.21-2.1.9 + pehkui_version=3.8.3+1.14.4-1.21 + iris_version=1.7.2+1.21 + sodium_version=mc1.21-0.5.9 + indium_version=1.0.33+mc1.21 # TMI Testing - tmi_type=emi - emi_version=1.0.29+1.20.4 + tmi_type=none + tla_version=1.2.1 + emi_version=1.1.7+1.21 + rei_version=16.0.729 + rei_architectury_version=13.0.1 + rei_cloth_basic_math_version=0.6.1 + rei_cloth_config_version=15.0.127 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a5952066..0d184210 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lib/TlaApi-1.2.1-sources.jar b/lib/TlaApi-1.2.1-sources.jar new file mode 100644 index 00000000..1604feb1 Binary files /dev/null and b/lib/TlaApi-1.2.1-sources.jar differ diff --git a/lib/TlaApi-1.2.1.jar b/lib/TlaApi-1.2.1.jar new file mode 100644 index 00000000..678a91d1 Binary files /dev/null and b/lib/TlaApi-1.2.1.jar differ diff --git a/lib/emi-fabric-dummy-1.0.0+1.19.3.jar b/lib/emi-fabric-dummy-1.0.0+1.19.3.jar deleted file mode 100644 index 8f513597..00000000 Binary files a/lib/emi-fabric-dummy-1.0.0+1.19.3.jar and /dev/null differ diff --git a/lib/emi-fabric-dummy-1.0.20+1.20.1.jar b/lib/emi-fabric-dummy-1.0.20+1.20.1.jar deleted file mode 100644 index 666dc75e..00000000 Binary files a/lib/emi-fabric-dummy-1.0.20+1.20.1.jar and /dev/null differ diff --git a/lib/reach-entity-attributes-2.4.2-sources.jar b/lib/reach-entity-attributes-2.4.2-sources.jar deleted file mode 100644 index 8f2e4142..00000000 Binary files a/lib/reach-entity-attributes-2.4.2-sources.jar and /dev/null differ diff --git a/lib/reach-entity-attributes-2.4.2.jar b/lib/reach-entity-attributes-2.4.2.jar deleted file mode 100644 index 817df4f2..00000000 Binary files a/lib/reach-entity-attributes-2.4.2.jar and /dev/null differ