-
Notifications
You must be signed in to change notification settings - Fork 37
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 #427 from Gu-ZT/releases/1.20.1
修正压电晶体和集电器中存在的问题
- Loading branch information
Showing
25 changed files
with
533 additions
and
61 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...entity/render/AscendingBlockRenderer.java → ...nderer/entity/AscendingBlockRenderer.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
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
46 changes: 46 additions & 0 deletions
46
...d/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.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,46 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_amethyst_blocks": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "c:amethyst_blocks" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_copper_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:copper_ingot" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "anvilcraft:piezoelectric_crystal_amethyst" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_copper_ingot", | ||
| "has_amethyst_blocks", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "anvilcraft:piezoelectric_crystal_amethyst" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
46 changes: 46 additions & 0 deletions
46
...urces/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.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,46 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_amethyst_blocks": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:amethyst_blocks" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_copper_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:copper_ingot" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "anvilcraft:piezoelectric_crystal_amethyst_forge" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_copper_ingot", | ||
| "has_amethyst_blocks", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "anvilcraft:piezoelectric_crystal_amethyst_forge" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
Oops, something went wrong.