Skip to content

Commit aee1f31

Browse files
theabab23333theabab23333
authored
Merge pull request #1 from Anvil-Dev/integration
Compatible with GuideME recipe 兼容GuideME配方
2 parents 8392e28 + 935266c commit aee1f31

116 files changed

Lines changed: 3869 additions & 217 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: christian-draeger/read-properties@1.1.1
2929
with:
3030
path: gradle.properties
31-
properties: 'mod_id mod_name java_version upload'
31+
properties: 'mod_id mod_name java_version modrinth_id curseforge_id upload'
3232

3333
- name: Setup Java ${{ steps.properties.outputs.java_version }}
3434
uses: actions/setup-java@v3.6.0
@@ -71,4 +71,4 @@ jobs:
7171
uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
7272
with:
7373
mod: build/libs/${{ steps.properties.outputs.mod_id }}-neoforge-${{ steps.version.outputs.version }}.jar
74-
extra-mods: patchouli:1.21-87-neoforge anvilcraft:1.21.1-1.5.0+pre-release.8 guideme:21.1.15
74+
extra-mods: anvilcraft:1.21.1-1.5.0+hotfix.1560 guideme:21.1.15

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
6363
with:
6464
mod: build/libs/${{ steps.properties.outputs.mod_id }}-neoforge-${{ steps.version.outputs.version }}.jar
65-
extra-mods: patchouli:1.21-87-neoforge anvilcraft:1.21.1-1.5.0+pre-release.8 guideme:21.1.15
65+
extra-mods: anvilcraft:1.21.1-1.5.0+hotfix.1560 guideme:21.1.15

