Skip to content

Commit c008aa1

Browse files
committed
feat: update to new ritual recipe features in occultism 1.146
1 parent 932fc63 commit c008aa1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ mod_description=KubeJS Plugin for Occultism
4141
kubejs_version=2100.7.0-build.103
4242
kubejs_version_range=[2100.7.0-build.33,)
4343

44-
occultism_version=1.139.1
45-
occultism_version_range=[1.139.1,)
44+
occultism_version=1.146.0
45+
occultism_version_range=[1.146.0,)
4646
#curios_version=5.2.0-beta.3
4747
#jei_version=15.2.0.23
4848
#geckolib_version=4.4

src/main/java/com/klikli_dev/occultism_kubejs/RitualRecipeSchema.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import dev.latvian.mods.kubejs.recipe.schema.RecipeSchema;
66
import net.minecraft.core.registries.BuiltInRegistries;
77
import net.minecraft.resources.ResourceLocation;
8+
import net.minecraft.tags.TagKey;
9+
import net.minecraft.world.entity.EntityType;
810
import net.minecraft.world.item.ItemStack;
911
import net.minecraft.world.item.crafting.Ingredient;
1012

@@ -15,6 +17,7 @@ public interface RitualRecipeSchema {
1517
RecipeKey<List<Ingredient>> INGREDIENTS = IngredientComponent.INGREDIENT.asList().inputKey("ingredients");
1618
RecipeKey<String> RITUAL_TYPE = StringComponent.ID.inputKey("ritual_type").alt("ritualType").optional("occultism:craft").alwaysWrite();
1719
RecipeKey<String> ENTITY_TO_SUMMON = StringComponent.ID.inputKey("entity_to_summon").alt("entityToSummon").alt("summon").defaultOptional();
20+
RecipeKey<TagKey<EntityType<?>>> ENTITY_TAG_TO_SUMMON = TagKeyComponent.ENTITY_TYPE.inputKey("entity_tag_to_summon").alt("entityTagToSummon").alt("summonTag").defaultOptional();
1821
RecipeKey<String> ENTITY_NBT = StringComponent.ANY.inputKey("entity_nbt").alt("entityNbt").defaultOptional();
1922
RecipeKey<Ingredient> ACTIVATION_ITEM = IngredientComponent.INGREDIENT.inputKey("activation_item").alt("activationItem");
2023
RecipeKey<String> PENTACLE_ID = StringComponent.ID.inputKey("pentacle_id").alt("pentacleId").alt("pentacle");
@@ -28,7 +31,7 @@ public interface RitualRecipeSchema {
2831

2932
RecipeKey<?> ENTITY_TO_SACRIFICE =
3033
RecipeComponent.builder(
31-
new RecipeComponentBuilder.Key("tag", StringComponent.ID),
34+
new RecipeComponentBuilder.Key("tag", TagKeyComponent.ENTITY_TYPE),
3235
new RecipeComponentBuilder.Key("display_name", StringComponent.ANY)
3336
)
3437
.inputKey("entity_to_sacrifice").alt("entityToSacrifice").alt("sacrifice")
@@ -43,7 +46,7 @@ public interface RitualRecipeSchema {
4346
// and now all the optionals...
4447
DURATION, SPIRIT_MAX_AGE, SPIRIT_JOB_TYPE, RITUAL_DUMMY, RITUAL_TYPE,
4548
// excluded keys last
46-
ENTITY_TO_SUMMON, ENTITY_NBT, ENTITY_TO_SACRIFICE, ITEM_TO_USE, COMMAND
49+
ENTITY_TO_SUMMON, ENTITY_TAG_TO_SUMMON, ENTITY_NBT, ENTITY_TO_SACRIFICE, ITEM_TO_USE, COMMAND
4750
);
4851

4952
}

0 commit comments

Comments
 (0)