mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-02-11 00:20:05 +00:00
Code Issues Releases Wiki Activity

Add back JEI integration

Browse Source
This commit is contained in:
Jonathan Coates 2021-08-29 22:20:06 +01:00
parent bbf3e48763
commit b2273c9b29
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -47,7 +47,8 @@ tasks.withType(JavaExec).configureEach {
sourceSets { sourceSets {
main.java { main.java {
exclude 'dan200/computercraft/shared/integration/**' exclude 'dan200/computercraft/shared/integration/morered/**'
exclude 'dan200/computercraft/shared/integration/crafttweaker/**'
} }
main.resources { main.resources {
srcDir 'src/generated/resources' srcDir 'src/generated/resources'
@ -151,11 +152,11 @@ dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api") compileOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14:api")
// compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313") // compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
// compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0") // compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")
// runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104") runtimeOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14")
shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT' shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'

4
src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java
View File

@ -90,10 +90,10 @@ public class JEIComputerCraft implements IModPlugin
runtime.getIngredientManager().addIngredientsAtRuntime( VanillaTypes.ITEM, upgradeItems ); runtime.getIngredientManager().addIngredientsAtRuntime( VanillaTypes.ITEM, upgradeItems );
// Hide all upgrade recipes // Hide all upgrade recipes
IRecipeCategory<?> category = registry.getRecipeCategory( VanillaRecipeCategoryUid.CRAFTING ); IRecipeCategory<?> category = registry.getRecipeCategory( VanillaRecipeCategoryUid.CRAFTING, false );
if( category != null ) if( category != null )
{ {
for( Object wrapper : registry.getRecipes( category ) ) for( Object wrapper : registry.getRecipes( category, null, false ) )
{ {
if( !(wrapper instanceof Recipe) ) continue; if( !(wrapper instanceof Recipe) ) continue;
ResourceLocation id = ((Recipe<?>) wrapper).getId(); ResourceLocation id = ((Recipe<?>) wrapper).getId();

1
src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java
View File

@ -33,6 +33,7 @@ import javax.annotation.Nonnull;
import java.util.*; import java.util.*;
import static net.minecraft.core.NonNullList.of; import static net.minecraft.core.NonNullList.of;
import static net.minecraft.world.item.crafting.Ingredient.of;
class RecipeResolver implements IRecipeManagerPlugin class RecipeResolver implements IRecipeManagerPlugin
{ {