Skip to content

修复问题 #4

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.

Sign up for GitHub

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

Open
DL909 wants to merge 3 commits into
base: releases/1.21.1
Choose a base branch
from
Open

修复问题 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af9ecf7
修正了所有手册系统中仍保留的 "anvilcraft" 命名空间键，改为正确的 "anvilcraft_patchouli" ，由此修复了…
DL909 Jan 14, 2026
a2a6dce
迁移到anvilcraft-1.5.1并修正了皇家钢在手册中的配方显示（因为会导致崩溃。
DL909 Jan 14, 2026
6016c07
Merge branch 'releases/1.21.1' into releases/1.21.1
TBPig Jan 15, 2026
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
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
210 changes: 105 additions & 105 deletions src/generated/resources/assets/anvilcraft_patchouli/lang/en_ud.json
View file
Open in desktop

Large diffs are not rendered by default.

210 changes: 105 additions & 105 deletions src/generated/resources/assets/anvilcraft_patchouli/lang/en_us.json
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 17 additions & 18 deletions src/main/java/dev/anvilcraft/patchouli/client/AnvilCraftPatchouliClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import dev.anvilcraft.patchouli.page.anvilitem.PageSuperHeating;
import dev.anvilcraft.patchouli.page.anvilitem.PageTimeWarp;
import dev.anvilcraft.patchouli.page.anvilitem.PageUnpack;
import dev.dubhe.anvilcraft.AnvilCraft;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModContainer;
Expand All @@ -27,22 +26,22 @@

