Skip to content

Commit

Permalink
update to NF 20.2.39-beta, fix guide book recipe gen
Browse files Browse the repository at this point in the history
  • Loading branch information
desht committed Nov 7, 2023
1 parent 380f9cf commit dc7e961
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ curse_project_id=250294
# Minecraft/Forge
minecraft_version=1.20.2
minecraft_version_range=[1.20.2,)
neo_version=20.2.3-beta
neo_version_range=[20.2.3-beta,)
neo_version=20.2.39-beta
neo_version_range=[20.2.20-beta,)
loader_version_range=[1,)
mappings_channel=parchment
mappings_version=1.20.2-2023.10.22
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "modularrouters:guide_book",
"category": "misc",
"conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "patchouli"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import me.desht.modularrouters.core.ModBlocks;
import me.desht.modularrouters.core.ModItems;
import me.desht.modularrouters.core.ModRecipes;
import me.desht.modularrouters.recipe.GuideBookRecipe;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.recipes.*;
Expand All @@ -16,7 +15,6 @@
import net.minecraft.world.level.ItemLike;
import net.neoforged.neoforge.common.Tags;
import net.neoforged.neoforge.common.conditions.ModLoadedCondition;
import net.neoforged.neoforge.common.crafting.ConditionalRecipeBuilder;
import net.neoforged.neoforge.registries.ForgeRegistries;

import java.util.Arrays;
Expand Down Expand Up @@ -339,10 +337,9 @@ protected void buildRecipes(RecipeOutput consumer) {
).save(consumer);

SpecialRecipeBuilder.special(ModRecipes.MODULE_RESET.get()).save(consumer, RL("reset_module").toString());
// new ConditionalRecipeBuilder()
// .withCondition(new ModLoadedCondition("patchouli"))
// .withRecipe(ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, GuideBookRecipe.makeGuideBook().getItem()))
// .save(consumer, RL("guide_book"));

SpecialRecipeBuilder.special(ModRecipes.GUIDE_BOOK.get())
.save(consumer.withConditions(new ModLoadedCondition("patchouli")), RL("guide_book"));
}

private <T extends ItemLike> ShapedRecipeBuilder shaped(T result, T required, String pattern, Object... keys) {
Expand Down

0 comments on commit dc7e961

Please sign in to comment.