diff --git a/config/modularmachinery/machinery/philostone.json b/config/modularmachinery/machinery/philostone.json new file mode 100644 index 00000000..3d58735b --- /dev/null +++ b/config/modularmachinery/machinery/philostone.json @@ -0,0 +1,425 @@ +{ + "registryname": "philostone", + "localizedname": "ia.machine.philostone.name", + "requires-blueprint": false, + "color": "842671", + "modifiers": [ + { + "elements": "calculator:material@6", + "x": 0, + "y": 2, + "z": 0, + "description": "ia.philostone_1", + "modifier": { + "target": "modularmachinery:item", + "io": "output", + "operation": 1, + "multiplier": 1.1 + } + }, + { + "elements": "actuallyadditions:block_crystal_empowered@0", + "x": 0, + "y": 2, + "z": 0, + "description": "ia.philostone_2", + "modifier": { + "target": "modularmachinery:item", + "io": "input", + "operation": 1, + "multiplier": 0.85 + } + }, + { + "elements": "twilightforest:block_storage@4", + "x": 0, + "y": 2, + "z": 0, + "description": "ia.philostone_3", + "modifier": { + "target": "modularmachinery:duration", + "io": "input", + "operation": 1, + "multiplier": 0.5 + } + } + ], + "parts": [ + { + "x": 2, + "y": 3, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 3, + "z": -2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 3, + "z": 2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 3, + "y": 1, + "z": 0, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 3, + "y": 0, + "z": 0, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": 0, + "y": 4, + "z": -1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 4, + "z": 0, + "elements": [ + "modularmachinery:blockoutputbus", + "modularmachinery:blockfluidoutputhatch" + ] + }, + { + "x": 0, + "y": 4, + "z": 1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -2, + "y": 1, + "z": 2, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": -2, + "y": 1, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -1, + "y": 4, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 2, + "z": 2, + "elements": [ + "botania:blazeblock@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 2, + "y": 1, + "z": 2, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 0, + "y": 2, + "z": -2, + "elements": [ + "botania:blazeblock@0" + ] + }, + { + "x": 2, + "y": 1, + "z": -2, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 0, + "y": 2, + "z": 0, + "elements": [ + "jaopca:block.ruby@0" + ] + }, + { + "x": -3, + "y": 0, + "z": 0, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": -2, + "y": 3, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 0, + "z": 3, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": -2, + "y": 0, + "z": 2, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": 0, + "y": 0, + "z": -1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 1, + "z": -3, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 0, + "y": 0, + "z": 1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -2, + "y": 1, + "z": -2, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 1, + "y": 2, + "z": 2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 0, + "y": 0, + "z": -3, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": -1, + "y": 2, + "z": -2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 1, + "y": 2, + "z": -2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -2, + "y": 0, + "z": -2, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": -1, + "y": 2, + "z": 2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 1, + "y": 4, + "z": 0, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 2, + "y": 2, + "z": -1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 0, + "elements": [ + "botania:blazeblock@0" + ] + }, + { + "x": 2, + "y": 2, + "z": 1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -2, + "y": 2, + "z": 0, + "elements": [ + "botania:blazeblock@0" + ] + }, + { + "x": 2, + "y": 0, + "z": -2, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": 0, + "y": 1, + "z": -2, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -2, + "y": 2, + "z": -1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": -3, + "y": 1, + "z": 0, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": -2, + "y": 2, + "z": 1, + "elements": [ + "chisel:voidstone@0" + ] + }, + { + "x": 2, + "y": 0, + "z": 2, + "elements": [ + "chisel:voidstone@7" + ] + }, + { + "x": 0, + "y": 1, + "z": 3, + "elements": [ + "chisel:voidstone@2", + "modularmachinery:blockinputbus" + ] + }, + { + "x": 0, + "y": 1, + "z": 2, + "elements": [ + "chisel:voidstone@0" + ] + } + ]} \ No newline at end of file diff --git a/config/modularmachinery/machinery/washer.json b/config/modularmachinery/machinery/washer.json index c1da23b2..399ac687 100644 --- a/config/modularmachinery/machinery/washer.json +++ b/config/modularmachinery/machinery/washer.json @@ -3,28 +3,191 @@ "localizedname": "ia.machine.washer.name", "requires-blueprint": false, "color": "FFFFFF", + "dynamic-patterns": [ + { + "name": "line", + "faces": [ + "north" + ], + "minSize": 1, + "maxSize": 8, + "parts": [ + { + "x": 0, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 1, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockoutputbus" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockfluidinputhatch", + "modularmachinery:blockfluidoutputhatch" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockfluidinputhatch", + "modularmachinery:blockfluidoutputhatch" + ] + }, + { + "x": -1, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockinputbus" + ] + }, + { + "x": -1, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockoutputbus" + ] + } + ], + "parts-end": [ + { + "x": 0, + "y": 0, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockparallelcontroller" + ] + }, + { + "x": 0, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockenergyinputhatch" + ] + }, + { + "x": 1, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": -1, + "y": 0, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": -1, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 1, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + }, + { + "x": 0, + "y": 1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0", + "modularmachinery:blockenergyinputhatch" + ] + }, + { + "x": -1, + "y": -1, + "z": 0, + "elements": [ + "ceramics:clay_hard@0" + ] + } + ], + "structure-size-offset-start": { + "x": 0, + "y": 0, + "z": 1 + }, + "structure-size-offset": { + "x": 0, + "y": 0, + "z": 1 + } + } + ], "parts": [ { - "x": -1, - "y": 0, - "z": 2, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": 0, - "z": 1, + "x": 0, + "y": -1, + "z": 0, "elements": [ - "modularmachinery:blockfluidinputhatch", - "ceramics:clay_hard@0" + "ceramics:clay_hard@0", + "modularmachinery:blockupgradebus", + "modularmachinery:blockenergyinputhatch" ] }, { "x": 1, - "y": 0, - "z": 2, + "y": -1, + "z": 0, "elements": [ "ceramics:clay_hard@0" ] @@ -37,15 +200,6 @@ "ceramics:clay_hard@0" ] }, - { - "x": 1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockfluidinputhatch", - "ceramics:clay_hard@0" - ] - }, { "x": 1, "y": 0, @@ -55,7 +209,7 @@ ] }, { - "x": 1, + "x": -1, "y": 1, "z": 0, "elements": [ @@ -65,65 +219,6 @@ { "x": 1, "y": 1, - "z": 2, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": 1, - "y": 1, - "z": 1, - "elements": [ - "modularmachinery:blockenergyinputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": -1, - "z": 1, - "elements": [ - "modularmachinery:blockfluidoutputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": -1, - "z": 2, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 2, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 1, - "elements": [ - "modularmachinery:blockenergyinputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 0, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": -1, - "y": -1, "z": 0, "elements": [ "ceramics:clay_hard@0" @@ -131,88 +226,19 @@ }, { "x": 0, - "y": 0, - "z": 2, - "elements": [ - "modularmachinery:blockfluidinputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": 0, - "y": -1, - "z": 1, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": 1, - "y": -1, - "z": 2, - "elements": [ - "ceramics:clay_hard@0" - ] - }, - { - "x": 1, - "y": -1, - "z": 1, - "elements": [ - "modularmachinery:blockfluidoutputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": 0, - "y": -1, - "z": 0, - "elements": [ - "modularmachinery:blockoutputbus", - "ceramics:clay_hard@0" - ] - }, - { - "x": 1, - "y": -1, + "y": 1, "z": 0, "elements": [ - "ceramics:clay_hard@0" + "ceramics:clay_hard@0", + "modularmachinery:blockupgradebus", + "modularmachinery:blockenergyinputhatch" ] }, { - "x": 0, + "x": -1, "y": -1, - "z": 2, - "elements": [ - "modularmachinery:blockoutputbus", - "ceramics:clay_hard@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 1, - "elements": [ - "modularmachinery:blockinputbus", - "ceramics:clay_hard@0" - ] - }, - { - "x": 0, - "y": 1, "z": 0, "elements": [ - "modularmachinery:blockenergyinputhatch", - "ceramics:clay_hard@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 2, - "elements": [ - "modularmachinery:blockenergyinputhatch", "ceramics:clay_hard@0" ] } diff --git a/resources/modularmachinery/lang/zh_cn.lang b/resources/modularmachinery/lang/zh_cn.lang index 7eac568d..61af2779 100644 --- a/resources/modularmachinery/lang/zh_cn.lang +++ b/resources/modularmachinery/lang/zh_cn.lang @@ -1,26 +1,35 @@ -//machines -modularmachinery.aspect_infuser=源质注入器 -modularmachinery.mana_converter=魔能转换器 -modularmachinery.ebf=电力高炉 -modularmachinery.freezer=真空冷冻机 -modularmachinery.magnetizer=磁化机 -modularmachinery.mixer=混合器 -modularmachinery.melter=融化器 -modularmachinery.aether_amplifier=天境增幅器 -modularmachinery.ae_crafter=应用合成器 -modularmachinery.arcane_crafter=辉耀合成器 -modularmachinery.fusion_computer=聚变控制计算机 -modularmachinery.adv_coke_oven=高级焦炉 -modularmachinery.mana_zoom=聚魔焦镜 -modularmachinery.wind_tunnel=风洞舱 -modularmachinery.washer=陶瓷浸洗瓮 -modularmachinery.lightning_infuser=大型雷电灌注器 -modularmachinery.psi_converter=§bψ§r转换器§bψ§r - -//modifiers -ia.aspect_infuser.speed=§b可以加快§e25%§b的制作速度§r,可叠加 -ia.mana_zoom.time=§b可以缩短§e25%§b的冷却时间§r,可叠加 -ia.mana_zoom.mana=§b可以提升§e25%§b的魔力聚焦量§r,可叠加 -ia.washer.water=§b可以降低§e20%§b的用水量§r,可叠加 -ia.wind_tunnel.boost1=§b可以提高§e25%§b的发电量§r,可叠加 -ia.wind_tunnel.boost2=§b可以提高§e50%§b的发电量§r,可叠加 \ No newline at end of file +//machines +modularmachinery.aspect_infuser=源质注入器 +modularmachinery.mana_converter=魔能转换器 +modularmachinery.ebf=电力高炉 +modularmachinery.freezer=真空冷冻机 +modularmachinery.magnetizer=磁化机 +modularmachinery.mixer=混合器 +modularmachinery.melter=融化器 +modularmachinery.aether_amplifier=天境增幅器 +modularmachinery.ae_crafter=应用合成器 +modularmachinery.arcane_crafter=辉耀合成器 +modularmachinery.fusion_computer=聚变控制计算机 +modularmachinery.adv_coke_oven=高级焦炉 +modularmachinery.mana_zoom=聚魔焦镜 +modularmachinery.wind_tunnel=风洞舱 +modularmachinery.washer=陶瓷浸洗瓮 +modularmachinery.lightning_infuser=大型雷电灌注器 +modularmachinery.psi_converter=§bψ§r转换器§bψ§r +modularmachinery.philostone=§5虚空贤者之石 + +//modifiers +ia.aspect_infuser.speed=§b可以加快§e25%§b的制作速度§r,可叠加 +ia.mana_zoom.time=§b可以缩短§e25%§b的冷却时间§r,可叠加 +ia.mana_zoom.mana=§b可以提升§e25%§b的魔力聚焦量§r,可叠加 +ia.washer.water=§b可以降低§e20%§b的用水量§r,可叠加 +ia.washer.efficiency=§b可以加快§e20%§b的清洗速度§r,可叠加 +ia.washer.itemout=§b可以增产§e10%§r,可叠加 +ia.washer.energy=§b可以节能§e15%§r,可叠加 +ia.wind_tunnel.boost1=§b可以提高§e25%§b的发电量§r,可叠加 +ia.wind_tunnel.boost2=§b可以提高§e50%§b的发电量§r,可叠加 + +//modifiers_block(实测并没有汉化成功) +ia.philostone_1=§b替换成此方块时提高§e10%§b产率 +ia.philostone_2=§b替换成此方块时降低§e15%§b消耗 +ia.philostone_3=§b替换成此方块时提高§e50%§b速度 diff --git a/scripts/recipes/multiblock/philostone.zs b/scripts/recipes/multiblock/philostone.zs new file mode 100644 index 00000000..bb217389 --- /dev/null +++ b/scripts/recipes/multiblock/philostone.zs @@ -0,0 +1,36 @@ +#reloadable +import mods.modularmachinery.RecipeBuilder; +import mods.modularmachinery.RecipePrimer; +import mods.modularmachinery.IngredientArrayBuilder; +import mods.modularmachinery.RecipeModifierBuilder; + +RecipeBuilder.newBuilder("philostone_1", "philostone", 100) + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemOutputs(*8) + .build(); + +RecipeBuilder.newBuilder("philostone_2", "philostone", 20) + .addItemInputs() + .addItemOutputs() + .build(); + +RecipeBuilder.newBuilder("philostone_3", "philostone", 20) + .addItemInputs(*2) + .addItemOutputs() + .build(); + +RecipeBuilder.newBuilder("philostone_4", "philostone", 200) + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addItemInputs() + .addFluidOutput(*5000) + .build(); \ No newline at end of file diff --git a/scripts/recipes/multiblock/washer.zs b/scripts/recipes/multiblock/washer.zs index 5ebef557..aa0b25c6 100644 --- a/scripts/recipes/multiblock/washer.zs +++ b/scripts/recipes/multiblock/washer.zs @@ -6,8 +6,14 @@ import mods.modularmachinery.RecipeModifierBuilder; val water = RecipeModifierBuilder.create("modularmachinery:fluid", "input", 0.80, 1, false).build(); val description_1 = game.localize("ia.washer.water"); +val efficiency = RecipeModifierBuilder.create("modularmachinery:duration", "input", 0.80, 1, false).build(); +val description_2 = game.localize("ia.washer.efficiency"); //此催化剂可以加快20%的清洗速度(递减乘算) +val itemout = RecipeModifierBuilder.create("modularmachinery:item", "output", 1.1, 1, false).build(); +val description_3 = game.localize("ia.washer.itemout"); //此催化剂可以增产10% +val energy = RecipeModifierBuilder.create("modularmachinery:energy", "input", 0.85, 1, false).build(); +val description_4 = game.localize("ia.washer.energy"); //此催化剂可以节能15% -RecipeBuilder.newBuilder("washer_1", "washer", 60) +RecipeBuilder.newBuilder("washer_1", "washer", 100) .addCatalystInput(, [description_1], [water]).setChance(0) @@ -20,6 +26,27 @@ RecipeBuilder.newBuilder("washer_1", "washer", 60) .addCatalystInput(, [description_1], [water]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0.01) + .addCatalystInput(, + [description_3], + [itemout]).setChance(0) + .addCatalystInput(, + [description_4], + [energy]).setChance(0) .addFluidInput(*160) .addItemInputs() .addEnergyPerTickInput(40) @@ -35,7 +62,7 @@ RecipeBuilder.newBuilder("washer_1", "washer", 60) .addItemOutputs().setChance(0.12) .build(); -RecipeBuilder.newBuilder("washer_2", "washer", 60) +RecipeBuilder.newBuilder("washer_2", "washer", 100) .addCatalystInput(, [description_1], [water]).setChance(0) @@ -48,6 +75,27 @@ RecipeBuilder.newBuilder("washer_2", "washer", 60) .addCatalystInput(, [description_1], [water]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0) + .addCatalystInput(, + [description_2], + [efficiency]).setChance(0.01) + .addCatalystInput(, + [description_3], + [itemout]).setChance(0) + .addCatalystInput(, + [description_4], + [energy]).setChance(0) .addFluidInput(*320) .addItemInputs() .addEnergyPerTickInput(60)