Skip to content

Commit

Permalink
chore: make recipe dyes fit bound book icon color
Browse files Browse the repository at this point in the history 
See #1155
  • Loading branch information
@klikli-dev
klikli-dev committed Jul 19, 2024
1 parent 2dc807e commit 824e490
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/generated/resources/data/occultism/recipe/crafting/book_of_binding_afrit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"item": "occultism:awakened_feather"
},
"p": {
"tag": "c:dyes/purple"
"tag": "c:dyes/yellow"
}
},
"pattern": [
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/data/occultism/recipe/crafting/book_of_binding_afrit_from_empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"item": "occultism:book_of_binding_empty"
},
"p": {
"tag": "c:dyes/purple"
"tag": "c:dyes/yellow"
}
},
"pattern": [
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/data/occultism/recipe/crafting/book_of_binding_djinni.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"item": "occultism:awakened_feather"
},
"g": {
"tag": "c:dyes/green"
"tag": "c:dyes/purple"
}
},
"pattern": [
Expand Down
2 changes: 1 addition & 1 deletion ...generated/resources/data/occultism/recipe/crafting/book_of_binding_djinni_from_empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"item": "occultism:book_of_binding_empty"
},
"g": {
"tag": "c:dyes/green"
"tag": "c:dyes/purple"
}
},
"pattern": [
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/data/occultism/recipe/crafting/book_of_binding_foliot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"item": "occultism:awakened_feather"
},
"w": {
"tag": "c:dyes/white"
"tag": "c:dyes/blue"
}
},
"pattern": [
Expand Down
2 changes: 1 addition & 1 deletion ...generated/resources/data/occultism/recipe/crafting/book_of_binding_foliot_from_empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"item": "occultism:book_of_binding_empty"
},
"w": {
"tag": "c:dyes/white"
"tag": "c:dyes/blue"
}
},
"pattern": [
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/data/occultism/recipe/crafting/book_of_binding_marid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"item": "occultism:awakened_feather"
},
"o": {
"tag": "c:dyes/orange"
"tag": "c:dyes/green"
},
"p": {
"tag": "c:dyes/purple"
"tag": "c:dyes/green"
}
},
"pattern": [
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/data/occultism/recipe/crafting/book_of_binding_marid_from_empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"item": "occultism:book_of_binding_empty"
},
"o": {
"tag": "c:dyes/orange"
"tag": "c:dyes/green"
},
"p": {
"tag": "c:dyes/purple"
"tag": "c:dyes/green"
}
},
"pattern": [
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/klikli_dev/occultism/datagen/recipe/OccultismRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ private void craftingRecipes(RecipeOutput pRecipeOutput) {
.pattern("cpf")
.pattern("pbp")
.pattern(" p ")
.define('p', Tags.Items.DYES_PURPLE)
.define('p', Tags.Items.DYES_YELLOW)
.define('b', OccultismItems.TABOO_BOOK.get())
.define('c', OccultismItems.PURIFIED_INK.get())
.define('f', OccultismItems.AWAKENED_FEATHER.get())
Expand All @@ -371,7 +371,7 @@ private void craftingRecipes(RecipeOutput pRecipeOutput) {
.pattern(" p ")
.pattern("pbp")
.pattern(" p ")
.define('p', Tags.Items.DYES_PURPLE)
.define('p', Tags.Items.DYES_YELLOW)
.define('b', OccultismItems.BOOK_OF_BINDING_EMPTY.get())
.unlockedBy("has_taboo_book", has(OccultismItems.BOOK_OF_BINDING_EMPTY.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_afrit_from_empty"));
Expand All @@ -388,15 +388,15 @@ private void craftingRecipes(RecipeOutput pRecipeOutput) {
.pattern(" g ")
.define('c', OccultismItems.PURIFIED_INK.get())
.define('b', OccultismItems.TABOO_BOOK.get())
.define('g', Tags.Items.DYES_GREEN)
.define('g', Tags.Items.DYES_PURPLE)
.define('f', OccultismItems.AWAKENED_FEATHER.get())
.unlockedBy("has_taboo_book", has(OccultismItems.TABOO_BOOK.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_djinni"));
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, OccultismItems.BOOK_OF_BINDING_DJINNI.get())
.pattern(" g ")
.pattern("gbg")
.pattern(" g ")
.define('g', Tags.Items.DYES_GREEN)
.define('g', Tags.Items.DYES_PURPLE)
.define('b', OccultismItems.BOOK_OF_BINDING_EMPTY.get())
.unlockedBy("has_empty_binding", has(OccultismItems.BOOK_OF_BINDING_EMPTY.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_djinni_from_empty"));
Expand All @@ -418,15 +418,15 @@ private void craftingRecipes(RecipeOutput pRecipeOutput) {
.pattern(" w ")
.define('c', OccultismItems.PURIFIED_INK.get())
.define('b', OccultismItems.TABOO_BOOK.get())
.define('w', Tags.Items.DYES_WHITE)
.define('w', Tags.Items.DYES_BLUE)
.define('f', OccultismItems.AWAKENED_FEATHER.get())
.unlockedBy("has_taboo_book", has(OccultismItems.TABOO_BOOK.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_foliot"));
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, OccultismItems.BOOK_OF_BINDING_FOLIOT.get())
.pattern(" w ")
.pattern("wbw")
.pattern(" w ")
.define('w', Tags.Items.DYES_WHITE)
.define('w', Tags.Items.DYES_BLUE)
.define('b', OccultismItems.BOOK_OF_BINDING_EMPTY.get())
.unlockedBy("has_empty_binding", has(OccultismItems.BOOK_OF_BINDING_EMPTY.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_foliot_from_empty"));
Expand All @@ -448,17 +448,17 @@ private void craftingRecipes(RecipeOutput pRecipeOutput) {
.pattern(" o ")
.define('c', OccultismItems.PURIFIED_INK.get())
.define('b', OccultismItems.TABOO_BOOK.get())
.define('o', Tags.Items.DYES_ORANGE)
.define('p', Tags.Items.DYES_PURPLE)
.define('o', Tags.Items.DYES_GREEN)
.define('p', Tags.Items.DYES_GREEN)
.define('f', OccultismItems.AWAKENED_FEATHER.get())
.unlockedBy("has_taboo_book", has(OccultismItems.TABOO_BOOK.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_marid"));
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, OccultismItems.BOOK_OF_BINDING_MARID.get())
.pattern(" o ")
.pattern("pbp")
.pattern(" o ")
.define('o', Tags.Items.DYES_ORANGE)
.define('p', Tags.Items.DYES_PURPLE)
.define('o', Tags.Items.DYES_GREEN)
.define('p', Tags.Items.DYES_GREEN)
.define('b', OccultismItems.BOOK_OF_BINDING_EMPTY.get())
.unlockedBy("has_empty_binding", has(OccultismItems.BOOK_OF_BINDING_EMPTY.get()))
.save(pRecipeOutput, ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "crafting/book_of_binding_marid_from_empty"));
Expand Down

0 comments on commit 824e490

Please sign in to comment.