Skip to content

Commit

Permalink
Merge pull request #1443 from YocyCraft/dev/tweak_recipes
Browse files Browse the repository at this point in the history
Tweaked recipes and fixed related bugs 调整配方,修复相关问题
  • Loading branch information
Gu-ZT authored Jan 1, 2025
2 parents 8866012 + 00fdcd3 commit 9f64313
Show file tree
Hide file tree
Showing 324 changed files with 1,065 additions and 306 deletions.
7 changes: 7 additions & 0 deletions src/generated/resources/assets/anvilcraft/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@
"gui.anvilcraft.category.time_warp.consume_fluid": "%s :ǝɯnsuoƆ",
"gui.anvilcraft.category.time_warp.need_activated": "pǝʇɐʌıʇɔⱯ pǝǝN",
"gui.anvilcraft.category.time_warp.produce_fluid": "%s :ǝɔnpoɹԀ",
"gui.anvilcraft.category.void_decay": "ʎɐɔǝᗡ pıoΛ",
"gui.anvilcraft.category.void_decay.around": "ʞɔoןq ɹǝʇuǝɔ ǝɥʇ oʇ ʇuǝɔɐظpɐ ʞɔoןq sıɥʇ ʇnԀ",
"gui.anvilcraft.category.void_decay.center": "ɹǝʇuǝɔ ʇɐ ʞɔoןq sıɥʇ ʇnԀ",
"gui.anvilcraft.category.void_decay.not_consumed": "uoısɹǝʌuoɔ uı pǝɯnsuoɔ ʇoN",
"gui.anvilcraft.category.void_decay.random_tick": "ʞɔıʇ ɯopuɐɹ pǝʌıǝɔǝɹ uǝɥʍ pǝʇɹǝʌuoɔ ǝq ןןıʍ ɹǝʇuǝɔ ʇɐ ʞɔoןq ǝɥ⟘",
"item.anvilcraft.amber": "ɹǝqɯⱯ",
"item.anvilcraft.amethyst_axe": "ǝxⱯ ʇsʎɥʇǝɯⱯ",
"item.anvilcraft.amethyst_hoe": "ǝoH ʇsʎɥʇǝɯⱯ",
Expand All @@ -332,6 +337,7 @@
"item.anvilcraft.brown_cement_bucket": "ʇǝʞɔnᗺ ʇuǝɯǝƆ uʍoɹᗺ",
"item.anvilcraft.capacitor": "ɹoʇıɔɐdɐƆ",
"item.anvilcraft.capacitor_empty": "ʎʇdɯƎ ɹoʇıɔɐdɐƆ",
"item.anvilcraft.charged_neutronium_ingot": "ʇobuI ɯnıuoɹʇnǝN pǝbɹɐɥƆ",
"item.anvilcraft.chocolate": "ǝʇɐןoɔoɥƆ",
"item.anvilcraft.chocolate_black": "ʞɔɐןᗺ ǝʇɐןoɔoɥƆ",
"item.anvilcraft.chocolate_white": "ǝʇıɥM ǝʇɐןoɔoɥƆ",
Expand Down Expand Up @@ -421,6 +427,7 @@
"item.anvilcraft.silver_ingot": "ʇobuI ɹǝʌןıS",
"item.anvilcraft.silver_nugget": "ʇǝbbnN ɹǝʌןıS",
"item.anvilcraft.sponge_gemmule": "ǝןnɯɯǝ⅁ ǝbuodS",
"item.anvilcraft.stable_neutronium_ingot": "ʇobuI ɯnıuoɹʇnǝN ǝןqɐʇS",
"item.anvilcraft.structure_tool": "ןoo⟘ ǝɹnʇɔnɹʇS",
"item.anvilcraft.tin_ingot": "ʇobuI uı⟘",
"item.anvilcraft.tin_nugget": "ʇǝbbnN uı⟘",
Expand Down
7 changes: 7 additions & 0 deletions src/generated/resources/assets/anvilcraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@
"gui.anvilcraft.category.time_warp.consume_fluid": "Consume: %s",
"gui.anvilcraft.category.time_warp.need_activated": "Need Activated",
"gui.anvilcraft.category.time_warp.produce_fluid": "Produce: %s",
"gui.anvilcraft.category.void_decay": "Void Decay",
"gui.anvilcraft.category.void_decay.around": "Put this block adjacent to the center block",
"gui.anvilcraft.category.void_decay.center": "Put this block at center",
"gui.anvilcraft.category.void_decay.not_consumed": "Not consumed in conversion",
"gui.anvilcraft.category.void_decay.random_tick": "The block at center will be converted when received random tick",
"item.anvilcraft.amber": "Amber",
"item.anvilcraft.amethyst_axe": "Amethyst Axe",
"item.anvilcraft.amethyst_hoe": "Amethyst Hoe",
Expand All @@ -332,6 +337,7 @@
"item.anvilcraft.brown_cement_bucket": "Brown Cement Bucket",
"item.anvilcraft.capacitor": "Capacitor",
"item.anvilcraft.capacitor_empty": "Capacitor Empty",
"item.anvilcraft.charged_neutronium_ingot": "Charged Neutronium Ingot",
"item.anvilcraft.chocolate": "Chocolate",
"item.anvilcraft.chocolate_black": "Chocolate Black",
"item.anvilcraft.chocolate_white": "Chocolate White",
Expand Down Expand Up @@ -421,6 +427,7 @@
"item.anvilcraft.silver_ingot": "Silver Ingot",
"item.anvilcraft.silver_nugget": "Silver Nugget",
"item.anvilcraft.sponge_gemmule": "Sponge Gemmule",
"item.anvilcraft.stable_neutronium_ingot": "Stable Neutronium Ingot",
"item.anvilcraft.structure_tool": "Structure Tool",
"item.anvilcraft.tin_ingot": "Tin Ingot",
"item.anvilcraft.tin_nugget": "Tin Nugget",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "anvilcraft:item/charged_neutronium_ingot"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "anvilcraft:item/stable_neutronium_ingot"
}
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_ingot": {
"has_iron_block": {
"conditions": {
"items": [
{
"items": "minecraft:iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_silver_pressure_plate": {
"conditions": {
"items": [
{
"items": "anvilcraft:silver_pressure_plate"
"items": "minecraft:iron_block"
}
]
},
Expand All @@ -33,22 +23,21 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:heliostats"
"recipe": "anvilcraft:heliostats_biological"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_silver_pressure_plate",
"has_sunflower",
"has_iron_ingot"
"has_iron_block"
]
],
"rewards": {
"recipes": [
"anvilcraft:heliostats"
"anvilcraft:heliostats_biological"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_circuit_board": {
"conditions": {
"items": [
{
"items": "anvilcraft:circuit_board"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_block": {
"conditions": {
"items": [
{
"items": "minecraft:iron_block"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:heliostats_electrical"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_circuit_board",
"has_iron_block"
]
],
"rewards": {
"recipes": [
"anvilcraft:heliostats_electrical"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:magnet_ingot_9"
"recipe": "anvilcraft:magnet_ingot_from_block"
},
"trigger": "minecraft:recipe_unlocked"
},
Expand All @@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"anvilcraft:magnet_ingot_9"
"anvilcraft:magnet_ingot_from_block"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:magnet_ingot_8"
"recipe": "anvilcraft:magnet_ingot_from_hollow_block"
},
"trigger": "minecraft:recipe_unlocked"
},
Expand All @@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"anvilcraft:magnet_ingot_8"
"anvilcraft:magnet_ingot_from_hollow_block"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_royal_steel_ingot": {
"has_plates/silver": {
"conditions": {
"items": [
{
"items": "anvilcraft:royal_steel_ingot"
"items": "#c:plates/silver"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_ruby_block": {
"has_royal_steel_ingot": {
"conditions": {
"items": [
{
"items": "anvilcraft:ruby_block"
"items": "anvilcraft:royal_steel_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_silver_pressure_plate": {
"has_ruby_block": {
"conditions": {
"items": [
{
"items": "anvilcraft:silver_pressure_plate"
"items": "anvilcraft:ruby_block"
}
]
},
Expand Down Expand Up @@ -63,7 +63,7 @@
"has_the_recipe",
"has_royal_steel_ingot",
"has_induction_light",
"has_silver_pressure_plate",
"has_plates/silver",
"has_ruby_block",
"has_tinted_glass"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_neutronium_ingot": {
"conditions": {
"items": [
{
"items": "anvilcraft:neutronium_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "anvilcraft:stable_neutronium_ingot"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_neutronium_ingot"
]
],
"rewards": {
"recipes": [
"anvilcraft:stable_neutronium_ingot"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"category": "building",
"key": {
"A": {
"item": "anvilcraft:amber"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"category": "redstone",
"key": {
"A": {
"item": "minecraft:glass"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:lead_ingot",
"ingredient": {
"item": "anvilcraft:raw_lead"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:lead_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_lead_ore"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:silver_ingot",
"ingredient": {
"item": "anvilcraft:raw_silver"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:silver_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_silver_ore"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:tin_ingot",
"ingredient": {
"item": "anvilcraft:raw_tin"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:tin_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_tin_ore"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:titanium_ingot",
"ingredient": {
"item": "anvilcraft:raw_titanium"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:titanium_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_titanium_ore"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:tungsten_ingot",
"ingredient": {
"item": "anvilcraft:raw_tungsten"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:tungsten_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_tungsten_ore"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:uranium_ingot",
"ingredient": {
"item": "anvilcraft:raw_uranium"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"category": "misc",
"cookingtime": 100,
"experience": 1.0,
"group": "anvilcraft:uranium_ingot",
"ingredient": {
"item": "anvilcraft:deepslate_uranium_ore"
},
Expand Down
Loading

0 comments on commit 9f64313

Please sign in to comment.