‎README.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# AnvilCraft-GuideMe
2+
3+
[![CI for Mod](https://github.com/Anvil-Dev/AnvilCraft-GuideME/actions/workflows/ci.yml/badge.svg)](https://github.com/Anvil-Dev/AnvilCraft-GuideME/actions/workflows/ci.yml)
4+
5+
## [AnvilCraft](https://github.com/Anvil-Dev/AnvilCraft)附属 by [Anvil-Dev](https://github.com/Anvil-Dev)
6+
7+
> 欢迎来到模组AnvilCraft-GuideMe的页面！模组是为铁砧工艺本体提供指南的附属，添加了本体内的游戏指南和额外的功能，主要功能有：
8+
9+
- ModInfo: 提供modid以查看当前当前模组加载情况，可以添加url跳转至外部链接
10+
- NeoColor: 可以提供十六进制颜色值以灵活自定义文本颜色
11+
- ItemEntity: 方便在场景中显示物品实体(由于技术原因，物品实体不会转)
12+
- Key: 提供某个功能的id以显示这个功能绑定的按键
13+
- WIP: 咕咕咕
14+
15+
部分文本抄自[AnvilCraft-Patchouli](https://github.com/Anvil-Dev/AnvilCraft-Patchouli)和[Xekr's TODO](https://github.com/Anvil-Dev/AnvilCraft/issues?q=is%3Aissue%20state%3Aopen%20author%3AXeKr%20label%3A%22%F0%9F%93%8B%EF%B8%8F%20TODO%22)
16+
17+
## 使用许可
18+
19+
[LICENSE 文件(LGPL-3.0)](./LICENSE)
20+
21+
## 使用方法
22+
23+
下载对应版本[GuideME](https://github.com/AppliedEnergistics/GuideME)、[AnvilCraft](https://github.com/Anvil-Dev/AnvilCraft)和此 `mod` 放入 `mods` 文件夹，启动游戏即可
24+
25+
## 主要维护者
26+
27+
[@theabab2333](https://github.com/theabab23333)
28+
[@Gugle](https://github.com/Gu-ZT)

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
minecraft = "1.21.1"
33
neoForge = "21.1.152"
44
registrate = "MC1.21-1.3.0+62"
5-
anvillib = "1.4.0+build.160"
6-
anvilcraft = "1.5.0+pre-release.24"
5+
anvillib = "1.4.0+build.172"
6+
anvilcraft = "1.5.0+hotfix.1562"
77
curios = "9.0.15+1.21.1"
88
jei = "19.21.0.247"
99
jade = "15.3.4+neoforge"
10-
patchouli = "1.21-87-NEOFORGE"
1110
modDevGradle = "2.0.78"
1211
lombok = "8.7.1"
1312
guideme = "21.1.9"
@@ -22,7 +21,6 @@ jeiCommonApi = { group = "mezz.jei", name = "jei-1.21.1-common-api", version.ref
2221
jeiForgeApi = { group = "mezz.jei", name = "jei-1.21.1-neoforge-api", version.ref = "jei" }
2322
jeiForgeImpl = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei" }
2423
jade = { group = "maven.modrinth", name = "jade", version.ref = "jade" }
25-
patchouli = { group = "vazkii.patchouli", name = "Patchouli", version.ref = "patchouli" }
2624
guideme = { group = "org.appliedenergistics", name = "guideme", version.ref = "guideme" }
2725
ae2 = { group = "org.appliedenergistics", name = "appliedenergistics2", version.ref = "ae2" }
2826

‎gradle/scripts/dependencies.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ dependencies {
2121
// Jade
2222
implementation(libs.jade)
2323

24-
// Patchouli
25-
implementation(libs.patchouli)
26-
2724
// GuideME
2825
compileOnly("org.appliedenergistics:guideme:${libs.versions.guideme.get()}:api")
2926
runtimeOnly(libs.guideme)

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎guidebook/ac_assets/sturcture/laser_miner.snbt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
DataVersion: 3955,
3+
size: [3, 7, 3],
4+
data: [
5+
{pos: [0, 0, 1], state: "anvilcraft:raw_silver_block"},
6+
{pos: [1, 0, 0], state: "anvilcraft:raw_silver_block"},
7+
{pos: [1, 0, 1], state: "anvilcraft:mineral_fountain", nbt: {id: "anvilcraft:mineral_fountain", tickCount: -1}},
8+
{pos: [1, 0, 2], state: "anvilcraft:raw_silver_block"},
9+
{pos: [2, 0, 1], state: "anvilcraft:raw_silver_block"},
10+
{pos: [1, 1, 1], state: "anvilcraft:deepslate_silver_ore"},
11+
{pos: [0, 5, 1], state: "anvilcraft:ruby_laser{facing:east,overload:false,switch:on}", nbt: {id: "anvilcraft:ruby_laser"}},
12+
{pos: [1, 5, 0], state: "anvilcraft:ruby_laser{facing:south,overload:false,switch:on}", nbt: {id: "anvilcraft:ruby_laser"}},
13+
{pos: [1, 5, 1], state: "anvilcraft:ruby_prism{facing:down}", nbt: {id: "anvilcraft:ruby_prism"}},
14+
{pos: [1, 5, 2], state: "anvilcraft:ruby_laser{facing:north,overload:false,switch:on}", nbt: {id: "anvilcraft:ruby_laser"}},
15+
{pos: [2, 5, 1], state: "anvilcraft:ruby_laser{facing:west,overload:false,switch:on}", nbt: {id: "anvilcraft:ruby_laser"}},
16+
{pos: [1, 6, 1], state: "minecraft:barrel{facing:east,open:false}", nbt: {Items: [{Slot: 0b, count: 3, id: "anvilcraft:raw_silver"}], id: "minecraft:barrel"}}
17+
],
18+
entities: [],
19+
palette: [
20+
"anvilcraft:raw_silver_block",
21+
"anvilcraft:deepslate_silver_ore",
22+
"anvilcraft:mineral_fountain",
23+
"anvilcraft:ruby_laser{facing:east,overload:false,switch:on}",
24+
"anvilcraft:ruby_laser{facing:south,overload:false,switch:on}",
25+
"anvilcraft:ruby_prism{facing:down}",
26+
"anvilcraft:ruby_laser{facing:north,overload:false,switch:on}",
27+
"anvilcraft:ruby_laser{facing:west,overload:false,switch:on}",
28+
"minecraft:barrel{facing:east,open:false}"
29+
]
30+
}

‎guidebook/ac_assets/sturcture/mineral_fountain.snbt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
DataVersion: 3955,
3+
size: [7, 2, 3],
4+
data: [
5+
{pos: [0, 0, 1], state: "anvilcraft:raw_silver_block"},
6+
{pos: [1, 0, 0], state: "anvilcraft:raw_silver_block"},
7+
{pos: [1, 0, 1], state: "anvilcraft:mineral_fountain"},
8+
{pos: [1, 0, 2], state: "anvilcraft:raw_silver_block"},
9+
{pos: [2, 0, 1], state: "anvilcraft:raw_silver_block"},
10+
{pos: [3, 0, 1], state: "anvilcraft:arrow{facing:east}"},
11+
{pos: [4, 0, 1], state: "anvilcraft:raw_silver_block"},
12+
{pos: [5, 0, 0], state: "anvilcraft:raw_silver_block"},
13+
{pos: [5, 0, 1], state: "anvilcraft:mineral_fountain", nbt: {id: "anvilcraft:mineral_fountain", tickCount: -1}},
14+
{pos: [5, 0, 2], state: "anvilcraft:raw_silver_block"},
15+
{pos: [6, 0, 1], state: "anvilcraft:raw_silver_block"},
16+
{pos: [1, 1, 1], state: "minecraft:deepslate{axis:y}"},
17+
{pos: [5, 1, 1], state: "anvilcraft:deepslate_silver_ore"}
18+
],
19+
entities: [],
20+
palette: [
21+
"anvilcraft:raw_silver_block",
22+
"minecraft:deepslate{axis:y}",
23+
"anvilcraft:deepslate_silver_ore",
24+
"anvilcraft:arrow{facing:east}",
25+
"anvilcraft:mineral_fountain"
26+
]
27+
}

‎guidebook/basic/basic_block_processing.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ navigation:
9494
<GameScene interactive={true} zoom={3}>
9595
<ImportStructure src="../ac_assets/sturcture/break.snbt" />
9696
<ItemEntity id="minecraft:cobblestone" count="1" pos="2 0.75 0" />
97+
<IsometricCamera yaw="195" pitch="30" />
9798
</GameScene>
9899

99100
使方块变为掉落物。

‎guidebook/basic/basic_minerals.md‎

Lines changed: 53 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -9,97 +9,81 @@ item_ids:
99
---
1010

1111
# 基本矿石
12+
#### 不同于大多数mod，正常情况下本模组的矿石不会自然生成，只能通过矿物涌泉得到。
1213

13-
不同于大多数mod，正常情况下本模组的矿石不会自然生成，只能通过矿物涌泉得到。
14-
为了在前期获得本模组的金属，你需要使用类似于“无中生有”的方式——“[物品过筛](basic_item_processing.mdesh)”。
15-
以此法获得的金属粒及其来源在后文列出。
14+
## 物品过筛
1615

17-
<ItemImage id="anvilcraft:lead_nugget" />
16+
### 为了在前期获得本模组的金属，你需要使用类似于“无中生有”的方式—— **物品过筛**。
1817

19-
*铅粒*通过筛选*火山灰*概率获得。
18+
##### **铅粒**、**锡粒**、**锌粒**和**银粒**都可通过过筛**火山灰**概率获得。
2019

21-
<ItemImage id="anvilcraft:tin_nugget" />
20+
<Row>
21+
<ItemImage id="anvilcraft:lead_nugget" scale="2" />
22+
<ItemImage id="anvilcraft:tin_nugget" scale="2" />
23+
<ItemImage id="anvilcraft:zinc_nugget" scale="2" />
24+
<ItemImage id="anvilcraft:silver_nugget" scale="2" />
25+
<ItemImage id="anvilcraft:tungsten_nugget" scale="2" />
26+
</Row>
2227

23-
*锡粒*通过筛选*火山灰*概率获得。
28+
##### **钨粒** 通过筛选 **下界尘** 概率获得。
2429

25-
<ItemImage id="anvilcraft:zinc_nugget" />
30+
<ItemImage id="anvilcraft:tungsten_nugget" scale="2" />
2631

27-
*锌粒*通过筛选*火山灰*概率获得。
32+
##### **钛粒** 通过筛选**末地尘** 概率获得。
33+
<ItemImage id="anvilcraft:titanium_nugget" scale="2" />
2834

29-
<ItemImage id="anvilcraft:silver_nugget" />
30-
31-
*银粒*通过筛选*火山灰*概率获得。
32-
33-
<ItemImage id="anvilcraft:tungsten_nugget" />
34-
35-
*钨粒*通过筛选*下界尘*概率获得。
36-
37-
<ItemImage id="anvilcraft:titanium_nugget" />
38-
39-
*钛粒*通过筛选*末地尘*概率获得。
35+
---
4036

41-
在获得一定量的金属后，你可以通过[时移](../smithing_corrupted_beacon.md#time_warp)将金属块转化为粗矿，并用粗矿块配合*矿脉涌泉*再生矿物。这要求你现阶段有能力制造*腐化信标*和*冲击桩*
37+
## 矿物涌泉
38+
在获得一定量的金属后，你可以通过 **时移** 将金属块转化为粗矿，
39+
并用粗矿块配合 **矿脉涌泉** 再生矿物。
40+
这要求你现阶段有能力制造 **腐化信标** 和 **冲击桩**
4241

43-
## 矿物涌泉产矿
42+
### 矿物涌泉产矿
4443

4544
<GameScene interactive={true} zoom={2}>
46-
<Block x="1" y="1" z="1" id="anvilcraft:deepslate_silver_ore" />
47-
<Block x="5" y="1" z="1" id="minecraft:deepslate" />
48-
<Block x="1" y="2" z="0" id="anvilcraft:raw_silver_block" />
49-
<Block x="5" y="2" z="0" id="anvilcraft:raw_silver_block" />
50-
<Block x="0" y="2" z="1" id="anvilcraft:raw_silver_block" />
51-
<Block x="1" y="2" z="1" id="anvilcraft:mineral_fountain" />
52-
<Block x="2" y="2" z="1" id="anvilcraft:raw_silver_block" />
53-
<Block x="3" y="2" z="1" id="anvilcraft:arrow" />
54-
<Block x="4" y="2" z="1" id="anvilcraft:raw_silver_block" />
55-
<Block x="5" y="2" z="1" id="anvilcraft:mineral_fountain" />
56-
<Block x="6" y="2" z="1" id="anvilcraft:raw_silver_block" />
57-
<Block x="1" y="2" z="2" id="anvilcraft:raw_silver_block" />
58-
<Block x="5" y="2" z="2" id="anvilcraft:raw_silver_block" />
45+
<ImportStructure src="../ac_assets/sturcture/mineral_fountain.snbt" />
46+
<IsometricCamera yaw="195" pitch="30" />
5947
</GameScene>
6048

61-
这种结构下的*矿物涌泉*可以生成矿石
49+
*这种结构下的 **矿物涌泉** 可以生成矿石*
6250

63-
*矿物涌泉*每秒检测四个面相邻方块，如果它们都是某一种粗矿块，则将*深板岩*转化为对应的深层矿。
64-
在主世界生成时，有1%概率生成*地核碎片矿石*，有1%概率生成*虚空石*。
65-
在下界生成时，有20%概率生成*地核碎片矿石*。
66-
在末地生成时，有20%概率生成*虚空石*。
67-
<Color hex="#aa2222">注意</Color>：宝石不能以这种方式再生，仅接受粗矿块。
68-
<Color hex="#aa2222">注意</Color>：矿物涌泉仅在y=-54及以下位置工作
51+
**矿物涌泉** 每秒检测四个面相邻方块，如果它们都是某一种粗矿块，则将 **深板岩** 转化为对应的深层矿。
52+
在主世界生成时，有1%概率生成 **地核碎片矿石**，有1%概率生成 **虚空石** 。
53+
在下界生成时，有20%概率生成 **地核碎片矿石** 。
54+
在末地生成时，有20%概率生成 **虚空石** 。
6955

70-
<a name="earth_core_shard_ore"></a>
71-
<ItemImage id="anvilcraft:earth_core_shard_ore" />
56+
<Color id="red">注意</Color>：宝石不能以这种方式再生，仅接受粗矿块。
57+
<Color id="red">注意</Color>：矿物涌泉仅在y=-54及以下位置工作
7258

73-
*地核碎片矿石*只能通过*矿物涌泉产矿*伴生
74-
受到*时运*与*精准采集*影响
59+
**地核碎片矿石** 只能通过 **矿物涌泉产矿** 伴生
60+
受到 **时运** 与 **精准采集** 影响
7561
需要钻石镐及以上等级镐挖掘
76-
挖掘获得*地核碎片*
77-
78-
<a name="earth_core_shard"></a>
79-
<ItemImage id="anvilcraft:earth_core_shard" />
62+
挖掘获得 **地核碎片**
8063

81-
*地核碎片*及其块状物、矿石防火，不受*熔岩*和*火焰*损害
82-
可参与[余烬金属锭](../smithing_tier_2_materials.md#ember_metal)的制作
64+
<ItemImage id="anvilcraft:earth_core_shard_ore" scale="2" />
8365

84-
<a name="void_stone"></a>
85-
<ItemImage id="anvilcraft:void_stone" />
86-
87-
*虚空石*只能通过*矿物涌泉产矿*伴生
88-
受到*时运*与*精准采集*影响
89-
需要钻石镐及以上等级镐挖掘
90-
挖掘获得*虚空物质*
66+
**地核碎片** 及其块状物、矿石防火，不受 **熔岩** 和 **火焰** 损害
67+
可参与[余烬金属锭]的制作
9168

92-
<a name="void_matter"></a>
93-
<ItemImage id="anvilcraft:void_matter" />
69+
<ItemImage id="anvilcraft:earth_core_shard" scale="2" />
9470

95-
*虚空物质*及其块状物、矿石防虚空，在*虚空*中会上升
71+
**虚空石** 只能通过 **矿物涌泉产矿** 伴生
72+
受到 **时运** 与 **精准采集** 影响
73+
需要钻石镐及以上等级镐挖掘
74+
挖掘获得 **虚空物质**
75+
**虚空物质** 及其块状物、矿石防虚空，在 **虚空** 中会上升
9676

97-
<a name="void_matter_block"></a>
98-
*虚空物质块*防虚空
99-
可用于制作[虚空能收集器](../power_system/power_advanced_void_energy_collection.md#void_energy_collector)
100-
自身具有*虚空衰变*的特性
77+
<Row>
78+
<ItemImage id="anvilcraft:void_matter" scale="2" />
79+
<ItemImage id="anvilcraft:void_matter_block" scale="2" />
80+
<ItemImage id="anvilcraft:void_stone" scale="2" />
81+
<Recipe id="anvilcraft:void_matter_block" />
82+
</Row>
10183

102-
<Recipe id="anvilcraft:void_matter_block" />
84+
**虚空物质块** 防虚空
85+
可用于制作[虚空能收集器]
86+
自身具有 **虚空衰变** 的特性
10387

10488
<a name="void_decay"></a>
10589
## 虚空衰变
@@ -113,18 +97,8 @@ item_ids:
11397
## 激光采矿系统
11498

11599
<GameScene interactive={true} zoom={2}>
116-
<Block x="1" y="0" z="1" id="minecraft:barrel" />
117-
<Block x="1" y="1" z="0" id="anvilcraft:ruby_laser"p:facing="east" />
118-
<Block x="0" y="1" z="1" id="anvilcraft:ruby_laser"p:facing="south" />
119-
<Block x="1" y="1" z="1" id="anvilcraft:ruby_prism" />
120-
<Block x="2" y="1" z="1" id="anvilcraft:ruby_laser"p:facing="north" />
121-
<Block x="1" y="1" z="2" id="anvilcraft:ruby_laser"p:facing="west" />
122-
<Block x="1" y="6" z="1" id="anvilcraft:deepslate_silver_ore" />
123-
<Block x="1" y="7" z="0" id="anvilcraft:raw_silver_block" />
124-
<Block x="0" y="7" z="1" id="anvilcraft:raw_silver_block" />
125-
<Block x="1" y="7" z="1" id="anvilcraft:mineral_fountain" />
126-
<Block x="2" y="7" z="1" id="anvilcraft:raw_silver_block" />
127-
<Block x="1" y="7" z="2" id="anvilcraft:raw_silver_block" />
100+
<ImportStructure src="../ac_assets/sturcture/laser_miner.snbt" />
101+
<IsometricCamera yaw="195" pitch="30" />
128102
</GameScene>
129103

130104
这种结构可以自动提取粗矿并存放至上方容器内,更多结构可以参考*5.5激光采矿机*

0 commit comments

Comments
 (0)