Skip to content

Commit 87bdc4e

Browse files
RobotgiggleRobotgiggle
committed
Recipe + book entry for ancient pigment
1 parent d2804fe commit 87bdc4e

File tree

9 files changed

+129
-15
lines changed

9 files changed

+129
-15
lines changed

‎Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
207207

208208
ring(RecipeCategory.MISC, HexItems.UUID_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.AMETHYST_SHARD)
209209
.unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
210-
ring(RecipeCategory.MISC, HexItems.DEFAULT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.COPPER_INGOT)
210+
ringCornerless(RecipeCategory.MISC, HexItems.DEFAULT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.AMETHYST_SHARD)
211+
.unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
212+
ringCornerless(RecipeCategory.MISC, HexItems.ANCIENT_PIGMENT, 1, HexItems.AMETHYST_DUST, Items.COPPER_INGOT)
211213
.unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
212214

213215
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, HexItems.SCROLL_SMOL)

‎Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
uuid_colorizer: "Soulglimmer Pigment",
105105
default_colorizer: "Vacant Pigment",
106-
ancient_colorizer: "Ancient Pigment,
106+
ancient_colorizer: "Ancient Pigment",
107107

108108
creative_unlocker: {
109109
"": "The Media Cube",
@@ -1565,6 +1565,7 @@
15651565
ancient_cyphers: {
15661566
"1": "While adventuring, I've come across what appear to be $(l:items/hexcasting)$(item)Cyphers/$ created by the Hexcasters of the ancient past. These $(item)Ancient Cyphers/$ work just like the ones I can craft: they can't be recharged, and will break when their reserve of _Media runs out. However, unlike my own $(l:items/hexcasting)$(item)Cyphers/$, their decayed structure allows me to glimpse the _Hex stored within.",
15671567
"2": "These may be useful for learning new techniques - who better to teach me than ancient masters of the art?$(br2)Alternatively, I could erase the contents of one and store my own _Hex inside, creating a casting item that clearly displays its own function."
1568+
"3": "The $(l:items/pigments)$(item)Pigment/$ baked into these relics is a unique blend of purple and orange, matching their copper-and-amethyst appearance. I can replicate it using the above recipe.",
15681569
},
15691570

15701571
phials: {
@@ -1587,7 +1588,7 @@
15871588
"colored.crafting.header": "Chromatic Pigments",
15881589
"colored.crafting.desc": "Pigments in all the colors of the rainbow.",
15891590

1590-
special: "And finally, a pair of special pigments. $(item)Soulglimmer Pigment/$ shines with colors wholly unique to me, and $(item)Vacant Pigment/$ restores my original purplish-orange spread.$(br2)$(italic)And all the colors I am inside have not been invented yet./$",
1591+
special: "And finally, a pair of special pigments. $(item)Soulglimmer Pigment/$ shines with colors wholly unique to me, and $(item)Vacant Pigment/$ restores my original amethyst hue.$(br2)$(italic)And all the colors I am inside have not been invented yet./$",
15911592
},
15921593

15931594
edified: {

‎Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/ancient_cyphers.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"type": "patchouli:spotlight",
1414
"text": "hexcasting.page.ancient_cyphers.2",
1515
"item": "hexcasting:ancient_cypher{variant:0},hexcasting:ancient_cypher{variant:1},hexcasting:ancient_cypher{variant:2},hexcasting:ancient_cypher{variant:3},hexcasting:ancient_cypher{variant:4},hexcasting:ancient_cypher{variant:5},hexcasting:ancient_cypher{variant:6},hexcasting:ancient_cypher{variant:7}"
16+
},
17+
{
18+
"type": "patchouli:crafting",
19+
"recipe": "hexcasting:ancient_colorizer",
20+
"text": "hexcasting.page.ancient_cyphers.3"
1621
}
1722
]
1823
}

‎Fabric/src/generated/resources/data/hexcasting/advancements/recipes/misc/ancient_colorizer.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"hexcasting:amethyst_dust"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "hexcasting:ancient_colorizer"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_item",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"hexcasting:ancient_colorizer"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎Fabric/src/generated/resources/data/hexcasting/recipes/ancient_colorizer.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"C": {
6+
"item": "hexcasting:amethyst_dust"
7+
},
8+
"I": {
9+
"item": "minecraft:copper_ingot"
10+
}
11+
},
12+
"pattern": [
13+
" C ",
14+
"CIC",
15+
" C "
16+
],
17+
"result": {
18+
"item": "hexcasting:ancient_colorizer"
19+
},
20+
"show_notification": true
21+
}

‎Fabric/src/generated/resources/data/hexcasting/recipes/default_colorizer.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
"C": {
66
"item": "hexcasting:amethyst_dust"
77
},
8-
"D": {
9-
"item": "hexcasting:amethyst_dust"
10-
},
118
"I": {
12-
"item": "minecraft:copper_ingot"
9+
"item": "minecraft:amethyst_shard"
1310
}
1411
},
1512
"pattern": [
16-
"DCD",
13+
" C ",
1714
"CIC",
18-
"DCD"
15+
" C "
1916
],
2017
"result": {
2118
"item": "hexcasting:default_colorizer"

‎Forge/src/generated/resources/data/hexcasting/advancements/recipes/misc/ancient_colorizer.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"hexcasting:amethyst_dust"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "hexcasting:ancient_colorizer"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_item",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"hexcasting:ancient_colorizer"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

‎Forge/src/generated/resources/data/hexcasting/recipes/ancient_colorizer.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"C": {
6+
"item": "hexcasting:amethyst_dust"
7+
},
8+
"I": {
9+
"item": "minecraft:copper_ingot"
10+
}
11+
},
12+
"pattern": [
13+
" C ",
14+
"CIC",
15+
" C "
16+
],
17+
"result": {
18+
"item": "hexcasting:ancient_colorizer"
19+
},
20+
"show_notification": true
21+
}

‎Forge/src/generated/resources/data/hexcasting/recipes/default_colorizer.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
"C": {
66
"item": "hexcasting:amethyst_dust"
77
},
8-
"D": {
9-
"item": "hexcasting:amethyst_dust"
10-
},
118
"I": {
12-
"item": "minecraft:copper_ingot"
9+
"item": "minecraft:amethyst_shard"
1310
}
1411
},
1512
"pattern": [
16-
"DCD",
13+
" C ",
1714
"CIC",
18-
"DCD"
15+
" C "
1916
],
2017
"result": {
2118
"item": "hexcasting:default_colorizer"

0 commit comments

Comments
 (0)