Fix bugs and add compatibility for GuideME 修bug，添加对GuideME的兼容

gradle.properties

@@ -21,7 +21,7 @@ curseforge_id=1380275
 mod_id=anvilcraft_pigsplus
 mod_name=AnvilCraft-PigsPlus
 mod_license=LGPL-3.0 license
-mod_version=0.1.9
+mod_version=0.1.10
 maven_group=dev.anvilcraft.pigsplus
 mod_authors=TB_pig
 mod_description=tools made by TB_pig

gradle/libs.versions.toml

@@ -1,14 +1,17 @@
 [versions]
 minecraft = "1.21.1"
-neoForge = "21.1.152"
+neoForge = "21.1.217"
 registrate = "MC1.21-1.3.0+62"
 anvillib = "1.4.0+build.172"
-anvilcraft = "1.5.0+hotfix.1570"
-anvilcraft_patchouli = "1.0.0+build.6"
+anvilcraft = "1.5.1"
+anvilcraft_patchouli = "1.0.0+build.9"
+anvilcraft_guideme = "1.5.1-1+build.19"
 curios = "9.0.15+1.21.1"
 jei = "19.21.0.247"
 jade = "15.3.4+neoforge"
 patchouli = "1.21-87-NEOFORGE"
+guideme = "21.1.9"
+ae2 = "19.2.10"
 modDevGradle = "2.0.78"
 lombok = "8.7.1"
 
