diff --git a/gradle.properties b/gradle.properties index 76824a8..85bcef9 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 658f03b..5210ac7 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index d2357c7..c413993 100644 --- a/gradle/scripts/dependencies.gradle +++ b/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) diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java index f34c5b5..7d36880 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java +++ b/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; diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/adjustable_power_converter.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/adjustable_power_converter.md new file mode 100644 index 0000000..ff5f595 --- /dev/null +++ b/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 +--- + +# 可调式能量转换器 + + + +# 合成 + + + +# 功能 + +- 按1kW ⇔ 80FE/t 转换能量(和本体一致，通过本体config调整) +- 可自选转换方向、能量转换量 +- 最大转换量8192kW +- 拥有128MFE容量 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/auto_machine.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/auto_machine.md new file mode 100644 index 0000000..26dcead --- /dev/null +++ b/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 +--- + +# 自动加工机 + + + + + + + +# 合成 + + + + + + + +# 特性 + +- 工作耗能16kW +- 收到红石信号时，进行一次工作 +- 将产物向上弹射或存放至上方的容器 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/block_breaker.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/block_breaker.md new file mode 100644 index 0000000..deb21d3 --- /dev/null +++ b/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 +--- + +# 方块破坏器 + + + +> 所需要的太过昂贵， +> 而使用铁砧与的组合又过于复杂，都难以广泛运用，实际生产迫切地需要新型方块破坏手段 + +# 合成 + + + +# 功能 + +类似于 + +- 尝试将掉落物放至身后 +- 可被红石或铁砧激活 +- 距离可被铁砧影响 +- [破坏受铁砧类型影响](./feature/anvil_destroy.md) diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/budding_echo_shard.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/budding_echo_shard.md new file mode 100644 index 0000000..d2312bb --- /dev/null +++ b/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 +--- + +# 回响母岩 + + + + + + + +> 幽匿物质展现出了极强的转化性，但这一点却没有在回响碎片上得到体现，也许可以试着让它接触一些相似的晶体结构。 +> 而将紫水晶母岩在与回响碎片接触后，生成了一种被称为“回响母岩”的物质。其对周边物质具有强大的转化能力。 + +# 合成 + + + +# 功能 + +## 生产回响碎片 + +1. 将放置于之上 +2. 接收随机刻时，将其转化为 +3. 被挖掘后固定掉落 1 个 + +## 生产幽匿方块 + +- 接收随机刻时，会尝试将4格以内的方块转化为并在其上概率生成幽匿系列方块 + +> 可以用来制作经验农场 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/cauldron_output.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/cauldron_output.md new file mode 100644 index 0000000..208aa42 --- /dev/null +++ b/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 +--- + +# 炼药锅输出槽 + + + +# 合成 + + + +# 功能 + +- 贴在上时， + - 输出制作完成的物品 + - 如果炼药锅装满了流体，输出流体至下方空的(如果有的话) +- 贴在容器上时，可以喷出物品 + +# 特性 + +- 可以被红石信号关闭 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chain_smithing_table.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chain_smithing_table.md new file mode 100644 index 0000000..624cf8e --- /dev/null +++ b/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 +--- + +# 连锁锻造台 + + + + + +# 合成 + + + + + +# 功能 + +- 可以同时放置最多四个模板和材料，将工具一键升到满级 + +> 比如放进去一把 、3个等级的锻造模板、3种合金块。 +> 就能直接获得 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chaotic_raw_ore.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/chaotic_raw_ore.md new file mode 100644 index 0000000..184f12d --- /dev/null +++ b/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 +--- +# 混沌粗矿 + + + + + + + +通过一个，就可以获得8种金属 + +> 可以观察到，地核碎片矿是任何矿物的伴生矿。借助地核碎片对矿物的亲和性，将多种矿物杂糅在一起，并借助余烬锻造台的能力使其功能保持独立，就可以制造出可被熔炼为八种金属的物质 + +# 合成 + + + + + + +# 功能 + +1. 通过一个量产 +2. 高温熔炼 + + + + + \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/electric_enchanting_table.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/electric_enchanting_table.md new file mode 100644 index 0000000..ada80a4 --- /dev/null +++ b/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 +--- + +# 电力附魔台 + + + +# 合成 + + + +# 功能 + +## 基本数值 +- 最大耗电量: 8192kW +- 工作时间: 5s +- 检测范围: 与附魔台相同 +- 检测范围内的每个 6% 耗电需求[乘算叠加] + +## 工作过程 +1. 检测范围内的，上的，附魔书的所有附魔 +2. 同种附魔取最高等级，随后尝试为物品附魔，耗电需求 = 128x+16x^2[x: 使用铁砧附加该附魔，所需的经验等级] +3. 耗电需求为 0 或超过上限时，物品会被强制弹出 +4. 类似于，如果物品已拥有同等级附魔，则升一级，且不会被冲突和等级限制 diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/enchanted_generator.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/enchanted_generator.md new file mode 100644 index 0000000..8391099 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/enchanted_generator.md @@ -0,0 +1,36 @@ +--- +navigation: + title: "附魔发电机" + icon: "anvilcraft_pigsplus:enchanted_generator" + position: 205 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:enchanted_generator +--- + +# 附魔发电机 + + + +# 合成 + + + +# 功能 + +- 工作范围：以自己为中心3x3x3 +- 可以识别工作范围内的，上的附魔书 + +## 常规工作模式 + +- 每级附魔提供 2kW 能量 +- 最大发电量：1024kW +- 不消耗附魔书 + +## 超频工作模式 + +*常规工作模式*下，附魔能提供的能量超过常规最大发电量 100kW ，即达到 1124kW 后，进入*超频工作模式* + +- 每级附魔提供 4kW 能量 +- 最大发电量：32768kW +- 吞噬附魔书，吞噬间隔和发电量成反比，发电达到上限时为10s \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/ender_component.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/ender_component.md new file mode 100644 index 0000000..f6e3ad0 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/ender_component.md @@ -0,0 +1,20 @@ +--- +navigation: + title: "末影部件" + icon: "anvilcraft_pigsplus:ender_component" + position: 210 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:ender_component +--- + +# 末影部件 + + + +空间，不再是阻碍 + +# 获得 + + +另一种方法是将丢入末地传送门，有 50% 概率获得 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/karakuri_component.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/karakuri_component.md new file mode 100644 index 0000000..4585150 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/karakuri_component.md @@ -0,0 +1,19 @@ +--- +navigation: + title: "机巧部件" + icon: "anvilcraft_pigsplus:karakuri_component" + position: 100 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:karakuri_component +--- + +# 机巧部件 + + + +> 机巧部件具有优秀的红石传导能力与结构强度，被广泛用于智能生产设备中 + +# 合成 + + \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/pigsplus.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/pigsplus.md new file mode 100644 index 0000000..f5f3260 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/pigsplus.md @@ -0,0 +1,10 @@ +--- +navigation: + title: "铁砧工艺：猪+" + icon: "anvilcraft_pigsplus:karakuri_component" + position: 101 +--- + +# 铁砧工艺：猪+ + +你好！这里是大猪 diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/portable_wireless_charger.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/portable_wireless_charger.md new file mode 100644 index 0000000..fb850fe --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/portable_wireless_charger.md @@ -0,0 +1,25 @@ +--- +navigation: + title: "便携无限充电器" + icon: "anvilcraft_pigsplus:portable_wireless_charger" + position: 105 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:portable_wireless_charger +--- + +# 便携无限充电器 + + + +# 合成 + + + +# 功能 + +- 放在玩家的背包中即可生效，最多同时生效1个 +- 如果玩家处于砧艺的电网中，持续消耗 512kW +- 持续为玩家背包中的FE物品充能 40960FE/t + +> 按1kW ⇒ 80FE/t 转换能量(和本体一致，通过本体config调整) \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/resdtone_conduit.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/resdtone_conduit.md new file mode 100644 index 0000000..4ceac07 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/resdtone_conduit.md @@ -0,0 +1,23 @@ +--- +navigation: + title: "红石传导块" + icon: "anvilcraft_pigsplus:redstone_conduit_block" + position: 101 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:redstone_conduit_block +--- + +# 红石传导块 + + + +> 机巧部件具有良好的红石传导性，如果使用一个方块将它们支撑起来，也许可以获得一个可以传递信号的方块 + +# 合成 + + + +# 功能 + +- 方块状的红石粉，可以以任意形状链接 diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/sculk_extractor.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/sculk_extractor.md new file mode 100644 index 0000000..66860b9 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/sculk_extractor.md @@ -0,0 +1,31 @@ +--- +navigation: + title: "幽匿萃取体" + icon: "anvilcraft_pigsplus:sculk_extractor" + position: 201 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:sculk_extractor +--- + +# 幽匿萃取体 + + + +可以吸收幽匿方块，释放大量经验 + +> 通过逆向研究幽匿催发体的机理构造，幽匿萃取体被制作出来，能够将幽匿块反向转化为经验球 + +# 获得 + + + +# 功能 + +- 吞噬距离7以内相连接的幽匿类方块，根据数量生成经验 +- 提供的经验更多(50倍) +- 可以参与连接，但不会被吞噬，也不产出经验 + +# 相关 + +- \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/spiritual_component.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/spiritual_component.md new file mode 100644 index 0000000..07e2e1a --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/spiritual_component.md @@ -0,0 +1,20 @@ +--- +navigation: + title: "灵媒部件" + icon: "anvilcraft_pigsplus:spiritual_component" + position: 200 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:spiritual_component +--- + +# 灵媒部件 + + + +机魂大悦 + +# 获得 + +携带附魔的被摧毁时，每条附魔提供 25% 的概率， +生成最多一个 \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/weak_resin_block.md b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/weak_resin_block.md new file mode 100644 index 0000000..e146976 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_guideme/anvilcraft_guideme/weak_resin_block.md @@ -0,0 +1,24 @@ +--- +navigation: + title: "虚弱树脂块" + icon: "anvilcraft_pigsplus:weak_resin_block" + position: 5 + parent: anvilcraft_guideme:pigsplus.md +item_ids: + - anvilcraft_pigsplus:weak_resin_block +--- + +# 虚弱树脂块 + + + +# 合成 + + + +# 功能 + +提供更加便捷的抓捕过程，具有的所有功能 + +- 可以直接抓捕中立和敌对生物，**不再需要**预先施加虚弱效果 +- 掉落在上面会获得 5s 的*虚弱*效果 \ No newline at end of file