-
Notifications
You must be signed in to change notification settings - Fork 39
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 #1215 from bijimio/14.1-features
Created/Updated jsons for Pure WL Pup; Rextextured sports bra & created recipe
- Loading branch information
Showing
10 changed files
with
177 additions
and
6 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
Binary file modified
BIN
+11 Bytes
(100%)
src/main/resources/assets/changed/textures/items/sports_bra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions
34
src/main/resources/data/changed/advancements/recipes/changed_items/sports_bra.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,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "changed:sports_bra" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_leather": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:leather" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "changed:sports_bra" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_leather", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
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
63 changes: 63 additions & 0 deletions
63
src/main/resources/data/changed/loot_tables/entities/pure_white_latex_wolf_pup.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,63 @@ | ||
| { | ||
| "type": "minecraft:entity", | ||
| "pools": [ | ||
| { | ||
| "rolls": 1.0, | ||
| "bonus_rolls": 0.0, | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "functions": [ | ||
| { | ||
| "function": "minecraft:set_count", | ||
| "count": { | ||
| "type": "minecraft:uniform", | ||
| "min": 0.0, | ||
| "max": 2.0 | ||
| }, | ||
| "add": false | ||
| }, | ||
| { | ||
| "function": "minecraft:looting_enchant", | ||
| "count": { | ||
| "type": "minecraft:uniform", | ||
| "min": 0.0, | ||
| "max": 1.0 | ||
| } | ||
| } | ||
| ], | ||
| "name": "changed:white_latex_goo" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "rolls": 1.0, | ||
| "bonus_rolls": 0.0, | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "functions": [ | ||
| { | ||
| "function": "minecraft:set_count", | ||
| "count": { | ||
| "type": "minecraft:uniform", | ||
| "min": 0.0, | ||
| "max": 1.0 | ||
| }, | ||
| "add": false | ||
| }, | ||
| { | ||
| "function": "minecraft:looting_enchant", | ||
| "count": { | ||
| "type": "minecraft:uniform", | ||
| "min": 0.0, | ||
| "max": 1.0 | ||
| } | ||
| } | ||
| ], | ||
| "name": "changed:orange" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
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": [ | ||
| "#D#", | ||
| "LBL" | ||
| ], | ||
| "key": { | ||
| "#": { | ||
| "item": "minecraft:string" | ||
| }, | ||
| "D": { | ||
| "item": "minecraft:black_dye" | ||
| }, | ||
| "L": { | ||
| "item": "minecraft:leather" | ||
| }, | ||
| "B": { | ||
| "item": "changed:latex_base" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "changed:sports_bra" | ||
| } | ||
| } |
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