@@ -17,7 +20,10 @@ registrate = { group = "com.tterrag.registrate", name = "Registrate", version.re
 anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" }
 anvilcraft = { group = "dev.dubhe", name = "anvilcraft-neoforge-1.21.1", version.ref = "anvilcraft" }
 anvilcraftpatchouli = { group = "dev.anvilcraft.addon", name = "anvilcraft_patchouli-neoforge-1.21.1", version.ref = "anvilcraft_patchouli"}
+anvilcraftguideme = { group = "dev.anvilcraft.guideme", name = "anvilcraft_guideme-neoforge-1.21.1", version.ref = "anvilcraft_guideme"}
 curios = { group = "top.theillusivec4.curios", name = "curios-neoforge", version.ref = "curios" }
+guideme = { group = "org.appliedenergistics", name = "guideme", version.ref = "guideme" }
+ae2 = { group = "org.appliedenergistics", name = "appliedenergistics2", version.ref = "ae2" }
 jeiCommonApi = { group = "mezz.jei", name = "jei-1.21.1-common-api", version.ref = "jei" }
 jeiForgeApi = { group = "mezz.jei", name = "jei-1.21.1-neoforge-api", version.ref = "jei" }
 jeiForgeImpl = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei" }

gradle/scripts/dependencies.gradle

@@ -11,7 +11,10 @@ dependencies {
     interfaceInjectionData(libs.anvilcraft) { transitive = false }
 
     // AnvilCraft: Patchouli
-    implementation(libs.anvilcraftpatchouli) { transitive = false }
+    // implementation(libs.anvilcraftpatchouli) { transitive = false }
+
+    // AnvilCraft: GuideME
+    implementation(libs.anvilcraftguideme) { transitive = false }
 
     // Curios API
     implementation(libs.curios)
@@ -21,6 +24,13 @@ dependencies {
     compileOnlyApi(libs.jeiForgeApi) { transitive = false }
     implementation(libs.jeiForgeImpl) { transitive = false }
 
+    // GuideME
+    compileOnly("org.appliedenergistics:guideme:${libs.versions.guideme.get()}:api")
+    runtimeOnly(libs.guideme)
+
+    // AE2
+    runtimeOnly(libs.ae2)
+
     // Jade
     implementation(libs.jade)
 

src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java

@@ -148,9 +148,9 @@ public void tick(Level level1, BlockPos blockPos) {
         if (grid == null || !grid.isWorking()) return;
         if (level1.getBlockState(blockPos).getValue(ElectricEnchantingTableBlock.POWERED)) return;
 
-        if (time == 0) moveItemToTransformingSlot();
+        if (time == 0) moveItemFromInputSlot();
         if (time > 0 && isGridWorking()) time--;
-        if (time == 0) moveItemToTransformedOverSlot();
+        if (time == 0) moveItemToResultSlot();
 
         int signal = this.getAnalogRedstoneSignal();
         if (this.signalCache != signal) {
@@ -159,12 +159,12 @@ public void tick(Level level1, BlockPos blockPos) {
         }
     }
 
-    protected void moveItemToTransformingSlot() {
+    protected void moveItemFromInputSlot() {
         ItemStack stack = itemHandler.getStackInSlot(0).copy();
-        itemHandler.setStackInSlot(0, ItemStack.EMPTY);
         if (stack.isEmpty()) return;
         if (!itemHandler.getStackInSlot(1).isEmpty()) return;
 
+        itemHandler.setStackInSlot(0, ItemStack.EMPTY);
         powerRate = calcPowerRate();
         enchantments = getEnchantment();
 
@@ -227,7 +227,7 @@ protected int CalcCostPowerValue() {
         return (int) Math.ceil(powerFromEnchantments * powerRate);
     }
 
-    protected void moveItemToTransformedOverSlot() {
+    protected void moveItemToResultSlot() {
         powerValue = 0;
         ItemStack stack = itemHandler.getStackInSlot(1).copy();
         if (stack.isEmpty()) return;

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/adjustable_power_converter.md

@@ -0,0 +1,24 @@
+---
+navigation:
+  title: "可调式能量转换器"
+  icon: "anvilcraft_pigsplus:adjustable_power_converter"
+  position: 105
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:adjustable_power_converter
+---
+
+# 可调式能量转换器
+
+<ItemImage id="anvilcraft_pigsplus:adjustable_power_converter" scale="3"></ItemImage>
+
+# 合成
+
+<Recipe id="anvilcraft_pigsplus:adjustable_power_converter"></Recipe>
+
+# 功能
+
+- 按1kW ⇔ 80FE/t 转换能量(和本体一致，通过本体config调整) 
+- 可自选转换方向、能量转换量
+- 最大转换量8192kW
+- 拥有128MFE容量

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/auto_machine.md

@@ -0,0 +1,33 @@
+---
+navigation:
+  title: "自动加工机"
+  icon: "anvilcraft_pigsplus:auto_royal_smithing_table"
+  position: 102
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:auto_royal_smithing_table
+  - anvilcraft_pigsplus:auto_royal_grindstone
+  - anvilcraft_pigsplus:auto_jewel_crafting_table
+---
+
+# 自动加工机
+
+<Row>
+<ItemImage id="anvilcraft_pigsplus:auto_royal_smithing_table" scale="3"></ItemImage>
+<ItemImage id="anvilcraft_pigsplus:auto_royal_grindstone" scale="3"></ItemImage>
+<ItemImage id="anvilcraft_pigsplus:auto_jewel_crafting_table" scale="3"></ItemImage>
+</Row>
+
+# 合成
+
+<Row>
+<Recipe id="anvilcraft_pigsplus:auto_royal_smithing_table"></Recipe>
+<Recipe id="anvilcraft_pigsplus:auto_royal_grindstone"></Recipe>
+<Recipe id="anvilcraft_pigsplus:auto_jewel_crafting_table"></Recipe>
+</Row>
+
+# 特性
+
+- 工作耗能16kW
+- 收到红石信号时，进行一次工作
+- 将产物向上弹射或存放至上方的容器

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/block_breaker.md

@@ -0,0 +1,29 @@
+---
+navigation:
+  title: "方块破坏器"
+  icon: "anvilcraft_pigsplus:block_breaker"
+  position: 101
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:block_breaker
+---
+
+# 方块破坏器
+
+<ItemImage id="anvilcraft_pigsplus:block_breaker" scale="3"></ItemImage>
+
+> <ItemLink id="anvilcraft:block_devourer" />所需要的<ItemLink id="anvilcraft:block_devourer" />太过昂贵，
+> 而使用铁砧与<ItemLink id="minecraft:stonecutter" />的组合又过于复杂，都难以广泛运用，实际生产迫切地需要新型方块破坏手段
+
+# 合成
+
+<Recipe id="anvilcraft_pigsplus:block_breaker"></Recipe>
+
+# 功能
+
+类似于<ItemLink id="anvilcraft:block_placer" />
+
+- 尝试将掉落物放至身后
+- 可被红石或铁砧激活
+- 距离可被铁砧影响
+- [破坏受铁砧类型影响](./feature/anvil_destroy.md)

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/budding_echo_shard.md

@@ -0,0 +1,39 @@
+---
+navigation:
+  title: "回响母岩"
+  icon: "anvilcraft_pigsplus:budding_echo_shard"
+  position: 110
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:budding_echo_shard
+  - anvilcraft_pigsplus:echo_cluster
+---
+
+# 回响母岩
+
+<Row>
+<ItemImage id="anvilcraft_pigsplus:budding_echo_shard" scale="3"></ItemImage>
+<ItemImage id="anvilcraft_pigsplus:echo_cluster" scale="3"></ItemImage>
+<ItemImage id="minecraft:echo_shard" scale="3"></ItemImage>
+</Row>
+
+> 幽匿物质展现出了极强的转化性，但这一点却没有在回响碎片上得到体现，也许可以试着让它接触一些相似的晶体结构。
+> 而将紫水晶母岩在与回响碎片接触后，生成了一种被称为“回响母岩”的物质。其对周边物质具有强大的转化能力。
+
+# 合成
+
+<Recipe id="anvilcraft:item_inject/budding_echo_shard"></Recipe>
+
+# 功能
+
+## 生产回响碎片
+
+1. 将<ItemLink id="anvilcraft_pigsplus:budding_echo_shard" />放置于<ItemLink id="minecraft:amethyst_cluster" />之上
+2. <ItemLink id="minecraft:amethyst_cluster" />接收随机刻时，将其转化为<ItemLink id="anvilcraft_pigsplus:echo_cluster" />
+3. <ItemLink id="anvilcraft_pigsplus:echo_cluster" />被挖掘后固定掉落 1 个<ItemLink id="minecraft:echo_shard" />
+
+## 生产幽匿方块
+
+- 接收随机刻时，会尝试将4格以内的方块转化为<ItemLink id="minecraft:sculk" />并在其上概率生成幽匿系列方块
+
+> 可以用来制作经验农场

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/cauldron_output.md

@@ -0,0 +1,28 @@
+---
+navigation:
+  title: "炼药锅输出槽"
+  icon: "anvilcraft_pigsplus:cauldron_output"
+  position: 101
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:cauldron_output
+---
+
+# 炼药锅输出槽
+
+<ItemImage id="anvilcraft_pigsplus:cauldron_output" scale="3"></ItemImage>
+
+# 合成
+
+<Recipe id="anvilcraft_pigsplus:cauldron_output"></Recipe>
+
+# 功能
+
+- 贴在<ItemLink id="minecraft:cauldron" />上时，
+  - 输出制作完成的物品
+  - 如果炼药锅装满了流体，输出流体至下方空的<ItemLink id="minecraft:cauldron" />(如果有的话)
+- 贴在容器上时，可以喷出物品
+
+# 特性
+
+- 可以被红石信号关闭

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chain_smithing_table.md

@@ -0,0 +1,28 @@
+---
+navigation:
+  title: "连锁锻造台"
+  icon: "anvilcraft_pigsplus:chain_smithing_table"
+  position: 101
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:chain_smithing_table
+---
+
+# 连锁锻造台
+
+<Row>
+<ItemImage id="anvilcraft_pigsplus:chain_smithing_table" scale="3"></ItemImage>
+</Row>
+
+# 合成
+
+<Row>
+<Recipe id="anvilcraft_pigsplus:chain_smithing_table"></Recipe>
+</Row>
+
+# 功能
+
+- 可以同时放置最多四个模板和材料，将工具一键升到满级
+
+> 比如放进去一把 <ItemLink id="anvilcraft:anvil_hammer" />、3个等级的锻造模板、3种合金块。
+> 就能直接获得 <ItemLink id="anvilcraft:transcendence_anvil_hammer" />

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chaotic_raw_ore.md

@@ -0,0 +1,39 @@
+---
+navigation:
+  title: "混沌粗矿"
+  icon: "anvilcraft_pigsplus:chaotic_raw_ore"
+  position: 215
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:chaotic_raw_ore
+  - anvilcraft_pigsplus:deepslate_chaotic_ore
+  - anvilcraft_pigsplus:chaotic_raw_ore_block
+---
+# 混沌粗矿
+
+<Row>
+<ItemImage id="anvilcraft_pigsplus:chaotic_raw_ore" scale="3"></ItemImage>
+<ItemImage id="anvilcraft_pigsplus:deepslate_chaotic_ore" scale="3"></ItemImage>
+<ItemImage id="anvilcraft_pigsplus:chaotic_raw_ore_block" scale="3"></ItemImage>
+</Row>
+
+<NeoColor id="888888">通过一个<ItemLink id="anvilcraft:mineral_fountain" />，就可以获得8种金属</NeoColor>
+
+> 可以观察到，地核碎片矿是任何矿物的伴生矿。借助地核碎片对矿物的亲和性，将多种矿物杂糅在一起，并借助余烬锻造台的能力使其功能保持独立，就可以制造出可被熔炼为八种金属的物质
+
+# 合成
+
+<Row>
+<Recipe id="anvilcraft:eight_to_one_smithing/chaotic_raw_ore"></Recipe>
+<Recipe id="anvilcraft_pigsplus:chaotic_raw_ore_block"></Recipe>
+</Row>
+
+# 功能
+
+1. 通过一个<ItemLink id="anvilcraft:mineral_fountain" />量产<ItemLink id="anvilcraft_pigsplus:chaotic_raw_ore" />
+2. 高温熔炼
+
+<Row>
+<Recipe id="anvilcraft:super_heating/chaotic_raw_ore"></Recipe>
+<Recipe id="anvilcraft:super_heating/chaotic_raw_ore_and_earth_core_shard"></Recipe>
+</Row>

src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/electric_enchanting_table.md

@@ -0,0 +1,31 @@
+---
+navigation:
+  title: "电力附魔台"
+  icon: "anvilcraft_pigsplus:electric_enchanting_table"
+  position: 311
+  parent: anvilcraft_guideme:pigsplus.md
+item_ids:
+  - anvilcraft_pigsplus:electric_enchanting_table
+---
+
+# 电力附魔台
+
+<ItemImage id="anvilcraft_pigsplus:electric_enchanting_table" scale="3"></ItemImage>
+
+# 合成
+
+<Recipe id="anvilcraft_pigsplus:electric_enchanting_table"></Recipe>
+
+# 功能
+
+## 基本数值
+- 最大耗电量: 8192kW
+- 工作时间: 5s
+- 检测范围: 与附魔台相同
+- 检测范围内的每个<ItemLink id="minecraft:bookshelf" /> 6% 耗电需求[乘算叠加]
+
+## 工作过程
+1. 检测范围内的，<ItemLink id="minecraft:chiseled_bookshelf" />上的，附魔书的所有附魔
+2. 同种附魔取最高等级，随后尝试为物品附魔，耗电需求 = 128x+16x^2[x: 使用铁砧附加该附魔，所需的经验等级]
+3. 耗电需求为 0 或超过上限时，物品会被强制弹出
+4. 类似于<ItemLink id="anvilcraft:transcendence_anvil" />，如果物品已拥有同等级附魔，则升一级，且不会被冲突和等级限制