-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
17 changed files
with
300 additions
and
20 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
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
13 changes: 13 additions & 0 deletions
13
...in/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/advancement/recipe_rule.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,13 @@ | ||
| { | ||
| "parent": "ams:root", | ||
| "criteria": { | ||
| "tick": { | ||
| "trigger": "minecraft:tick" | ||
| } | ||
| }, | ||
| "rewards": { | ||
| "recipes": [ | ||
|
|
||
| ] | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
.../src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/advancement/root.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,7 @@ | ||
| { | ||
| "criteria": { | ||
| "tick": { | ||
| "trigger": "minecraft:tick" | ||
| } | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/bone_block.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,17 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern":[ | ||
| "###", | ||
| "###", | ||
| "###" | ||
| ], | ||
| "key":{ | ||
| "#":{ | ||
| "item":"minecraft:bone" | ||
| } | ||
| }, | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:bone_block", | ||
| "count":3 | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
....21/src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/bundle.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,20 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern":[ | ||
| "SRS", | ||
| "R R", | ||
| "RRR" | ||
| ], | ||
| "key":{ | ||
| "S":{ | ||
| "item":"minecraft:string" | ||
| }, | ||
| "R":{ | ||
| "item":"minecraft:rabbit_hide" | ||
| } | ||
| }, | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:bundle", | ||
| "count":1 | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/dispenser1.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,16 @@ | ||
| { | ||
| "type":"crafting_shapeless", | ||
| "ingredients":[ | ||
| { | ||
| "item":"minecraft:bow" | ||
| }, | ||
| { | ||
| "item":"minecraft:dropper" | ||
| } | ||
| ], | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:dispenser", | ||
| "count":1 | ||
| } | ||
| } | ||
|
|
24 changes: 24 additions & 0 deletions
24
...src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/dispenser2.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,24 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern":[ | ||
| " SX", | ||
| "SDX", | ||
| " SX" | ||
| ], | ||
| "key":{ | ||
| "D":{ | ||
| "item":"minecraft:dropper" | ||
| }, | ||
| "S":{ | ||
| "item":"minecraft:stick" | ||
| }, | ||
| "X":{ | ||
| "item":"minecraft:string" | ||
| } | ||
| }, | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:dispenser", | ||
| "count":1 | ||
| } | ||
| } | ||
|
|
26 changes: 26 additions & 0 deletions
26
....21/src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/elytra.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,26 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern":[ | ||
| "PSP", | ||
| "P*P", | ||
| "PLP" | ||
| ], | ||
| "key":{ | ||
| "P":{ | ||
| "item":"minecraft:phantom_membrane" | ||
| }, | ||
| "S":{ | ||
| "item":"minecraft:stick" | ||
| }, | ||
| "*":{ | ||
| "item":"minecraft:saddle" | ||
| }, | ||
| "L":{ | ||
| "item":"minecraft:string" | ||
| } | ||
| }, | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:elytra", | ||
| "count":1 | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...urces/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/enchanted_golden_apples.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,20 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "###", | ||
| "#A#", | ||
| "###" | ||
| ], | ||
| "key": { | ||
| "#": { | ||
| "item": "minecraft:gold_block" | ||
| }, | ||
| "A": { | ||
| "item": "minecraft:apple" | ||
| } | ||
| }, | ||
| "result": { | ||
| "/*ams_recipes_item_id*/": "minecraft:enchanted_golden_apple", | ||
| "count": 1 | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
...es/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/polished_blackstone_button.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,12 @@ | ||
| { | ||
| "type":"crafting_shapeless", | ||
| "ingredients":[ | ||
| { | ||
| "item":"minecraft:deepslate" | ||
| } | ||
| ], | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:polished_blackstone_button", | ||
| "count":1 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...c/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/ams/recipe/sculk_sensor.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,23 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern":[ | ||
| " ", | ||
| "RQR", | ||
| "DDD" | ||
| ], | ||
| "key":{ | ||
| "D":{ | ||
| "item":"minecraft:deepslate" | ||
| }, | ||
| "R":{ | ||
| "item":"minecraft:redstone" | ||
| }, | ||
| "Q":{ | ||
| "item":"minecraft:quartz" | ||
| } | ||
| }, | ||
| "result":{ | ||
| "/*ams_recipes_item_id*/":"minecraft:sculk_sensor", | ||
| "count":1 | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
versions/1.21/src/main/resources/assets/carpetamsaddition/AmsRecipeTweakPack/pack.mcmeta
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,6 @@ | ||
| { | ||
| "pack": { | ||
| "pack_format": 6, | ||
| "description": "Carpet AMS addition recipe tweaking pack" | ||
| } | ||
| } |
Oops, something went wrong.