-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fixes #1276 * fixes #1278 * removed outdated information * more ae2 dust compat * soul gem blacklist use bosses tag
- Loading branch information
Showing
17 changed files
with
247 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/c/tags/item/dusts/sky_stone.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "values": [ | ||
| { | ||
| "id": "ae2:sky_dust", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "values": [ | ||
| { | ||
| "id": "ae2:sky_stone_block", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "ae2:smooth_sky_stone_block", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "ae2:sky_stone_brick", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "ae2:sky_stone_small_brick", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
48 changes: 48 additions & 0 deletions
48
...urces/data/occultism/advancement/recipes/crushing/crushing/ender_pearl_dust_from_tag.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "neoforge:conditions": [ | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:ender_pearls" | ||
| } | ||
| }, | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:dusts/ender_pearl" | ||
| } | ||
| } | ||
| ], | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_ender_pearl": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": "#c:ender_pearls" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "occultism:crushing/ender_pearl_dust_from_tag" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "has_ender_pearl" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "occultism:crushing/ender_pearl_dust_from_tag" | ||
| ] | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...erated/resources/data/occultism/advancement/recipes/crushing/crushing/sky_stone_dust.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "neoforge:conditions": [ | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:sky_stones" | ||
| } | ||
| }, | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:dusts/sky_stone" | ||
| } | ||
| } | ||
| ], | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_sky_stone": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": "#c:sky_stones" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "occultism:crushing/sky_stone_dust" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "has_sky_stone" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "occultism:crushing/sky_stone_dust" | ||
| ] | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/generated/resources/data/occultism/recipe/crushing/ender_pearl_dust_from_tag.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "neoforge:conditions": [ | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:ender_pearls" | ||
| } | ||
| }, | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:dusts/ender_pearl" | ||
| } | ||
| } | ||
| ], | ||
| "type": "occultism:crushing", | ||
| "ingredient": { | ||
| "tag": "c:ender_pearls" | ||
| }, | ||
| "result": { | ||
| "type": "occultism:tag", | ||
| "count": 2, | ||
| "tag": "c:dusts/ender_pearl" | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/data/occultism/recipe/crushing/sky_stone_dust.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "neoforge:conditions": [ | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:sky_stones" | ||
| } | ||
| }, | ||
| { | ||
| "type": "neoforge:not", | ||
| "value": { | ||
| "type": "neoforge:tag_empty", | ||
| "tag": "c:dusts/sky_stone" | ||
| } | ||
| } | ||
| ], | ||
| "type": "occultism:crushing", | ||
| "ignore_crushing_multiplier": true, | ||
| "ingredient": { | ||
| "tag": "c:sky_stones" | ||
| }, | ||
| "result": { | ||
| "type": "occultism:tag", | ||
| "count": 1, | ||
| "tag": "c:dusts/sky_stone" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
.../com/klikli_dev/occultism/integration/apothicenchanting/ApothicEnchantingIntegration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.klikli_dev.occultism.integration.apothicenchanting; | ||
|
|
||
| import dev.shadowsoffire.apothic_enchanting.ApothicEnchanting; | ||
| import dev.shadowsoffire.apothic_enchanting.util.MiscUtil; | ||
| import net.minecraft.core.Holder; | ||
| import net.minecraft.core.registries.Registries; | ||
| import net.minecraft.world.item.enchantment.Enchantment; | ||
| import net.neoforged.fml.ModList; | ||
|
|
||
| public class ApothicEnchantingIntegration { | ||
| public static boolean isLoaded() { | ||
| return ModList.get().isLoaded("apothic_enchanting"); | ||
| } | ||
|
|
||
| /** | ||
| * Copied from Apothic Enchanting Hooks | ||
| * Using a different function to call in iesnium anvil | ||
| */ | ||
| public static int getApothicMaxLevel(Enchantment enchantment){ | ||
| Holder<Enchantment> holder = MiscUtil.findHolder(Registries.ENCHANTMENT, enchantment); | ||
| if (holder != null) { | ||
| return ApothicEnchanting.getEnchInfo(holder).getMaxLevel(); | ||
| } | ||
| return enchantment.getMaxLevel(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.