mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-05-20 04:22:07 +00:00
Code Issues Releases Wiki Activity

Update JEI to MC 1.21.11

Browse Source
This commit is contained in:
Jonathan Coates
2025-12-17 13:14:14 +00:00
parent a8032d6c65
commit 309b78eb8a
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/libs.versions.toml
+7 -7
View File
@@ -38,12 +38,12 @@ nightConfig = "3.8.3"
fabricPermissions = "0.3.3"
iris-fabric = "1.9.1+1.21.7-fabric"
iris-forge = "1.9.1+1.21.7-neoforge"
jei = "26.0.0.1"
jei = "27.0.0.1"
modmenu = "16.0.0-rc.1"
moreRed = "6.0.0.3"
rei = "18.0.800"
sodium-fabric = "mc1.21.6-0.6.13-fabric"
sodium-forge = "mc1.21.6-0.6.13-neoforge"
sodium-fabric = "mc1.21.11-0.8.0-fabric"
sodium-forge = "mc1.21.11-0.8.0-neoforge"
mixinExtra = "0.3.5"
create-forge = "6.0.0-6"
create-fabric = "6.0.7.0+mc1.20.1-build.1716"
@@ -107,9 +107,9 @@ fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-l
fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
iris-fabric = { module = "maven.modrinth:iris", version.ref = "iris-fabric" }
iris-forge = { module = "maven.modrinth:iris", version.ref = "iris-forge" }
jei-api = { module = "mezz.jei:jei-1.21.10-common-api", version.ref = "jei" }
jei-fabric = { module = "mezz.jei:jei-1.21.10-fabric", version.ref = "jei" }
jei-forge = { module = "mezz.jei:jei-1.21.10-neoforge", version.ref = "jei" }
jei-api = { module = "mezz.jei:jei-1.21.11-common-api", version.ref = "jei" }
jei-fabric = { module = "mezz.jei:jei-1.21.11-fabric", version.ref = "jei" }
jei-forge = { module = "mezz.jei:jei-1.21.11-neoforge", version.ref = "jei" }
mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
mixinExtra = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtra" }
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
@@ -178,7 +178,7 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
# Minecraft
externalMods-common = ["iris-forge", "jei-api", "nightConfig-core", "nightConfig-toml"]
externalMods-forge-compile = ["moreRed", "iris-forge", "jei-api"]
externalMods-forge-runtime = []
externalMods-forge-runtime = ["jei-forge"]
externalMods-fabric-compile = ["fabricPermissions", "iris-fabric", "jei-api", "rei-api", "rei-builtin"]
externalMods-fabric-runtime = []
projects/common/build.gradle.kts
-6
View File
@@ -11,12 +11,6 @@ plugins {
id("cc-tweaked.publishing")
}
sourceSets.client {
java {
exclude("dan200/computercraft/client/integration/jei")
}
}
minecraft {
accessWideners(
"src/main/resources/computercraft.accesswidener",
projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java
+4 -2
View File
@@ -20,6 +20,7 @@ import mezz.jei.api.registration.IAdvancedRegistration;
import mezz.jei.api.registration.ISubtypeRegistration;
import mezz.jei.api.runtime.IJeiRuntime;
import net.minecraft.client.Minecraft;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.RegistryAccess;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.ItemStack;
@@ -106,7 +107,8 @@ public class JEIComputerCraft implements IModPlugin {
*/
private static final ISubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> Integer.toString(DyedItemColor.getOrDefault(stack, -1));
private static RegistryAccess getRegistryAccess() {
return Minecraft.getInstance().level.registryAccess();
private static HolderLookup.Provider getRegistryAccess() {
var connection = Minecraft.getInstance().getConnection();
return connection == null ? RegistryAccess.EMPTY : connection.registryAccess();
}
}
projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java
+1 -1
View File
@@ -12,8 +12,8 @@ import mezz.jei.api.ingredients.ITypedIngredient;
import mezz.jei.api.recipe.advanced.ISimpleRecipeManagerPlugin;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.*;
import net.minecraft.world.item.crafting.display.RecipeDisplay;