Skip to content

Commit cd1cd94

Browse files
committed
Update deps, and bump min Neo version to 21.1.21
1 parent 62a305b commit cd1cd94

23 files changed

+71
-72
lines changed

build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525

2626
tasks.named('wrapper', Wrapper).configure {
2727
//Define wrapper values here so as to not have to always do so when updating gradlew.properties
28-
gradleVersion = '8.9'
28+
gradleVersion = '8.10'
2929
distributionType = Wrapper.DistributionType.ALL
3030
}
3131

@@ -375,10 +375,7 @@ dependencies {
375375
localRuntime(emi)
376376
} else {
377377
//We still need it to load in datagen regardless of if we are using emi or a different viewer so that we can access EMI related objects
378-
//TODO - 1.21: Make a PR to EMI to bootstrap in datagen, and more importantly be able to somehow provide the registry access context
379-
// rather than it trying to grab it from Minecraft.getInstance().level as Minecraft.getInstance() is null in datagen
380-
// As https://github.com/emilyploszaj/emi/pull/600 broke it
381-
//datagenMainRuntimeOnly(emi)
378+
datagenMainRuntimeOnly(emi)
382379
}
383380

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

docs/Development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Mekanism is developed for Minecraft 1.21 using NeoForge.
44

55
## Prerequisites
66

7-
* Gradle - Version 8.9 is known to work, your mileage with other versions may vary
7+
* Gradle - Version 8.10 is known to work, your mileage with other versions may vary
88
* JDK - Version 21 is the target as that is what Mojang ships, but to run gradle you must use a minimum of JDK 17.
99

1010
## Directory Structure

gradle.properties

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ minecraft_version=1.21.1
99
previous_minecraft_version=1.20.6
1010
previous_minor_minecraft_version=1.21
1111
loader_version_range=[4,)
12-
forge_version=21.1.9
12+
forge_version=21.1.22
1313
mod_version=10.6.9
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.1.9,)
16+
forge_version_range=[21.1.21,)
1717
minecraft_version_range=[1.21.1]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
2020
release_type=alpha
2121

2222
#JUnit/Testing dependencies
23-
junit_version=5.10.2
23+
junit_version=5.11.0
2424
jqwik_version=1.9.0
2525

2626
#NeoGradle Settings
@@ -39,15 +39,16 @@ yamlops_version=1.2.0
3939
cc_tweaked_version=1.111.0
4040
crafttweaker_version=21.0.1
4141
ctm_version=1.2.0+2
42-
curios_version=9.0.5+1.21
43-
emi_version=1.1.10
42+
curios_version=9.0.6+1.21
43+
emi_version=1.1.12
4444
grand_power_version=3.0.0
4545
jade_api_id=5427895
46-
jade_id=5572926
47-
jei_version=19.8.4.116
46+
jade_id=5639932
47+
jei_version=19.8.5.118
4848
json_things_version=0.12.1
49-
top_version=1.21_neo-12.0.0-1
50-
wthit_version=12.2.3
49+
top_version=1.21_neo-12.0.3-5
50+
wildfire_gender_mod_id=5579007
51+
wthit_version=12.3.0
5152

5253
#Mod dependency min version ranges
5354

@@ -56,10 +57,10 @@ wthit_version=12.2.3
5657

5758

5859
#Mod dependencies for recipes (only used by our data generators)
59-
ae2_version=19.0.17-beta
60-
biomesoplenty_version=21.0.0.12
60+
ae2_version=19.0.20-beta
61+
biomesoplenty_version=21.0.0.18
6162
farmers_delight_id=5566383
62-
glitchcore_version=2.0.0.2
63+
glitchcore_version=2.0.0.3
6364
terrablender_version=4.0.0.1
6465

6566
#Outdated mod dependencies
@@ -68,7 +69,6 @@ jeitweaker_version=8.0.5
6869
oc2_id=3896581
6970
projecte_api_id=4860862
7071
recipe_stages_version=8.0.0.2
71-
wildfire_gender_mod_id=5357649
7272

7373
#Outdated mod dependencies for recipes
7474
projecte_id=4860859

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/api/java/mekanism/api/text/TextComponentUtil.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.minecraft.world.entity.EntityType;
1616
import net.minecraft.world.item.Item;
1717
import net.minecraft.world.item.ItemStack;
18+
import net.minecraft.world.level.Level;
1819
import net.minecraft.world.level.block.Block;
1920
import net.minecraft.world.level.material.Fluid;
2021
import net.neoforged.neoforge.fluids.FluidStack;
@@ -75,6 +76,7 @@ public static MutableComponent build(Object... components) {
7576
case FluidStack stack -> current = stack.getHoverName().copy();
7677
case Fluid fluid -> current = fluid.getFluidType().getDescription().copy();
7778
case EntityType<?> entityType -> current = entityType.getDescription().copy();
79+
case Level level -> current = level.getDescription().copy();
7880
case Direction direction -> current = getTranslatedDirection(direction);
7981
case Boolean bool -> current = getTranslatedBoolean(bool);
8082
//Fallback to a generic replacement
@@ -207,6 +209,8 @@ public static MutableComponent smartTranslate(String key, Object... components)
207209
current = fluid.getFluidType().getDescription().copy();
208210
} else if (component instanceof EntityType<?> entityType) {
209211
current = entityType.getDescription().copy();
212+
} else if (component instanceof Level level) {
213+
current = level.getDescription().copy();
210214
} else if (component instanceof Direction direction) {
211215
current = getTranslatedDirection(direction);
212216
} else if (component instanceof Boolean bool) {

src/datagen/generated/mekanism/.cache/218650cadc91bcfaaf2b781442052736f6b17664

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/.cache/c2007283a832f570d2167eeffdb50ecb2f811654

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/emi/aliases/mekanism.json

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/emi/recipe/defaults/mekanism.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismadditions/.cache/51220ff8a73863394102edc7f72ea26928851318

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)