diff --git a/groovy/loader/recipe/BetterQuesting.groovy b/groovy/loader/recipe/BetterQuesting.groovy index 5cbc883..3db7fac 100644 --- a/groovy/loader/recipe/BetterQuesting.groovy +++ b/groovy/loader/recipe/BetterQuesting.groovy @@ -1,5 +1,3 @@ -package recipe - log.info("Starting to load BetterQuesting Recipes...") // Questbook diff --git a/groovy/loader/recipe/Chisel.groovy b/groovy/loader/recipe/Chisel.groovy index fdec4e3..9f85109 100644 --- a/groovy/loader/recipe/Chisel.groovy +++ b/groovy/loader/recipe/Chisel.groovy @@ -91,9 +91,4 @@ mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:pa mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 463)) // Fluid mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 467)) // Light mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 469)) // FE -mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 470)) // GTEU - -// Bedrock -mods.chisel.carving.addGroup(bedrock_group) -mods.chisel.carving.addVariation(bedrock_group, item('minecraft:bedrock')) -mods.chisel.carving.addVariation(bedrock_group, item('gtlitecore:meta_block_compressed_135', 12)) \ No newline at end of file +mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 470)) // GTEU \ No newline at end of file diff --git a/groovy/loader/recipe/GregTechLiteCore.groovy b/groovy/loader/recipe/GregTechLiteCore.groovy index 457bec3..206cdde 100644 --- a/groovy/loader/recipe/GregTechLiteCore.groovy +++ b/groovy/loader/recipe/GregTechLiteCore.groovy @@ -5,6 +5,7 @@ import static util.GroovyUtil.* log.info("Starting to load GregTechLiteCore Recipes...") /* -------------------------------------------------------------------------- */ +def vacuum_chamber = recipemap('vacuum_chamber') def wiremill = recipemap('wiremill') /* -------------------------------------------------------------------------- */ @@ -12,12 +13,12 @@ def wiremill = recipemap('wiremill') crafting.addShapeless(item('minecraft:string') * 4, [item('gtlitecore:gtlite_meta_item_2', 219)]) // Cotton wiremill.recipeBuilder() - .circuitMeta(1) - .inputs(item('gtlitecore:gtlite_meta_item_2', 219)) // Cotton - .outputs(item('minecraft:string') * 4) - .EUt(7) // ULV - .duration(2 * TICK) - .buildAndRegister() + .circuitMeta(1) + .inputs(item('gtlitecore:gtlite_meta_item_2', 219)) // Cotton + .outputs(item('minecraft:string') * 4) + .EUt(7) // ULV + .duration(2 * TICK) + .buildAndRegister() // Drain crafting.removeByOutput(item('gtlitecore:gtlite_meta_item_1', 116)) @@ -30,4 +31,12 @@ crafting.shapedBuilder() .key('P', ore('pipeSmallFluidSteel')) .key('I', ore('barsIron')) .output(item('gtlitecore:gtlite_meta_item_1', 116)) - .register() \ No newline at end of file + .register() + +// Bedrock convert +vacuum_chamber.recipeBuilder() + .inputs(item('gtlitecore:meta_block_compressed_135', 12)) // Bedrockium block + .outputs(item('minecraft:bedrock')) + .EUt(VA[LV]) + .duration(5 * SECOND) + .buildAndRegister() diff --git a/index.toml b/index.toml index 07eaddd..c0ccbbf 100644 --- a/index.toml +++ b/index.toml @@ -2498,7 +2498,7 @@ hash = "e8d85f0a56bc9f5222ffb10068bbb9b2b590cc99b9898d16a8cf172ec4ea96d3" [[files]] file = "groovy/loader/recipe/BetterQuesting.groovy" -hash = "b8c4badc0c0f911363959230afab9c6a73c91f69cc11e4d9568c84e337063b05" +hash = "6ce2cb739e70b90e100574444759bfc77b2fefc8d0efd332c176db79b2d722c9" [[files]] file = "groovy/loader/recipe/BuildingGadgets.groovy" @@ -2506,7 +2506,7 @@ hash = "3634d1052d476d56f5948d61b1794db0dba092f7866378ef3e8cd3728f1eaa62" [[files]] file = "groovy/loader/recipe/Chisel.groovy" -hash = "55327d614d51879e1ee8c9e2382edae4dd7ba8d791c6b992e75977ec048fa5b7" +hash = "e5863761e759edd2b379e83177c29f1c411783eca784ef615192000dd2f0d7d6" [[files]] file = "groovy/loader/recipe/EnderCore.groovy" @@ -2534,7 +2534,7 @@ hash = "06c481d3c123a6a035354614d37054294744513ba19c4a7f6650c9ca4f337212" [[files]] file = "groovy/loader/recipe/GregTechLiteCore.groovy" -hash = "4bad8115cfabf14320ddddcb23d38ff200319a874cd20fd96b42ce922b89f01d" +hash = "0977a33355ae33c85613e16d60cdf0c1045daa5a6c8365114e0ee86898a267b2" [[files]] file = "groovy/loader/recipe/JustEnoughItems.groovy" @@ -2796,7 +2796,7 @@ metafile = true [[files]] file = "mods/gtlitecore-1.0.0.jar" -hash = "cd892cd0a7134fa641262aa1d1a60da97bffd121eef83518c96fbdd51f48ff01" +hash = "7211165b210115ae714347056f7e6d325efd6c9bea4ff5cb99d0ea652b19bc4a" [[files]] file = "mods/had-enough-characters.pw.toml" diff --git a/mods/gtlitecore-1.0.0.jar b/mods/gtlitecore-1.0.0.jar index 3941d05..9600e80 100644 Binary files a/mods/gtlitecore-1.0.0.jar and b/mods/gtlitecore-1.0.0.jar differ diff --git a/pack.toml b/pack.toml index 7889b2a..a9cf767 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "d04c80beeaf7edd82614c9ec7d1337e5b274c0366b037e9f21471614cf3d4b95" +hash = "74b1849162520950fed433df68719964b8fac97899843d8d9ef9010341c7adc5" [versions] forge = "14.23.5.2860"