Skip to content

Commit

Permalink
update mc property and tweak mod deps
Browse files Browse the repository at this point in the history
  • Loading branch information
thiakil committed Aug 14, 2024
1 parent d8505ea commit 23f194e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,14 @@ dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junit_version}")
//We use https://github.com/jqwik-team/jqwik to allow for implementing property based testing
testImplementation("net.jqwik:jqwik:${jqwik_version}")

compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")

compileOnly("mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}")
if (recipe_viewer == 'jei' || recipe_viewer == 'hybrid') {
localRuntime("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
}

compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
compileOnly("dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}:api")
def emi = "dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}"
//TODO: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
//Compile against full emi in datagen
datagenMainCompileOnly(emi)
Expand All @@ -382,7 +381,7 @@ dependencies {
//datagenMainRuntimeOnly(emi)
}

localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
localRuntime("team.chisel.ctm:CTM:${previous_minor_minecraft_version}-${ctm_version}")

compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api")
localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}")
Expand All @@ -400,7 +399,7 @@ dependencies {
//TODO: Re-enable when it updates
//localRuntime(jeiTweaker)

compileOnly("dev.gigaherz.jsonthings:JsonThings-${minecraft_version}:${json_things_version}")
compileOnly("dev.gigaherz.jsonthings:JsonThings-${previous_minor_minecraft_version}:${json_things_version}")

//Mods we have dependencies on but don't bother loading into the dev environment
//compileOnly("curse.maven:projecte-api-226410:${projecte_api_id}")
Expand All @@ -410,15 +409,15 @@ dependencies {
compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}:api")
compileOnly("com.blamejared.recipestages:RecipeStages:${recipe_stages_version}")
compileOnly("curse.maven:opencomputers2-437654:${oc2_id}")
compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cc_tweaked_version}")
compileOnly("cc.tweaked:cc-tweaked-${previous_minor_minecraft_version}-forge-api:${cc_tweaked_version}")
//localRuntime("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_tweaked_version}")
compileOnly("curse.maven:female-gender-forge-481655:${wildfire_gender_mod_id}")

//Dependencies for data generators for mod compat reference
datagenMainImplementation("appeng:appliedenergistics2:${ae2_version}")
datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${minecraft_version}-${glitchcore_version}")
datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}")
datagenMainImplementation("com.github.glitchfiend:BiomesOPlenty-neoforge:${minecraft_version}-${biomesoplenty_version}")
datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${previous_minor_minecraft_version}-${glitchcore_version}")
datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${previous_minor_minecraft_version}-${terrablender_version}")
datagenMainImplementation("com.github.glitchfiend:BiomesOPlenty-neoforge:${previous_minor_minecraft_version}-${biomesoplenty_version}")
//TODO: Switch back to datagenMainImplementation after it doesn't crash when default components are modified in datagen
datagenMainCompileOnly("curse.maven:farmers-delight-398521:${farmers_delight_id}")
//TODO - 1.20.2: Re-enable after projecte is updated
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx4G
org.gradle.configuration-cache=true

java_version=21
minecraft_version=1.21
minecraft_version=1.21.1
#Used as a helper for porting when deps we use have not updated yet
previous_minecraft_version=1.20.4
previous_minor_minecraft_version=1.20.6
previous_minecraft_version=1.20.6
previous_minor_minecraft_version=1.21
loader_version_range=[4,)
forge_version=21.1.8
mod_version=10.6.7
Expand Down Expand Up @@ -37,15 +37,15 @@ yamlops_version=1.2.0

#Mod dependencies
cc_tweaked_version=1.111.0
crafttweaker_version=20.0.18
crafttweaker_version=21.0.1
ctm_version=1.2.0+2
curios_version=9.0.5+1.21
emi_version=1.1.10
grand_power_version=3.0.0
jade_api_id=5427895
jade_id=5572926
jei_version=19.5.2.66
json_things_version=0.12.0
jei_version=19.8.4.116
json_things_version=0.12.1
top_version=1.21_neo-12.0.0-1
wthit_version=12.2.3

Expand Down

0 comments on commit 23f194e

Please sign in to comment.