forked from AllTheMods/ATM-6
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request AllTheMods#3073 from AllTheMods/misc-fixes
Misc fixes
- Loading branch information
Showing
9 changed files
with
173 additions
and
30 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,14 @@ | ||
| {} | ||
| { | ||
| "conditions": [{ | ||
| "type": "apotheosis:module", | ||
| "module": "book" | ||
| },{ | ||
| "type": "forge:mod_loaded", | ||
| "modid": "patchouli" | ||
| }], | ||
| "criteria": { | ||
| "tick": { | ||
| "trigger": "minecraft:tick" | ||
| } | ||
| } | ||
| } |
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,35 @@ | ||
| { | ||
| "parent": "pedestals:main/root", | ||
| "display": { | ||
| "icon": { | ||
| "item": "pedestals:filter/filteritemstack" | ||
| }, | ||
| "title": { | ||
| "translate": "advancements.main.craft_filter.title" | ||
| }, | ||
| "description": { | ||
| "translate": "advancements.main.craft_filter.description" | ||
| }, | ||
| "frame": "task", | ||
| "show_toast": true, | ||
| "announce_to_chat": true, | ||
| "hidden": false | ||
| }, | ||
| "criteria": { | ||
| "requirement1": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "pedestals:filters" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "requirement1" | ||
| ] | ||
| ] | ||
| } |
103 changes: 103 additions & 0 deletions
103
kubejs/data/twilightforest/advancements/alt/compat/tconstruct.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,103 @@ | ||
| { | ||
| "conditions": [ | ||
| { | ||
| "type": "forge:mod_loaded", | ||
| "modid": "tconstruct" | ||
| } | ||
| ], | ||
| "parent": "twilightforest:alt/root", | ||
| "criteria": { | ||
| "materials_book": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:materials_and_you" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "gold_cast": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "tconstruct:casts/gold" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "sand_cast": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "tconstruct:casts/sand" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "blank_pattern": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:pattern" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "crafting_station": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:crafting_station" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "tinker_station": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:tinker_station" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "part_builder": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:part_builder" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "tinkers_anvil": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "item": "tconstruct:tinkers_anvil" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "materials_book", | ||
| "gold_cast", | ||
| "sand_cast", | ||
| "blank_pattern", | ||
| "crafting_station", | ||
| "tinker_station", | ||
| "part_builder", | ||
| "tinkers_anvil" | ||
| ] | ||
| ] | ||
| } |
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