diff --git a/web/index.toml b/web/index.toml index ccb0597..deafebb 100644 --- a/web/index.toml +++ b/web/index.toml @@ -1176,17 +1176,37 @@ hash = "1219965b228f2e88f924b8aecd6115bce3e2e1d110bc49c91dd8efd7e02fecd7" file = "kubejs/config/common.properties" hash = "c76aeac807af0348d65392c8a7f89ad07c7b90cde8b9e036b0126f199b53d0a9" +[[files]] +file = "kubejs/data/createsifter/recipes/sifting/desh_brass.json" +hash = "4a1a18a59f79c6a7fe6c49c300843a2b06721f2fac60aed1a2a6cc8c29c58d1a" + +[[files]] +file = "kubejs/data/createsifter/recipes/sifting/end_brass.json" +hash = "ddf982b944f5236a88c04fb1d760066acf0c947c13e9dcd3ebb1a043a1b14a3f" + +[[files]] +file = "kubejs/data/createsifter/recipes/sifting/moon_desh_brass.json" +hash = "7fa8e33102e4f8b8d94615965183425ca370049d93041817bce0a7d0ed870285" + +[[files]] +file = "kubejs/data/createsifter/recipes/sifting/quartz_brass.json" +hash = "914759c603906719ce4cc6d72b159e74c9556af1b3c5ef8f1c23198a8a6d506d" + +[[files]] +file = "kubejs/data/createsifter/recipes/sifting/quartz_zinc.json" +hash = "731030953f12a1628006588618541415ed2ed5e32a1562c51b43c15083dc2123" + [[files]] file = "kubejs/server_scripts/base.js" hash = "a19b7c81a150bd965b153ded9c45ee7649eaad9e10d0a5ec1d662e7b15ceadb2" [[files]] file = "kubejs/server_scripts/mechanical-extruder.js" -hash = "2e0d84a07ac20ee106f31b0dc7981bb00119277ba6ca4f180c05eb2b973c1cc7" +hash = "8b84dacce605e69cf345fecc3493fbbdbf235b02d74b6256ac2cb8256b0c12b8" [[files]] file = "kubejs/server_scripts/sifter.js" -hash = "2c25a4bb1a29434ccec4053331bca8569f9302f59a4900117356a6eaf4c5c59b" +hash = "84398646f81e5b6e7cab8d86f177e6b79b0c6df4f073dcabb6c9237856e7e4d2" [[files]] file = "kubejs/startup_scripts/sifter.js" diff --git a/web/kubejs/data/createsifter/recipes/sifting/desh_brass.json b/web/kubejs/data/createsifter/recipes/sifting/desh_brass.json new file mode 100644 index 0000000..7a930a1 --- /dev/null +++ b/web/kubejs/data/createsifter/recipes/sifting/desh_brass.json @@ -0,0 +1,26 @@ +{ + "type": "createsifter:sifting", + "ingredients": [ + { + "item": "createsifter:brass_mesh" + }, + { + "item": "minecraft:deepslate" + } + ], + "processingTime": 500, + "results": [ + { + "chance": 0.2, + "item": "ad_astra:desh_nugget" + }, + { + "chance": 0.1, + "item": "ad_astra:ostrum_nugget" + }, + { + "chance": 0.05, + "item": "ad_astra:calorite_nugget" + } + ] + } \ No newline at end of file diff --git a/web/kubejs/data/createsifter/recipes/sifting/end_brass.json b/web/kubejs/data/createsifter/recipes/sifting/end_brass.json new file mode 100644 index 0000000..c5031e2 --- /dev/null +++ b/web/kubejs/data/createsifter/recipes/sifting/end_brass.json @@ -0,0 +1,22 @@ +{ + "type": "createsifter:sifting", + "ingredients": [ + { + "item": "createsifter:brass_mesh" + }, + { + "item": "minecraft:end_stone" + } + ], + "processingTime": 500, + "results": [ + { + "chance": 0.3, + "item": "minecraft:chorus_fruit" + }, + { + "chance": 0.05, + "item": "minecraft:ender_pearl" + } + ] + } \ No newline at end of file diff --git a/web/kubejs/data/createsifter/recipes/sifting/moon_desh_brass.json b/web/kubejs/data/createsifter/recipes/sifting/moon_desh_brass.json new file mode 100644 index 0000000..867b150 --- /dev/null +++ b/web/kubejs/data/createsifter/recipes/sifting/moon_desh_brass.json @@ -0,0 +1,26 @@ +{ + "type": "createsifter:sifting", + "ingredients": [ + { + "item": "createsifter:brass_mesh" + }, + { + "item": "ad_astra:moon_sand" + } + ], + "processingTime": 500, + "results": [ + { + "chance": 0.5, + "item": "ad_astra:desh_nugget" + }, + { + "chance": 0.3, + "item": "ad_astra:ostrum_nugget" + }, + { + "chance": 0.1, + "item": "ad_astra:calorite_nugget" + } + ] + } \ No newline at end of file diff --git a/web/kubejs/data/createsifter/recipes/sifting/quartz_brass.json b/web/kubejs/data/createsifter/recipes/sifting/quartz_brass.json new file mode 100644 index 0000000..ebb5eba --- /dev/null +++ b/web/kubejs/data/createsifter/recipes/sifting/quartz_brass.json @@ -0,0 +1,26 @@ +{ + "type": "createsifter:sifting", + "ingredients": [ + { + "item": "createsifter:brass_mesh" + }, + { + "item": "minecraft:soul_sand" + } + ], + "processingTime": 500, + "results": [ + { + "chance": 0.4, + "item": "minecraft:quartz" + }, + { + "chance": 0.3, + "item": "minecraft:blaze_powder" + }, + { + "chance": 0.05, + "item": "minecraft:ghast_tear" + } + ] + } \ No newline at end of file diff --git a/web/kubejs/data/createsifter/recipes/sifting/quartz_zinc.json b/web/kubejs/data/createsifter/recipes/sifting/quartz_zinc.json new file mode 100644 index 0000000..fefc253 --- /dev/null +++ b/web/kubejs/data/createsifter/recipes/sifting/quartz_zinc.json @@ -0,0 +1,22 @@ +{ + "type": "createsifter:sifting", + "ingredients": [ + { + "item": "createsifter:zinc_mesh" + }, + { + "item": "minecraft:soul_sand" + } + ], + "processingTime": 500, + "results": [ + { + "chance": 0.2, + "item": "minecraft:quartz" + }, + { + "chance": 0.1, + "item": "minecraft:blaze_powder" + } + ] + } \ No newline at end of file diff --git a/web/kubejs/server_scripts/mechanical-extruder.js b/web/kubejs/server_scripts/mechanical-extruder.js index 0d08484..c3c139e 100644 --- a/web/kubejs/server_scripts/mechanical-extruder.js +++ b/web/kubejs/server_scripts/mechanical-extruder.js @@ -16,6 +16,10 @@ ServerEvents.recipes(event => { //listen for the "recipes" server event. Item.of('minecraft:end_stone'), [Fluid.of('minecraft:lava'),Fluid.of('minecraft:water')]) .withCatalyst('minecraft:end_stone') + event.recipes.createMechanicalExtruderExtruding( + Item.of('minecraft:deepslate'), + [Fluid.of('minecraft:lava'),Fluid.of('minecraft:water')]) + .withCatalyst('minecraft:deepslate') event.recipes.createMechanicalExtruderExtruding( Item.of('minecraft:soul_sand'),[Fluid.of('minecraft:lava'),Fluid.of('minecraft:water')]).withCatalyst('minecraft:soul_soil') diff --git a/web/kubejs/server_scripts/sifter.js b/web/kubejs/server_scripts/sifter.js index 4766df7..5d3f0a6 100644 --- a/web/kubejs/server_scripts/sifter.js +++ b/web/kubejs/server_scripts/sifter.js @@ -5,14 +5,14 @@ ServerEvents.recipes(event => { //listen for the "recipes" server event. console.log('Sifting recipes') // event.recipes.create.item_application(['kubejs:crushed'], [['#forge:stripped_wood', '#forge:stripped_logs'], 'create:shadow_steel']) - event.recipes.createsifterSifting([Item.of('minecraft:quartz').withChance(0.2),Item.of('minecraft:blaze_powder').withChance(0.1),Item.of('minecraft:ghast_tear').withChance(0.05),Item.of('minecraft:blaze_rod').withChance(0.05)], ['minecraft:soul_sand','createsifter:zinc_mesh']) - event.recipes.createsifterSifting([Item.of('minecraft:quartz').withChance(0.4),Item.of('minecraft:blaze_powder').withChance(0.2),Item.of('minecraft:ghast_tear').withChance(0.05),Item.of('minecraft:blaze_rod').withChance(0.05)], ['minecraft:soul_sand','createsifter:brass_mesh']) + //event.recipes.createsifterSifting([Item.of('minecraft:quartz').withChance(0.2),Item.of('minecraft:blaze_powder').withChance(0.1),Item.of('minecraft:ghast_tear').withChance(0.05),Item.of('minecraft:blaze_rod').withChance(0.05)], ['minecraft:soul_sand','createsifter:zinc_mesh']) + //event.recipes.createsifterSifting([Item.of('minecraft:quartz').withChance(0.4),Item.of('minecraft:blaze_powder').withChance(0.2),Item.of('minecraft:ghast_tear').withChance(0.05),Item.of('minecraft:blaze_rod').withChance(0.05)], ['minecraft:soul_sand','createsifter:brass_mesh']) - event.recipes.createsifterSifting([Item.of('minecraft:chrous_fruit').withChance(0.1),Item.of('minecraft:ender_pearl').withChance(0.05)], ['minecraft:end_stone','createsifter:zinc_mesh']) - event.recipes.createsifterSifting([Item.of('minecraft:chrous_fruit').withChance(0.2),Item.of('minecraft:ender_pearl').withChance(0.1)], ['minecraft:end_stone','createsifter:brass_mesh']) + //event.recipes.createsifterSifting([Item.of('minecraft:chrous_fruit').withChance(0.1),Item.of('minecraft:ender_pearl').withChance(0.05)], ['minecraft:end_stone','createsifter:zinc_mesh']) + //event.recipes.createsifterSifting([Item.of('minecraft:chrous_fruit').withChance(0.2),Item.of('minecraft:ender_pearl').withChance(0.1)], ['minecraft:end_stone','createsifter:brass_mesh']) - event.recipes.createsifterSifting([Item.of('ad_astra:desh_nugget').withChance(0.2),Item.of('minecraft:ostrum_nugget').withChance(0.1),Item.of('minecraft:calorite_nugget').withChance(0.05)], ['minecraft:deepslate','createsifter:brass_mesh']) - event.recipes.createsifterSifting([Item.of('ad_astra:desh_nugget').withChance(0.4),Item.of('minecraft:ostrum_nugget').withChance(0.3),Item.of('minecraft:calorite_nugget').withChance(0.1)], ['ad_astra:moon_sand','createsifter:brass_mesh']) + //event.recipes.createsifterSifting([Item.of('ad_astra:desh_nugget').withChance(0.2),Item.of('minecraft:ostrum_nugget').withChance(0.1),Item.of('minecraft:calorite_nugget').withChance(0.05)], ['minecraft:deepslate','createsifter:brass_mesh']) + //event.recipes.createsifterSifting([Item.of('ad_astra:desh_nugget').withChance(0.4),Item.of('minecraft:ostrum_nugget').withChance(0.3),Item.of('minecraft:calorite_nugget').withChance(0.1)], ['ad_astra:moon_sand','createsifter:brass_mesh']) diff --git a/web/pack.toml b/web/pack.toml index 5ad4737..6724fd6 100644 --- a/web/pack.toml +++ b/web/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "336aaa2b817feb530d91dc48bca30c299c5c64e58ffa8f424d9a54619fa159ad" +hash = "42013b626d482ec41c53026b89a4612c1b4b405c49f19e1fd232101b73f60806" [versions] forge = "47.1.47"