diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockTagProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockTagProvider.java index 1abcfde3..1a0ff902 100644 --- a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockTagProvider.java +++ b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModBlockTagProvider.java @@ -9,6 +9,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import java.util.concurrent.CompletableFuture; @@ -53,6 +54,12 @@ protected void addTags(HolderLookup.Provider arg) { ModBlocks.hangingCorner); getOrCreateTagBuilder(ModBlockTags.OVENS).add(ModBlocks.ovens); + final var dyedOvens = getOrCreateTagBuilder(ModBlockTags.DYED_OVENS); + for (final var oven : ModBlocks.ovens) { + if (oven.getColor() != DyeColor.WHITE) { + dyedOvens.add(oven); + } + } final var kitchenConnectors = getOrCreateTagBuilder(ModBlockTags.KITCHEN_CONNECTORS); kitchenConnectors.add(ModBlocks.corner, ModBlocks.hangingCorner); diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModItemTagProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModItemTagProvider.java index 8f87f02e..4a24bbed 100644 --- a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModItemTagProvider.java +++ b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModItemTagProvider.java @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -31,5 +32,12 @@ protected void addTags(HolderLookup.Provider lookup) { for (final var oven : ModBlocks.ovens) { ovens.add(oven.asItem()); } + + final var dyedOvens = getOrCreateTagBuilder(ModItemTags.DYED_OVENS); + for (final var oven : ModBlocks.ovens) { + if (oven.getColor() != DyeColor.WHITE) { + dyedOvens.add(oven.asItem()); + } + } } } diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModModelProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModModelProvider.java index 74abda6d..98c73e0c 100644 --- a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModModelProvider.java +++ b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModModelProvider.java @@ -81,7 +81,8 @@ private void createOvenBlock(BlockModelGenerators blockStateModelGenerator, Oven final var textureMapping = getOvenTextures(block); final var ovenModel = ovenTemplate.create(block, textureMapping, blockStateModelGenerator.modelOutput); final var activeTextureMapping = getOvenTextures(block); - activeTextureMapping.putForced(TextureSlot.create("ovenfront"), new ResourceLocation("cookingforblockheads", "block/" + block.getColor().getName() + "_oven_front_active")); + activeTextureMapping.putForced(TextureSlot.create("ovenfront"), + new ResourceLocation("cookingforblockheads", "block/" + block.getColor().getName() + "_oven_front_active")); final var activeOvenModel = ovenTemplate.createWithSuffix(block, "_active", activeTextureMapping, blockStateModelGenerator.modelOutput); blockStateModelGenerator.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block) .with(createBooleanModelDispatch(OvenBlock.ACTIVE, ovenModel, activeOvenModel)) @@ -90,7 +91,8 @@ private void createOvenBlock(BlockModelGenerators blockStateModelGenerator, Oven final var ovenDoorTemplate = new ModelTemplate(Optional.of(new ResourceLocation("cookingforblockheads", "block/dyed_oven_door")), Optional.empty()); ovenDoorTemplate.createWithSuffix(block, "_door", textureMapping, blockStateModelGenerator.modelOutput); - final var ovenDoorActiveTemplate = new ModelTemplate(Optional.of(new ResourceLocation("cookingforblockheads", "block/dyed_oven_door_active")), Optional.empty()); + final var ovenDoorActiveTemplate = new ModelTemplate(Optional.of(new ResourceLocation("cookingforblockheads", "block/dyed_oven_door_active")), + Optional.empty()); ovenDoorActiveTemplate.createWithSuffix(block, "_door_active", activeTextureMapping, blockStateModelGenerator.modelOutput); } diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java index 43f12fec..c0ae8c5e 100644 --- a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java +++ b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java @@ -83,7 +83,7 @@ public void buildRecipes(RecipeOutput exporter) { .requires(ModItemTags.DYED_OVENS) .requires(dyeItemTags[color.ordinal()]) .unlockedBy("has_oven", has(ModBlocks.ovens[DyeColor.WHITE.ordinal()])) - .save(exporter); + .save(exporter, "dye_" + color.getSerializedName() + "_oven"); } shapeless(RecipeCategory.DECORATIONS, ModBlocks.fridge) diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_active.json index 1d12cf64..6b6f8de0 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/blue_oven_side", "ovenbottom": "cookingforblockheads:block/blue_oven_bottom", - "ovenfront": "cookingforblockheads:block/blue_oven_front", + "ovenfront": "cookingforblockheads:block/blue_oven_front_active", "ovenfront_active": "cookingforblockheads:block/blue_oven_front_active", "oventop": "cookingforblockheads:block/blue_oven_top", "particle": "cookingforblockheads:block/blue_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_door_active.json index c03e47b3..888800c8 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/blue_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/blue_oven_side", "ovenbottom": "cookingforblockheads:block/blue_oven_bottom", - "ovenfront": "cookingforblockheads:block/blue_oven_front", + "ovenfront": "cookingforblockheads:block/blue_oven_front_active", "ovenfront_active": "cookingforblockheads:block/blue_oven_front_active", "oventop": "cookingforblockheads:block/blue_oven_top", "particle": "cookingforblockheads:block/blue_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_active.json index c43a5c78..328025e6 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/brown_oven_side", "ovenbottom": "cookingforblockheads:block/brown_oven_bottom", - "ovenfront": "cookingforblockheads:block/brown_oven_front", + "ovenfront": "cookingforblockheads:block/brown_oven_front_active", "ovenfront_active": "cookingforblockheads:block/brown_oven_front_active", "oventop": "cookingforblockheads:block/brown_oven_top", "particle": "cookingforblockheads:block/brown_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_door_active.json index 613cc0c9..d134ce7e 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/brown_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/brown_oven_side", "ovenbottom": "cookingforblockheads:block/brown_oven_bottom", - "ovenfront": "cookingforblockheads:block/brown_oven_front", + "ovenfront": "cookingforblockheads:block/brown_oven_front_active", "ovenfront_active": "cookingforblockheads:block/brown_oven_front_active", "oventop": "cookingforblockheads:block/brown_oven_top", "particle": "cookingforblockheads:block/brown_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_active.json index e0ea2d07..69d20b7d 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/green_oven_side", "ovenbottom": "cookingforblockheads:block/green_oven_bottom", - "ovenfront": "cookingforblockheads:block/green_oven_front", + "ovenfront": "cookingforblockheads:block/green_oven_front_active", "ovenfront_active": "cookingforblockheads:block/green_oven_front_active", "oventop": "cookingforblockheads:block/green_oven_top", "particle": "cookingforblockheads:block/green_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_door_active.json index 00b9a62e..dcd583c0 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/green_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/green_oven_side", "ovenbottom": "cookingforblockheads:block/green_oven_bottom", - "ovenfront": "cookingforblockheads:block/green_oven_front", + "ovenfront": "cookingforblockheads:block/green_oven_front_active", "ovenfront_active": "cookingforblockheads:block/green_oven_front_active", "oventop": "cookingforblockheads:block/green_oven_top", "particle": "cookingforblockheads:block/green_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_active.json index fcf316d8..04ca6200 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/light_blue_oven_side", "ovenbottom": "cookingforblockheads:block/light_blue_oven_bottom", - "ovenfront": "cookingforblockheads:block/light_blue_oven_front", + "ovenfront": "cookingforblockheads:block/light_blue_oven_front_active", "ovenfront_active": "cookingforblockheads:block/light_blue_oven_front_active", "oventop": "cookingforblockheads:block/light_blue_oven_top", "particle": "cookingforblockheads:block/light_blue_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_door_active.json index 28a4cf25..129f84df 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/light_blue_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/light_blue_oven_side", "ovenbottom": "cookingforblockheads:block/light_blue_oven_bottom", - "ovenfront": "cookingforblockheads:block/light_blue_oven_front", + "ovenfront": "cookingforblockheads:block/light_blue_oven_front_active", "ovenfront_active": "cookingforblockheads:block/light_blue_oven_front_active", "oventop": "cookingforblockheads:block/light_blue_oven_top", "particle": "cookingforblockheads:block/light_blue_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_active.json index 809efe93..a67d396b 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/lime_oven_side", "ovenbottom": "cookingforblockheads:block/lime_oven_bottom", - "ovenfront": "cookingforblockheads:block/lime_oven_front", + "ovenfront": "cookingforblockheads:block/lime_oven_front_active", "ovenfront_active": "cookingforblockheads:block/lime_oven_front_active", "oventop": "cookingforblockheads:block/lime_oven_top", "particle": "cookingforblockheads:block/lime_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_door_active.json index 594239dd..751a6ad8 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/lime_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/lime_oven_side", "ovenbottom": "cookingforblockheads:block/lime_oven_bottom", - "ovenfront": "cookingforblockheads:block/lime_oven_front", + "ovenfront": "cookingforblockheads:block/lime_oven_front_active", "ovenfront_active": "cookingforblockheads:block/lime_oven_front_active", "oventop": "cookingforblockheads:block/lime_oven_top", "particle": "cookingforblockheads:block/lime_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_active.json index 9eade521..b4cf9a5b 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/magenta_oven_side", "ovenbottom": "cookingforblockheads:block/magenta_oven_bottom", - "ovenfront": "cookingforblockheads:block/magenta_oven_front", + "ovenfront": "cookingforblockheads:block/magenta_oven_front_active", "ovenfront_active": "cookingforblockheads:block/magenta_oven_front_active", "oventop": "cookingforblockheads:block/magenta_oven_top", "particle": "cookingforblockheads:block/magenta_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_door_active.json index 2625488a..a697944c 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/magenta_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/magenta_oven_side", "ovenbottom": "cookingforblockheads:block/magenta_oven_bottom", - "ovenfront": "cookingforblockheads:block/magenta_oven_front", + "ovenfront": "cookingforblockheads:block/magenta_oven_front_active", "ovenfront_active": "cookingforblockheads:block/magenta_oven_front_active", "oventop": "cookingforblockheads:block/magenta_oven_top", "particle": "cookingforblockheads:block/magenta_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/orange_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/orange_oven_door_active.json index c5a2f09e..ca023506 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/orange_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/orange_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/orange_oven_side", "ovenbottom": "cookingforblockheads:block/orange_oven_bottom", - "ovenfront": "cookingforblockheads:block/orange_oven_front", + "ovenfront": "cookingforblockheads:block/orange_oven_front_active", "ovenfront_active": "cookingforblockheads:block/orange_oven_front_active", "oventop": "cookingforblockheads:block/orange_oven_top", "particle": "cookingforblockheads:block/orange_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/pink_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/pink_oven_door_active.json index 0103e145..13638ee6 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/pink_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/pink_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/pink_oven_side", "ovenbottom": "cookingforblockheads:block/pink_oven_bottom", - "ovenfront": "cookingforblockheads:block/pink_oven_front", + "ovenfront": "cookingforblockheads:block/pink_oven_front_active", "ovenfront_active": "cookingforblockheads:block/pink_oven_front_active", "oventop": "cookingforblockheads:block/pink_oven_top", "particle": "cookingforblockheads:block/pink_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_active.json index afe3b6a0..66b20b1a 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/purple_oven_side", "ovenbottom": "cookingforblockheads:block/purple_oven_bottom", - "ovenfront": "cookingforblockheads:block/purple_oven_front", + "ovenfront": "cookingforblockheads:block/purple_oven_front_active", "ovenfront_active": "cookingforblockheads:block/purple_oven_front_active", "oventop": "cookingforblockheads:block/purple_oven_top", "particle": "cookingforblockheads:block/purple_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_door_active.json index 91e5e9e3..31334987 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/purple_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/purple_oven_side", "ovenbottom": "cookingforblockheads:block/purple_oven_bottom", - "ovenfront": "cookingforblockheads:block/purple_oven_front", + "ovenfront": "cookingforblockheads:block/purple_oven_front_active", "ovenfront_active": "cookingforblockheads:block/purple_oven_front_active", "oventop": "cookingforblockheads:block/purple_oven_top", "particle": "cookingforblockheads:block/purple_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_active.json index f15f0190..aa85ac32 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/red_oven_side", "ovenbottom": "cookingforblockheads:block/red_oven_bottom", - "ovenfront": "cookingforblockheads:block/red_oven_front", + "ovenfront": "cookingforblockheads:block/red_oven_front_active", "ovenfront_active": "cookingforblockheads:block/red_oven_front_active", "oventop": "cookingforblockheads:block/red_oven_top", "particle": "cookingforblockheads:block/red_oven_side", diff --git a/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_door_active.json b/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_door_active.json index 5f76c14e..01a11a9b 100644 --- a/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_door_active.json +++ b/shared/src/generated/resources/assets/cookingforblockheads/models/block/red_oven_door_active.json @@ -3,7 +3,7 @@ "textures": { "backsplash": "cookingforblockheads:block/red_oven_side", "ovenbottom": "cookingforblockheads:block/red_oven_bottom", - "ovenfront": "cookingforblockheads:block/red_oven_front", + "ovenfront": "cookingforblockheads:block/red_oven_front_active", "ovenfront_active": "cookingforblockheads:block/red_oven_front_active", "oventop": "cookingforblockheads:block/red_oven_top", "particle": "cookingforblockheads:block/red_oven_side", diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_black_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_black_oven.json new file mode 100644 index 00000000..3ddd9c0f --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_black_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_black_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_black_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_blue_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_blue_oven.json new file mode 100644 index 00000000..e7701335 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_blue_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_blue_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_blue_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_brown_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_brown_oven.json new file mode 100644 index 00000000..a5469821 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_brown_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_brown_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_brown_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_cyan_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_cyan_oven.json new file mode 100644 index 00000000..c302fc80 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_cyan_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_cyan_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_cyan_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_gray_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_gray_oven.json new file mode 100644 index 00000000..9fbc3bbd --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_gray_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_gray_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_gray_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_green_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_green_oven.json new file mode 100644 index 00000000..b08f59d8 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_green_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_green_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_green_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_blue_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_blue_oven.json new file mode 100644 index 00000000..d6634763 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_blue_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_light_blue_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_light_blue_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_gray_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_gray_oven.json new file mode 100644 index 00000000..edeb6e96 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_light_gray_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_light_gray_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_light_gray_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_lime_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_lime_oven.json new file mode 100644 index 00000000..0bf0c190 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_lime_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_lime_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_lime_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_magenta_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_magenta_oven.json new file mode 100644 index 00000000..ff32d7df --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_magenta_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_magenta_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_magenta_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_orange_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_orange_oven.json new file mode 100644 index 00000000..b353d5f9 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_orange_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_orange_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_orange_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_pink_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_pink_oven.json new file mode 100644 index 00000000..c35d5163 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_pink_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_pink_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_pink_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_purple_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_purple_oven.json new file mode 100644 index 00000000..0fcde5ef --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_purple_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_purple_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_purple_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_red_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_red_oven.json new file mode 100644 index 00000000..a0c644bb --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_red_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_red_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_red_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_white_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_white_oven.json new file mode 100644 index 00000000..85acd112 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_white_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_white_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_white_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_yellow_oven.json b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_yellow_oven.json new file mode 100644 index 00000000..7a6edc94 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/advancements/recipes/decorations/dye_yellow_oven.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oven": { + "conditions": { + "items": [ + { + "items": [ + "cookingforblockheads:oven" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dye_yellow_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_oven" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dye_yellow_oven" + ] + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_black_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_black_oven.json new file mode 100644 index 00000000..1299b3a0 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_black_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:black_dyes" + } + ], + "result": { + "item": "cookingforblockheads:black_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_blue_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_blue_oven.json new file mode 100644 index 00000000..80b33d0d --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_blue_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:blue_dyes" + } + ], + "result": { + "item": "cookingforblockheads:blue_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_brown_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_brown_oven.json new file mode 100644 index 00000000..e8957d9c --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_brown_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:brown_dyes" + } + ], + "result": { + "item": "cookingforblockheads:brown_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_cyan_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_cyan_oven.json new file mode 100644 index 00000000..650ad9e8 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_cyan_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:cyan_dyes" + } + ], + "result": { + "item": "cookingforblockheads:cyan_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_gray_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_gray_oven.json new file mode 100644 index 00000000..7e6623aa --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_gray_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:gray_dyes" + } + ], + "result": { + "item": "cookingforblockheads:gray_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_green_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_green_oven.json new file mode 100644 index 00000000..7f1cc6ec --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_green_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:green_dyes" + } + ], + "result": { + "item": "cookingforblockheads:green_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_blue_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_blue_oven.json new file mode 100644 index 00000000..c8137f89 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_blue_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:light_blue_dyes" + } + ], + "result": { + "item": "cookingforblockheads:light_blue_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_gray_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_gray_oven.json new file mode 100644 index 00000000..f2ef7704 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_light_gray_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:light_gray_dyes" + } + ], + "result": { + "item": "cookingforblockheads:light_gray_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_lime_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_lime_oven.json new file mode 100644 index 00000000..671f5d89 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_lime_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:lime_dyes" + } + ], + "result": { + "item": "cookingforblockheads:lime_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_magenta_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_magenta_oven.json new file mode 100644 index 00000000..e2c43728 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_magenta_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:magenta_dyes" + } + ], + "result": { + "item": "cookingforblockheads:magenta_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_orange_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_orange_oven.json new file mode 100644 index 00000000..60b1c793 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_orange_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:orange_dyes" + } + ], + "result": { + "item": "cookingforblockheads:orange_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_pink_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_pink_oven.json new file mode 100644 index 00000000..0392e64f --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_pink_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:pink_dyes" + } + ], + "result": { + "item": "cookingforblockheads:pink_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_purple_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_purple_oven.json new file mode 100644 index 00000000..06405c6d --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_purple_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:purple_dyes" + } + ], + "result": { + "item": "cookingforblockheads:purple_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_red_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_red_oven.json new file mode 100644 index 00000000..4f524eba --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_red_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:red_dyes" + } + ], + "result": { + "item": "cookingforblockheads:red_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_white_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_white_oven.json new file mode 100644 index 00000000..9e27d291 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_white_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:white_dyes" + } + ], + "result": { + "item": "cookingforblockheads:oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_yellow_oven.json b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_yellow_oven.json new file mode 100644 index 00000000..8c6a0666 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/recipes/dye_yellow_oven.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "cookingforblockheads:dyed_ovens" + }, + { + "tag": "c:yellow_dyes" + } + ], + "result": { + "item": "cookingforblockheads:yellow_oven" + } +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json b/shared/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json new file mode 100644 index 00000000..0fab46c2 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json @@ -0,0 +1,20 @@ +{ + "replace": false, + "values": [ + "cookingforblockheads:orange_oven", + "cookingforblockheads:magenta_oven", + "cookingforblockheads:light_blue_oven", + "cookingforblockheads:yellow_oven", + "cookingforblockheads:lime_oven", + "cookingforblockheads:pink_oven", + "cookingforblockheads:gray_oven", + "cookingforblockheads:light_gray_oven", + "cookingforblockheads:cyan_oven", + "cookingforblockheads:purple_oven", + "cookingforblockheads:blue_oven", + "cookingforblockheads:brown_oven", + "cookingforblockheads:green_oven", + "cookingforblockheads:red_oven", + "cookingforblockheads:black_oven" + ] +} \ No newline at end of file diff --git a/shared/src/generated/resources/data/cookingforblockheads/tags/items/dyed_ovens.json b/shared/src/generated/resources/data/cookingforblockheads/tags/items/dyed_ovens.json new file mode 100644 index 00000000..0fab46c2 --- /dev/null +++ b/shared/src/generated/resources/data/cookingforblockheads/tags/items/dyed_ovens.json @@ -0,0 +1,20 @@ +{ + "replace": false, + "values": [ + "cookingforblockheads:orange_oven", + "cookingforblockheads:magenta_oven", + "cookingforblockheads:light_blue_oven", + "cookingforblockheads:yellow_oven", + "cookingforblockheads:lime_oven", + "cookingforblockheads:pink_oven", + "cookingforblockheads:gray_oven", + "cookingforblockheads:light_gray_oven", + "cookingforblockheads:cyan_oven", + "cookingforblockheads:purple_oven", + "cookingforblockheads:blue_oven", + "cookingforblockheads:brown_oven", + "cookingforblockheads:green_oven", + "cookingforblockheads:red_oven", + "cookingforblockheads:black_oven" + ] +} \ No newline at end of file diff --git a/shared/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java b/shared/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java index 3cd97c36..88996fe6 100644 --- a/shared/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java +++ b/shared/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java @@ -32,11 +32,6 @@ public class CookingForBlockheads { - // TODO fix balm model loading on fabric using modelloadingplugin - // TODO split electric oven into its own block and fix heating unit upgrade stuff - // TODO consider a new creative tab for the dyed blocks - // TODO consider JEI grouping support for the dyed blocks - public static final String MOD_ID = "cookingforblockheads"; public static final Logger logger = LogManager.getLogger(MOD_ID); diff --git a/shared/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/OvenBlockEntity.java b/shared/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/OvenBlockEntity.java index 326b8ae1..3903763a 100644 --- a/shared/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/OvenBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/cookingforblockheads/block/entity/OvenBlockEntity.java @@ -386,8 +386,6 @@ public boolean hasPowerUpgrade() { public void setHasPowerUpgrade(boolean hasPowerUpgrade) { this.hasPowerUpgrade = hasPowerUpgrade; - BlockState state = level.getBlockState(worldPosition); - // TODO level.setBlockAndUpdate(worldPosition, state.setValue(OvenBlock.POWERED, hasPowerUpgrade)); setChanged(); }