-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added assembling colored beds via machine * Added pufferfish extraction for sponge piece. Including toast and also added missing toast for sponge piece (see #2883) * Added painting tool -> 1 string extraction * Added sticky piston -> slime ball extraction * Improved two recipe names incl. toasts * Added smelting glass panes back to glass * Added anvil uncrafting * Added bow/crossbow -> String via extraction * Added cobble->black & bars->ingot blast furnace recipes
- Loading branch information
Ayutac
committed
Apr 28, 2022
1 parent
deef1f3
commit 1fc34f1
Showing
25 changed files
with
504 additions
and
4 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
74 changes: 74 additions & 0 deletions
74
...reborn/datagen/recipes/machine/assembling_machine/AssemblingMachineRecipesProvider.groovy
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,74 @@ | ||
| /* | ||
| * This file is part of TechReborn, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) 2020 TechReborn | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package techreborn.datagen.recipes.machine.assembling_machine | ||
|
|
||
| import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator | ||
| import net.minecraft.item.ItemStack | ||
| import net.minecraft.item.Items | ||
| import net.minecraft.tag.ItemTags | ||
| import techreborn.datagen.recipes.TechRebornRecipesProvider | ||
|
|
||
| class AssemblingMachineRecipesProvider extends TechRebornRecipesProvider { | ||
|
|
||
| AssemblingMachineRecipesProvider(FabricDataGenerator dataGenerator) { | ||
| super(dataGenerator) | ||
| } | ||
|
|
||
| @Override | ||
| void generateRecipes() { | ||
| generateBed() | ||
| } | ||
|
|
||
| void generateBed() { | ||
| [ | ||
| (Items.BLACK_WOOL): Items.BLACK_BED, | ||
| (Items.BLUE_WOOL): Items.BLUE_BED, | ||
| (Items.BROWN_WOOL): Items.BROWN_BED, | ||
| (Items.CYAN_WOOL): Items.CYAN_BED, | ||
| (Items.GRAY_WOOL): Items.GRAY_BED, | ||
| (Items.GREEN_WOOL): Items.GREEN_BED, | ||
| (Items.LIGHT_BLUE_WOOL): Items.LIGHT_BLUE_BED, | ||
| (Items.LIGHT_GRAY_WOOL): Items.LIGHT_GRAY_BED, | ||
| (Items.LIME_WOOL): Items.LIME_BED, | ||
| (Items.MAGENTA_WOOL): Items.MAGENTA_BED, | ||
| (Items.ORANGE_WOOL): Items.ORANGE_BED, | ||
| (Items.PINK_WOOL): Items.PINK_BED, | ||
| (Items.PURPLE_WOOL): Items.PURPLE_BED, | ||
| (Items.RED_WOOL): Items.RED_BED, | ||
| (Items.WHITE_DYE): Items.WHITE_BED, | ||
| (Items.YELLOW_DYE): Items.YELLOW_BED | ||
| ].each {(wool, bed) -> | ||
| offerAssemblingMachineRecipe { | ||
| ingredients new ItemStack(wool, 2), ItemTags.PLANKS | ||
| output bed | ||
| source "wool" | ||
| power 25 | ||
| time 250 | ||
| criterion getCriterionName(wool), getCriterionConditions(wool) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
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
32 changes: 32 additions & 0 deletions
32
src/main/resources/data/techreborn/advancements/recipes/blast_furnace/blackstone.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "techreborn:blast_furnace/blackstone" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_cobblestone": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": ["minecraft:cobblestone"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "techreborn:blast_furnace/blackstone" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_cobblestone", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/resources/data/techreborn/advancements/recipes/blast_furnace/iron_ingot.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "techreborn:blast_furnace/iron_ingot" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_iron_bars": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": ["minecraft:iron_bars"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "techreborn:blast_furnace/iron_ingot" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_iron_bars", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
...sources/data/techreborn/advancements/recipes/extractor/slime_ball_from_sticky_piston.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "techreborn:extractor/slime_ball_from_sticky_piston" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_sticky_piston": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": ["minecraft:sticky_piston"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "techreborn:extractor/slime_ball_from_sticky_piston" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_sticky_piston", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/resources/data/techreborn/advancements/recipes/extractor/sponge_piece_from_cod.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "techreborn:extractor/sponge_piece_from_cod" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_cod": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": ["minecraft:cod"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "techreborn:extractor/sponge_piece_from_cod" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_cod", | ||
| "has_the_recipe" | ||
| ] | ||
| ] | ||
| } |
32 changes: 32 additions & 0 deletions
32
...esources/data/techreborn/advancements/recipes/extractor/sponge_piece_from_pufferfish.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "rewards": { | ||
| "recipes": [ | ||
| "techreborn:extractor/sponge_piece_from_pufferfish" | ||
| ] | ||
| }, | ||
| "criteria": { | ||
| "has_pufferfish": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": ["minecraft:pufferfish"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "has_the_recipe": { | ||
| "trigger": "minecraft:recipe_unlocked", | ||
| "conditions": { | ||
| "recipe": "techreborn:extractor/sponge_piece_from_pufferfish" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_pufferfish", | ||
| "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
Oops, something went wrong.