Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skyroot Bucket Recipes & Skyroot Banister Fix #7

Open
wants to merge 1 commit into
base: 1.20.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// 1.20.1 2023-09-25T02:24:18.836469 Recipes
// 1.20.1 2024-05-29T01:28:24.3285958 Recipes
076bb04e4023c8c115ab5f54f5e6d90da5ecf376 data/minecraft/advancements/recipes/building_blocks/hollow_golden_oak_log_from_golden_oak_log_stonecutting.json
38a29fae051973545af3e38cd48520b281cc0b90 data/minecraft/advancements/recipes/building_blocks/hollow_skyroot_log_from_skyroot_log_stonecutting.json
2dd20decd953c4d761dcde43149a45a65863e15d data/minecraft/recipes/hollow_golden_oak_log_from_golden_oak_log_stonecutting.json
d78c6104b95fac96ce4fb6fb03d53d4d94fa7b96 data/minecraft/recipes/hollow_skyroot_log_from_skyroot_log_stonecutting.json
becf0f4f279673ace324d746af1332a3ebf96047 data/umbral_skies/advancements/recipes/building_blocks/skyroot_rainy_cloud.json
5fd7a5393efd43d2e7b9166bc5c757c4a2b1e37a data/umbral_skies/advancements/recipes/building_blocks/skyroot_snowy_cloud.json
9c6b4722d31092c6f4df464a58ccb3b4de80adc3 data/umbral_skies/advancements/recipes/combat/arctic_gloves.json
80669a4be54bb9321bd383da8780e9a1ac18abc1 data/umbral_skies/advancements/recipes/combat/fiery_gloves.json
e10cea8020ebf37d9dd6675626e060094716ff83 data/umbral_skies/advancements/recipes/combat/fiery_iron_gloves.json
Expand All @@ -18,6 +20,8 @@ d92007d0c05610128a6835c3392f34b3cb47bcdd data/umbral_skies/recipes/fiery_gloves.
733ca7a838f362be4f764c6d2f51c3108e77a23f data/umbral_skies/recipes/ironwood_gloves.json
c3447b451fa1c42e443e0361a08816e318f32567 data/umbral_skies/recipes/knightmetal_gloves.json
eba8d2eda6faec0b71af231e9d2d3b0c282ee687 data/umbral_skies/recipes/naga_gloves.json
008c4880421987666168a8bebc576d37663bf311 data/umbral_skies/recipes/skyroot_banister.json
1262c2803074fc0b42304e172d71348faeee7d36 data/umbral_skies/recipes/skyroot_banister.json
0d8c88d31e17472ede250a4f87bc9b09c083679d data/umbral_skies/recipes/skyroot_rainy_cloud.json
a3cac9ea5fbb2862130786f96a728b57c813bf67 data/umbral_skies/recipes/skyroot_snowy_cloud.json
f0a12b95b7c6eb20376774bbf09fc41db08c2885 data/umbral_skies/recipes/steeleaf_gloves.json
05b32c4c6e0401de28d415ef08b4c0159f1f3a52 data/umbral_skies/recipes/yeti_gloves.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_block": {
"conditions": {
"items": [
{
"items": [
"twilightforest:fluffy_cloud"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "umbral_skies:skyroot_rainy_cloud"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_block",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"umbral_skies:skyroot_rainy_cloud"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_block": {
"conditions": {
"items": [
{
"items": [
"twilightforest:fluffy_cloud"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "umbral_skies:skyroot_snowy_cloud"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_block",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"umbral_skies:skyroot_snowy_cloud"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"| |"
],
"result": {
"count": 3,
"item": "umbral_skies:skyroot_banister"
},
"show_notification": true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "twilightforest:fluffy_cloud"
},
"-": {
"item": "aether:skyroot_water_bucket"
}
},
"pattern": [
"###",
"#-#",
"###"
],
"result": {
"count": 8,
"item": "twilightforest:rainy_cloud"
},
"show_notification": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "twilightforest:fluffy_cloud"
},
"-": {
"item": "aether:skyroot_powder_snow_bucket"
}
},
"pattern": [
"###",
"#-#",
"###"
],
"result": {
"count": 8,
"item": "twilightforest:snowy_cloud"
},
"show_notification": true
}
19 changes: 18 additions & 1 deletion src/main/java/us/drullk/umbralskies/data/UmbralRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import net.minecraft.data.recipes.*;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.Tags;
import twilightforest.data.tags.ItemTagGenerator;
import twilightforest.init.TFBlocks;
import twilightforest.init.TFItems;
import us.drullk.umbralskies.block.UmbralBlocks;
import us.drullk.umbralskies.item.UmbralItems;
Expand All @@ -24,7 +26,7 @@ public UmbralRecipes(PackOutput output) {
@Override
protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
ShapedRecipeBuilder
.shaped(RecipeCategory.DECORATIONS, UmbralBlocks.SKYROOT_BANISTER.get())
.shaped(RecipeCategory.DECORATIONS, UmbralBlocks.SKYROOT_BANISTER.get(), 3)
.pattern("___")
.pattern("| |")
.define('_', AetherBlocks.SKYROOT_SLAB.get())
Expand All @@ -40,6 +42,9 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
recipeGloves(consumer, UmbralItems.ARCTIC_GLOVES.get(), TFItems.ARCTIC_FUR.get());
recipeGloves(consumer, UmbralItems.YETI_GLOVES.get(), TFItems.ALPHA_YETI_FUR.get());

recipeClouds(consumer, TFBlocks.SNOWY_CLOUD.get(), TFBlocks.FLUFFY_CLOUD.get(), AetherItems.SKYROOT_POWDER_SNOW_BUCKET.get(), "skyroot_snowy_cloud");
recipeClouds(consumer, TFBlocks.RAINY_CLOUD.get(), TFBlocks.FLUFFY_CLOUD.get(), AetherItems.SKYROOT_WATER_BUCKET.get(), "skyroot_rainy_cloud");

ShapelessRecipeBuilder
.shapeless(RecipeCategory.COMBAT, UmbralItems.FIERY_GLOVES.get())
.requires(AetherItems.IRON_GLOVES.get())
Expand All @@ -59,4 +64,16 @@ private static void recipeGloves(Consumer<FinishedRecipe> consumer, Item gloves,
.unlockedBy("has_item", has(material))
.save(consumer);
}

private static void recipeClouds(Consumer<FinishedRecipe> consumer, Block creates, Block cloud, Item bucket, String name) {
ShapedRecipeBuilder
.shaped(RecipeCategory.BUILDING_BLOCKS, creates, 8)
.pattern("###")
.pattern("#-#")
.pattern("###")
.define('#', cloud)
.define('-', bucket)
.unlockedBy("has_block", has(cloud))
.save(consumer, UmbralSkies.prefix(name));
}
}