Skip to content

Commit 7338c82

Browse files
committed
Update deps and bump min Neo version to 21.0.8 to ensure the correct creative GUI is used (#8093)
1 parent f5d6a79 commit 7338c82

File tree

236 files changed

+251
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+251
-253
lines changed

build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ runs {
271271
if (hasProperty('forge_force_ansi')) {
272272
//Force ansi if declared as a gradle variable, as the auto detection doesn't detect IntelliJ properly
273273
// or eclipse's plugin that adds support for ansi escape in console
274-
jvmArguments.add("-Dterminal.ansi=${property('forge_force_ansi')}")
274+
systemProperties.put('terminal.ansi', (String) property('forge_force_ansi'))
275275
}
276276

277277
modSources.add((SourceSet[]) [sourceSets.main, sourceSets.api])
@@ -380,8 +380,8 @@ dependencies {
380380
//We use https://github.com/jqwik-team/jqwik to allow for implementing property based testing
381381
testImplementation("net.jqwik:jqwik:${jqwik_version}")
382382

383-
compileOnly("mezz.jei:jei-${previous_minecraft_version}-common-api:${jei_version}")
384-
compileOnly("mezz.jei:jei-${previous_minecraft_version}-neoforge-api:${jei_version}")
383+
compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-common-api:${jei_version}")
384+
compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge-api:${jei_version}")
385385
if (recipe_viewer == 'jei' || recipe_viewer == 'hybrid') {
386386
//TODO: Re-enable when JEI updates
387387
//localRuntime("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge:${jei_version}")
@@ -412,8 +412,7 @@ dependencies {
412412
transitive = false
413413
}*/
414414
compileOnly("curse.maven:jade-api-324717:${jade_api_id}")
415-
//TODO: Re-enable when Jade updates
416-
//localRuntime("curse.maven:jade-324717:${jade_id}")
415+
localRuntime("curse.maven:jade-324717:${jade_id}")
417416
compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
418417

419418
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
@@ -441,10 +440,9 @@ dependencies {
441440
//Dependencies for data generators for mod compat reference
442441
//TODO: Switch back to datagenMainImplementation when it updated
443442
datagenMainCompileOnly("appeng:appliedenergistics2-neoforge:${ae2_version}")
444-
//datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${previous_minor_minecraft_version}-${glitchcore_version}")
445-
//datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${previous_minor_minecraft_version}-${terrablender_version}")
446-
//TODO: Switch back to datagenMainImplementation when it updated
447-
datagenMainCompileOnly("com.github.glitchfiend:BiomesOPlenty-neoforge:${previous_minor_minecraft_version}-${biomesoplenty_version}")
443+
datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${minecraft_version}-${glitchcore_version}")
444+
datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}")
445+
datagenMainImplementation("com.github.glitchfiend:BiomesOPlenty-neoforge:${minecraft_version}-${biomesoplenty_version}")
448446
//TODO - 1.20.2: Switch back to datagenMainImplementation
449447
datagenMainCompileOnly("curse.maven:farmers-delight-398521:${farmers_delight_id}")
450448
//TODO - 1.20.2: Re-enable after projecte is updated

gradle.properties

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ minecraft_version=1.21
99
previous_minecraft_version=1.20.4
1010
previous_minor_minecraft_version=1.20.6
1111
loader_version_range=[4,)
12-
forge_version=21.0.6-beta
12+
forge_version=21.0.8-beta
1313
mod_version=10.6.0
1414
#This determines the minimum version of forge required to use Mekanism
1515
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
16-
forge_version_range=[21.0.6-beta,)
16+
forge_version_range=[21.0.8-beta,)
1717
minecraft_version_range=[1.21]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
@@ -38,6 +38,8 @@ yamlops_version=1.2.0
3838
#Mod dependencies
3939
jade_api_id=5427895
4040
jade_id=5427817
41+
top_version=1.21_neo-12.0.0-1
42+
wthit_version=12.1.2
4143

4244
#Mod dependency min version ranges
4345

@@ -46,29 +48,26 @@ jade_id=5427817
4648

4749

4850
#Mod dependencies for recipes (only used by our data generators)
49-
51+
biomesoplenty_version=21.0.0.4
52+
glitchcore_version=2.0.0.1
53+
terrablender_version=4.0.0.1
5054

5155
#Outdated mod dependencies
5256
cc_tweaked_version=1.111.0
53-
crafttweaker_version=19.0.8
57+
crafttweaker_version=19.0.10
5458
curios_version=8.0.0+1.20.6
5559
ctm_version=1.1.7+11
5660
emi_version=1.1.6
5761
flux_networks_id=5234697
58-
jei_version=17.3.0.52
62+
jei_version=18.0.0.62
5963
jeitweaker_version=8.0.5
6064
json_things_version=0.10.0
6165
oc2_id=3896581
6266
projecte_api_id=4860862
6367
recipe_stages_version=8.0.0.2
64-
top_version=1.20.5_neo-11.1.1-2
6568
wildfire_gender_mod_id=5357649
66-
wthit_version=11.3.0
6769

6870
#Outdated mod dependencies for recipes
6971
ae2_version=18.1.3-alpha
70-
biomesoplenty_version=18.4.0.7
7172
farmers_delight_id=5051242
72-
glitchcore_version=1.1.0.10
7373
projecte_id=4860859
74-
terrablender_version=3.5.0.5

0 commit comments

Comments
 (0)