@Mod(value = AnvilCraftPatchouli.MOD_ID, dist = Dist.CLIENT)
public class AnvilCraftPatchouliClient {
public AnvilCraftPatchouliClient(@NotNull IEventBus modBus, @NotNull ModContainer container) {
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("time_warp"), PageTimeWarp.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("neutron_irradiation"), PageNeutronIrradiation.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("super_heating"), PageSuperHeating.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("jewel_crafting"), PageJewelCrafting.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("multiple_to_one_smithing"), PageMultipleToOneSmithing.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("block_compress"), PageBlockCompress.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("item_inject"), PageItemInject.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("item_crush"), PageItemCrush.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("item_compress"), PageItemCompress.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("stamping"), PageStamping.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("bulging"), PageBulging.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("boiling"), PageBoiling.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("cooking"), PageCooking.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("unpack"), PageUnpack.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("mesh"), PageMesh.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraft.of("anvil_collision"), PageAnvilCollisionCraft.class);
public AnvilCraftPatchouliClient(@SuppressWarnings("unused") @NotNull IEventBus modBus, @SuppressWarnings("unused") @NotNull ModContainer container) {
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("time_warp"), PageTimeWarp.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("neutron_irradiation"), PageNeutronIrradiation.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("super_heating"), PageSuperHeating.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("jewel_crafting"), PageJewelCrafting.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("multiple_to_one_smithing"), PageMultipleToOneSmithing.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("block_compress"), PageBlockCompress.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("item_inject"), PageItemInject.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("item_crush"), PageItemCrush.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("item_compress"), PageItemCompress.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("stamping"), PageStamping.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("bulging"), PageBulging.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("boiling"), PageBoiling.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("cooking"), PageCooking.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("unpack"), PageUnpack.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("mesh"), PageMesh.class);
ClientBookRegistry.INSTANCE.pageTypes.put(AnvilCraftPatchouli.of("anvil_collision"), PageAnvilCollisionCraft.class);
}
}
210 changes: 105 additions & 105 deletions src/main/java/dev/anvilcraft/patchouli/data/lang/LangHandler.java
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...s/assets/anvilcraft_patchouli/patchouli_books/guide/en_us/categories/machine_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "title.anvilcraft_patchouli.patchouli.machine_example",
"description": "intro.anvilcraft_patchouli.patchouli.machine_example",
"sortnum": 8,
"icon": "anvilcraft:pulse_generator"
"name": "title.anvilcraft_patchouli.patchouli.machine_example",
"description": "intro.anvilcraft_patchouli.patchouli.machine_example",
"sortnum": 8,
"icon": "anvilcraft:pulse_generator"
}
4 changes: 2 additions & 2 deletions ...vilcraft_patchouli/patchouli_books/guide/en_us/entries/advanced/special_heated_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"text": "$(item)超温的余烬金属块$()非常不稳定，往往只能维持一小段时间。且在冷却后，有$(thing)5%%$()的概率变为$(item)下界合金块$()。$(br)$(li)可以为$(l:power/heat_collection)集热器$()提供1024kW能量。$(li)烫伤踩在上面的生物，造成8点伤害。 $(li)接触水一段时间后，和海绵类似，蒸发距离10以内的水。"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_2_and_uranium_block_256",
"text": "一次撞击会将附近最多16个余烬金属块加热为$(thing)超温$()，最多持续$(thing)20s$()。"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_2_and_plutonium_block_256",
"text": "一次撞击会将附近最多16个余烬金属块加热为$(thing)超温$()，最多持续$(thing)60s$()。"
}
Expand Down
20 changes: 15 additions & 5 deletions ...sets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/advanced/super_heating.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,21 @@
"0": "anvilcraft:heater[overload=false]"
},
"pattern": [
["V"],
["A"],
["C"],
["0"],
[" "]
[
"V"
],
[
"A"
],
[
"C"
],
[
"0"
],
[
" "
]
]
},
"text": "执行高温熔炼所需的结构"
Expand Down
18 changes: 15 additions & 3 deletions .../assets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/advanced/void_decay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,21 @@
"G": "minecraft:granite"
},
"pattern": [
[" "," V V "," "],
[" V V ","VGVAVVV"," "],
[" "," V 0 V "," "]
[
" ",
" V V ",
" "
],
[
" V V ",
"VGVAVVV",
" "
],
[
" ",
" V 0 V ",
" "
]
]
},
"enable_visualize": false,
Expand Down
64 changes: 53 additions & 11 deletions ...resources/assets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/cake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"pages": [
"利用$(l:struct/multiblock)多方块转化/合成$()，可以制造巨型蛋糕，每吃一口都能回复15$(thing)饱食度$()，12$(thing)饱和度$()$(br2)$(#666666)巨型蛋糕是个弥天大谎$()",
{
"type": "anvilcraft:cooking",
"type": "anvilcraft_patchouli:cooking",
"recipe": "anvilcraft:cooking/cake_base_block",
"text": "首先，做出蛋糕胚$(br2)食用回复5$(thing)饱食度$()，4$(thing)饱和度$()"
},
{
"type": "anvilcraft:item_compress",
"type": "anvilcraft_patchouli:item_compress",
"recipe": "anvilcraft:item_compress/cream_block",
"recipe2": "anvilcraft:item_compress/berry_cream_block"
},
{
"type": "anvilcraft:item_compress",
"type": "anvilcraft_patchouli:item_compress",
"recipe": "anvilcraft:item_compress/chocolate_cream_block",
"text": "然后，做出三种奶油块。三者提供营养按序分别如下：$(li)5$(thing)饱食度$()，2$(thing)饱和度$()$(li)8$(thing)饱食度$()，3.2$(thing)饱和度$()$(li)12$(thing)饱食度$()，4.8$(thing)饱和度$()"
},
Expand All @@ -44,11 +44,41 @@
"I": "anvilcraft:chocolate_cream_block"
},
"pattern": [
[" ", " ", " ", "F F F", " "],
[" ", " ", " ", " ", " "],
[" ", "F F F", " ", "G H I", " "],
[" ", "A D E", "B 0 B", "C C C", " "],
[" ", " ", " ", " ", " "]
[
" ",
" ",
" ",
"F F F",
" "
],
[
" ",
" ",
" ",
" ",
" "
],
[
" ",
"F F F",
" ",
"G H I",
" "
],
[
" ",
"A D E",
"B 0 B",
"C C C",
" "
],
[
" ",
" ",
" ",
" ",
" "
]
]
},
"enable_visualize": false,
Expand All @@ -70,9 +100,21 @@
"C": "anvilcraft:chocolate_cake_block"
},
"pattern": [
[" ", " C ", " "],
[" B ", "BBB", " B "],
["AAA", "A0A", "AAA"]
[
" ",
" C ",
" "
],
[
" B ",
"BBB",
" B "
],
[
"AAA",
"A0A",
"AAA"
]
]
},
"text": "摆成如下形状后，使用$(l:struct/multiblock)多方块转化/合成$()可以获得巨型蛋糕。"
Expand Down
2 changes: 1 addition & 1 deletion ...sources/assets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/cement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"text": "可以用来合成各种混凝土，且不会因此被消耗 $(p)$(#888888)长期以来，水泥作为一种重要的胶凝材料，广泛应用于土木建筑、水利、国防等工程$()"
},
{
"type": "anvilcraft:bulging",
"type": "anvilcraft_patchouli:bulging",
"recipe": "anvilcraft:bulging/cement_cauldron",
"title": "制作水泥",
"text": "制作出的水泥默认为灰色，投入染料并砸击可染色。"
Expand Down
10 changes: 5 additions & 5 deletions ...es/assets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/confinement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@
"text": "这是捕获砧子的必需方块，将它放置在被铁砧撞击的方块附近即可"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_0_and_corrupted_beacon_32",
"recipe2": "anvilcraft:anvil_collision/anvil_tier_0_and_giant_anvil_32"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_0_and_space_overcompressor_32",
"text": "在较低的速度下撞击，可以产生$(thing)时间、空间、质量$()三种砧子"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_0_and_corrupted_beacon_128",
"recipe2": "anvilcraft:anvil_collision/anvil_tier_0_and_giant_anvil_128"
},
{
"type": "anvilcraft:anvil_collision",
"type": "anvilcraft_patchouli:anvil_collision",
"recipe": "anvilcraft:anvil_collision/anvil_tier_0_and_space_overcompressor_128",
"text": "在较高的速度下撞击，可以产生$(thing)能量$()砧子"
},
{
"type": "anvilcraft:item_inject",
"type": "anvilcraft_patchouli:item_inject",
"recipe": "anvilcraft:item_inject/confined_neutronium_ingot",
"text": "手动塞入充能中子锭也可以制作"
}
Expand Down
50 changes: 37 additions & 13 deletions ...sets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/corrupted_beacon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "title.anvilcraft_patchouli.patchouli.apply.corrupted_beacon",
"category": "anvilcraft:technology_application",
"category": "anvilcraft_patchouli:technology_application",
"icon": "anvilcraft:corrupted_beacon",
"sortnum": 16000,
"entry_color": "004400",
Expand Down Expand Up @@ -28,44 +28,68 @@
"M": "anvilcraft:hollow_magnet_block[lit=false]"
},
"pattern": [
[" ", " M ", " "],
[" ", " A ", " "],
[" ", " ", " "],
[" ", " C ", " "],
[" ", " B ", " "],
["GGG", "G0G", "GGG"]
[
" ",
" M ",
" "
],
[
" ",
" A ",
" "
],
[
" ",
" ",
" "
],
[
" ",
" C ",
" "
],
[
" ",
" B ",
" "
],
[
"GGG",
"G0G",
"GGG"
]
]
},
"enable_visualize": "true",
"text": "Time Warp operation requires lit Corrupted Beacon. This means if you want to use magnet block to control anvils on top, you need to use $(item)Hollow Magnet Block$()."
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/raw_copper",
"text": "Metals can be transformed into coarse ores"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/budding_amethyst",
"recipe2": "anvilcraft:time_warp/wither_skeleton_skull"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/wither_rose",
"recipe2": "anvilcraft:time_warp/dirt"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/tuff",
"recipe2": "anvilcraft:time_warp/calcite"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/soul_soil",
"recipe2": "anvilcraft:time_warp/crying_obsidian"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"recipe": "anvilcraft:time_warp/end_stone"
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...sets/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/enchantment_copy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "title.anvilcraft_patchouli.patchouli.apply.enchantment_copy",
"category": "anvilcraft:technology_application",
"category": "anvilcraft_patchouli:technology_application",
"icon": "minecraft:enchanted_book",
"sortnum": 36001,
"entry_color": "660066",
Expand Down
4 changes: 2 additions & 2 deletions ...ts/anvilcraft_patchouli/patchouli_books/guide/en_us/entries/apply/gem_transformation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"title": "自动宝石转化"
},
{
"type": "anvilcraft:super_heating",
"type": "anvilcraft_patchouli:super_heating",
"recipe": "anvilcraft:super_heating/melt_gem_cauldron",
"text": "将$(item)绿宝石块$()高温加热以融化为一锅$(item)熔融宝石$()。"
},
Expand All @@ -27,7 +27,7 @@
"text": "$(li)熔融宝石流动部分与水接触时随机变为【闪长岩、安山岩、花岗岩】中的一种$(li)熔融宝石源头与水接触时变为陶瓦$(li)熔融宝石流体落到水上时，水变为石头"
},
{
"type": "anvilcraft:time_warp",
"type": "anvilcraft_patchouli:time_warp",
"title": "宝石块",
"recipe": "anvilcraft:time_warp/ruby_block",
"text": "将锅下的$(item)加热器$()换成激活的$(item)腐化信标$()，或者将$(item)熔融宝石$()舀入另一口下有激活的$(item)腐化信标$()的锅。$(br)1颗$(thing)宝石$()加上1锅熔融宝石，可以被$(thing)时移$()为1块$(thing)宝石块$()。"
Expand Down
Loading