forked from MrCrayfish/MrCrayfishDeviceMod
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.20.1' into Qboi123-start-menu
- Loading branch information
Showing
86 changed files
with
2,280 additions
and
349 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
6 changes: 6 additions & 0 deletions
6
common/src/main/generated/resources/assets/devices/models/item/glass_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,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "devices:item/glass_dust" | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...n/src/main/generated/resources/data/devices/advancements/recipes/misc/ethernet_cable.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_plastic": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:plastic" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:ethernet_cable" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_plastic", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:ethernet_cable" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/gpu.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_plastic": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:plastic" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:gpu" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_plastic", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:gpu" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/hard_drive.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_plastic": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:plastic" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:hard_drive" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_plastic", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:hard_drive" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/plastic.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_plastic_unrefined": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:plastic_unrefined" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:plastic" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_plastic_unrefined", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:plastic" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
...on/src/main/generated/resources/data/devices/advancements/recipes/misc/plastic_frame.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_plastic": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:plastic" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:plastic_frame" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_plastic", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:plastic_frame" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
...rc/main/generated/resources/data/devices/advancements/recipes/misc/plastic_unrefined.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_slime_ball": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:slime_ball" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:plastic_unrefined" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_slime_ball", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:plastic_unrefined" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/ram.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_circuit_board": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:circuit_board" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:ram" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_circuit_board", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:ram" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/screen.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_circuit_board": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:circuit_board" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:screen" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_circuit_board", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:screen" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
...rc/main/generated/resources/data/devices/advancements/recipes/misc/solid_state_drive.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_flash_chip": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "devices:flash_chip" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:solid_state_drive" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_flash_chip", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:solid_state_drive" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
common/src/main/generated/resources/data/devices/advancements/recipes/misc/wheel.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,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_iron_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:iron_ingot" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "devices:wheel" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_iron_ingot", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "devices:wheel" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
Oops, something went wrong.